|
@@ -5,7 +5,7 @@
|
|
|
<el-form-item label="学练宝版本" prop="memberRankId" :rules="[
|
|
|
{ required: true, message: '请选择学练宝版本', trigger: 'blur' }
|
|
|
]">
|
|
|
- <!-- <el-cascader
|
|
|
+ <el-cascader
|
|
|
v-model.trim="memberForm.memberRankId"
|
|
|
style="width: 100% !important"
|
|
|
:options="memberRankList"
|
|
@@ -15,8 +15,8 @@
|
|
|
clearable
|
|
|
@change="getMemberList"
|
|
|
placeholder="请选择学练宝版本"
|
|
|
- ></el-cascader> -->
|
|
|
- <el-select
|
|
|
+ ></el-cascader>
|
|
|
+ <!-- <el-select
|
|
|
placeholder="请选择学练宝版本"
|
|
|
clearable
|
|
|
v-model.trim="memberForm.memberRankId"
|
|
@@ -24,7 +24,7 @@
|
|
|
style="width: 100% !important"
|
|
|
>
|
|
|
<el-option v-for="(item, index) in memberFeeSettingList" :key="index" :label="item.rankName" :value="item.id"></el-option>
|
|
|
- </el-select>
|
|
|
+ </el-select> -->
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
label="学练宝周期"
|
|
@@ -192,23 +192,40 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- const rankInfo = await getmemberRankOrganizationFeeMapper({
|
|
|
- page: 1,
|
|
|
- rows: 10,
|
|
|
- organId: this.organId
|
|
|
- });
|
|
|
- const { rows } = rankInfo.data;
|
|
|
- this.memberFeeSettingList = rows || [];
|
|
|
- if (this.memberFeeSettingList.length <= 0) {
|
|
|
- this.$bus.$emit("showguide", ["memberList"]);
|
|
|
+ // const rankInfo = await getmemberRankOrganizationFeeMapper({
|
|
|
+ // page: 1,
|
|
|
+ // rows: 10,
|
|
|
+ // organId: this.organId
|
|
|
+ // });
|
|
|
+ // const { rows } = rankInfo.data;
|
|
|
+ // this.memberFeeSettingList = rows || [];
|
|
|
+ // if (this.memberFeeSettingList.length <= 0) {
|
|
|
+ // this.$bus.$emit("showguide", ["memberList"]);
|
|
|
+ // }
|
|
|
+
|
|
|
+ const rankInfo = await getAllMemberFindByOrganIds([this.organId], true)
|
|
|
+ this.memberRankList = rankInfo.data || []
|
|
|
+ if (this.type == "update") {
|
|
|
+ const { memberRankSettingId } = this.multipleSelection;
|
|
|
+ this.memberForm.memberRankId = this.formatParentId(memberRankSettingId, this.memberRankList);
|
|
|
+ this.$forceUpdate()
|
|
|
}
|
|
|
} catch (e) {}
|
|
|
},
|
|
|
getMemberList() {
|
|
|
let money = 0;
|
|
|
const memberForm = this.memberForm;
|
|
|
- const selectItem = this.memberFeeSettingList.find(item => item.id == memberForm.memberRankId);
|
|
|
- const memberFeeSetting = selectItem ? selectItem.memberFeeSetting : null
|
|
|
+ let memberFeeSetting = null
|
|
|
+ const memberRankId = this.memberForm.memberRankId || []
|
|
|
+ this.memberRankList.forEach(item => {
|
|
|
+ if(item.id === memberRankId[0]) {
|
|
|
+ item.children.forEach(child => {
|
|
|
+ if(child.id === memberRankId[1]) {
|
|
|
+ memberFeeSetting = child.memberFeeSetting
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
if (memberFeeSetting) {
|
|
|
switch (memberForm?.period) {
|
|
|
case "MONTH": {
|