Merge branch '红色' into 更新

Eservice/agent/billCanUseProduct/index.js

@@ -36,6 +36,9 @@ Page({
         })
         getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
         this.listData();
+        this.setData({
+            siteid: wx.getStorageSync('userMsg').siteid
+        })
     },
     tabChange(e) {
         this.data.param.content.isAll = e.detail.name == '产品库' ? '1' : '0';

Eservice/agent/billCanUseProduct/index.scss

@@ -44,4 +44,49 @@ page {
 			background: var(--warning);
 		}
 	}
+}
+
+.description {
+	position: relative;
+	overflow: hidden;
+	box-sizing: border-box;
+
+	.title {
+		font-size: 30rpx;
+		margin-bottom: 16rpx !important;
+		color: #414141;
+
+		.tag {
+			display: inline-block;
+			margin-right: 8rpx;
+			font-size: 22rpx;
+			color: #fff;
+			padding: 0 10rpx;
+			border-radius: 4rpx;
+			box-sizing: border-box;
+		}
+
+		.M {
+			background-color: #3774F6;
+		}
+
+		.P {
+			background-color: #FF9F00;
+		}
+
+		.m {
+			background-color: #3774F6;
+		}
+
+		.p {
+			background-color: #FF9F00;
+		}
+	}
+
+	.avatar {
+		position: absolute;
+		right: -20rpx;
+		top: 50%;
+		transform: translate(0, -50%);
+	}
 }

Eservice/agent/billCanUseProduct/index.wxml

@@ -8,11 +8,18 @@
 <t-pull-down-refresh value="{{baseRefresh.value}}" loadingProps="{{loadingProps}}" loadingTexts="{{loadingTexts}}" bind:refresh="onPullDownRefresh" bind:scrolltolower="onReachBottom">
   <view style="padding:10px;">
     <t-checkbox-group value="{{selection}}" bind:change="handleGroupChange">
-      <t-cell wx:for="{{list}}" wx:key="itemid" title="{{item.itemname}}">
+      <t-cell wx:for="{{list}}" wx:key="itemid">
         <view class="avatar" slot="left-icon">
           <image src="{{item.attinfos[0].url}}" style="width: 60px;height: 60px;" mode="aspectFill" />
         </view>
-        <view slot="description">
+
+        <view class="description" slot="description">
+          <view class="title" wx:if="{{siteid == 'HY'}}">
+            <view wx:for="{{item.traceabilitytype}}" class="tag {{it}}" wx:for-item="it" wx:key="it">
+              {{language[it=='M'||it=='m'?'自制':'外购']||it=='M'||it=='m'?'自制':'外购'}}
+            </view>{{item.itemname}}
+          </view>
+          <view wx:else class="title">{{item.itemname}} </view>
           <view class="small">{{language['商品编号']||'商品编号'}}:{{item.itemno}}</view>
           <view class="small">
             {{language['商品型号']||'商品型号'}}:{{language[item.model]||item.model}}
@@ -23,9 +30,9 @@
               {{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}
             </view>
           </block>
-        </view>
-        <view class="avatar" slot="right-icon">
-          <t-checkbox value="{{item.itemid}}" />
+          <view class="avatar">
+            <t-checkbox value="{{item.itemid}}" />
+          </view>
         </view>
       </t-cell>
     </t-checkbox-group>

Eservice/components/productCard/index.wxss → Eservice/components/productCard/index.scss

@@ -14,6 +14,42 @@
   margin-right: 10px;
 }
 
+.image{
+  flex-shrink: 0;
+}
+
+.title {
+  margin-bottom: 12rpx;
+  line-height: 30rpx;
+
+  .tag {
+    display: inline-block;
+    margin-right: 8rpx;
+    font-size: 22rpx;
+    color: #fff;
+    padding: 4rpx 10rpx;
+    border-radius: 4rpx;
+    box-sizing: border-box;
+  }
+
+  .M {
+    background-color: #3774F6;
+  }
+
+  .P {
+    background-color: #FF9F00;
+  }
+
+  .m {
+    background-color: #3774F6;
+  }
+
+  .p {
+    background-color: #FF9F00;
+  }
+}
+
+
 .small {
   font-size: 24rpx;
   color: #999;
@@ -32,7 +68,7 @@
   align-items: center;
   justify-content: space-around;
   top: 80rpx;
-  right:10rpx;
+  right: 10rpx;
 }
 
 .flex-align-center {

Eservice/components/productCard/index.wxml

@@ -1,9 +1,14 @@
 <!--components/productCard/index.wxml-->
 <view class="card">
   <view class="flex">
-    <image wx:if="{{data.attinfos[0].url}}" src="{{data.attinfos[0].url}}" mode="aspectFill" />
+    <image class="image" wx:if="{{data.attinfos[0].url}}" src="{{data.attinfos[0].url}}" mode="aspectFill" />
     <view>
-      <view>{{data.itemname}}</view>
+      <view class="title" wx:if="{{siteid == 'HY'}}">
+        <view wx:for="{{data.traceabilitytype}}" class="tag {{it}}" wx:for-item="it" wx:key="it">
+          {{language[it=='M'||it=='m'?'自制':'外购']||it=='M'||it=='m'?'自制':'外购'}}
+        </view>{{data.itemname}}
+      </view>
+      <view wx:else>{{data.itemname}} </view>
       <view class="small">
         {{language['商品编号']||'商品编号'}}:{{data.itemno}}
       </view>