|
@@ -27,7 +27,7 @@
|
|
|
|
|
|
<script>
|
|
|
import transferTree from '@/pages/common/transfer-tree';
|
|
|
-import { allAppFuncTree, userHasAuthFunIds, checkAppFunRepeat } from '@/api/permission-selfhelp-manage';
|
|
|
+import { allAppFuncTree, userHasAuthFunIds } from '@/api/permission-selfhelp-manage';
|
|
|
export default {
|
|
|
props: {
|
|
|
selectKeys: [Array],
|
|
@@ -92,6 +92,10 @@ export default {
|
|
|
const cancelContent = this.nodeTransferLabel(cancelKeys, this.data);
|
|
|
// 获取目标树所有的key,包含父节点
|
|
|
const allKeys = this.$refs.transferTree.allKeyValue(false, this.$refs.transferTree.targetData);
|
|
|
+ // 剔除该用户已经拥有的资源
|
|
|
+ // const validRepeatNode = resourceInfos
|
|
|
+ // .filter((item) => !this.havefunIds.includes(item.funId))
|
|
|
+ // .map((item) => item.funId);
|
|
|
// 实际保存的节点,剔除应用节点
|
|
|
const resourceInfos = allKeys
|
|
|
.map((item) => this.$refs.transferTree.$refs['to-tree'].getNode(item).data)
|
|
@@ -107,36 +111,10 @@ export default {
|
|
|
if (applyKeys.length == 0 && cancelKeys.length == 0) {
|
|
|
this.$message.warning('已选资源无变更。');
|
|
|
} else {
|
|
|
- // 需要验证是否有重复申请的资源,
|
|
|
- const repeatFlag = await this.handleCheckRepeat(resourceInfos);
|
|
|
- if (repeatFlag == '200') {
|
|
|
- this.$emit('success', approveContent, cancelContent, this.selectedValue, resourceInfos);
|
|
|
- }
|
|
|
+ this.$emit('success', approveContent, cancelContent, this.selectedValue, resourceInfos);
|
|
|
}
|
|
|
},
|
|
|
- // 验证是否重复申请
|
|
|
- handleCheckRepeat(resourceInfos) {
|
|
|
- return new Promise((resolve) => {
|
|
|
- // 剔除该用户已经拥有的资源
|
|
|
- const validRepeatNode = resourceInfos
|
|
|
- .filter((item) => !this.havefunIds.includes(item.funId))
|
|
|
- .map((item) => item.funId);
|
|
|
- let params = {
|
|
|
- applicantIdcard: this.$store.getters.user.idcard,
|
|
|
- addFunIds: validRepeatNode
|
|
|
- };
|
|
|
- if (this.applicantOrdNo) {
|
|
|
- params['applicantOrdNo'] = this.applicantOrdNo;
|
|
|
- }
|
|
|
- checkAppFunRepeat(params).then((res) => {
|
|
|
- const { result, msg } = res.data;
|
|
|
- if (result !== '200') {
|
|
|
- this.$message.warning(msg);
|
|
|
- }
|
|
|
- resolve(result);
|
|
|
- });
|
|
|
- });
|
|
|
- },
|
|
|
+
|
|
|
handleSearch(value, data) {
|
|
|
if (!value) return true;
|
|
|
return data.label.indexOf(value) !== -1;
|