소스 검색

带信息

zxz 3 년 전
부모
커밋
0a62010822
2개의 변경된 파일32개의 추가작업 그리고 30개의 파일을 삭제
  1. 16 18
      src/views/warehouse/warehouseManagementNoWeightIn.vue
  2. 16 12
      src/views/warehouse/warehouseManagementNoWeightOut.vue

+ 16 - 18
src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -836,7 +836,6 @@ export default {
     }
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
-    this.getList()
     this.dataList.id = this.$route.query.id
     this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
     this.dataList.contractNo = this.$route.query.contractNo
@@ -883,16 +882,7 @@ export default {
       this.isGetCost = true
       this.cost = this.dataList.cost
     }
-    getReceiptTaskNo({
-      flag: 2,
-      warehouseName: this.deptBudgetList1.warehouseName,
-      agentKey: localStorage.getItem('ws-pf_userId'),
-    })
-      .toPromise()
-      .then((response) => {
-        this.deptBudgetList2 = response
-      })
-      
+  this.getList()
     if(this.$route.query.automaticWeightAcquisition == '1'){
       this.openPort()
     }
@@ -1084,7 +1074,11 @@ export default {
       for (let i = 0; i < this.deptBudgetList2.length; i++) {
         if (this.deptBudgetList2[i].inOutTaskNo == e) {
           var data = this.deptBudgetList2[i]
-          this.dataList.contractNo = this.deptBudgetList2[i].contractNo
+          if (this.deptBudgetList2[i].contractNo) {
+            this.dataList.contractNo = this.deptBudgetList2[i].contractNo
+          } else {
+            this.dataList.contractNo = this.deptBudgetList2[i].moveTaskNo
+          }
         }
       }
       for (var i = 0; i < this.outContractNo.length; i++) {
@@ -1921,6 +1915,15 @@ export default {
         .then((response) => {
           this.goodnameList = response
         })
+          getReceiptTaskNo({
+      flag: 2,
+      warehouseName: this.deptBudgetList1.warehouseName,
+      agentKey: localStorage.getItem('ws-pf_userId'),
+    })
+      .toPromise()
+      .then((response) => {
+        this.deptBudgetList2 = response
+      })
       // 品级
       pullDown({
         constId: 'CON3',
@@ -1974,10 +1977,7 @@ export default {
         .then((response) => {
           this.options1 = response
           this.outContractNo = response
-    //             debugger
-    // this.contractNoChange(this.dataList.inOutTaskNo)
-
-
+        this.contractNoChange(this.dataList.inOutTaskNo)
         })
       //合同编号2
       xialaNo({
@@ -2009,8 +2009,6 @@ export default {
           this.staffList = response
           //  this.agent = response
         })
-    //      debugger
-    // this.contractNoChange(this.dataList.inOutTaskNo)
 
     },
     selecttaskType(e) {

+ 16 - 12
src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -622,7 +622,6 @@ export default {
     }
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
-    this.getList()
     this.dataList.id = this.$route.query.id
     this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
     this.dataList.contractNo = this.$route.query.contractNo
@@ -651,19 +650,10 @@ export default {
     this.dataList.statusFlag = this.$route.statusFlag
     this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
     console.log(this.dataList)
-    getReceiptTaskNo({
-      flag: 1,
-      warehouseName: this.deptBudgetList.warehouseName,
-      agentKey: localStorage.getItem('ws-pf_userId'),
-    })
-      .toPromise()
-      .then((response) => {
-        this.deptBudgetList2 = response
-      })
-      
     if(this.$route.query.automaticWeightAcquisition == '1'){
       this.openPort()
     }
+    this.getList()
   },
   methods: {
     async closePort() {
@@ -897,7 +887,11 @@ export default {
       for (let i = 0; i < this.deptBudgetList2.length; i++) {
         if (this.deptBudgetList2[i].inOutTaskNo == e) {
           var data = this.deptBudgetList2[i]
-          this.dataList.contractNo = this.deptBudgetList2[i].contractNo
+          if (this.deptBudgetList2[i].contractNo) {
+            this.dataList.contractNo = this.deptBudgetList2[i].contractNo
+          } else {
+            this.dataList.contractNo = this.deptBudgetList2[i].moveTaskNo
+          }
         }
       }
 
@@ -1522,6 +1516,15 @@ export default {
         .then((response) => {
           this.goodnameList = response
         })
+    getReceiptTaskNo({
+      flag: 1,
+      warehouseName: this.deptBudgetList.warehouseName,
+      agentKey: localStorage.getItem('ws-pf_userId'),
+    })
+      .toPromise()
+      .then((response) => {
+        this.deptBudgetList2 = response
+      })
       // 品级
       pullDown({
         constId: 'CON3',
@@ -1557,6 +1560,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.outContractNo = response
+          this.contractNoChange(this.dataList.inOutTaskNo)
           for (let i = 0; i < response.length; i++) {
             if (this.dataList.contractNo == response[i].contractNo) {
               if (response[i].deliverType == '1') {