|
@@ -84,7 +84,7 @@
|
|
<div>
|
|
<div>
|
|
<auth auths="memberRankSetting/get">
|
|
<auth auths="memberRankSetting/get">
|
|
<el-button v-if="scope.row.parentId <= 0" type="text" @click="addLeave(scope.row)"
|
|
<el-button v-if="scope.row.parentId <= 0" type="text" @click="addLeave(scope.row)"
|
|
- >添加了项</el-button
|
|
|
|
|
|
+ >添加子版本</el-button
|
|
>
|
|
>
|
|
</auth>
|
|
</auth>
|
|
<!-- memberRankSetting/add -->
|
|
<!-- memberRankSetting/add -->
|
|
@@ -440,7 +440,7 @@ export default {
|
|
|
|
|
|
this.addDisabled = false;
|
|
this.addDisabled = false;
|
|
this.pageType = "create";
|
|
this.pageType = "create";
|
|
- await this.getMemberRankList();
|
|
|
|
|
|
+ await this.getMemberRankList(this.form.parentId || null);
|
|
this.memberRankCount = 0;
|
|
this.memberRankCount = 0;
|
|
this.treeMemberData = await this.setMemberTableData(
|
|
this.treeMemberData = await this.setMemberTableData(
|
|
this.memberRankList,
|
|
this.memberRankList,
|
|
@@ -452,7 +452,7 @@ export default {
|
|
this.addDisabled,
|
|
this.addDisabled,
|
|
"class"
|
|
"class"
|
|
);
|
|
);
|
|
- await this.getNewTree();
|
|
|
|
|
|
+ await this.getNewTree(this.form.parentId || null);
|
|
this.slideCount = 0;
|
|
this.slideCount = 0;
|
|
this.treeData = await this.setTableData(
|
|
this.treeData = await this.setTableData(
|
|
this.silderList,
|
|
this.silderList,
|
|
@@ -686,8 +686,8 @@ export default {
|
|
},
|
|
},
|
|
async resetTree(row) {
|
|
async resetTree(row) {
|
|
try {
|
|
try {
|
|
- await this.getNewTree();
|
|
|
|
- await this.getMemberRankList();
|
|
|
|
|
|
+ await this.getNewTree(row.parentId || null);
|
|
|
|
+ await this.getMemberRankList(row.parentId || null);
|
|
this.treeMemberData = await this.setMemberTableData(
|
|
this.treeMemberData = await this.setMemberTableData(
|
|
this.memberRankList
|
|
this.memberRankList
|
|
);
|
|
);
|
|
@@ -708,7 +708,7 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
this.checkAll =
|
|
this.checkAll =
|
|
- data.memberPrivilegesItemIdList?.length >= this.slideCount || false;
|
|
|
|
|
|
+ data.memberPrivilegesItemIdList?.length >= this.slideCount && data.memberPrivilegesItemIdList?.length > 0 || false;
|
|
// 反写树的值
|
|
// 反写树的值
|
|
this.isIndeterminate =
|
|
this.isIndeterminate =
|
|
data.memberPrivilegesItemIdList?.length > 0 &&
|
|
data.memberPrivilegesItemIdList?.length > 0 &&
|
|
@@ -724,7 +724,7 @@ export default {
|
|
this.$refs.trees.setCheckedKeys(this.checkList);
|
|
this.$refs.trees.setCheckedKeys(this.checkList);
|
|
});
|
|
});
|
|
|
|
|
|
- this.memberCheckAll = data.memberCategoryIdList?.length >= this.memberRankCount || false;
|
|
|
|
|
|
+ this.memberCheckAll = data.memberCategoryIdList?.length >= this.memberRankCount && data.memberCategoryIdList?.length > 0 || false;
|
|
this.isMemberIndeterminate = data.memberCategoryIdList?.length > 0 && data.memberCategoryIdList?.length < this.memberRankCount;
|
|
this.isMemberIndeterminate = data.memberCategoryIdList?.length > 0 && data.memberCategoryIdList?.length < this.memberRankCount;
|
|
this.memberCheckList = data.memberCategoryIdList;
|
|
this.memberCheckList = data.memberCategoryIdList;
|
|
const mSplice = this.getParent(data.memberCategoryIdList || [], this.treeMemberData, 'member')
|
|
const mSplice = this.getParent(data.memberCategoryIdList || [], this.treeMemberData, 'member')
|
|
@@ -753,23 +753,21 @@ export default {
|
|
console.log(e);
|
|
console.log(e);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- async getNewTree() {
|
|
|
|
|
|
+ async getNewTree(parentId) {
|
|
try {
|
|
try {
|
|
- const resTree = await getMemberPrivilegesItem();
|
|
|
|
|
|
+ const resTree = await getMemberPrivilegesItem({ parentMemberId: parentId });
|
|
this.silderList = resTree.data;
|
|
this.silderList = resTree.data;
|
|
this.slideCount = 0;
|
|
this.slideCount = 0;
|
|
} catch {}
|
|
} catch {}
|
|
},
|
|
},
|
|
async getMemberRankList(parentId) {
|
|
async getMemberRankList(parentId) {
|
|
try {
|
|
try {
|
|
- const { data } = await api_memberRankCategoryTree({ parentId });
|
|
|
|
|
|
+ const { data } = await api_memberRankCategoryTree({ parentMemberId: parentId });
|
|
this.memberRankList = data.musicScoreCategories || [];
|
|
this.memberRankList = data.musicScoreCategories || [];
|
|
this.memberRankCount = 0;
|
|
this.memberRankCount = 0;
|
|
|
|
|
|
this.classList = data.lessonCategories || [];
|
|
this.classList = data.lessonCategories || [];
|
|
this.classCount = 0;
|
|
this.classCount = 0;
|
|
-
|
|
|
|
- // return this.setMemberTableData(data)
|
|
|
|
} catch {}
|
|
} catch {}
|
|
}
|
|
}
|
|
}
|
|
}
|