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

src/components/balanceAlert.vue

@@ -59,7 +59,6 @@ export default {
             // The Web Serial API is supported.
             console.log('the Web Serial API is supported.')
             const port = await navigator.serial.requestPort()
-          debugger
             if(this.deptBudgetList.warehouseName == '白城内陆港'){
               this.param = 1200
             }
@@ -116,7 +115,7 @@ export default {
             console.log('value:', value)
           }
           else if(this.deptBudgetList.warehouseName == '白城内陆港'){
-            break
+            continue
           }
           if (
             this.deptBudgetList.warehouseName &&

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -1162,7 +1162,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.waterContent < 1 ||
+            this.dataList.warehouseInOutDetail.waterContent < 0 ||
             this.dataList.warehouseInOutDetail.waterContent > 40 ||
             (String(this.dataList.warehouseInOutDetail.waterContent).indexOf(
                 '.'
@@ -1175,7 +1175,7 @@
               2)
           ) {
             this.$message({
-              message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1192,7 +1192,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.impurity < 1 ||
+            this.dataList.warehouseInOutDetail.impurity < 0 ||
             this.dataList.warehouseInOutDetail.impurity > 40 ||
             (String(this.dataList.warehouseInOutDetail.impurity).indexOf('.') !=
               -1 &&
@@ -1204,7 +1204,7 @@
               2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1220,7 +1220,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.dataList.warehouseInOutDetail.mildewGrain < 0 ||
             this.dataList.warehouseInOutDetail.mildewGrain > 40 ||
             (String(this.dataList.warehouseInOutDetail.mildewGrain).indexOf(
                 '.'
@@ -1233,7 +1233,7 @@
               2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1250,7 +1250,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.dataList.warehouseInOutDetail.jiaorenli < 0 ||
             this.dataList.warehouseInOutDetail.jiaorenli > 40 ||
             (String(this.dataList.warehouseInOutDetail.jiaorenli).indexOf('.') !=
               -1 &&
@@ -1262,7 +1262,7 @@
               2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1279,7 +1279,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.dataList.warehouseInOutDetail.imperfectGrain < 0 ||
             this.dataList.warehouseInOutDetail.imperfectGrain > 40 ||
             (String(this.dataList.warehouseInOutDetail.imperfectGrain).indexOf(
                 '.'
@@ -1292,7 +1292,7 @@
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1321,7 +1321,7 @@
               0)
           ) {
             this.$message({
-              message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
+              message: '容重(克/升)输入错误! 取值范围1-1000之间且是整数',
               type: 'warning',
             })
             return

src/views/warehouse/warehouseManagementTare.vue

@@ -483,6 +483,7 @@
           this.deptBudgetList.grossWeight = data
         } else {
           this.tare = data
+          this.deptBudgetList = data
         }
       },
       openPort() {