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

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -1222,7 +1222,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.waterContent).length -
           (String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<1
+          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<0
       ) {
         this.$message({
           message: '水分输入错误',
@@ -1256,7 +1256,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.impurity).length -
           (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<1
+          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<0
       ) {
         this.$message({
           message: '杂质输入错误',
@@ -1276,7 +1276,7 @@ export default {
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
             (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 500
+            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 0
       ) {
         this.$message({
           message: '容重输入错误',
@@ -1301,7 +1301,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<0)
       ) {
         this.$message({
           message: '霉变粒输入错误',
@@ -1325,7 +1325,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<1)
+            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<0)
       ) {
         this.$message({
           message: '热损伤输入错误',
@@ -1350,7 +1350,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.imperfectGrain
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
           message: '不完整粒输入错误',
@@ -1375,7 +1375,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.protein
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.protein>70||this.deptBudgetList.contractGoodsInfo.protein<1)
+            2||this.deptBudgetList.contractGoodsInfo.protein>70||this.deptBudgetList.contractGoodsInfo.protein<0)
       ) {
         this.$message({
           message: '蛋白输入错误',

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -1346,7 +1346,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.waterContent).length -
           (String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<1
+          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<0
       ) {
         this.$message({
           message: '水分输入错误',
@@ -1380,7 +1380,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.impurity).length -
           (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<1
+          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<0
       ) {
         this.$message({
           message: '杂质输入错误',
@@ -1400,7 +1400,7 @@ export default {
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
             (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 500
+            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 0
       ) {
         this.$message({
           message: '容重输入错误',
@@ -1425,7 +1425,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<0)
       ) {
         this.$message({
           message: '霉变粒输入错误',
@@ -1449,7 +1449,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<1)
+            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<0)
       ) {
         this.$message({
           message: '热损伤输入错误',
@@ -1474,7 +1474,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.imperfectGrain
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
           message: '不完整粒输入错误',
@@ -1499,7 +1499,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.protein
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.protein>70||this.deptBudgetList.contractGoodsInfo.protein<1)
+            2||this.deptBudgetList.contractGoodsInfo.protein>70||this.deptBudgetList.contractGoodsInfo.protein<0)
       ) {
         this.$message({
           message: '蛋白输入错误',

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -1200,7 +1200,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.waterContent).length -
           (String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<1
+          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<0
       ) {
         this.$message({
           message: '水分输入错误',
@@ -1234,7 +1234,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.impurity).length -
           (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<1
+          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<0
       ) {
         this.$message({
           message: '杂质输入错误',
@@ -1254,7 +1254,7 @@ export default {
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
             (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 500
+            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 0
       ) {
         this.$message({
           message: '容重输入错误',
@@ -1279,7 +1279,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<0)
       ) {
         this.$message({
           message: '霉变粒输入错误',
@@ -1303,7 +1303,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<1)
+            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<0)
       ) {
         this.$message({
           message: '热损伤输入错误',
@@ -1328,7 +1328,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.imperfectGrain
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
           message: '不完整粒输入错误',
@@ -1353,7 +1353,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.protein
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.protein>70||this.deptBudgetList.contractGoodsInfo.protein<1)
+            2||this.deptBudgetList.contractGoodsInfo.protein>70||this.deptBudgetList.contractGoodsInfo.protein<0)
       ) {
         this.$message({
           message: '蛋白输入错误',

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -1321,7 +1321,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.waterContent).length -
           (String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<1
+          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<0
       ) {
         this.$message({
           message: '水分输入错误',
@@ -1355,7 +1355,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.impurity).length -
           (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<1
+          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<0
       ) {
         this.$message({
           message: '杂质输入错误',
@@ -1375,7 +1375,7 @@ export default {
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
             (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 500
+            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 0
       ) {
         this.$message({
           message: '容重输入错误',
@@ -1400,7 +1400,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<0)
       ) {
         this.$message({
           message: '霉变粒输入错误',
@@ -1424,7 +1424,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<1)
+            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<0)
       ) {
         this.$message({
           message: '热损伤输入错误',
@@ -1449,7 +1449,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.imperfectGrain
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
           message: '不完整粒输入错误',
@@ -1474,7 +1474,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.protein
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.protein>70||this.deptBudgetList.contractGoodsInfo.protein<1)
+            2||this.deptBudgetList.contractGoodsInfo.protein>70||this.deptBudgetList.contractGoodsInfo.protein<0)
       ) {
         this.$message({
           message: '蛋白输入错误',

src/views/contractManagement/purchaseContractAdd.vue

@@ -1136,7 +1136,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.waterContent).length -
           (String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<1
+          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<0
       ) {
         this.$message({
           message: '水分输入错误',
@@ -1163,7 +1163,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.impurity).length -
           (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<1
+          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<0
       ) {
         this.$message({
           message: '杂质输入错误',
@@ -1183,7 +1183,7 @@ export default {
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
             (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 500
+            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 0
       ) {
         this.$message({
           message: '容重输入错误',
@@ -1208,7 +1208,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<0)
       ) {
         this.$message({
           message: '霉变粒输入错误',
@@ -1232,7 +1232,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<1)
+            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<0)
       ) {
         this.$message({
           message: '热损伤输入错误',
@@ -1257,7 +1257,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.imperfectGrain
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
           message: '不完整粒输入错误',

src/views/contractManagement/purchaseContractEdit.vue

@@ -1168,7 +1168,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.waterContent).length -
           (String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<1
+          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<0
       ) {
         this.$message({
           message: '水分输入错误',
@@ -1195,7 +1195,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.impurity).length -
           (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<1
+          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<0
       ) {
         this.$message({
           message: '杂质输入错误',
@@ -1215,7 +1215,7 @@ export default {
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
             (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 500
+            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 0
       ) {
         this.$message({
           message: '容重输入错误',
@@ -1240,7 +1240,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<0)
       ) {
         this.$message({
           message: '霉变粒输入错误',
@@ -1264,7 +1264,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<1)
+            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<0)
       ) {
         this.$message({
           message: '热损伤输入错误',
@@ -1289,7 +1289,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.imperfectGrain
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
           message: '不完整粒输入错误',

src/views/contractManagement/salesContractAdd.vue

@@ -1071,7 +1071,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.waterContent).length -
           (String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<1
+          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<0
       ) {
         this.$message({
           message: '水分输入错误',
@@ -1098,7 +1098,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.impurity).length -
           (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<1
+          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<0
       ) {
         this.$message({
           message: '杂质输入错误',
@@ -1118,7 +1118,7 @@ export default {
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
             (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 500
+            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 0
       ) {
         this.$message({
           message: '容重输入错误',
@@ -1143,7 +1143,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<0)
       ) {
         this.$message({
           message: '霉变粒输入错误',
@@ -1167,7 +1167,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<1)
+            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<0)
       ) {
         this.$message({
           message: '热损伤输入错误',
@@ -1192,7 +1192,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.imperfectGrain
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
           message: '不完整粒输入错误',

src/views/contractManagement/salesContractEdit.vue

@@ -1139,7 +1139,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.waterContent).length -
           (String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<1
+          2||this.deptBudgetList.contractGoodsInfo.waterContent>40||this.deptBudgetList.contractGoodsInfo.waterContent<0
       ) {
         this.$message({
           message: '水分输入错误',
@@ -1166,7 +1166,7 @@ export default {
         String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
         String(this.deptBudgetList.contractGoodsInfo.impurity).length -
           (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<1
+          2||this.deptBudgetList.contractGoodsInfo.impurity>40||this.deptBudgetList.contractGoodsInfo.impurity<0
       ) {
         this.$message({
           message: '杂质输入错误',
@@ -1186,7 +1186,7 @@ export default {
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
           String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
             (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 500
+            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo.bulkDensity < 0
       ) {
         this.$message({
           message: '容重输入错误',
@@ -1211,7 +1211,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.mildewGrain>40||this.deptBudgetList.contractGoodsInfo.mildewGrain<0)
       ) {
         this.$message({
           message: '霉变粒输入错误',
@@ -1235,7 +1235,7 @@ export default {
               '.'
             ) +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<1)
+            2||this.deptBudgetList.contractGoodsInfo.jiaorenli>40||this.deptBudgetList.contractGoodsInfo.jiaorenli<0)
       ) {
         this.$message({
           message: '热损伤输入错误',
@@ -1260,7 +1260,7 @@ export default {
               this.deptBudgetList.contractGoodsInfo.imperfectGrain
             ).indexOf('.') +
               1) >
-            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<1)
+            2||this.deptBudgetList.contractGoodsInfo.imperfectGrain>40||this.deptBudgetList.contractGoodsInfo.imperfectGrain<0)
       ) {
         this.$message({
           message: '不完整粒输入错误',

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -177,6 +177,18 @@
             ></el-input>
             <span class="unchangeable">*</span>
           </el-form-item>
+          <el-form-item label="发票费（个人）" span="1" prop="invoiceFeePerson" >
+            <el-input
+              v-model="dataList.invoiceFeePerson"
+              placeholder="请输入发票费（个人）"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
+            <el-input
+              v-model="dataList.invoiceFeeCompany"
+              placeholder="请输入发票费（企业）"
+            ></el-input>
+          </el-form-item>
           <div class="small-title"></div>
         </el-form>
       </div>
@@ -746,7 +758,7 @@ export default {
         })
         return
       }
-      if (this.dataList.waterContent>40||this.dataList.waterContent<1) {
+      if (this.dataList.waterContent>40||this.dataList.waterContent<0) {
         this.$message({
           message: '水分输入错误！',
           type: 'warning'
@@ -774,7 +786,7 @@ export default {
         this.dataList.bulkDensity&&String(this.dataList.bulkDensity).indexOf('.') != -1 &&
           String(this.dataList.bulkDensity).length -
             (String(this.dataList.bulkDensity).indexOf('.') + 1) >
-            2||this.dataList.bulkDensity>1000||this.dataList.bulkDensity<500){
+            2||this.dataList.bulkDensity>1000||this.dataList.bulkDensity<0){
         this.$message({
           message: '容重输入错误',
           type: 'warning'
@@ -785,7 +797,7 @@ export default {
         this.dataList.protein&&String(this.dataList.protein).indexOf('.') != -1 &&
           String(this.dataList.protein).length -
             (String(this.dataList.protein).indexOf('.') + 1) >
-            2||this.dataList.protein&&this.dataList.protein>80||this.dataList.protein&&this.dataList.protein<1){
+            2||this.dataList.protein&&this.dataList.protein>80||this.dataList.protein&&this.dataList.protein<0){
         this.$message({
           message: '蛋白占比输入错误',
           type: 'warning'
@@ -796,7 +808,7 @@ export default {
         this.dataList.impurity&&String(this.dataList.impurity).indexOf('.') != -1 &&
           String(this.dataList.impurity).length -
             (String(this.dataList.impurity).indexOf('.') + 1) >2
-            ||this.dataList.impurity&&this.dataList.impurity>40||this.dataList.impurity&&this.dataList.impurity<1) {
+            ||this.dataList.impurity&&this.dataList.impurity>40||this.dataList.impurity&&this.dataList.impurity<0) {
         this.$message({
           message: '杂质输入错误',
           type: 'warning'
@@ -807,7 +819,7 @@ export default {
         this.dataList.mildewGrain&&String(this.dataList.mildewGrain).indexOf('.') != -1 &&
           String(this.dataList.mildewGrain).length -
             (String(this.dataList.mildewGrain).indexOf('.') + 1) >
-            2||this.dataList.mildewGrain&&this.dataList.mildewGrain>40||this.dataList.mildewGrain&&this.dataList.mildewGrain<1) {
+            2||this.dataList.mildewGrain&&this.dataList.mildewGrain>40||this.dataList.mildewGrain&&this.dataList.mildewGrain<0) {
         this.$message({
           message: '霉变粒输入错误',
           type: 'warning'
@@ -818,7 +830,7 @@ export default {
         this.dataList.jiaorenli&&String(this.dataList.jiaorenli).indexOf('.') != -1 &&
           String(this.dataList.jiaorenli).length -
             (String(this.dataList.jiaorenli).indexOf('.') + 1) >
-            2||this.dataList.jiaorenli&&this.dataList.jiaorenli>40||this.dataList.jiaorenli&&this.dataList.jiaorenli<1) {
+            2||this.dataList.jiaorenli&&this.dataList.jiaorenli>40||this.dataList.jiaorenli&&this.dataList.jiaorenli<0) {
         this.$message({
           message: '热损伤输入错误',
           type: 'warning'
@@ -829,7 +841,7 @@ export default {
         this.dataList.imperfectGrain&&String(this.dataList.imperfectGrain).indexOf('.') != -1 &&
           String(this.dataList.imperfectGrain).length -
             (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
-            2||this.dataList.imperfectGrain&&this.dataList.imperfectGrain>40||this.dataList.imperfectGrain&&this.dataList.imperfectGrain<1) {
+            2||this.dataList.imperfectGrain&&this.dataList.imperfectGrain>40||this.dataList.imperfectGrain&&this.dataList.imperfectGrain<0) {
         this.$message({
           message: '不完善粒输入错误',
           type: 'warning'

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -207,6 +207,18 @@
               placeholder="请输入买方电话"
             ></el-input>
           </el-form-item>
+          <el-form-item label="发票费（个人）" span="1" prop="invoiceFeePerson" >
+            <el-input
+              v-model="dataList.invoiceFeePerson"
+              placeholder="请输入发票费（个人）"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
+            <el-input
+              v-model="dataList.invoiceFeeCompany"
+              placeholder="请输入发票费（企业）"
+            ></el-input>
+          </el-form-item>
           <div class="small-title"></div>
         </el-form>
       </div>
@@ -783,7 +795,7 @@ export default {
         })
         return
       }
-      if (this.dataList.waterContent>40||this.dataList.waterContent<1) {
+      if (this.dataList.waterContent>40||this.dataList.waterContent<0) {
         this.$message({
           message: '水分输入错误！',
           type: 'warning'
@@ -811,7 +823,7 @@ export default {
         this.dataList.bulkDensity&&String(this.dataList.bulkDensity).indexOf('.') != -1 &&
           String(this.dataList.bulkDensity).length -
             (String(this.dataList.bulkDensity).indexOf('.') + 1) >
-            2||this.dataList.bulkDensity>1000||this.dataList.bulkDensity<500){
+            2||this.dataList.bulkDensity>1000||this.dataList.bulkDensity<0){
         this.$message({
           message: '容重输入错误',
           type: 'warning'
@@ -822,7 +834,7 @@ export default {
         this.dataList.protein&&String(this.dataList.protein).indexOf('.') != -1 &&
           String(this.dataList.protein).length -
             (String(this.dataList.protein).indexOf('.') + 1) >
-            2||this.dataList.protein&&this.dataList.protein>80||this.dataList.protein&&this.dataList.protein<1){
+            2||this.dataList.protein&&this.dataList.protein>80||this.dataList.protein&&this.dataList.protein<0){
         this.$message({
           message: '蛋白占比输入错误',
           type: 'warning'
@@ -833,7 +845,7 @@ export default {
         this.dataList.impurity&&String(this.dataList.impurity).indexOf('.') != -1 &&
           String(this.dataList.impurity).length -
             (String(this.dataList.impurity).indexOf('.') + 1) >2
-            ||this.dataList.impurity&&this.dataList.impurity>40||this.dataList.impurity&&this.dataList.impurity<1) {
+            ||this.dataList.impurity&&this.dataList.impurity>40||this.dataList.impurity&&this.dataList.impurity<0) {
         this.$message({
           message: '杂质输入错误',
           type: 'warning'
@@ -844,7 +856,7 @@ export default {
         this.dataList.mildewGrain&&String(this.dataList.mildewGrain).indexOf('.') != -1 &&
           String(this.dataList.mildewGrain).length -
             (String(this.dataList.mildewGrain).indexOf('.') + 1) >
-            2||this.dataList.mildewGrain&&this.dataList.mildewGrain>40||this.dataList.mildewGrain&&this.dataList.mildewGrain<1) {
+            2||this.dataList.mildewGrain&&this.dataList.mildewGrain>40||this.dataList.mildewGrain&&this.dataList.mildewGrain<0) {
         this.$message({
           message: '霉变粒输入错误',
           type: 'warning'
@@ -855,7 +867,7 @@ export default {
         this.dataList.jiaorenli&&String(this.dataList.jiaorenli).indexOf('.') != -1 &&
           String(this.dataList.jiaorenli).length -
             (String(this.dataList.jiaorenli).indexOf('.') + 1) >
-            2||this.dataList.jiaorenli&&this.dataList.jiaorenli>40||this.dataList.jiaorenli&&this.dataList.jiaorenli<1) {
+            2||this.dataList.jiaorenli&&this.dataList.jiaorenli>40||this.dataList.jiaorenli&&this.dataList.jiaorenli<0) {
         this.$message({
           message: '热损伤输入错误',
           type: 'warning'
@@ -866,7 +878,7 @@ export default {
         this.dataList.imperfectGrain&&String(this.dataList.imperfectGrain).indexOf('.') != -1 &&
           String(this.dataList.imperfectGrain).length -
             (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
-            2||this.dataList.imperfectGrain&&this.dataList.imperfectGrain>40||this.dataList.imperfectGrain&&this.dataList.imperfectGrain<1) {
+            2||this.dataList.imperfectGrain&&this.dataList.imperfectGrain>40||this.dataList.imperfectGrain&&this.dataList.imperfectGrain<0) {
         this.$message({
           message: '不完善粒输入错误',
           type: 'warning'

src/views/salesManagement/salesPlanAdd.vue

@@ -213,6 +213,18 @@
               placeholder="请输入卖方电话"
             ></el-input>
             <span class="unchangeable">*</span>
+            <el-form-item label="发票费（个人）" span="1" prop="invoiceFeePerson" >
+            <el-input
+              v-model="dataList.invoiceFeePerson"
+              placeholder="请输入发票费（个人）"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
+            <el-input
+              v-model="dataList.invoiceFeeCompany"
+              placeholder="请输入发票费（企业）"
+            ></el-input>
+          </el-form-item>
           </el-form-item>
           <div class="small-title"></div>
         </el-form>
@@ -846,7 +858,7 @@ export default {
         })
         return
       }
-      if (this.dataList.waterContent > 40 || this.dataList.waterContent < 1) {
+      if (this.dataList.waterContent > 40 || this.dataList.waterContent < 0) {
         this.$message({
           message: '水分输入错误！',
           type: 'warning',
@@ -879,7 +891,7 @@ export default {
             (String(this.dataList.bulkDensity).indexOf('.') + 1) >
             2) ||
         this.dataList.bulkDensity > 1000 ||
-        this.dataList.bulkDensity < 500
+        this.dataList.bulkDensity < 0
       ) {
         this.$message({
           message: '容重输入错误',
@@ -891,7 +903,7 @@ export default {
         this.dataList.protein&&String(this.dataList.protein).indexOf('.') != -1 &&
           String(this.dataList.protein).length -
             (String(this.dataList.protein).indexOf('.') + 1) >
-            2||this.dataList.protein&&this.dataList.protein>80||this.dataList.protein&&this.dataList.protein<1){
+            2||this.dataList.protein&&this.dataList.protein>80||this.dataList.protein&&this.dataList.protein<0){
         this.$message({
           message: '蛋白占比输入错误',
           type: 'warning'
@@ -902,7 +914,7 @@ export default {
         this.dataList.impurity&&String(this.dataList.impurity).indexOf('.') != -1 &&
           String(this.dataList.impurity).length -
             (String(this.dataList.impurity).indexOf('.') + 1) >2
-            ||this.dataList.impurity&&this.dataList.impurity>40||this.dataList.impurity&&this.dataList.impurity<1) {
+            ||this.dataList.impurity&&this.dataList.impurity>40||this.dataList.impurity&&this.dataList.impurity<0) {
         this.$message({
           message: '杂质输入错误',
           type: 'warning'
@@ -913,7 +925,7 @@ export default {
         this.dataList.mildewGrain&&String(this.dataList.mildewGrain).indexOf('.') != -1 &&
           String(this.dataList.mildewGrain).length -
             (String(this.dataList.mildewGrain).indexOf('.') + 1) >
-            2||this.dataList.mildewGrain&&this.dataList.mildewGrain>40||this.dataList.mildewGrain&&this.dataList.mildewGrain<1) {
+            2||this.dataList.mildewGrain&&this.dataList.mildewGrain>40||this.dataList.mildewGrain&&this.dataList.mildewGrain<0) {
         this.$message({
           message: '霉变粒输入错误',
           type: 'warning'
@@ -924,7 +936,7 @@ export default {
         this.dataList.jiaorenli&&String(this.dataList.jiaorenli).indexOf('.') != -1 &&
           String(this.dataList.jiaorenli).length -
             (String(this.dataList.jiaorenli).indexOf('.') + 1) >
-            2||this.dataList.jiaorenli&&this.dataList.jiaorenli>40||this.dataList.jiaorenli&&this.dataList.jiaorenli<1) {
+            2||this.dataList.jiaorenli&&this.dataList.jiaorenli>40||this.dataList.jiaorenli&&this.dataList.jiaorenli<0) {
         this.$message({
           message: '热损伤输入错误',
           type: 'warning'
@@ -935,7 +947,7 @@ export default {
         this.dataList.imperfectGrain&&String(this.dataList.imperfectGrain).indexOf('.') != -1 &&
           String(this.dataList.imperfectGrain).length -
             (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
-            2||this.dataList.imperfectGrain&&this.dataList.imperfectGrain>40||this.dataList.imperfectGrain&&this.dataList.imperfectGrain<1) {
+            2||this.dataList.imperfectGrain&&this.dataList.imperfectGrain>40||this.dataList.imperfectGrain&&this.dataList.imperfectGrain<0) {
         this.$message({
           message: '不完善粒输入错误',
           type: 'warning'

src/views/salesManagement/salesPlanEdit.vue

@@ -182,6 +182,18 @@
               placeholder="请输入卖方电话"
             ></el-input>
           </el-form-item>
+          <el-form-item label="发票费（个人）" span="1" prop="invoiceFeePerson" >
+            <el-input
+              v-model="dataList.invoiceFeePerson"
+              placeholder="请输入发票费（个人）"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
+            <el-input
+              v-model="dataList.invoiceFeeCompany"
+              placeholder="请输入发票费（企业）"
+            ></el-input>
+          </el-form-item>
           <div class="small-title"></div>
         </el-form>
       </div>
@@ -749,7 +761,7 @@ export default {
         })
         return
       }
-      if (this.dataList.waterContent > 40 || this.dataList.waterContent < 1) {
+      if (this.dataList.waterContent > 40 || this.dataList.waterContent < 0) {
         this.$message({
           message: '水分输入错误！',
           type: 'warning',
@@ -782,7 +794,7 @@ export default {
             (String(this.dataList.bulkDensity).indexOf('.') + 1) >
             2) ||
         this.dataList.bulkDensity > 1000 ||
-        this.dataList.bulkDensity < 500
+        this.dataList.bulkDensity < 0
       ) {
         this.$message({
           message: '容重输入错误',
@@ -794,7 +806,7 @@ export default {
         this.dataList.protein&&String(this.dataList.protein).indexOf('.') != -1 &&
           String(this.dataList.protein).length -
             (String(this.dataList.protein).indexOf('.') + 1) >
-            2||this.dataList.protein&&this.dataList.protein>80||this.dataList.protein&&this.dataList.protein<1){
+            2||this.dataList.protein&&this.dataList.protein>80||this.dataList.protein&&this.dataList.protein<0){
         this.$message({
           message: '蛋白占比输入错误',
           type: 'warning'
@@ -805,7 +817,7 @@ export default {
         this.dataList.impurity&&String(this.dataList.impurity).indexOf('.') != -1 &&
           String(this.dataList.impurity).length -
             (String(this.dataList.impurity).indexOf('.') + 1) >2
-            ||this.dataList.impurity&&this.dataList.impurity>40||this.dataList.impurity&&this.dataList.impurity<1) {
+            ||this.dataList.impurity&&this.dataList.impurity>40||this.dataList.impurity&&this.dataList.impurity<0) {
         this.$message({
           message: '杂质输入错误',
           type: 'warning'
@@ -816,7 +828,7 @@ export default {
         this.dataList.mildewGrain&&String(this.dataList.mildewGrain).indexOf('.') != -1 &&
           String(this.dataList.mildewGrain).length -
             (String(this.dataList.mildewGrain).indexOf('.') + 1) >
-            2||this.dataList.mildewGrain&&this.dataList.mildewGrain>40||this.dataList.mildewGrain&&this.dataList.mildewGrain<1) {
+            2||this.dataList.mildewGrain&&this.dataList.mildewGrain>40||this.dataList.mildewGrain&&this.dataList.mildewGrain<0) {
         this.$message({
           message: '霉变粒输入错误',
           type: 'warning'
@@ -827,7 +839,7 @@ export default {
         this.dataList.jiaorenli&&String(this.dataList.jiaorenli).indexOf('.') != -1 &&
           String(this.dataList.jiaorenli).length -
             (String(this.dataList.jiaorenli).indexOf('.') + 1) >
-            2||this.dataList.jiaorenli&&this.dataList.jiaorenli>40||this.dataList.jiaorenli&&this.dataList.jiaorenli<1) {
+            2||this.dataList.jiaorenli&&this.dataList.jiaorenli>40||this.dataList.jiaorenli&&this.dataList.jiaorenli<0) {
         this.$message({
           message: '热损伤输入错误',
           type: 'warning'
@@ -838,7 +850,7 @@ export default {
         this.dataList.imperfectGrain&&String(this.dataList.imperfectGrain).indexOf('.') != -1 &&
           String(this.dataList.imperfectGrain).length -
             (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
-            2||this.dataList.imperfectGrain&&this.dataList.imperfectGrain>40||this.dataList.imperfectGrain&&this.dataList.imperfectGrain<1) {
+            2||this.dataList.imperfectGrain&&this.dataList.imperfectGrain>40||this.dataList.imperfectGrain&&this.dataList.imperfectGrain<0) {
         this.$message({
           message: '不完善粒输入错误',
           type: 'warning'