Merge branch 'master' into 页面修改

Eservice/agent/billCanUseProduct/index.wxml

@@ -13,21 +13,16 @@
           <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['商品编号']||'商品编号'}}:{{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['公称通径']||'公称通径'}}:{{item.caliber||' --'}}
-            </view>
-            <view class="small">
-              {{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||' --'}}
+              {{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}
             </view>
           </block>
-
         </view>
         <view class="avatar" slot="right-icon">
           <t-checkbox value="{{item.itemid}}" />
@@ -41,13 +36,16 @@
 <view class="footer">
   <view class="count" />
   <view class="but-box">
-    <van-button disabled='{{selection.length == 0}}' custom-class='but delete' bind:click="refresh">{{language['重置']||'重 置'}}</van-button>
-    <van-button disabled='{{selection.length == 0}}' custom-class='but' bind:click="onConfirm">{{language['添加']||'添加选中的商品'}}</van-button>
+    <van-button disabled='{{selection.length == 0}}' custom-class='but delete' bind:click="refresh">
+      {{language['重置']||'重 置'}}
+    </van-button>
+    <van-button disabled='{{selection.length == 0}}' custom-class='but' bind:click="onConfirm">
+      {{language['添加']||'添加选中的商品'}}
+    </van-button>
   </view>
 </view>
-
-<!--   <view wx:if="{{selection.length > 0}}" style="padding:10px 10px 0 10px" class="flex-align-center flex-between">
+<!-- <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>
- -->
+  </view> -->
+<wxs src="../../../utils/nominalpressure.wxs" module="join"></wxs>

Eservice/components/productCard/index.wxml

@@ -15,7 +15,7 @@
           {{language['公称通径']||'公称通径'}}:{{data.caliber||' --'}}
         </view>
         <view class="small flex-align-center">
-          {{language['公称压力']||'公称压力'}}:{{data.nominalpressure||' --'}}
+          {{language['公称压力']||'公称压力'}}:{{join.formatting(data.nominalpressure)}}
         </view>
       </block>
       <block wx:if="{{model==1}}">
@@ -63,4 +63,6 @@
       <textarea auto-height maxlength='499' value="{{data.reason}}" data-name='reason' bindblur='onBlur' />
     </view>
   </block>
-</view>
+</view>
+
+<wxs src="../../../utils/nominalpressure.wxs" module="join"></wxs>

Eservice/saler/billCanUseProduct/index.wxml

@@ -1,10 +1,12 @@
-<!--pages/agent/billCanUseProduct/index.vue.wxml-->
+<!-- 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>
+      <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}}">
@@ -12,18 +14,14 @@
           <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['商品编号']||'商品编号'}}:{{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['公称通径']||'公称通径'}}:{{item.caliber||' --'}}
-            </view>
-            <view class="small">
-              {{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||' --'}}
+              {{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}
             </view>
           </block>
         </view>
@@ -33,5 +31,6 @@
       </t-cell>
     </t-checkbox-group>
   </view>
+</t-pull-down-refresh>
 
-</t-pull-down-refresh>
+<wxs src="../../../utils/nominalpressure.wxs" module="join"></wxs>

Eservice/workerLeader/billCanUseProduct/index.wxml

@@ -23,7 +23,7 @@
               {{language['公称通径']||'公称通径'}}:{{item.caliber||' --'}}
             </view>
             <view class="small">
-              {{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||' --'}}
+                {{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}
             </view>
           </block>
         </view>
@@ -34,4 +34,6 @@
     </t-checkbox-group>
   </view>
 
-</t-pull-down-refresh>
+</t-pull-down-refresh>
+
+<wxs src="../../../utils/nominalpressure.wxs" module="join"></wxs>

packageA/account/detail.wxml

@@ -46,7 +46,7 @@
 					{{language['公称通径']||'公称通径'}}：{{item.caliber||'--'}}
 				</view>
 				<view class="col">
-					{{language['公称压力']||'公称压力'}}：{{item.nominalpressure||'--'}}
+					{{language['公称压力']||'公称压力'}}：{{join.formatting(item.nominalpressure)}}
 				</view>
 			</block>
 			<view class="col">
@@ -93,4 +93,6 @@
 		</view>
 	</view>
 	<Yl_Empty wx:if="{{list.length === 0}}" />
-</Yl_ListBox>
+</Yl_ListBox>
+
+<wxs src="../../utils/nominalpressure.wxs" module="join" />

packageA/borrow/modules/product/index.js

@@ -196,7 +196,8 @@ Component({
 					"id":20230116111602,
 					"content": {
 						nocache:true,
-						"sa_orderid": this.data.sa_orderid, //订单ID
+                        "sa_orderid": this.data.sa_orderid, //订单ID
+                        brandids:[],
 						"pageNumber": 1,
 						"pageTotal": 1,
 						"total": 0,

packageA/borrow/modules/product/list/index.wxml

@@ -21,11 +21,11 @@
 				</view>
 				<view class="subfield" wx:if="{{siteid == 'HY'}}">
 					<text class="line-1" style="margin-right: 6rpx;">{{language['公称通径']||'公称通径'}}:{{language[item.caliber]||item.caliber||' --'}}</text>
-					<text class="line-1" style="margin-right: 6rpx;">{{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||' --'}}</text>
+					<text class="line-1" style="margin-right: 6rpx;">{{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}</text>
 				</view>
 				<view class="subfield">
 					<text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{language[item.material]||item.material||' --'}}</text>
-					<text class="line-1">{{language['标准']||'标准'}}：{{language[item.standards]||item.standards||' --'}}</text>
+					<text class="line-1">{{language['标准']||'标准'}}：{{language[(siteid=='HY'?item.standardsmx:item.standards)]||(siteid=='HY'?item.standardsmx:item.standards)||'--'}}</text>
 				</view>
 				<view class="subfield">
 					<text class="line-1" style="margin-right: 6rpx;">{{language['已发数量']||'已发数量'}}：{{item.deliedqty||' --'}}</text>
@@ -87,4 +87,6 @@
 <block wx:if="{{list.length==0}}">
 	<Yl_Empty />
 	<view style="height: 150rpx;" />
-</block>
+</block>
+
+<wxs src="../../../../../utils/nominalpressure.wxs" module="join"></wxs>

packageA/invoice/detail.js

@@ -27,11 +27,11 @@ Page({
         }]
     },
     onLoad(options) {
+        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
         this.setData({
             sa_invoiceapplyid: options.id
         });
         this.getDetail();
-        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
     },
     getDetail() {
         _Http.basic({

packageA/invoice/modules/detailLine/list/index.wxml

@@ -25,7 +25,7 @@
 
                 <view class="subfield" wx:if="{{siteid=='HY'}}">
                     <text class="line-1" style="margin-right: 6rpx;">{{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber||' --'}}</text>
-                    <text class="line-1">{{language['公称压力']||'公称压力'}}：{{language[item.nominalpressure]||item.nominalpressure||' --'}}</text>
+                    <text class="line-1">{{language['公称压力']||'公称压力'}}：{{join.formatting(item.nominalpressure)}}</text>
                 </view>
             </view>
             <view wx:if="{{!disabled}}" class="delete" data-item="{{item}}" catchtap="deleteProduct">
@@ -48,4 +48,6 @@
 <block wx:if="{{list.length==0}}">
     <Yl_Empty />
     <view style="height: 150rpx;" />
-</block>
+</block>
+
+<wxs src="../../../../../utils/nominalpressure.wxs" module="join"></wxs>

packageA/market/detail.wxml

@@ -12,9 +12,7 @@
 </swiper>
 <!-- 产品介绍 -->
 <view class="intr">
-  <view class="title">
-    {{detail.itemname}}
-  </view>
+  <view class="title">{{detail.itemname}}</view>
   <view class="tags">
     <text wx:for="{{detail.brand}}" wx:key="sa_brandid">{{language[item.brandname]||item.brandname}}</text>
     <text wx:for="{{detail.tradefield}}" wx:key="index">{{language[item.tradefield]||item.tradefield}}</text>
@@ -34,36 +32,34 @@
 </view>
 <!-- 选择型号 -->
 <view class="model" wx:if="{{rows.length}}">
-  <view class="label">
-    {{language['选择商品']||'选择商品'}}
-  </view>
+  <view class="label">{{language['选择商品']||'选择商品'}}</view>
   <view class="product-box">
-    <navigator url="#" class="product {{itemno===item.itemno?'active':''}}" wx:for="{{rows}}" wx:key="itemno" bindtap="changeItemno" data-item="{{item}}">{{language[item.spec]||item.spec}}</navigator>
+    <navigator url="#" class="product {{itemno===item.itemno?'active':''}}" wx:for="{{rows}}" wx:key="itemno" bindtap="changeItemno" data-item="{{item}}">
+      {{language[item.spec]||item.spec}}
+    </navigator>
   </view>
 </view>
 <van-tabs custom-class='tabs' title-active-color='var(--assist)' color='var(--assist)'>
   <van-tab title="{{language['商品简介']||'商品简介'}}">
     <view class="tab-box">
-      <view class="row">
-        {{language['商品编号']||'商品编号'}}：{{detail.itemno}}
-      </view>
+      <view class="row">{{language['商品编号']||'商品编号'}}：{{detail.itemno}}</view>
       <view wx:if="{{siteid!='HY' && detail.spec}}" class="row">
         {{language['规格']||'规格'}}：{{detail.spec || ' --'}}
       </view>
       <view wx:if="{{detail.model}}" class="row">
         {{language['型号']||'型号'}}：{{detail.model || ' --'}}
       </view>
-
+      <view class="row">
+        {{language['标准']||'标准'}}：{{language[(siteid=='HY'?detail.standardsmx:detail.standards)]||(siteid=='HY'?detail.standardsmx:detail.standards)||'--'}}
+      </view>
       <block wx:if="{{siteid == 'HY'}}">
         <view class="row">
           {{language['公称通径']||'公称通径'}}：{{detail.caliber||detail.itemextend[0].caliber || ' --'}}
         </view>
         <view class="row">
-          {{language['公称压力']||'公称压力'}}：{{detail.nominalpressure||detail.itemextend[0].nominalpressure || ' --'}}
-        </view>
-        <view class="row">
-          {{language['产线']||'产线'}}：{{detail.itemextend[0].prodline || ' --'}}
+          {{language['公称压力']||'公称压力'}}：{{join.formatting(detail.nominalpressure||detail.itemextend[0].nominalpressure)}}
         </view>
+        <view class="row">{{language['产线']||'产线'}}：{{detail.itemextend[0].prodline || ' --'}}</view>
         <view class="row">
           {{language['执行器类型']||'执行器类型'}}：{{detail.itemextend[0].actuatortype || ' --'}}
         </view>
@@ -71,7 +67,6 @@
           {{language['执行器品牌']||'执行器品牌'}}：{{detail.itemextend[0].actuatorbrand || ' --'}}
         </view>
       </block>
-
       <block wx:else>
         <view wx:if="{{detail.itemextend[0].material}}" class="row">
           {{language['材质']||'材质'}}：{{detail.itemextend[0].material || ' --'}}
@@ -95,17 +90,17 @@
           {{language['特殊说明']||'特殊说明'}}：{{detail.itemextend[0].specalnote || ' --'}}
         </view>
       </block>
-
     </view>
   </van-tab>
   <van-tab title="{{language[siteid=='HY'?'技术资料':'产品资料'] || siteid=='HY'?'技术资料':'产品资料'}}">
     <Yl_Empty wx:if="{{detail.technicalinfo.length==0}}" />
     <view wx:else class="document-box">
-      <navigator class="document" url="#" wx:for="{{detail.technicalinfo}}" wx:key="index" bindtap="openDocument" data-item="{{item}}">{{item.document}}</navigator>
+      <navigator class="document" url="#" wx:for="{{detail.technicalinfo}}" wx:key="index" bindtap="openDocument" data-item="{{item}}">
+        {{item.document}}
+      </navigator>
     </view>
   </van-tab>
 </van-tabs>
-
 <block wx:if="{{userrole!='业务员'}}">
   <!-- 底部 -->
   <view style="height: 150rpx;" />
@@ -113,8 +108,11 @@
     <picker wx:if="{{detail.tradefield.length>=2}}" range='{{detail.tradefield}}' range-key='tradefield' bindchange='storage'>
       <van-button custom-class='but' bindtap="clickBut">{{language['加入购物车']||'加入购物车'}}</van-button>
     </picker>
-    <van-button wx:else custom-class='but' bindtap="clickBut">{{language['加入购物车']||'加入购物车'}}</van-button>
+    <van-button wx:else custom-class='but' bindtap="clickBut">
+      {{language['加入购物车']||'加入购物车'}}
+    </van-button>
   </view>
   <!-- 购物车按钮 -->
   <Float id="Float" />
-</block>
+</block>
+<wxs src="../../utils/nominalpressure.wxs" module="join"></wxs>

packageA/orderForm/index.js

@@ -12,6 +12,7 @@ Page({
             "pageNumber": 1,
             "pageTotal": 1,
             "pageSize": 20,
+            "systemclient": "wechatsaletool",
             total: 0,
             "where": {
                 "condition": "",

packageA/orderForm/modules/product/list/index.wxml

@@ -21,11 +21,7 @@
                 </view>
                 <view class="subfield" wx:if="{{siteid=='HY'}}">
                     <text class="line-1" style="margin-right: 6rpx;">{{language['公称通径']||'公称通径'}}:{{language[item.caliber]||item.caliber||' --'}}</text>
-                    <text class="line-1">{{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||' --'}}</text>
-                </view>
-                <view class="subfield">
-                    <text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{language[item.material]||item.material||' --'}}</text>
-                    <text class="line-1">{{language['标准']||'标准'}}：{{language[item.standards]||item.standards||' --'}}</text>
+                    <text class="line-1">{{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}</text>
                 </view>
                 <view class="subfield">
                     <text class="line-1" style="margin-right: 6rpx;">{{language['已发数量']||'已发数量'}}：{{item.deliedqty||' --'}}</text>
@@ -90,4 +86,6 @@
 </block>
 <van-popup show="{{ popupShow }}" position="bottom" bind:click-overlay="closePopup" z-index='999999999'>
     <van-datetime-picker type="date" value="{{ changeDate.minDate }}" min-date="{{ changeDate.minDate }}" bind:confirm='onConfirm' bind:cancel='closePopup' />
-</van-popup>
+</van-popup>
+
+<wxs src="../../../../../utils/nominalpressure.wxs" module="join"></wxs>

packageA/shipment/modules/binding/index.wxml

@@ -26,10 +26,12 @@
 				</view>
 				<view class="row" wx:if="{{siteid=='HY'}}">
 					<text>{{language['公称通径']||'公称通径'}}：{{it.caliber || ' --'}}</text>
-					<text>{{language['公称压力']||'公称压力'}}：{{it.nominalpressure || ' --'}}</text>
+					<text>{{language['公称压力']||'公称压力'}}：{{join.formatting(it.nominalpressure)}}</text>
 				</view>
 			</view>
 		</view>
 	</block>
 </view>
-<Yl_Empty wx:if="{{list.length==0}}" />
+<Yl_Empty wx:if="{{list.length==0}}" />
+
+<wxs src="../../../../utils/nominalpressure.wxs" module="join" />

packageA/shopping/modules/standard/index.wxml

@@ -15,7 +15,7 @@
             <view class="exp" wx:if="{{siteid!='HY'}}">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec}}</view>
             <block wx:else>
                 <view class="exp">{{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber || '--'}}</view>
-                <view class="exp">{{language['公称压力']||'公称压力'}}：{{language[item.nominalpressure]||item.nominalpressure || '--'}}</view>
+                <view class="exp">{{language['公称压力']||'公称压力'}}：{{join.formatting(item.nominalpressure)}}</view>
             </block>
             <view class="exp">{{language['型号']||'型号'}}：{{language[item.model]||item.model}}</view>
             <view class="exp">{{language['品牌']||'品牌'}}：{{language[item.brandname]||item.brandname}}</view>
@@ -62,4 +62,6 @@
     module.exports.price = function (figure, defaultamount) {
         return (figure - defaultamount).toFixed(2)
     }
-</wxs>
+</wxs>
+
+<wxs src="../../../../utils/nominalpressure.wxs" module="join" />

packageA/shopping/modules/tool/index.wxml

@@ -15,7 +15,7 @@
             <view class="exp" wx:if="{{siteid!='HY'}}">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec}}</view>
             <block wx:else>
                 <view class="exp">{{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber || '--'}}</view>
-                <view class="exp">{{language['公称压力']||'公称压力'}}：{{language[item.nominalpressure]||item.nominalpressure || '--'}}</view>
+                <view class="exp">{{language['公称压力']||'公称压力'}}：{{join.formatting(item.nominalpressure)}}</view>
             </block>
             <view class="exp">{{language['型号']||'型号'}}：{{language[item.model]||item.model}}</view>
             <view class="exp">{{language['品牌']||'品牌'}}：{{language[item.brandName]||item.brandName||" --"}}</view>
@@ -63,4 +63,6 @@
     module.exports.price = function (figure, defaultamount) {
         return (figure - defaultamount).toFixed(2)
     }
-</wxs>
+</wxs>
+
+<wxs src="../../../../utils/nominalpressure.wxs" module="join" />

packageA/tool/modules/list/index.wxml

@@ -13,7 +13,7 @@
     <view class="right-box">
         <view class="title line-1">{{item.itemname||'--'}}</view>
         <view class="type line-1">{{language['型号']||'型号'}}：{{language[item.model]||item.model||'--'}} <text wx:if="{{siteid!='HY'}}" style="margin-left: 16rpx;">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||'--'}}</text></view>
-        <view class="type line-1" wx:if="{{siteid == 'HY'}}">{{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber||'--'}} <text style="margin-left: 16rpx;">{{language['公称压力']||'公称压力'}}：{{language[item.nominalpressure]||item.nominalpressure||'--'}}</text></view>
+        <view class="type line-1" wx:if="{{siteid == 'HY'}}">{{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber||'--'}} <text style="margin-left: 16rpx;">{{language['公称压力']||'公称压力'}}：{{join.formatting(item.nominalpressure)}}</text></view>
         <view class="tags">
             <view style="background: #FA8C16;">
                 {{language[item.brandname]||item.brandname}}
@@ -35,4 +35,6 @@
         </block>
     </view>
 </view>
-<Yl_Empty wx:if="{{list.length === 0}}" />
+<Yl_Empty wx:if="{{list.length === 0}}" />
+
+<wxs src="../../../../utils/nominalpressure.wxs" module="join" />

packageA/toolBill/modules/selectProduct/index.wxml

@@ -20,9 +20,9 @@
                     <text>{{language['单价']||'单价'}}:{{item.price}}</text>
                     {{language['数量']||'数量'}}:{{item.qty}}
                 </view>
-                <view class="subfield line-1">
+                <view wx:if="{{siteid == 'HY'}}" class="subfield line-1">
                     <text>{{language['公称通径']||'公称通径'}}:{{item.caliber||'--'}}</text>
-                    {{language['公称压力']||'公称压力'}}:{{item.nominalpressure||'--'}}
+                    {{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}
                 </view>
                 <view class="price line-1">
                     {{language['总金额']||'总金额'}}<text class="num">￥{{item.gradeprice || item.amount}}{{language['元']||'元'}}</text>
@@ -54,4 +54,6 @@
             },
         }
     </wxs>
-</block>
+</block>
+
+<wxs src="../../../../utils/nominalpressure.wxs" module="join"></wxs>

packageA/toolBill/modules/toolDetail/list/index.wxml

@@ -21,11 +21,7 @@
 				</view>
 				<view class="subfield" wx:if="{{siteid=='HY'}}">
 					<text class="line-1" style="margin-right: 6rpx;">{{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber||' --'}}</text>
-					<text class="line-1">{{language['公称压力']||'公称压力'}}：{{language[item.nominalpressure]||item.nominalpressure||' --'}}</text>
-				</view>
-				<view class="subfield">
-					<text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{language[item.material]||item.material||' --'}}</text>
-					<text class="line-1">{{language['标准']||'标准'}}：{{language[item.standards]||item.standards||' --'}}</text>
+					<text class="line-1">{{language['公称压力']||'公称压力'}}：{{join.formatting(item.nominalpressure)}}</text>
 				</view>
 				<view class="subfield">
 					<text class="line-1" style="margin-right: 6rpx;">{{language['起订数量']||'起订数量'}}：{{item.orderminqty||' --'}}</text>
@@ -68,4 +64,6 @@
 <block wx:if="{{list.length==0}}">
 	<Yl_Empty />
 	<view style="height: 150rpx;" />
-</block>
+</block>
+
+<wxs src="../../../../../utils/nominalpressure.wxs" module="join"></wxs>

select/orderFormLine/index.wxml

@@ -22,9 +22,13 @@
 				<view class="subfield line-1">
 					<text>{{language[item.type]||item.type}}：{{item.sonum||' --'}}</text>
 				</view>
+				<view></view>
 				<view class="subfield line-1" wx:if="{{siteid == 'HY'}}">
 					<text style="margin-right: 6rpx;">{{language['公称通径']||'公称通径'}}：{{item.caliber||' --'}}</text>
-					<text>{{language['公称压力']||'公称压力'}}：{{item.nominalpressure||' --'}}</text>
+			
+				</view>
+				<view class="subfield line-1" wx:if="{{siteid == 'HY'}}">
+					<text>{{language['公称压力']||'公称压力'}}：{{join.formatting(item.nominalpressure)}}</text>
 				</view>
 				<view class="subfield line-1">
 					<text>{{language['数量']||'数量'}}：{{item.qty||' --'}}</text>
@@ -60,4 +64,6 @@
 			},
 		}
 	</wxs>
-</block>
+</block>
+
+<wxs src="../../utils/nominalpressure.wxs" module="join"></wxs>

select/product/index.js

@@ -75,7 +75,9 @@ Page({
         let params = this.data.params;
         if (init) params.content.pageNumber = 1
         if (params.content.pageNumber > params.content.pageTotal) return;
-
+        for (const key in params.content.where) {
+            if (String(params.content.where[key]).length == 0) delete(params.content.where[key])
+        }
         _Http.basic(params).then(res => {
             console.log("选择产品列表", res)
             this.selectComponent('#ListBox').RefreshToComplete();
@@ -204,6 +206,7 @@ Page({
     handleFilter(e) {
         this.data.params.content.where.itemclassid = e.detail.itemclassid || "";
         this.data.params.content.where.sa_brandid = e.detail.sa_brandid || "";
+        this.data.params.content.brandids = e.detail.sa_brandid ? [e.detail.sa_brandid] : [];
         this.data.params.content.where.tradefield = e.detail.tradefield || "";
         this.data.params.content.where.standards = e.detail.standards || "";
         this.data.params.content.where.material = e.detail.material || "";

select/product/index.wxml

@@ -26,16 +26,17 @@
                 <view class="subfield line-1">
                     {{language['产品编码']||'产品编码'}}：{{item.itemno}}
                 </view>
+                <view class="subfield line-1">
+                    {{language['标准']||'标准'}}：{{language[(siteid=='HY'?item.standardsmx:item.standards)]||(siteid=='HY'?item.standardsmx:item.standards)||'--'}}
+                </view>
                 <view class="subfield line-1">
                     <text>{{language['品牌']||'品牌'}}:{{language[item.brandname]||item.brandname||'--'}}</text>
                     {{language['领域']||'领域'}}:{{language[item.tradefields]||item.tradefields||'--'}}
                 </view>
                 <view class="subfield line-1" wx:if="{{siteid=='HY'}}">
                     <text>{{language['公称通径']||'公称通径'}}:{{language[item.caliber]||item.caliber||'--'}}</text>
-                    {{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||'--'}}
+                    {{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}
                 </view>
-
-
                 <view class="price line-1">
                     {{language['价格']||'价格'}}：<text class="num">{{item.newPrice}}{{language['元']||'元'}}</text><text wx:if="{{item.oldPrice}}" style="text-decoration:line-through; color:#999;">/{{item.oldPrice}}</text>
                 </view>
@@ -68,4 +69,5 @@
             },
         }
     </wxs>
-</block>
+</block>
+<wxs src="../../utils/nominalpressure.wxs" module="join"></wxs>

utils/nominalpressure.wxs

@@ -0,0 +1,4 @@
+module.exports.formatting = function formatting(list) {
+    if (list.length == 0) return '--';
+    return list.join('/');
+};