ccjgmwz 3 tahun lalu
induk
melakukan
843d80032d

+ 1 - 1
public/static/weightCheck.html

@@ -22,7 +22,7 @@
         width: 1000px;
         padding: 30px 20px 20px 20px;
         font-size: 18px;
-        height: 65vh;
+        height: 130vh;
         /* position: absolute; */
         /*        top: 0;
         bottom: 0;

+ 2 - 2
src/views/houseSelfCollect/paymentManagement.vue

@@ -780,8 +780,8 @@ import download from '../../components/WsDownload/download'
       getpayment({
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        // startDate:startDate,
-        // endDate:endDate,
+        startDate:startDate,
+        endDate:endDate,
         searchKeyWord: this.searchKeyWord,
         searchType: searchParam,
         warehouseName: this.warehouseName,

+ 7 - 4
src/views/houseSelfCollect/weightCheck.vue

@@ -292,7 +292,7 @@
             searchKeyWord: '',
             warehouseName: sessionStorage.getItem('ck'),
             managementType: 1,
-            viewFlag:'1'
+            // viewFlag:'1'
           })
           .toPromise()
           .then((response) => {
@@ -323,9 +323,12 @@
         console.log(this.common.commonWeighingList, 'commonWeighingList')
         let _list = this.common.commonWeighingList
         for (let i = 0; i < _list.length; i++) {
-          if (_list[i].allow == 2) {
-            continue
-          }
+          if (_list[i].paymentManagement) {
+            if (_list[i].paymentManagement.status != '待结算' || _list[i].paymentManagement
+              .approveStatus) {
+              continue
+            } 
+          } 
           if (_list[i].status == '已质检' || _list[i].status == '已称毛重') {
             this.mList.push(_list[i])
           }