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

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -307,7 +307,7 @@
 
               </ws-info-table>
 
-              <div class="title">质检数据</div>
+              <div class="title">质检数据 <span class="bulu">补录：</span><el-switch v-model="value1"></el-switch></div>
               <ws-info-table>
                 <ws-form-item label="等级" span="1" prop="outType">
                   <ws-select style="margin-right:10px;" v-if='statusTypetext!="复检"' v-model="deptBudgetList.grade"
@@ -630,6 +630,7 @@
           },
         ],
         // searchKeyWord:''
+        value1:false,
       }
     },
     activated() {
@@ -1555,14 +1556,6 @@
             return
           }
         }
-        this.deptBudgetList.warehouseInOutDetail.grade = this.deptBudgetList.grade
-        if (!this.deptBudgetList.grade) {
-          this.$message({
-            message: '等级不能为空！',
-            type: 'warning',
-          })
-          return
-        }
         this.deptBudgetList.warehouseInOutDetail.reGrade = this.deptBudgetList.reGrade
         if (!this.deptBudgetList.reGrade && this.statusTypetext == '复检') {
           this.$message({
@@ -1680,9 +1673,24 @@
         //   })
         //   return
         // }
-        //自检员
-        this.deptBudgetList.warehouseInOutDetail.waterContent = this.deptBudgetList.waterContent
-        if (this.deptBudgetList.waterContent) {
+        if (this.value1 == false && this.statusTypetext == '初检') {
+          this.deptBudgetList.warehouseInOutDetail.grade = this.deptBudgetList.grade
+      if (!this.deptBudgetList.grade) {
+        this.$message({
+          message: '等级不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+        this.deptBudgetList.warehouseInOutDetail.waterContent =
+          this.deptBudgetList.waterContent
+        if (!this.deptBudgetList.waterContent) {
+           this.$message({
+              message: '请输入水分',
+              type: 'warning',
+            })
+            return
+        }
           if (isNaN(this.deptBudgetList.waterContent)) {
             this.$message({
               message: '水分（%）非数字!',
@@ -1694,13 +1702,9 @@
             this.deptBudgetList.waterContent < 0 ||
             this.deptBudgetList.waterContent > 40 ||
             (String(this.deptBudgetList.waterContent).indexOf('.') != -1 &&
-              String(this.deptBudgetList.waterContent)
-              .length -
-              (String(
-                  this.deptBudgetList.waterContent
-                ).indexOf('.') +
-                1) >
-              2)
+              String(this.deptBudgetList.waterContent).length -
+                (String(this.deptBudgetList.waterContent).indexOf('.') + 1) >
+                2)
           ) {
             this.$message({
               message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
@@ -1708,233 +1712,283 @@
             })
             return
           }
+        
+        //杂质
+        this.deptBudgetList.warehouseInOutDetail.impurity =
+          this.deptBudgetList.impurity
+        if (!this.deptBudgetList.impurity) {
+           this.$message({
+              message: '请输入杂质!',
+              type: 'warning',
+            })
+            return
         }
-        this.deptBudgetList.warehouseInOutDetail.reWaterContent = this.deptBudgetList.reWaterContent
-        if (this.deptBudgetList.reWaterContent) {
-          if (isNaN(this.deptBudgetList.reWaterContent)) {
+          if (isNaN(this.deptBudgetList.impurity)) {
             this.$message({
-              message: '复检水分（%）非数字!',
+              message: '杂质（%）非数字!',
               type: 'warning',
             })
             return
           }
           if (
-            this.deptBudgetList.reWaterContent < 0 ||
-            this.deptBudgetList.reWaterContent > 40 ||
-            (String(this.deptBudgetList.reWaterContent).indexOf('.') != -1 &&
-              String(this.deptBudgetList.reWaterContent)
-              .length -
-              (String(
-                  this.deptBudgetList.reWaterContent
-                ).indexOf('.') +
-                1) >
-              2)
+            this.deptBudgetList.impurity < 0 ||
+            this.deptBudgetList.impurity > 40 ||
+            (String(this.deptBudgetList.impurity).indexOf('.') != -1 &&
+              String(this.deptBudgetList.impurity).length -
+                (String(this.deptBudgetList.impurity).indexOf('.') + 1) >
+                2)
           ) {
             this.$message({
-              message: '复检水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
           }
+        
+        //霉变
+        this.deptBudgetList.warehouseInOutDetail.mildewGrain =
+          this.deptBudgetList.mildewGrain
+        if (!this.deptBudgetList.mildewGrain) {
+           this.$message({
+              message: '请输入霉变粒！',
+              type: 'warning',
+            })
+            return
         }
-        //杂质
-        this.deptBudgetList.warehouseInOutDetail.impurity = this.deptBudgetList.impurity
-        if (this.deptBudgetList.impurity) {
-          if (isNaN(this.deptBudgetList.impurity)) {
+          if (isNaN(this.deptBudgetList.mildewGrain)) {
             this.$message({
-              message: '杂质（%）非数字!',
+              message: '霉变粒（%）非数字!',
               type: 'warning',
             })
             return
           }
           if (
-            this.deptBudgetList.impurity < 0 ||
-            this.deptBudgetList.impurity > 40 ||
-            (String(this.deptBudgetList.impurity).indexOf('.') != -1 &&
-              String(this.deptBudgetList.impurity).length -
-              (String(this.deptBudgetList.impurity).indexOf('.') + 1) > 2)
+            this.deptBudgetList.mildewGrain < 0 ||
+            this.deptBudgetList.mildewGrain > 40 ||
+            (String(this.deptBudgetList.mildewGrain).indexOf('.') != -1 &&
+              String(this.deptBudgetList.mildewGrain).length -
+                (String(this.deptBudgetList.mildewGrain).indexOf('.') + 1) >
+                2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
           }
+        
+        this.deptBudgetList.warehouseInOutDetail.jiaorenli =
+          this.deptBudgetList.jiaorenli
+        //热损伤
+        if (!this.deptBudgetList.jiaorenli) {
+           this.$message({
+              message: '请输入热损伤!',
+              type: 'warning',
+            })
+            return
+
         }
-        this.deptBudgetList.warehouseInOutDetail.reImpurity = this.deptBudgetList.reImpurity
-        if (this.deptBudgetList.reImpurity) {
-          if (isNaN(this.deptBudgetList.reImpurity)) {
+          if (isNaN(this.deptBudgetList.jiaorenli)) {
             this.$message({
-              message: '复检杂质（%）非数字!',
+              message: '热损伤（%）非数字!',
               type: 'warning',
             })
             return
           }
           if (
-            this.deptBudgetList.reImpurity < 0 ||
-            this.deptBudgetList.reImpurity > 40 ||
-            (String(this.deptBudgetList.reImpurity).indexOf('.') != -1 &&
-              String(this.deptBudgetList.reImpurity).length -
-              (String(this.deptBudgetList.reImpurity).indexOf('.') + 1) > 2)
+            this.deptBudgetList.jiaorenli < 0 ||
+            this.deptBudgetList.jiaorenli > 40 ||
+            (String(this.deptBudgetList.jiaorenli).indexOf('.') != -1 &&
+              String(this.deptBudgetList.jiaorenli).length -
+                (String(this.deptBudgetList.jiaorenli).indexOf('.') + 1) >
+                2)
           ) {
             this.$message({
-              message: '复检杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
           }
+        
+        this.deptBudgetList.warehouseInOutDetail.imperfectGrain =
+          this.deptBudgetList.imperfectGrain
+        //不完善粒（%）
+        if (!this.deptBudgetList.imperfectGrain) {
+           this.$message({
+              message: '请输入不完善粒!',
+              type: 'warning',
+            })
+            return
         }
-        //霉变
-        this.deptBudgetList.warehouseInOutDetail.mildewGrain = this.deptBudgetList.mildewGrain
-        if (this.deptBudgetList.mildewGrain) {
-          if (isNaN(this.deptBudgetList.mildewGrain)) {
+          if (isNaN(this.deptBudgetList.imperfectGrain)) {
             this.$message({
-              message: '霉变粒（%）非数字!',
+              message: '不完善粒（%）非数字!',
               type: 'warning',
             })
             return
           }
           if (
-            this.deptBudgetList.mildewGrain < 0 ||
-            this.deptBudgetList.mildewGrain > 40 ||
-            (String(this.deptBudgetList.mildewGrain).indexOf(
-                '.'
-              ) != -1 &&
-              String(this.deptBudgetList.mildewGrain)
-              .length -
-              (String(
-                  this.deptBudgetList.mildewGrain
-                ).indexOf('.') +
-                1) >
-              2)
+            this.deptBudgetList.imperfectGrain < 0 ||
+            this.deptBudgetList.imperfectGrain > 40 ||
+            (String(this.deptBudgetList.imperfectGrain).indexOf('.') != -1 &&
+              String(this.deptBudgetList.imperfectGrain).length -
+                (String(this.deptBudgetList.imperfectGrain).indexOf('.') + 1) >
+                2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
           }
+        
+        //容重
+        this.deptBudgetList.warehouseInOutDetail.bulkDensity =
+          this.deptBudgetList.bulkDensity
+        if (!this.deptBudgetList.bulkDensity) {
+           this.$message({
+              message: '请输入容重!',
+              type: 'warning',
+            })
+            return
         }
-        this.deptBudgetList.warehouseInOutDetail.reMildewGrain = this.deptBudgetList.reMildewGrain
-        if (this.deptBudgetList.reMildewGrain) {
-          if (isNaN(this.deptBudgetList.reMildewGrain)) {
+          if (isNaN(this.deptBudgetList.bulkDensity)) {
             this.$message({
-              message: '复检霉变粒（%）非数字!',
+              message: '容重(克/升)非数字!',
               type: 'warning',
             })
             return
           }
           if (
-            this.deptBudgetList.reMildewGrain < 0 ||
-            this.deptBudgetList.reMildewGrain > 40 ||
-            (String(this.deptBudgetList.reMildewGrain).indexOf(
-                '.'
-              ) != -1 &&
-              String(this.deptBudgetList.reMildewGrain)
+            (this.deptBudgetList.bulkDensity &&
+              String(this.deptBudgetList.bulkDensity).indexOf('.') != -1 &&
+              String(this.deptBudgetList.bulkDensity).length -
+                (String(this.deptBudgetList.bulkDensity).indexOf('.') + 1) >
+                2) ||
+            this.deptBudgetList.bulkDensity > 1000 ||
+            this.deptBudgetList.bulkDensity < 0
+          ) {
+            this.$message({
+              message: '容重输入错误',
+              type: 'warning',
+            })
+            return
+          }
+        
+      }
+        this.deptBudgetList.warehouseInOutDetail.reWaterContent = this.deptBudgetList.reWaterContent
+        if (this.deptBudgetList.reWaterContent) {
+          if (isNaN(this.deptBudgetList.reWaterContent)) {
+            this.$message({
+              message: '复检水分（%）非数字!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.deptBudgetList.reWaterContent < 0 ||
+            this.deptBudgetList.reWaterContent > 40 ||
+            (String(this.deptBudgetList.reWaterContent).indexOf('.') != -1 &&
+              String(this.deptBudgetList.reWaterContent)
               .length -
               (String(
-                  this.deptBudgetList.reMildewGrain
+                  this.deptBudgetList.reWaterContent
                 ).indexOf('.') +
                 1) >
               2)
           ) {
             this.$message({
-              message: '复检霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              message: '复检水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
           }
         }
-        this.deptBudgetList.warehouseInOutDetail.jiaorenli = this.deptBudgetList.jiaorenli
-        //热损伤
-        if (this.deptBudgetList.jiaorenli) {
-          if (isNaN(this.deptBudgetList.jiaorenli)) {
+
+        this.deptBudgetList.warehouseInOutDetail.reImpurity = this.deptBudgetList.reImpurity
+        if (this.deptBudgetList.reImpurity) {
+          if (isNaN(this.deptBudgetList.reImpurity)) {
             this.$message({
-              message: '热损伤（%）非数字!',
+              message: '复检杂质（%）非数字!',
               type: 'warning',
             })
             return
           }
           if (
-            this.deptBudgetList.jiaorenli < 0 ||
-            this.deptBudgetList.jiaorenli > 40 ||
-            (String(this.deptBudgetList.jiaorenli).indexOf(
-                '.'
-              ) != -1 &&
-              String(this.deptBudgetList.jiaorenli).length -
-              (String(
-                  this.deptBudgetList.jiaorenli
-                ).indexOf('.') +
-                1) >
-              2)
+            this.deptBudgetList.reImpurity < 0 ||
+            this.deptBudgetList.reImpurity > 40 ||
+            (String(this.deptBudgetList.reImpurity).indexOf('.') != -1 &&
+              String(this.deptBudgetList.reImpurity).length -
+              (String(this.deptBudgetList.reImpurity).indexOf('.') + 1) > 2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              message: '复检杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
           }
         }
-        this.deptBudgetList.warehouseInOutDetail.reJiaorenli = this.deptBudgetList.reJiaorenli
-        if (this.deptBudgetList.reJiaorenli) {
-          if (isNaN(this.deptBudgetList.reJiaorenli)) {
+
+        this.deptBudgetList.warehouseInOutDetail.reMildewGrain = this.deptBudgetList.reMildewGrain
+        if (this.deptBudgetList.reMildewGrain) {
+          if (isNaN(this.deptBudgetList.reMildewGrain)) {
             this.$message({
-              message: '复检热损伤（%）非数字!',
+              message: '复检霉变粒（%）非数字!',
               type: 'warning',
             })
             return
           }
           if (
-            this.deptBudgetList.reJiaorenli < 0 ||
-            this.deptBudgetList.reJiaorenli > 40 ||
-            (String(this.deptBudgetList.reJiaorenli).indexOf(
+            this.deptBudgetList.reMildewGrain < 0 ||
+            this.deptBudgetList.reMildewGrain > 40 ||
+            (String(this.deptBudgetList.reMildewGrain).indexOf(
                 '.'
               ) != -1 &&
-              String(this.deptBudgetList.reJiaorenli).length -
+              String(this.deptBudgetList.reMildewGrain)
+              .length -
               (String(
-                  this.deptBudgetList.reJiaorenli
+                  this.deptBudgetList.reMildewGrain
                 ).indexOf('.') +
                 1) >
               2)
           ) {
             this.$message({
-              message: '复检热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              message: '复检霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
           }
         }
-        this.deptBudgetList.warehouseInOutDetail.imperfectGrain = this.deptBudgetList.imperfectGrain
-        //不完善粒（%）
-        if (this.deptBudgetList.imperfectGrain) {
-          if (isNaN(this.deptBudgetList.imperfectGrain)) {
+        this.deptBudgetList.warehouseInOutDetail.reJiaorenli = this.deptBudgetList.reJiaorenli
+        if (this.deptBudgetList.reJiaorenli) {
+          if (isNaN(this.deptBudgetList.reJiaorenli)) {
             this.$message({
-              message: '不完善粒（%）非数字!',
+              message: '复检热损伤（%）非数字!',
               type: 'warning',
             })
             return
           }
           if (
-            this.deptBudgetList.imperfectGrain < 0 ||
-            this.deptBudgetList.imperfectGrain > 40 ||
-            (String(
-                this.deptBudgetList.imperfectGrain
-              ).indexOf('.') != -1 &&
-              String(this.deptBudgetList.imperfectGrain)
-              .length -
+            this.deptBudgetList.reJiaorenli < 0 ||
+            this.deptBudgetList.reJiaorenli > 40 ||
+            (String(this.deptBudgetList.reJiaorenli).indexOf(
+                '.'
+              ) != -1 &&
+              String(this.deptBudgetList.reJiaorenli).length -
               (String(
-                  this.deptBudgetList.imperfectGrain
+                  this.deptBudgetList.reJiaorenli
                 ).indexOf('.') +
                 1) >
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
+              message: '复检热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
           }
         }
+
         this.deptBudgetList.warehouseInOutDetail.reImperfectGrain = this.deptBudgetList.reImperfectGrain
         if (this.deptBudgetList.reImperfectGrain) {
           if (isNaN(this.deptBudgetList.reImperfectGrain)) {
@@ -1965,38 +2019,6 @@
             return
           }
         }
-        //容重
-        this.deptBudgetList.warehouseInOutDetail.bulkDensity = this.deptBudgetList.bulkDensity
-        if (this.deptBudgetList.bulkDensity) {
-          if (isNaN(this.deptBudgetList.bulkDensity)) {
-            this.$message({
-              message: '容重(克/升)非数字!',
-              type: 'warning',
-            })
-            return
-          }
-          if (
-            (this.deptBudgetList.bulkDensity &&
-              String(
-                this.deptBudgetList.bulkDensity
-              ).indexOf('.') != -1 &&
-              String(this.deptBudgetList.bulkDensity)
-              .length -
-              (String(
-                  this.deptBudgetList.bulkDensity
-                ).indexOf('.') +
-                1) >
-              2) ||
-            this.deptBudgetList.bulkDensity > 1000 ||
-            this.deptBudgetList.bulkDensity < 0
-          ) {
-            this.$message({
-              message: '容重输入错误',
-              type: 'warning',
-            })
-            return
-          }
-        }
         this.deptBudgetList.warehouseInOutDetail.reBulkDensity = this.deptBudgetList.reBulkDensity
         if (this.deptBudgetList.reBulkDensity) {
           if (isNaN(this.deptBudgetList.reBulkDensity)) {
@@ -2068,6 +2090,7 @@
 
                           this.$message.success('添加成功')
                           this.getList()
+                          this.selectWarehouse()
                           // this.$router.push({
                           //   path: 'warehouseManagementList',
                           // })
@@ -2764,4 +2787,9 @@
   /deep/.ws-info-table .el-form-item.rememo .el-form-item__content {
     height: 76px;
   }
+  .bulu{
+    font-size: 16px;
+    font-weight: 500;
+    margin-left: 10px;
+  }
 </style>

src/views/outboundManagement/weighingManagementNew.vue

@@ -944,6 +944,13 @@
             return
           }
         }
+        if (!this.weighingList.binNumber) {
+            this.$message({
+              message: '仓位号不能为空',
+              type: 'warning',
+            })
+            return
+          }
         if (this.tpyeNo == 1) {
           if (!this.weighingList.tare) {
             this.$message({
@@ -1090,6 +1097,14 @@
                   })
                   .catch((response) => {
                     this.$notify.warning(response)
+                    if (this.weighingList.grossWeight) {
+                      this.weighingList.grossWeight = this.weighingList.grossWeight * 1000
+                    }
+
+                    if (this.weighingList.netWeight) {
+                      this.weighingList.netWeight = this.weighingList.netWeight * 1000
+                    }
+                    this.weighingList.tare = this.weighingList.tare * 1000
                   })
               } else {
                 this.weighingList.relationId = this.relationId
@@ -1098,6 +1113,7 @@
                 var weighingList1 =  JSON.parse(JSON.stringify(this.weighingList))//为了解除双向绑定问题，不影响this.weighingList的数据
                 weighingList1.id = this.weighingList.warehouseInOutId
                 weighingList1.warehouseInOutDetail.id = this.weighingList.inOutDetailId
+                console.log(weighingList1)
                 addstorageputList(weighingList1)
                   .toPromise()
                   .then((response) => {
@@ -1202,6 +1218,7 @@
               var weighingList1 =  JSON.parse(JSON.stringify(this.weighingList))//为了解除双向绑定问题，不影响this.weighingList的数据
               weighingList1.id = this.weighingList.warehouseInOutId
               weighingList1.warehouseInOutDetail.id = this.weighingList.inOutDetailId
+              console.log(weighingList1)
               addstorageputList(weighingList1)
                 .toPromise()
                 .then((response) => {
@@ -1239,8 +1256,6 @@
                         message: '提交成功',
                         type: 'success',
                       })
-
-                      // debugger
                       this.inspect = JSON.parse(JSON.stringify(this.weighingList))
 
                       this.isShowPrint = true