|
@@ -274,7 +274,7 @@
|
|
|
<el-form-item
|
|
|
label="学练宝版本"
|
|
|
prop="memberRankSettingId"
|
|
|
- :rules="[{ required: true, message: '请选择学练宝版本' }]"
|
|
|
+ :rules="[{ required: true, message: '请选择学练宝版本' }]"
|
|
|
:label-width="formLabelWidth"
|
|
|
>
|
|
|
<el-cascader
|
|
@@ -285,23 +285,7 @@
|
|
|
:disabled="addDisabled"
|
|
|
:options="remberList"
|
|
|
:props="{ value: 'id', label: 'name' }"
|
|
|
- :show-all-levels="false"
|
|
|
></el-cascader>
|
|
|
- <!-- <el-select
|
|
|
- :disabled="addDisabled"
|
|
|
- class="multiple"
|
|
|
- filterable
|
|
|
- v-model.trim="form.memberRankSettingId"
|
|
|
- clearable
|
|
|
- placeholder="请选择学练宝"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in remberList"
|
|
|
- :key="index"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
- </el-select> -->
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
|
|
@@ -751,7 +735,7 @@ export default {
|
|
|
groupPurchaseQuarterlyFee: "",
|
|
|
groupPurchaseYearFee: "",
|
|
|
organIds: [],
|
|
|
- memberRankSettingId: "",
|
|
|
+ memberRankSettingId: [],
|
|
|
incomeMonthFee: "", // 月经营报表
|
|
|
incomeQuarterlyFee: "", // 季度经营报表
|
|
|
incomeHalfYearFee: "", // 半年经营报表
|
|
@@ -848,7 +832,7 @@ export default {
|
|
|
incomeHalfYearFee: "", // 半年经营报表
|
|
|
incomeYearFee: "", // 年经营报表
|
|
|
organIds: [],
|
|
|
- memberRankSettingId: ""
|
|
|
+ memberRankSettingId: []
|
|
|
}),
|
|
|
this.$refs[ruleForm].resetFields();
|
|
|
},
|
|
@@ -875,15 +859,16 @@ export default {
|
|
|
obj[key] = row.memberFeeSetting[key];
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ await this.getAllMember()
|
|
|
this.form = {
|
|
|
...obj,
|
|
|
organIds: row.organId ? [row.organId] : [],
|
|
|
- outId: row.id
|
|
|
+ outId: row.id,
|
|
|
+ memberRankSettingId: row.memberRankSettingId ? this.formatParentId(row.memberRankSettingId, this.remberList) : [],
|
|
|
};
|
|
|
- await this.getAllMember()
|
|
|
- this.form.memberRankSettingId = row.memberRankSettingId ? this.formatParentId(row.memberRankSettingId, this.remberList) : [],
|
|
|
-
|
|
|
+
|
|
|
+ // this.form.memberRankSettingId =
|
|
|
+ // this.$forceUpdate()
|
|
|
this.branchStatus = true;
|
|
|
},
|
|
|
formatParentId(id, list, ids = []) {
|
|
@@ -909,6 +894,7 @@ export default {
|
|
|
this.branchStatus = false;
|
|
|
return;
|
|
|
}
|
|
|
+ console.log(this.form)
|
|
|
this.$refs.ruleForm.validate(async flag => {
|
|
|
if (flag) {
|
|
|
const memberRankSettingId = this.form.memberRankSettingId.length > 0 ? this.form.memberRankSettingId[this.form.memberRankSettingId.length -1] : null
|