sasp-admin 0.2.57 → 0.2.62
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +19 -14
- package/package.json +1 -1
- package/src/assets/font/iconfont.css +1846 -1346
- package/src/assets/js/api/apiAdmin.js +12 -0
- package/src/components/public/org/sysOrgPosUserSelect.vue +23 -3
- package/src/views/menu/component/menuManageComponent.vue +21 -21
- package/src/views/org/entOrgTree.vue +19 -11
- package/src/views/org/sysEntOrgUserDetail.vue +11 -111
- package/src/views/org/sysOrgPosUserDetail.vue +4 -4
- package/src/views/org/sysOrgTree.vue +45 -22
- package/src/views/role/authRole/authRole.vue +7 -5
- package/src/views/role/commonRole/commonRole.vue +13 -6
- package/src/views/role/commonRole/compoment/commonSettingNew.vue +37 -31
|
@@ -35,36 +35,36 @@
|
|
|
35
35
|
</el-tab-pane>
|
|
36
36
|
<!--关联菜单 end-->
|
|
37
37
|
<!--资源权限 start-->
|
|
38
|
-
<el-tab-pane label="资源权限" name="2" v-if="!tenantId"
|
|
39
|
-
<el-container class="comomSettiingStyle" v-loading="sourceLoading" element-loading-text="加载中"
|
|
40
|
-
<el-main style="height: 100%;overflow: hidden;padding: 0"
|
|
41
|
-
<div class="aside-tree"
|
|
42
|
-
<role-source-setting
|
|
43
|
-
ref="sourceRef"
|
|
44
|
-
:role-id="roleId"
|
|
45
|
-
:check-source-opt-power="checkSourceOptPower"
|
|
46
|
-
:check-source-data-power="checkSourceDataPower"
|
|
47
|
-
@setSourcePower="setSourcePower"
|
|
48
|
-
@setSourceLoading="setSourceLoading"
|
|
49
|
-
@setCurrentSourceNode="setCurrentSourceNode"
|
|
50
|
-
</role-source-setting
|
|
51
|
-
</div
|
|
52
|
-
<div class="opt-div-class"
|
|
53
|
-
<role-menu-power-setting
|
|
54
|
-
v-if="refreshSourcePower"
|
|
55
|
-
:opt-power="sourceOptPower"
|
|
56
|
-
:data-power="sourceDataPower"
|
|
57
|
-
:opt-power-tree="sourceOptPowerTree"
|
|
58
|
-
:data-power-tree="sourceDataPowerTree"
|
|
59
|
-
:check-opt-power="checkSourceOptPower"
|
|
60
|
-
:check-data-power="checkSourceDataPower"
|
|
61
|
-
:current-click-node="currentClickSourceNode"
|
|
62
|
-
</role-menu-power-setting
|
|
63
|
-
</div
|
|
64
|
-
</el-main
|
|
65
|
-
</el-container
|
|
66
|
-
</el-tab-pane
|
|
67
|
-
|
|
38
|
+
<!-- <el-tab-pane label="资源权限" name="2" v-if="!tenantId">-->
|
|
39
|
+
<!-- <el-container class="comomSettiingStyle" v-loading="sourceLoading" element-loading-text="加载中">-->
|
|
40
|
+
<!-- <el-main style="height: 100%;overflow: hidden;padding: 0">-->
|
|
41
|
+
<!-- <div class="aside-tree">-->
|
|
42
|
+
<!-- <role-source-setting-->
|
|
43
|
+
<!-- ref="sourceRef"-->
|
|
44
|
+
<!-- :role-id="roleId"-->
|
|
45
|
+
<!-- :check-source-opt-power="checkSourceOptPower"-->
|
|
46
|
+
<!-- :check-source-data-power="checkSourceDataPower"-->
|
|
47
|
+
<!-- @setSourcePower="setSourcePower"-->
|
|
48
|
+
<!-- @setSourceLoading="setSourceLoading"-->
|
|
49
|
+
<!-- @setCurrentSourceNode="setCurrentSourceNode">-->
|
|
50
|
+
<!-- </role-source-setting>-->
|
|
51
|
+
<!-- </div>-->
|
|
52
|
+
<!-- <div class="opt-div-class">-->
|
|
53
|
+
<!-- <role-menu-power-setting-->
|
|
54
|
+
<!-- v-if="refreshSourcePower"-->
|
|
55
|
+
<!-- :opt-power="sourceOptPower"-->
|
|
56
|
+
<!-- :data-power="sourceDataPower"-->
|
|
57
|
+
<!-- :opt-power-tree="sourceOptPowerTree"-->
|
|
58
|
+
<!-- :data-power-tree="sourceDataPowerTree"-->
|
|
59
|
+
<!-- :check-opt-power="checkSourceOptPower"-->
|
|
60
|
+
<!-- :check-data-power="checkSourceDataPower"-->
|
|
61
|
+
<!-- :current-click-node="currentClickSourceNode">-->
|
|
62
|
+
<!-- </role-menu-power-setting>-->
|
|
63
|
+
<!-- </div>-->
|
|
64
|
+
<!-- </el-main>-->
|
|
65
|
+
<!-- </el-container>-->
|
|
66
|
+
<!-- </el-tab-pane>-->
|
|
67
|
+
<!-- <!–资源权限 end–>-->
|
|
68
68
|
<!--关联人员 start-->
|
|
69
69
|
<el-tab-pane label="关联人员" name="3">
|
|
70
70
|
<sys-org-pos-user-select
|
|
@@ -362,10 +362,14 @@
|
|
|
362
362
|
let levelChildrenOrgArr = []; //保存所有勾选的父级
|
|
363
363
|
let levelParentOrgArr = []; // 所有的父级数据
|
|
364
364
|
let typeArr = ["user","org","pos"];
|
|
365
|
+
let checkedOrgIdArr = [];
|
|
365
366
|
typeArr.forEach(type=>{
|
|
366
367
|
let arr = vm.$refs.commonUserRef.getCheckedInfo(type);
|
|
367
368
|
arr.forEach(function (data) {
|
|
368
369
|
data["roleType"] = type; // 设置角色类型
|
|
370
|
+
if(type == "org"){
|
|
371
|
+
checkedOrgIdArr.push(data.id);
|
|
372
|
+
}
|
|
369
373
|
});
|
|
370
374
|
resultArr = resultArr.concat(arr);
|
|
371
375
|
});
|
|
@@ -376,7 +380,9 @@
|
|
|
376
380
|
let parentOrgIdArr = []; // 当前选中的父级数据的Ids
|
|
377
381
|
levelParentOrgArr.forEach(item => {
|
|
378
382
|
item["roleType"] = "levelParentOrg";
|
|
379
|
-
|
|
383
|
+
if(checkedOrgIdArr.indexOf(item.id) > -1){
|
|
384
|
+
parentOrgIdArr.push(item.id);
|
|
385
|
+
}
|
|
380
386
|
});
|
|
381
387
|
// levelChildrenOrgArr.forEach(item => {
|
|
382
388
|
// item["roleType"] = "levelChildrenOrg";
|