xiaohaizhao 2 weeks ago
parent
commit
d75c839c49

+ 2 - 1
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,

+ 1 - 1
packageA/toolBill/modules/selectProduct/index.wxml

@@ -20,7 +20,7 @@
                     <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['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}
                 </view>

+ 4 - 1
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 || "";