Merge branch '黄色' into 测试

Eservice/agent/billCanUseProduct/index.js

@@ -31,9 +31,10 @@ Page({
             this.data.param.content.sa_orderid = prePage.data.sa_orderid
         }
         this.setData({
-            loadingTexts: ['下拉刷新', '松手刷新', '正在刷新', '刷新完成'].map(v => getApp().globalData.Language.getMapText(v))
+            loadingTexts: ['下拉刷新', '松手刷新', '正在刷新', '刷新完成'].map(v => getApp().globalData.Language.getMapText(v)),
+            siteid: wx.getStorageSync('userMsg').siteid
         })
-        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
+        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
         this.listData();
     },
     tabChange(e) {

Eservice/agent/billCanUseProduct/index.wxml

@@ -19,6 +19,15 @@
           <view class="small">
             {{language['商品型号']||'商品型号'}}:{{language[item.model]||item.model}}
           </view>
+          <block wx:if="{{siteid=='HY'}}">
+            <view class="small">
+              {{language['公称通径']||'公称通径'}}:{{item.caliber||' --'}}
+            </view>
+            <view class="small">
+              {{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||' --'}}
+            </view>
+          </block>
+
         </view>
         <view class="avatar" slot="right-icon">
           <t-checkbox value="{{item.itemid}}" />

Eservice/components/productCard/index.js

@@ -19,6 +19,14 @@ Component({
       type: Boolean
     }
   },
+  lifetimes: {
+    attached: function () {
+      getApp().globalData.Language.getLanguagePackage(this)
+      this.setData({
+        siteid: wx.getStorageSync('userMsg').siteid
+      })
+    }
+  },
   methods: {
     onIconTap() {
       this.triggerEvent("delete", this.data.data);
@@ -39,15 +47,15 @@ Component({
         content: getApp().globalData.Language.joint([{
           t: 1,
           v: '是否确定修改',
-      }, {
+        }, {
           v: data.itemname,
           f: "“",
           r: "”"
-      }, {
+        }, {
           t: 1,
           v: '数量为',
           r: `:${value}`
-      }]),
+        }]),
         complete: (res) => {
           if (res.cancel) {
             that.setData({

Eservice/components/productCard/index.wxml

@@ -10,6 +10,14 @@
       <view class="small">
         {{language['型号']||'商品型号'}}:{{data.model}}
       </view>
+      <block wx:if="{{siteid=='HY'}}">
+        <view class="small flex-align-center">
+          {{language['公称通径']||'公称通径'}}:{{data.caliber||' --'}}
+        </view>
+        <view class="small flex-align-center">
+          {{language['公称压力']||'公称压力'}}:{{data.nominalpressure||' --'}}
+        </view>
+      </block>
       <block wx:if="{{model==1}}">
         <view wx:if="{{changeQty}}" class="small flex-align-center">
           {{language['数量']||'数量'}}:<input value="{{data.qty}}" bindinput="inputChange" bindblur="newOnBlur" placeholder="{{language['数量']||'输入数量'}}"></input>

Eservice/saler/billCanUseProduct/index.js

@@ -69,7 +69,8 @@ Page({
 
     this.setData({
       param: this.data.param,
-      loadingTexts: ['下拉刷新', '松手刷新', '正在刷新', '刷新完成'].map(v => getApp().globalData.Language.getMapText(v))
+      loadingTexts: ['下拉刷新', '松手刷新', '正在刷新', '刷新完成'].map(v => getApp().globalData.Language.getMapText(v)),
+      siteid: wx.getStorageSync('userMsg').siteid
     })
     getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
     this.listData()

Eservice/saler/billCanUseProduct/index.wxml

@@ -18,6 +18,14 @@
           <view class="small">
             {{language['商品型号']||'商品型号'}}:{{language[item.model]||item.model}}
           </view>
+          <block wx:if="{{siteid=='HY'}}">
+            <view class="small">
+              {{language['公称通径']||'公称通径'}}:{{item.caliber||' --'}}
+            </view>
+            <view class="small">
+              {{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||' --'}}
+            </view>
+          </block>
         </view>
         <view class="avatar" slot="right-icon">
           <t-checkbox value="{{item.itemid}}" />

Eservice/workerLeader/billCanUseProduct/index.js

@@ -69,9 +69,10 @@ Page({
 
     this.setData({
       param: this.data.param,
-      loadingTexts: ['下拉刷新', '松手刷新', '正在刷新', '刷新完成'].map(v => getApp().globalData.Language.getMapText(v))
+      loadingTexts: ['下拉刷新', '松手刷新', '正在刷新', '刷新完成'].map(v => getApp().globalData.Language.getMapText(v)),
+      siteid: wx.getStorageSync('userMsg').siteid
     })
-    getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
+    getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
     this.listData()
   },
 

Eservice/workerLeader/billCanUseProduct/index.wxml

@@ -1,35 +1,37 @@
 <!--pages/agent/billCanUseProduct/index.vue.wxml-->
-<t-pull-down-refresh
-  value="{{baseRefresh.value}}"
-  loadingProps="{{loadingProps}}"
-  loadingTexts="{{loadingTexts}}"
-  bind:refresh="onPullDownRefresh"
-  bind:scrolltolower="onReachBottom"
->
-<view style="padding:10px">
-  <t-search model:value="{{value}}" placeholder="{{language['关键字']||'根据商品名称搜索'}}"bind:submit="search" bind:clear="clear"  shape="round"/>
-  <view wx:if="{{selection.length > 0}}" style="padding:10px 10px 0 10px" class="flex-align-center flex-between">
-    <t-button size="small" variant="text" bind:tap="refresh">{{language['重置']||'重 置'}}</t-button>
-    <t-button theme="primary" size="small" variant="text" bind:tap="onConfirm">{{language['添加']||'添加选中的商品'}}</t-button>
-  </view>
-  <t-checkbox-group value="{{selection}}" bind:change="handleGroupChange" >
-    <t-cell wx:for="{{list}}" wx:key="itemid" title="{{item.itemname}}">
-      <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="small">
-          {{language['商品编号']||'商品编号'}}:{{item.itemno}}
+<t-pull-down-refresh value="{{baseRefresh.value}}" loadingProps="{{loadingProps}}" loadingTexts="{{loadingTexts}}" bind:refresh="onPullDownRefresh" bind:scrolltolower="onReachBottom">
+  <view style="padding:10px">
+    <t-search model:value="{{value}}" placeholder="{{language['关键字']||'根据商品名称搜索'}}" bind:submit="search" bind:clear="clear" shape="round" />
+    <view wx:if="{{selection.length > 0}}" style="padding:10px 10px 0 10px" class="flex-align-center flex-between">
+      <t-button size="small" variant="text" bind:tap="refresh">{{language['重置']||'重 置'}}</t-button>
+      <t-button theme="primary" size="small" variant="text" bind:tap="onConfirm">{{language['添加']||'添加选中的商品'}}</t-button>
+    </view>
+    <t-checkbox-group value="{{selection}}" bind:change="handleGroupChange">
+      <t-cell wx:for="{{list}}" wx:key="itemid" title="{{item.itemname}}">
+        <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="small">
+            {{language['商品编号']||'商品编号'}}:{{item.itemno}}
+          </view>
+          <view class="small">
+            {{language['商品型号']||'商品型号'}}:{{language[item.model]||item.model}}
+          </view>
+          <block wx:if="{{siteid=='HY'}}">
+            <view class="small">
+              {{language['公称通径']||'公称通径'}}:{{item.caliber||' --'}}
+            </view>
+            <view class="small">
+              {{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||' --'}}
+            </view>
+          </block>
         </view>
-        <view class="small">
-          {{language['商品型号']||'商品型号'}}:{{language[item.model]||item.model}}
+        <view class="avatar" slot="right-icon">
+          <t-checkbox value="{{item.itemid}}" />
         </view>
-      </view>
-      <view class="avatar" slot="right-icon">
-        <t-checkbox value="{{item.itemid}}"/>
-      </view>
-    </t-cell>
-  </t-checkbox-group>
-</view>
+      </t-cell>
+    </t-checkbox-group>
+  </view>
 
 </t-pull-down-refresh>