Browse Source

修改逻辑

lex-xin 5 years ago
parent
commit
40a2c39b32

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-6e585d98.131b24ea.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.bc155c7d.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-52ad561e.0f04e872.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6e585d98.ec0db802.js


+ 56 - 16
src/views/chargeManager/one.vue

@@ -112,9 +112,9 @@
         <div class="moreRule">
           <div class="moreRuleIn" v-for="(domain, index) in result.domains" :key="domain.key">
             <el-form-item class="setWidth" :label="'第' + (index + 1)" :label-width="formLabelWidth">
+              <!-- @change="onBranchChange" -->
               <el-select
                 v-model.trim="domain.organId"
-                @change="onBranchChange"
                 :disabled="domain.disabled"
                 placeholder="请选择分部"
                 clearable
@@ -358,35 +358,55 @@ export default {
         this.$message.error(res.msg);
       }
     },
-    onBranchChange(val) {
-      this.calcBranchList.forEach(item => {
-        if (val == item.value) {
-          item.disabled = true;
-        } else {
-          item.disabled = false;
-        }
-      });
-    },
+    // onBranchChange(val) {
+    //   this.calcBranchList.forEach(item => {
+    //     if (val == item.value) {
+    //       item.disabled = true;
+    //     } else {
+    //       item.disabled = false;
+    //     }
+    //   });
+    // },
     addDomain(form, checked) {
       let domains = form.domains,
         forms = this.form,
         singleLength = domains.length,
         lastDate = domains[singleLength - 1]; // 获取倒数一个对象
+
+      // 如果三个值都为空,则不用检验
+      if (!lastDate.organId && !lastDate.scale && !lastDate.feeFlag && checked) {
+        form.errorText = ''
+        return;
+      }
+
       let countScale = 0;
+      let selectFeeCount = 0,
+          selectFeeCount2 = 0
       domains.forEach(item => {
         countScale += Number(item.scale);
+        if(forms.type == 2) {
+          if(item.feeFlag == 'Y') {
+            selectFeeCount++
+          }
+        } else if(forms.type == 1) {
+          if(item.feeFlag == 'N') {
+            selectFeeCount2++
+          }
+        }
       });
+      if(selectFeeCount > 1) {
+        form.errorText = `承担手续费只能设置一次“是”`;
+        return
+      } else if(selectFeeCount2 > 0) {
+        form.errorText = `承担手续费只能设置“是”`;
+        return
+      }
       let num = 0;
       if (forms.type === 2) {
         num = 100;
       } else if (forms.type === 1) {
         num = 10;
       }
-      // 如果三个值都为空,则不用检验
-      if (!lastDate.organId && !lastDate.scale && !lastDate.feeFlag) {
-        form.errorText = ''
-        return;
-      }
 
       if (!lastDate.organId) {
         form.errorText = "选择分部不能为空";
@@ -427,6 +447,12 @@ export default {
       }
     },
     removeDomain(form, item) {
+      // this.calcBranchList.forEach(organ => {
+      //   if (item.organId == organ.value) {
+      //     console.log(true)
+      //     organ.disabled = false;
+      //   }
+      // });
       var index = form.domains.indexOf(item);
       if (index !== -1) {
         form.domains.splice(index, 1);
@@ -521,6 +547,20 @@ export default {
         type: 2,
         routeScale: []
       };
+      this.result = {
+        domains: [
+          {
+            organId: null,
+            scale: null,
+            feeFlag: null,
+            disabled: false,
+            key: Date.now()
+          }
+        ],
+        errorText: null,
+        yqError: null,
+        hfError: null
+      }
       this.$refs[formName].resetFields();
     }
   }
@@ -556,7 +596,7 @@ export default {
     font-size: 12px;
     line-height: 1;
     position: absolute;
-    left: 120px;
+    left: 100px;
     top: 100%;
     margin-top: -21px;
   }

Some files were not shown because too many files changed in this diff