修改问题

src/views/chargeManager/one.vue

@@ -13,7 +13,7 @@
           <el-table-column align="center" prop="yqMerNo" label="双乾商户号"></el-table-column>
           <el-table-column align="center" label="收款比例">
             <template slot-scope="scope">
-              {{ scope.row.type == 1 ? '比数比例' : null }}
+              {{ scope.row.type == 1 ? '数比例' : null }}
               {{ scope.row.type == 2 ? '金额比例' : null }}
             </template>
           </el-table-column>
@@ -103,7 +103,7 @@
             v-model.trim.number="form.type"
             @change="onRadioChange('ruleForm')"
             :label="1"
-          >比数比例</el-radio>
+          >数比例</el-radio>
         </el-form-item>
 
         <el-form-item class="moreRule" :label-width="formLabelWidth" style="margin-bottom: 0;">
@@ -119,6 +119,7 @@
                 @change="onBranchChange"
                 :disabled="domain.disabled"
                 placeholder="请选择分部"
+                clearable
               >
                 <el-option
                   v-for="(item, index) in calcBranchList"
@@ -134,13 +135,14 @@
                 type="number"
                 v-number
                 min="0"
-                :max="form.type === 1 ? 100 : 10"
+                clearable
+                :max="form.type === 1 ? 10 : 100"
                 placeholder="请输入比例"
                 :disabled="domain.disabled"
                 @mousewheel.native.prevent
                 v-model.trim="domain.scale"
               >
-                <template v-if="form.type === 1" slot="append">%</template>
+                <template v-if="form.type === 2" slot="append">%</template>
               </el-input>
             </el-form-item>
             <el-form-item>
@@ -149,6 +151,7 @@
                 placeholder="请选择是否承担手续费"
                 style="width: 150px !important;"
                 :disabled="domain.disabled"
+                clearable
               >
                 <el-option value="Y" label="是"></el-option>
                 <el-option value="N" label="否"></el-option>
@@ -367,12 +370,13 @@ export default {
       });
       let num = 0;
       if (forms.type === 2) {
-        num = 10;
-      } else if (forms.type === 1) {
         num = 100;
+      } else if (forms.type === 1) {
+        num = 10;
       }
       // 如果三个值都为空，则不用检验
       if (!lastDate.organId && !lastDate.scale && !lastDate.feeFlag) {
+        form.errorText = ''
         return;
       }
 
@@ -384,9 +388,12 @@ export default {
       if (!parseInt(lastDate.scale)) {
         form.errorText = "比例不能为空";
         return;
-      } else if (parseInt(countScale) > num) {
+      } else if (parseInt(lastDate.scale) > num) {
         form.errorText = "比例不能超过" + num;
         return;
+      } else if (parseInt(countScale) > num) {
+        form.errorText = "比例总和应为" + num;
+        return;
       }
 
       if (!lastDate.feeFlag) {

src/views/chargeManager/two.vue

@@ -20,7 +20,7 @@
               :rules="{
                 required: true, message: '请选择所属分部', trigger: 'change'
               }">
-              <el-select v-model.trim="domain.organId" :disabled="domain.disabled" placeholder="请选择所属分部">
+              <el-select v-model.trim="domain.organId" clearable :disabled="domain.disabled" placeholder="请选择所属分部">
                 <el-option
                   v-for="(item, index1) in branchList"
                   :key="index1"
@@ -32,7 +32,7 @@
             <el-form-item class="setWidth" :prop="'domains.' + index + '.routeOrganId'" :rules="[
               { required: true, message: '请选择收款分部', trigger: 'change' },
             ]">
-              <el-select v-model.trim="domain.routeOrganId" :disabled="domain.disabled" placeholder="请选择收款分部">
+              <el-select clearable v-model.trim="domain.routeOrganId" :disabled="domain.disabled" placeholder="请选择收款分部">
                 <el-option
                   v-for="(item, index) in calcBranchList"
                   :key="index"
@@ -44,6 +44,7 @@
             <el-form-item class="setWidth" :prop="'domains.' + index + '.amount'" :rules="validAmount">
               <el-input
                 type="age"
+                clearable
                 placeholder="请输入比例"
                 :disabled="domain.disabled"
                 @mousewheel.native.prevent
@@ -55,6 +56,7 @@
               { required: true, message: '请选择购买类型', trigger: 'change' },
             ]">
               <el-select
+                clearable
                 v-model.trim="domain.type"
                 placeholder="购买类型"
                 style="width: 180px !important"
@@ -270,7 +272,6 @@ export default {
               this.formSporadic = item.paranValue
                 ? JSON.parse(item.paranValue)
                 : { organId: null, minReceipt: 0 };
-              console.log(this.formSporadic)
               this.sporadicId = item.id;
             }
           });