Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -4131,7 +4131,7 @@ export default {
           //   }
           //   this.deptBudgetList.qualityNo = 'SGRK' + this.getTime() + this.warehouseNo + count
           // }
-          this.getList()
+          // this.getList()
         }
       }
       for (let i = 0; i < this.warehouseList1.length; i++) {
@@ -4139,19 +4139,19 @@ export default {
           this.positionInfos = this.warehouseList1[i].positionInfos
         }
       }
-      console.log(this.positionInfos)
-      if (this.warehouseName) {
-        getReceiptTaskNo({
-          flag: this.taskflag,
-          warehouseName: this.warehouseName,
-          agentKey: localStorage.getItem('ws-pf_userId'),
-        })
-          .toPromise()
-          .then((response) => {
-            this.taskNolist = response
-          })
-        this.getList()
-      }
+      // console.log(this.positionInfos)
+      // if (this.warehouseName) {
+      //   getReceiptTaskNo({
+      //     flag: this.taskflag,
+      //     warehouseName: this.warehouseName,
+      //     agentKey: localStorage.getItem('ws-pf_userId'),
+      //   })
+      //     .toPromise()
+      //     .then((response) => {
+      //       this.taskNolist = response
+      //     })
+      //   this.getList()
+      // }
     },
     selectpackingMethod(e) {
       this.$set(this.deptBudgetList, 'grade', e)

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -106,8 +106,9 @@
                     size="small" />
                 </ws-form-item>
                 <ws-form-item label="车牌号" span="1" prop="carNumber">
-                  <ws-input v-model="weighingList.carNumber" placeholder="自动获取，不可编辑" maxlength="100" size="small"
+                  <ws-input v-model="weighingList.carNumber" v-if="inWarehouseType==1" placeholder="自动获取，不可编辑" maxlength="100" size="small"
                     disabled />
+                    <ws-input v-model="weighingList.carNumber" v-else placeholder="自动获取，不可编辑" maxlength="100" size="small" />
                 </ws-form-item>
                 <ws-form-item label="运输方式" span="1" prop="outType" v-if="inWarehouseType == 1">
                   <ws-input v-model="weighingList.outType" placeholder="自动获取，不可编辑" maxlength="100" size="small"

src/views/statisticalReport/autoSettlementList.vue

@@ -693,6 +693,17 @@ export default {
       }else{
         this.contractNo=''
       }
+    autocontract({
+        compId: localStorage.getItem('ws-pf_compId'),
+    })
+    .toPromise()
+    .then((response) => {
+      this.contractNoList = response
+      this.contractNoList.unshift({
+        contractNo: '全部合同'
+      })
+      this.options = this.contractNoList
+    })
     this.getList()
     this.showType = this.isShow
   },
@@ -1715,19 +1726,8 @@ export default {
           this.deptBudgetTotal = response.total
           this.warehouseList = response
         })
-      autocontract({
-        compId: localStorage.getItem('ws-pf_compId'),
-        // roleFlag: this.roleFlag,
-      })
-        .toPromise()
-        .then((response) => {
-          this.contractNoList = response
-          this.contractNoList.unshift({
-            contractNo: '全部合同'
-          })
-          this.options = this.contractNoList
-        })
     },
+
     handleRemove(file) {
       console.log(file)
     },