|
@@ -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>
|
|
@@ -115,7 +115,6 @@
|
|
|
<!-- @change="onBranchChange" -->
|
|
|
<el-select
|
|
|
v-model.trim="domain.organId"
|
|
|
- :disabled="domain.disabled"
|
|
|
placeholder="请选择分部"
|
|
|
clearable
|
|
|
>
|
|
@@ -136,7 +135,6 @@
|
|
|
clearable
|
|
|
:max="form.type === 1 ? 10 : 100"
|
|
|
placeholder="请输入比例"
|
|
|
- :disabled="domain.disabled"
|
|
|
@mousewheel.native.prevent
|
|
|
v-model.trim="domain.scale"
|
|
|
>
|
|
@@ -148,14 +146,13 @@
|
|
|
v-model.trim="domain.feeFlag"
|
|
|
placeholder="请选择是否承担手续费"
|
|
|
style="width: 150px !important;"
|
|
|
- :disabled="domain.disabled"
|
|
|
clearable
|
|
|
>
|
|
|
<el-option value="Y" label="是"></el-option>
|
|
|
<el-option value="N" label="否"></el-option>
|
|
|
</el-select>
|
|
|
<el-button
|
|
|
- v-if="index != 0 && !domain.disabled"
|
|
|
+ v-if="index != 0"
|
|
|
@click.prevent="removeDomain(result, domain)"
|
|
|
>删除</el-button>
|
|
|
</el-form-item>
|
|
@@ -444,6 +441,9 @@ export default {
|
|
|
form.errorText = "比例总和应为" + num;
|
|
|
return;
|
|
|
}
|
|
|
+ if(selectFeeCount != 1) {
|
|
|
+ form.errorText = "承担手续费必须设置一次“是”"
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
removeDomain(form, item) {
|