1

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1669,78 +1669,78 @@ export default {
     },
     //确认初检信息
     checkOk() {
-      this.deptBudgetList.warehouseInOutDetail.reWaterContent =
-            this.deptBudgetList.reWaterContent
-          if (!this.deptBudgetList.reWaterContent) {
-            this.$message({
-              message: '请输入水分',
-              type: 'warning',
-            })
-            return
-          }
-          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.reWaterContent).indexOf('.') + 1) >
-              2)
-          ) {
-            this.$message({
-              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
-              type: 'warning',
-            })
-            return
-          }
-          if(!this.deptBudgetList.waterContent){
-            this.deptBudgetList.waterContent =this.deptBudgetList.reWaterContent
-             this.deptBudgetList.warehouseInOutDetail.waterContent =this.deptBudgetList.reWaterContent
-          }
-          //容重
-          this.deptBudgetList.warehouseInOutDetail.reBulkDensity =
-            this.deptBudgetList.reBulkDensity
-          if (!this.deptBudgetList.reBulkDensity) {
-            if(this.deptBudgetList.goodsName!='大豆'){
-              this.$message({
-                message: '请输入容重!',
-                type: 'warning',
-              })
-              return
-            }else{
-              this.$message({
-                message: '请输入蛋白!',
-                type: 'warning',
-              })
-              return
-            }
+      // this.deptBudgetList.warehouseInOutDetail.reWaterContent =
+      //       this.deptBudgetList.reWaterContent
+      //     if (!this.deptBudgetList.reWaterContent) {
+      //       this.$message({
+      //         message: '请输入水分',
+      //         type: 'warning',
+      //       })
+      //       return
+      //     }
+      //     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.reWaterContent).indexOf('.') + 1) >
+      //         2)
+      //     ) {
+      //       this.$message({
+      //         message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
+      //         type: 'warning',
+      //       })
+      //       return
+      //     }
+      //     if(!this.deptBudgetList.waterContent){
+      //       this.deptBudgetList.waterContent =this.deptBudgetList.reWaterContent
+      //        this.deptBudgetList.warehouseInOutDetail.waterContent =this.deptBudgetList.reWaterContent
+      //     }
+      //     //容重
+      //     this.deptBudgetList.warehouseInOutDetail.reBulkDensity =
+      //       this.deptBudgetList.reBulkDensity
+      //     if (!this.deptBudgetList.reBulkDensity) {
+      //       if(this.deptBudgetList.goodsName!='大豆'){
+      //         this.$message({
+      //           message: '请输入容重!',
+      //           type: 'warning',
+      //         })
+      //         return
+      //       }else{
+      //         this.$message({
+      //           message: '请输入蛋白!',
+      //           type: 'warning',
+      //         })
+      //         return
+      //       }
             
-          }
-          if (isNaN(this.deptBudgetList.reBulkDensity)) {
-            if(this.deptBudgetList.goodsName!='大豆'){
-              this.$message({
-              message: '容重(克/升)非数字!',
-              type: 'warning',
-            })
-            return
-            }else{
-              this.$message({
-              message: '蛋白非数字!',
-              type: 'warning',
-            })
-            return
-            }
-          }
-          if(!this.deptBudgetList.bulkDensity){
-            this.deptBudgetList.bulkDensity =this.deptBudgetList.reBulkDensity
-            this.deptBudgetList.warehouseInOutDetail.bulkDensity =this.deptBudgetList.reBulkDensity
-          }
+      //     }
+      //     if (isNaN(this.deptBudgetList.reBulkDensity)) {
+      //       if(this.deptBudgetList.goodsName!='大豆'){
+      //         this.$message({
+      //         message: '容重(克/升)非数字!',
+      //         type: 'warning',
+      //       })
+      //       return
+      //       }else{
+      //         this.$message({
+      //         message: '蛋白非数字!',
+      //         type: 'warning',
+      //       })
+      //       return
+      //       }
+      //     }
+      //     if(!this.deptBudgetList.bulkDensity){
+      //       this.deptBudgetList.bulkDensity =this.deptBudgetList.reBulkDensity
+      //       this.deptBudgetList.warehouseInOutDetail.bulkDensity =this.deptBudgetList.reBulkDensity
+      //     }
       if (!this.deptBudgetList.binNumber) {
         this.$message({
           message: '请选择仓位号',
@@ -2465,7 +2465,7 @@ export default {
           })
           return
         }
-        if (this.value1 == false && this.statusTypetext == '初检'||this.statusTypetext == '确认') {
+        if (this.value1 == false && this.statusTypetext == '初检') {
           this.deptBudgetList.warehouseInOutDetail.grade = this.deptBudgetList.grade
           if (!this.deptBudgetList.grade) {
             this.$message({