Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/warehouse/warehouseManagementDelivery.vue

@@ -702,7 +702,7 @@ export default {
         type:'干粮',
         addressUrl:'',
         warehouseInOutDetail: {},
-         selfLoading:"0",
+         selfLoading:'0',
       },
       historyList: [],
 
@@ -713,7 +713,7 @@ export default {
       },
       accessoryTFs: false,
       deptBudgetList1:[],
-      carChange1:"手动填写",
+      carChange1:'手动填写',
       carjudge:false
     }
   },
@@ -732,11 +732,11 @@ export default {
       carNoTypeChange(){
          this.carjudge = !this.carjudge
         if(!this.carjudge){
-            this.deptBudgetList.selfLoading = "0"
-            this.carChange1="手动填写"
+            this.deptBudgetList.selfLoading = '0'
+            this.carChange1='手动填写'
         }else{
-            this.deptBudgetList.selfLoading = "1"
-            this.carChange1="识别下拉"
+            this.deptBudgetList.selfLoading = '1'
+            this.carChange1='识别下拉'
         }
       },
     imgBig(item){
@@ -904,7 +904,7 @@ export default {
         return
       }
       if (
-        this.deptBudgetList.tare < 0 ||
+        this.deptBudgetList.tare <= 0 ||
         this.deptBudgetList.tare > 10000 ||
         (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
           String(this.deptBudgetList.tare).length -
@@ -1220,7 +1220,7 @@ export default {
         return
       }
       if (
-        this.deptBudgetList.tare < 0 ||
+        this.deptBudgetList.tare <= 0 ||
         this.deptBudgetList.tare > 10000 ||
         (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
           String(this.deptBudgetList.tare).length -
@@ -1602,7 +1602,7 @@ export default {
         }
       }
       if(!this.carstatus){//若自运的合同该字段置空
-          this.deptBudgetList.selfLoading = ""
+          this.deptBudgetList.selfLoading = ''
         }
       this.$confirm(`确定提交出库信息`, {
         cancelButtonText: '取消',

src/views/warehouse/warehouseManagementGross.vue

@@ -1399,7 +1399,7 @@
         }
         if (
           this.information == '皮重检斤' &&
-          (this.deptBudgetList.tare < 0 ||
+          (this.deptBudgetList.tare <= 0 ||
             this.deptBudgetList.tare > 1000000 ||
             (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
               String(this.deptBudgetList.tare).length -

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -474,7 +474,7 @@
           inOutDate: '',
           inOutType: '',
           goodsName: '',
-          selfLoading: "0",
+          selfLoading: '0',
           warehouseInOutDetail: {
             qualityInspector: '',
           },
@@ -500,8 +500,8 @@
         param: 9600,
         allowEdit: true,
         result1: '00',
-        grossWeight: "", //显示的毛重
-        carChange1: "手动填写",
+        grossWeight: '', //显示的毛重
+        carChange1: '手动填写',
         carjudge: false
       }
     },
@@ -559,11 +559,11 @@
       carNoTypeChange() {
         this.carjudge = !this.carjudge
         if (!this.carjudge) {
-          this.dataList.selfLoading = "0"
-          this.carChange1 = "手动填写"
+          this.dataList.selfLoading = '0'
+          this.carChange1 = '手动填写'
         } else {
-          this.dataList.selfLoading = "1"
-          this.carChange1 = "识别下拉"
+          this.dataList.selfLoading = '1'
+          this.carChange1 = '识别下拉'
         }
       },
       setVal(data) {
@@ -790,7 +790,7 @@
           return
         }
         if (
-          this.dataList.tare < 0 ||
+          this.dataList.tare <= 0 ||
           this.dataList.tare > 200000 ||
           (String(this.dataList.tare).indexOf('.') != -1 &&
             String(this.dataList.tare).length -
@@ -1163,7 +1163,7 @@
           }
         }
         if (!this.carstatus) { //若自运的合同该字段置空
-          this.deptBudgetList.selfLoading = ""
+          this.deptBudgetList.selfLoading = ''
         }
         this.$confirm(`确定提交毛重检斤`, {
             cancelButtonText: '取消',

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -677,7 +677,7 @@ export default {
         pureWeight:'',
         deductionAmount:'',
         deductionWeigh:'',
-        selfLoading:"0"
+        selfLoading:'0'
       },
       historyList: [],
 
@@ -687,7 +687,7 @@ export default {
         },
       },
       accessoryTFs: false,
-        carChange1:"手动填写",
+        carChange1:'手动填写',
         carjudge:false
     }
   },
@@ -732,11 +732,11 @@ export default {
       carNoTypeChange(){
         this.carjudge = !this.carjudge
         if(!this.carjudge){
-            this.dataList.selfLoading = "0"
-            this.carChange1="手动填写"
+            this.dataList.selfLoading = '0'
+            this.carChange1='手动填写'
         }else{
-            this.dataList.selfLoading = "1"
-            this.carChange1="识别下拉"
+            this.dataList.selfLoading = '1'
+            this.carChange1='识别下拉'
         }
       },
     imgBig(item){
@@ -870,7 +870,7 @@ export default {
         return
       }
       if (
-        this.dataList.tare < 0 ||
+        this.dataList.tare <= 0 ||
         this.dataList.tare > 10000 ||
         (String(this.dataList.tare).indexOf('.') != -1 &&
           String(this.dataList.tare).length -
@@ -1230,7 +1230,7 @@ export default {
         }
       }
       if(!this.carstatus){//若自运的合同该字段置空
-          this.dataList.selfLoading = ""
+          this.dataList.selfLoading = ''
         }
       this.$refs.dataList.validate((valid) => {
         if (valid) {

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -1075,7 +1075,7 @@ export default {
       }
 
       if (
-        this.dataList.tare < 0 ||
+        this.dataList.tare <= 0 ||
         this.dataList.tare > 10000 ||
         (String(this.dataList.tare).indexOf('.') != -1 &&
           String(this.dataList.tare).length -

src/views/warehouse/warehouseManagementPut.vue

@@ -713,7 +713,7 @@
           return
         }
         if (
-          this.deptBudgetList.tare < 0 ||
+          this.deptBudgetList.tare <= 0 ||
           this.deptBudgetList.tare > 10000 ||
           (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
             String(this.deptBudgetList.tare).length -
@@ -1258,7 +1258,7 @@
           return
         }
         if (
-          this.deptBudgetList.tare < 0 ||
+          this.deptBudgetList.tare <= 0 ||
           this.deptBudgetList.tare > 10000 ||
           (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
             String(this.deptBudgetList.tare).length -

src/views/warehouse/warehouseManagementTare.vue

@@ -729,7 +729,7 @@
         }
         if (
           this.information == '皮重检斤' &&
-          (this.deptBudgetList.tare < 0 ||
+          (this.deptBudgetList.tare <= 0 ||
             this.deptBudgetList.tare > 8000000 ||
             (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
               String(this.deptBudgetList.tare).length -
@@ -1042,7 +1042,7 @@
           return
         }
         if (
-          this.deptBudgetList.tare < 0 ||
+          this.deptBudgetList.tare <= 0 ||
           this.deptBudgetList.tare > 800000 ||
           (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
             String(this.deptBudgetList.tare).length -

src/views/warehousenew/warehouseManagementDelivery.vue

@@ -702,7 +702,7 @@ export default {
         type:'干粮',
         addressUrl:'',
         warehouseInOutDetail: {},
-         selfLoading:"0",
+         selfLoading:'0',
       },
       historyList: [],
 
@@ -713,7 +713,7 @@ export default {
       },
       accessoryTFs: false,
       deptBudgetList1:[],
-      carChange1:"手动填写",
+      carChange1:'手动填写',
       carjudge:false
     }
   },
@@ -732,11 +732,11 @@ export default {
       carNoTypeChange(){
          this.carjudge = !this.carjudge
         if(!this.carjudge){
-            this.deptBudgetList.selfLoading = "0"
-            this.carChange1="手动填写"
+            this.deptBudgetList.selfLoading = '0'
+            this.carChange1='手动填写'
         }else{
-            this.deptBudgetList.selfLoading = "1"
-            this.carChange1="识别下拉"
+            this.deptBudgetList.selfLoading = '1'
+            this.carChange1='识别下拉'
         }
       },
     imgBig(item){
@@ -904,7 +904,7 @@ export default {
         return
       }
       if (
-        this.deptBudgetList.tare < 0 ||
+        this.deptBudgetList.tare <= 0 ||
         this.deptBudgetList.tare > 10000 ||
         (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
           String(this.deptBudgetList.tare).length -
@@ -1220,7 +1220,7 @@ export default {
         return
       }
       if (
-        this.deptBudgetList.tare < 0 ||
+        this.deptBudgetList.tare <= 0 ||
         this.deptBudgetList.tare > 10000 ||
         (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
           String(this.deptBudgetList.tare).length -
@@ -1602,7 +1602,7 @@ export default {
         }
       }
       if(!this.carstatus){//若自运的合同该字段置空
-          this.deptBudgetList.selfLoading = ""
+          this.deptBudgetList.selfLoading = ''
         }
       this.$confirm(`确定提交出库信息`, {
         cancelButtonText: '取消',

src/views/warehousenew/warehouseManagementNoWeightIn.vue

@@ -551,7 +551,7 @@
             value: '3',
           },
         ],
-        tare: "",
+        tare: '',
       }
     },
     mounted() {},
@@ -895,7 +895,7 @@
         }
 
         if (
-          this.dataList.tare < 0 ||
+          this.dataList.tare <= 0 ||
           this.dataList.tare > 200000 ||
           (String(this.dataList.tare).indexOf('.') != -1 &&
             String(this.dataList.tare).length -

src/views/warehousenew/warehouseManagementNoWeightOut.vue

@@ -474,7 +474,7 @@
           inOutDate: '',
           inOutType: '',
           goodsName: '',
-          selfLoading: "0",
+          selfLoading: '0',
           warehouseInOutDetail: {
             qualityInspector: '',
           },
@@ -500,8 +500,8 @@
         param: 9600,
         allowEdit: true,
         result1: '00',
-        grossWeight: "", //显示的毛重
-        carChange1: "手动填写",
+        grossWeight: '', //显示的毛重
+        carChange1: '手动填写',
         carjudge: false
       }
     },
@@ -557,11 +557,11 @@
       carNoTypeChange() {
         this.carjudge = !this.carjudge
         if (!this.carjudge) {
-          this.dataList.selfLoading = "0"
-          this.carChange1 = "手动填写"
+          this.dataList.selfLoading = '0'
+          this.carChange1 = '手动填写'
         } else {
-          this.dataList.selfLoading = "1"
-          this.carChange1 = "识别下拉"
+          this.dataList.selfLoading = '1'
+          this.carChange1 = '识别下拉'
         }
       },
       setVal(data) {
@@ -788,7 +788,7 @@
           return
         }
         if (
-          this.dataList.tare < 0 ||
+          this.dataList.tare <= 0 ||
           this.dataList.tare > 200000 ||
           (String(this.dataList.tare).indexOf('.') != -1 &&
             String(this.dataList.tare).length -
@@ -1161,7 +1161,7 @@
           }
         }
         if (!this.carstatus) { //若自运的合同该字段置空
-          this.deptBudgetList.selfLoading = ""
+          this.deptBudgetList.selfLoading = ''
         }
         this.$confirm(`确定提交毛重检斤`, {
             cancelButtonText: '取消',

src/views/warehousenew/warehouseManagementPerfectDelivery.vue

@@ -677,7 +677,7 @@ export default {
         pureWeight:'',
         deductionAmount:'',
         deductionWeigh:'',
-        selfLoading:"0"
+        selfLoading:'0'
       },
       historyList: [],
 
@@ -687,7 +687,7 @@ export default {
         },
       },
       accessoryTFs: false,
-        carChange1:"手动填写",
+        carChange1:'手动填写',
         carjudge:false
     }
   },
@@ -732,11 +732,11 @@ export default {
       carNoTypeChange(){
         this.carjudge = !this.carjudge
         if(!this.carjudge){
-            this.dataList.selfLoading = "0"
-            this.carChange1="手动填写"
+            this.dataList.selfLoading = '0'
+            this.carChange1='手动填写'
         }else{
-            this.dataList.selfLoading = "1"
-            this.carChange1="识别下拉"
+            this.dataList.selfLoading = '1'
+            this.carChange1='识别下拉'
         }
       },
     imgBig(item){
@@ -870,7 +870,7 @@ export default {
         return
       }
       if (
-        this.dataList.tare < 0 ||
+        this.dataList.tare <= 0 ||
         this.dataList.tare > 10000 ||
         (String(this.dataList.tare).indexOf('.') != -1 &&
           String(this.dataList.tare).length -
@@ -1230,7 +1230,7 @@ export default {
         }
       }
       if(!this.carstatus){//若自运的合同该字段置空
-          this.dataList.selfLoading = ""
+          this.dataList.selfLoading = ''
         }
       this.$refs.dataList.validate((valid) => {
         if (valid) {

src/views/warehousenew/warehouseManagementPerfectput.vue

@@ -1075,7 +1075,7 @@ export default {
       }
 
       if (
-        this.dataList.tare < 0 ||
+        this.dataList.tare <= 0 ||
         this.dataList.tare > 10000 ||
         (String(this.dataList.tare).indexOf('.') != -1 &&
           String(this.dataList.tare).length -

src/views/warehousenew/warehouseManagementPut.vue

@@ -713,7 +713,7 @@
           return
         }
         if (
-          this.deptBudgetList.tare < 0 ||
+          this.deptBudgetList.tare <= 0 ||
           this.deptBudgetList.tare > 10000 ||
           (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
             String(this.deptBudgetList.tare).length -
@@ -1258,7 +1258,7 @@
           return
         }
         if (
-          this.deptBudgetList.tare < 0 ||
+          this.deptBudgetList.tare <= 0 ||
           this.deptBudgetList.tare > 10000 ||
           (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
             String(this.deptBudgetList.tare).length -

src/views/warehousenew/warehouseManagementTare.vue

@@ -409,7 +409,7 @@
           grossWeight: '',
           tare: '',
           inOutDate: '',
-          selfLoading: "0",
+          selfLoading: '0',
         },
         weightbills: {},
         historyList: [],
@@ -441,8 +441,8 @@
             value: '3',
           },
         ],
-        tare: "0", //显示的皮重
-        carChange1: "手动填写",
+        tare: '0', //显示的皮重
+        carChange1: '手动填写',
         carjudge: false,
         options2: [],
       }
@@ -484,11 +484,11 @@
       carNoTypeChange() {
         this.carjudge = !this.carjudge
         if (!this.carjudge) {
-          this.deptBudgetList.selfLoading = "0"
-          this.carChange1 = "手动填写"
+          this.deptBudgetList.selfLoading = '0'
+          this.carChange1 = '手动填写'
         } else {
-          this.deptBudgetList.selfLoading = "1"
-          this.carChange1 = "识别下拉"
+          this.deptBudgetList.selfLoading = '1'
+          this.carChange1 = '识别下拉'
         }
       },
       setVal(data) {
@@ -729,7 +729,7 @@
         }
         if (
           this.information == '皮重检斤' &&
-          (this.deptBudgetList.tare < 0 ||
+          (this.deptBudgetList.tare <= 0 ||
             this.deptBudgetList.tare > 200000 ||
             (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
               String(this.deptBudgetList.tare).length -
@@ -1042,7 +1042,7 @@
           return
         }
         if (
-          this.deptBudgetList.tare < 0 ||
+          this.deptBudgetList.tare <= 0 ||
           this.deptBudgetList.tare > 500000 ||
           (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
             String(this.deptBudgetList.tare).length -
@@ -1442,7 +1442,7 @@
           }
         }
         if (!this.carstatus) { //若自运的合同该字段置空
-          this.deptBudgetList.selfLoading = ""
+          this.deptBudgetList.selfLoading = ''
         }
         this.$confirm(`确定提交出库信息`, {
           cancelButtonText: '取消',