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

src/views/contractManagement/purchaseContractEdit.vue

@@ -333,7 +333,7 @@
     },
     data() {
       return {
-        type: "",
+        type: '',
         dialogVisible: false,
         //弹出框
         dialogViewSpareMoney: false,
@@ -562,8 +562,8 @@
           .then((response) => {
             this.feedbackLeaders = response
               let _obj = []   //发货反馈负责人下拉列表第一个添加  "无需发货反馈（默认）"
-            _obj.staffName = "无需发货反馈（默认）"
-            _obj.staffMobilePhone = "(默认)"
+            _obj.staffName = '无需发货反馈（默认）'
+            _obj.staffMobilePhone = '(默认)'
             this.feedbackLeaders.unshift(_obj)
           })
       },
@@ -855,28 +855,28 @@
           })
           return
         }
-        if (!this.deptBudgetList.overShort) {
-          this.$message({
-            message: '请输入溢短装！',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          isNaN(this.deptBudgetList.overShort) ||
-          (String(this.deptBudgetList.overShort).indexOf('.') != -1 &&
-            String(this.deptBudgetList.overShort).length -
-            (String(this.deptBudgetList.overShort).indexOf('.') + 1) >
-            2) ||
-          this.deptBudgetList.overShort < 0 ||
-          this.deptBudgetList.overShort > 50
-        ) {
-          this.$message({
-            message: '溢短装输入有误！',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.overShort) {
+        //   this.$message({
+        //     message: '请输入溢短装！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   isNaN(this.deptBudgetList.overShort) ||
+        //   (String(this.deptBudgetList.overShort).indexOf('.') != -1 &&
+        //     String(this.deptBudgetList.overShort).length -
+        //     (String(this.deptBudgetList.overShort).indexOf('.') + 1) >
+        //     2) ||
+        //   this.deptBudgetList.overShort < 0 ||
+        //   this.deptBudgetList.overShort > 50
+        // ) {
+        //   this.$message({
+        //     message: '溢短装输入有误！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.deliveryDateEnd) {
           this.$message({
             message: '请选择交货日期（止）',
@@ -895,7 +895,7 @@
           })
           return
         }
-          if (!this.deptBudgetList.unitContractPrice && this.deptBudgetList.priceType == "定价采购") {
+          if (!this.deptBudgetList.unitContractPrice && this.deptBudgetList.priceType == '定价采购') {
           this.$message({
             message: '请输入合同单价！',
             type: 'warning',
@@ -918,7 +918,7 @@
           })
           return
         }
-        if (!this.deptBudgetList.totalContractPrice && this.deptBudgetList.priceType == "定价采购") {
+        if (!this.deptBudgetList.totalContractPrice && this.deptBudgetList.priceType == '定价采购') {
           this.$message({
             message: '请输入合同总价！',
             type: 'warning',