zxz 3 rokov pred
rodič
commit
d270f72172

+ 9 - 0
src/views/warehouse/warehouseManagementNoWeight.vue

@@ -288,6 +288,10 @@ export default {
             binNumber: row.binNumber,
             carNo: row.carNo,
             compId: row.compId,
+            boxNo:row.boxNo,
+            boxNoOther: row.boxNoOther,
+            titleNo: row.titleNo,
+            titleNoOther: row.titleNoOther,
             contractNo: row.contractNo,
             goodsName: row.goodsName,
             goodsNameKey: row.goodsNameKey,
@@ -333,10 +337,15 @@ export default {
             carNo: row.carNo,
             compId: row.compId,
             contractNo: row.contractNo,
+            boxNo:row.boxNo,
+            boxNoOther: row.boxNoOther,
+            titleNo: row.titleNo,
+            titleNoOther: row.titleNoOther,
             goodsName: row.goodsName,
             goodsNameKey: row.goodsNameKey,
             grade: row.grade,
             status:'',
+            inOutTaskNo:row.inOutTaskNo,
             grossWeight: row.grossWeight,
             inOutDate: row.inOutDate,
             inOutFlag: row.inOutFlag,

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

@@ -779,7 +779,10 @@ export default {
         agent: '',
         carNo: '',
         inOutDate: '',
-
+        boxNo:'',
+        boxNoOther:'',
+        titleNo:'',
+        titleNoOther:'',
         inOutType: '',
         goodsName: '',
         warehouseInOutDetail: {},
@@ -845,6 +848,10 @@ export default {
     this.dataList.netWeight = Math.round(this.$route.query.netWeight * 1000)
     this.dataList.grade = this.$route.query.grade
     this.dataList.agent = this.$route.query.agent
+    this.dataList.boxNo = this.$route.query.boxNo
+    this.dataList.boxNoOther = this.$route.query.boxNoOther
+    this.dataList.titleNo = this.$route.query.titleNo
+    this.dataList.titleNoOther = this.$route.query.titleNoOther
     this.dataList.carNo = this.$route.query.carNo
     this.dataList.inOutDate = this.$route.query.inOutDate
     this.dataList.contractNo = this.$route.query.contractNo
@@ -889,6 +896,7 @@ export default {
     if(this.$route.query.automaticWeightAcquisition == '1'){
       this.openPort()
     }
+   
   },
   methods: {
     async closePort() {
@@ -1966,6 +1974,10 @@ export default {
         .then((response) => {
           this.options1 = response
           this.outContractNo = response
+    //             debugger
+    // this.contractNoChange(this.dataList.inOutTaskNo)
+
+
         })
       //合同编号2
       xialaNo({
@@ -1997,6 +2009,9 @@ export default {
           this.staffList = response
           //  this.agent = response
         })
+    //      debugger
+    // this.contractNoChange(this.dataList.inOutTaskNo)
+
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {

+ 5 - 0
src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -632,12 +632,17 @@ export default {
     this.dataList.binNumber = this.$route.query.binNumber
     this.dataList.tare = Math.round(this.$route.query.tare * 1000)
     this.dataList.netWeight = Math.round(this.$route.query.netWeight * 1000)
+    this.dataList.boxNo = this.$route.query.boxNo
+    this.dataList.boxNoOther = this.$route.query.boxNoOther
+    this.dataList.titleNo = this.$route.query.titleNo
+    this.dataList.titleNoOther = this.$route.query.titleNoOther
     this.dataList.grade = this.$route.query.grade
     this.dataList.agent = this.$route.query.agent
     this.dataList.carNo = this.$route.query.carNo
     this.dataList.inOutDate = this.$route.query.inOutDate
     this.dataList.contractNo = this.$route.query.contractNo
     this.dataList.inOutType = this.$route.query.inOutType
+    this.dataList.inOutTaskNo = this.$route.query.inOutTaskNo
     this.dataList.compId = this.$route.query.compId
     this.dataList.goodsName = this.$route.query.goodsName
     this.dataList.goodsNameKey = Number(this.$route.query.goodsNameKey)