Browse Source

前端gjy

18513069273 4 years ago
parent
commit
8663a79b0c

+ 15 - 21
src/views/contractManagement/purchaseContractAdd.vue

@@ -741,12 +741,9 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.buyer.length < 4 ||
-        this.deptBudgetList.buyer.length > 30
-      ) {
+      if (this.deptBudgetList.buyer.length > 30) {
         this.$message({
-          message: '买方名称长度不符合要求,请输入4到30个字符之内!',
+          message: '买方名称长度不符合要求,请输入30个字符之内!',
           type: 'warning',
         })
         return
@@ -758,12 +755,9 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.seller.length < 4 ||
-        this.deptBudgetList.seller.length > 30
-      ) {
+      if (this.deptBudgetList.seller.length > 30) {
         this.$message({
-          message: '卖方名称长度不符合要求,请输入4到30个字符之内!',
+          message: '卖方名称长度不符合要求,请输入30个字符之内!',
           type: 'warning',
         })
         return
@@ -1033,8 +1027,8 @@ export default {
         return
       }
       if (
-        (this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.goodsNameKey < 0) ||
+        this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000 ||
+        this.deptBudgetList.contractProcessInfo.goodsNameKey < 0 ||
         (String(this.deptBudgetList.contractProcessInfo.goodsNameKey).indexOf(
           '.'
         ) != -1 &&
@@ -1052,9 +1046,9 @@ export default {
         return
       }
       if (
-        (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) |
-          (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||
-        (String(this.deptBudgetList.ccontractProcessInfo.waterContent).indexOf(
+        this.deptBudgetList.contractProcessInfo.waterContent > 10000000 ||
+        this.deptBudgetList.contractProcessInfo.waterContent < 0 ||
+        (String(this.deptBudgetList.contractProcessInfo.waterContent).indexOf(
           '.'
         ) != -1 &&
           String(this.deptBudgetList.contractProcessInfo.waterContent).length -
@@ -1071,8 +1065,8 @@ export default {
         return
       }
       if (
-        (this.deptBudgetList.contractProcessInfo.goodsName > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.goodsName < 0) ||
+        this.deptBudgetList.contractProcessInfo.goodsName > 1000000000 ||
+        this.deptBudgetList.contractProcessInfo.goodsName < 0 ||
         (String(this.deptBudgetList.contractProcessInfo.goodsName).indexOf(
           '.'
         ) != -1 &&
@@ -1090,8 +1084,8 @@ export default {
         return
       }
       if (
-        (this.deptBudgetList.contractProcessInfo.impurity > 1000000000) |
-          (this.deptBudgetList.contractProcessInfo.impurity < 0) ||
+        this.deptBudgetList.contractProcessInfo.impurity > 1000000000 ||
+        this.deptBudgetList.contractProcessInfo.impurity < 0 ||
         (String(this.deptBudgetList.contractProcessInfo.impurity).indexOf(
           '.'
         ) != -1 &&
@@ -1109,8 +1103,8 @@ export default {
         return
       }
       if (
-        (this.deptBudgetList.contractProcessInfo.imperfectGrain > 200000) |
-          (this.deptBudgetList.contractProcessInfo.imperfectGrain < 0) ||
+        this.deptBudgetList.contractProcessInfo.imperfectGrain > 200000 ||
+        this.deptBudgetList.contractProcessInfo.imperfectGrain < 0 ||
         (String(this.deptBudgetList.contractProcessInfo.imperfectGrain).indexOf(
           '.'
         ) != -1 &&

+ 5 - 11
src/views/contractManagement/purchaseContractEdit.vue

@@ -816,12 +816,9 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.buyer.length < 4 ||
-        this.deptBudgetList.buyer.length > 30
-      ) {
+      if (this.deptBudgetList.buyer.length > 30) {
         this.$message({
-          message: '买方名称长度不符合要求,请输入4到30个字符之内!',
+          message: '买方名称长度不符合要求,请输入30个字符之内!',
           type: 'warning',
         })
         return
@@ -833,12 +830,9 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.seller.length < 4 ||
-        this.deptBudgetList.seller.length > 30
-      ) {
+      if (this.deptBudgetList.seller.length > 30) {
         this.$message({
-          message: '卖方名称长度不符合要求,请输入4到30个字符之内!',
+          message: '卖方名称长度不符合要求,请输入30个字符之内!',
           type: 'warning',
         })
         return
@@ -1129,7 +1123,7 @@ export default {
       if (
         (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) |
           (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||
-        (String(this.deptBudgetList.ccontractProcessInfo.waterContent).indexOf(
+        (String(this.deptBudgetList.contractProcessInfo.waterContent).indexOf(
           '.'
         ) != -1 &&
           String(this.deptBudgetList.contractProcessInfo.waterContent).length -

+ 1 - 1
src/views/contractManagement/salesContract.vue

@@ -587,7 +587,7 @@ export default {
         res: data,
         fileName: `${
           this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
+        }_销售合同`,
         type: 'xls',
       })
     },

+ 5 - 11
src/views/contractManagement/salesContractAdd.vue

@@ -769,12 +769,9 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.buyer.length < 4 ||
-        this.deptBudgetList.buyer.length > 30
-      ) {
+      if (this.deptBudgetList.buyer.length > 30) {
         this.$message({
-          message: '买方名称长度不符合要求,请输入4到30个字符之内!',
+          message: '买方名称长度不符合要求,请输入30个字符之内!',
           type: 'warning',
         })
         return
@@ -786,12 +783,9 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.seller.length < 4 ||
-        this.deptBudgetList.seller.length > 30
-      ) {
+      if (this.deptBudgetList.seller.length > 30) {
         this.$message({
-          message: '卖方名称长度不符合要求,请输入4到30个字符之内!',
+          message: '卖方名称长度不符合要求,请输入30个字符之内!',
           type: 'warning',
         })
         return
@@ -1082,7 +1076,7 @@ export default {
       if (
         (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) |
           (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||
-        (String(this.deptBudgetList.ccontractProcessInfo.waterContent).indexOf(
+        (String(this.deptBudgetList.contractProcessInfo.waterContent).indexOf(
           '.'
         ) != -1 &&
           String(this.deptBudgetList.contractProcessInfo.waterContent).length -

+ 5 - 11
src/views/contractManagement/salesContractEdit.vue

@@ -805,12 +805,9 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.buyer.length < 4 ||
-        this.deptBudgetList.buyer.length > 30
-      ) {
+      if (this.deptBudgetList.buyer.length > 30) {
         this.$message({
-          message: '买方名称长度不符合要求,请输入4到30个字符之内!',
+          message: '买方名称长度不符合要求,请输入30个字符之内!',
           type: 'warning',
         })
         return
@@ -822,12 +819,9 @@ export default {
         })
         return
       }
-      if (
-        this.deptBudgetList.seller.length < 4 ||
-        this.deptBudgetList.seller.length > 30
-      ) {
+      if (this.deptBudgetList.seller.length > 30) {
         this.$message({
-          message: '卖方名称长度不符合要求,请输入4到30个字符之内!',
+          message: '卖方名称长度不符合要求,请输入30个字符之内!',
           type: 'warning',
         })
         return
@@ -1118,7 +1112,7 @@ export default {
       if (
         (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) |
           (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||
-        (String(this.deptBudgetList.ccontractProcessInfo.waterContent).indexOf(
+        (String(this.deptBudgetList.contractProcessInfo.waterContent).indexOf(
           '.'
         ) != -1 &&
           String(this.deptBudgetList.contractProcessInfo.waterContent).length -