更新

src/views/houseSelfCollect/weighingManagement.vue

@@ -390,7 +390,7 @@
             .then((response) => {
               this.dialogData = response
               if (response.compName == '黑龙江秋收有限公司') {
-              this.printData.compName = '黑龙江中天昊元贸易有限公司'
+              this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
               }
               this.isShowPrint = true
             })
@@ -454,7 +454,8 @@
               cangid: this.cangid,
               warehouseName: this.warehouseName,
               paramType: row.qualityInspectionManagement.paramType,
-              customerNumberCard: row.customerNumberCard
+              customerNumberCard: row.customerNumberCard,
+              automaticWeightAcquisition: row.automaticWeightAcquisition
             },
           })
         } else {

src/views/houseSelfCollect/weightCheck.vue

@@ -243,7 +243,7 @@
       }
     },
     mounted() {
-      this.openPort()
+     
     },
     activated() {
       console.log(this.common.name)
@@ -283,6 +283,9 @@
       } else if (this.tpyeNo == 2) {
         this.information = '皮重'
       }
+      if(this.$route.query.automaticWeightAcquisition == '1'){
+        this.openPort()
+      }
 
     },
     deactivated() {

src/views/warehouse/warehouseManagementGross.vue

@@ -899,7 +899,9 @@ export default {
     //   // this.deptBudgetList.inOutType = '退库'
     //   this.deptBudgetList.inOutTypeKey = '1'
     // }
-    this.openPort()
+    if(this.$route.query.automaticWeightAcquisition == '1'){
+      this.openPort()
+    }
   },
   methods: {
     async closePort() {

src/views/warehouse/warehouseManagementList.vue

@@ -325,12 +325,12 @@
         },
         accessoryTFs: false,
         isShowPrintType: false, //打印
-        headerText: "",
+        headerText: '',
         packtypeList: [], //仓库列表
         parameter: {
           radio: 3,
-          startDate: "",
-          endDate: "",
+          startDate: '',
+          endDate: '',
           proportion: ''
         },
         date: {
@@ -348,9 +348,9 @@
       //导出、打印
       outData(index) {
         if (index == 1) {
-          this.headerText = "导出记录"
+          this.headerText = '导出记录'
         } else if (index == 2) {
-          this.headerText = "打印记录"
+          this.headerText = '打印记录'
         }
         // 获取仓库
         xiala({
@@ -367,38 +367,38 @@
         var strDate = date.getDate()
         var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
         this.parameter.startDate = pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + pastdate.getDate()
-        this.parameter.endDate = "" + year + "-" + month + "-" + strDate
+        this.parameter.endDate = '' + year + '-' + month + '-' + strDate
         this.$forceUpdate();
         this.isShowPrintType = true
       },
       removePrint() {
-        this.parameter.warehouseName = ""
-        this.parameter.proportion = ""
+        this.parameter.warehouseName = ''
+        this.parameter.proportion = ''
         this.isShowPrintType = false
 
       },
       async submitClick() {
-        if (!this.parameter.radio && this.headerText == "打印记录") {
-          this.$message.error("请选择打印的类型")
+        if (!this.parameter.radio && this.headerText == '打印记录') {
+          this.$message.error('请选择打印的类型')
           return
         }
         if (!this.parameter.startDate) {
-          this.$message.error("请选择打印的起始日期")
+          this.$message.error('请选择打印的起始日期')
           return
         }
         if (!this.parameter.endDate) {
-          this.$message.error("请选择打印的截止日期")
+          this.$message.error('请选择打印的截止日期')
           return
         }
         if (new Date(this.parameter.endDate).getTime() < new Date(this.parameter.startDate).getTime()) {
-          this.$message.error("截止日期输入错误")
+          this.$message.error('截止日期输入错误')
           return
         }
         if (!this.parameter.warehouseName) {
-          this.$message.error("请选择所要打印的仓库")
+          this.$message.error('请选择所要打印的仓库')
           return
         }
-        if (this.headerText == "导出记录") {
+        if (this.headerText == '导出记录') {
           if (this.parameter.radio == 3) {
             const {
               data
@@ -435,7 +435,7 @@
             })
           }
 
-        } else if (this.headerText == "打印记录") {
+        } else if (this.headerText == '打印记录') {
           console.log(this.parameter.startDate)
           addselectinfoList({
               compId: localStorage.getItem('ws-pf_compId'),
@@ -448,7 +448,7 @@
             }).toPromise()
             .then((response) => {
               if (response.records.length == 0) {
-                this.$message.error("暂未查到所要打印的出入库信息")
+                this.$message.error('暂未查到所要打印的出入库信息')
               } else {
                 var warehousePrint = response.records
                 if (this.parameter.proportion) {
@@ -490,9 +490,9 @@
                           }
                           response1.splice(index, 1) //删除已添加过得假数据车牌号
                           if (response1.length == 0) {
-                            sessionStorage.setItem("inOutWarehouse_Print", JSON.stringify(warehousePrint))
-                            let _canshu = ""
-                            _canshu = this.parameter.radio +"&warehouseName=" + this.parameter.warehouseName+"&startDate=" + this.parameter.startDate+"&endDate=" + this.parameter.startDate
+                            sessionStorage.setItem('inOutWarehouse_Print', JSON.stringify(warehousePrint))
+                            let _canshu = ''
+                            _canshu = this.parameter.radio +'&warehouseName=' + this.parameter.warehouseName+'&startDate=' + this.parameter.startDate+'&endDate=' + this.parameter.startDate
                             window.open('../../../../../static/warehousePrint.html?type=' + _canshu)
                           }
                         } else { //增量为0时
@@ -500,16 +500,16 @@
                         }
                       }
                       //跳转
-                      sessionStorage.setItem("inOutWarehouse_Print", JSON.stringify(warehousePrint))
-                      let _canshu = ""
-                      _canshu = this.parameter.radio + "&warehouseName=" + this.parameter.warehouseName+"&startDate=" + this.parameter.startDate+"&endDate=" + this.parameter.startDate
+                      sessionStorage.setItem('inOutWarehouse_Print', JSON.stringify(warehousePrint))
+                      let _canshu = ''
+                      _canshu = this.parameter.radio + '&warehouseName=' + this.parameter.warehouseName+'&startDate=' + this.parameter.startDate+'&endDate=' + this.parameter.startDate
                       window.open('../../../../../static/warehousePrint.html?type=' + _canshu)
 
                     })
                 } else { //没有增量比例的直接打印
-                  sessionStorage.setItem("inOutWarehouse_Print", JSON.stringify(response.records))
-                  let _canshu1 = ""
-                  _canshu1 = this.parameter.radio + "&warehouseName=" + this.parameter.warehouseName+"&startDate=" + this.parameter.startDate+"&endDate=" + this.parameter.startDate
+                  sessionStorage.setItem('inOutWarehouse_Print', JSON.stringify(response.records))
+                  let _canshu1 = ''
+                  _canshu1 = this.parameter.radio + '&warehouseName=' + this.parameter.warehouseName+'&startDate=' + this.parameter.startDate+'&endDate=' + this.parameter.startDate
                   window.open('../../../../../static/warehousePrint.html?type=' + _canshu1)
                 }
               }
@@ -611,7 +611,8 @@
             warehouseType: this.warehouseType,
             createType: item.createType,
             information: '毛重检斤',
-            allowEdit: item.allowEdit
+            allowEdit: item.allowEdit,
+            automaticWeightAcquisition: item.automaticWeightAcquisition
           },
         })
       },
@@ -628,7 +629,8 @@
             warehouseType: this.warehouseType,
             warehouseId: item.warehouseId,
             information: '皮重检斤',
-            allowEdit: item.allowEdit
+            allowEdit: item.allowEdit,
+            automaticWeightAcquisition: item.automaticWeightAcquisition
           },
         })
       },

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -317,7 +317,7 @@ export default {
             deductionAmount:row.deductionAmount,
             deductionWeight:row.deductionWeight,
             allowEdit:row.allowEdit,
-
+            automaticWeightAcquisition: row.automaticWeightAcquisition
           },
         })
       } else if (row.inOutFlag == 1) {
@@ -359,7 +359,8 @@ export default {
             pureWeight:row.pureWeight,
             deductionAmount:row.deductionAmount,
             deductionWeight:row.deductionWeight,
-            allowEdit:row.allowEdit
+            allowEdit:row.allowEdit,
+            automaticWeightAcquisition:row.automaticWeightAcquisition
           },
         })
       }

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -824,7 +824,6 @@ export default {
     }
   },
   mounted() {
-	  this.openPort()
 	},
   activated() {
     if (this.$route.query.allowEdit == 1) {
@@ -886,6 +885,10 @@ export default {
       .then((response) => {
         this.deptBudgetList2 = response
       })
+      
+    if(this.$route.query.automaticWeightAcquisition == '1'){
+      this.openPort()
+    }
   },
   methods: {
     async closePort() {

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -613,7 +613,6 @@ export default {
     }
   },
   mounted() {
-	  this.openPort()
 	},
   activated() {
     if (this.$route.query.allowEdit == 1) {
@@ -656,6 +655,10 @@ export default {
       .then((response) => {
         this.deptBudgetList2 = response
       })
+      
+    if(this.$route.query.automaticWeightAcquisition == '1'){
+      this.openPort()
+    }
   },
   methods: {
     async closePort() {

src/views/warehouse/warehouseManagementTare.vue

@@ -773,7 +773,9 @@ export default {
         console.log(response)
         this.deptBudgetList1 = response
       })
-     this.openPort()  
+    if(this.$route.query.automaticWeightAcquisition == '1'){
+      this.openPort()
+    }
   },
   methods: {
     async closePort() {