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
|
@@ -498,6 +498,18 @@ let objResult = {
|
|
|
498
498
|
saveShortcutMenu:"/shortcutMenuController/saveShortcutMenu"
|
|
499
499
|
},
|
|
500
500
|
|
|
501
|
+
/**
|
|
502
|
+
* 快捷菜单分组
|
|
503
|
+
*/
|
|
504
|
+
groupMenu:{
|
|
505
|
+
url:"/groupMenuController",
|
|
506
|
+
saveGroupMenu:"/groupMenuController/saveGroupMenu",
|
|
507
|
+
find:"/groupMenuController/find",
|
|
508
|
+
add:"/groupMenuController/add",
|
|
509
|
+
update:"/groupMenuController/update",
|
|
510
|
+
delete:"/groupMenuController/delete",
|
|
511
|
+
},
|
|
512
|
+
|
|
501
513
|
/*
|
|
502
514
|
* 喜好设置
|
|
503
515
|
* */
|
|
@@ -225,10 +225,30 @@
|
|
|
225
225
|
vm.disabledDim = true;
|
|
226
226
|
}
|
|
227
227
|
vm.loginUser = vm.USER_GLOBAL.getLoginUser() || {};
|
|
228
|
-
vm.axios.post(vm.api.param.getSysParams
|
|
229
|
-
let sysParamObj = res.data;
|
|
228
|
+
vm.axios.post(vm.api.param.getSysParams).then(function (res) {
|
|
229
|
+
let sysParamObj = res.data || {};
|
|
230
|
+
let userDimension = sysParamObj.userDimension;
|
|
230
231
|
// vm.entOrgDim = JSON.parse(vm.platStringUtil.replaceAll(sysParamObj["sysEntDim.id"],"'","\"") || "{}");;
|
|
231
|
-
vm.roleTypeMap = JSON.parse(vm.platStringUtil.replaceAll(
|
|
232
|
+
vm.roleTypeMap = JSON.parse(vm.platStringUtil.replaceAll(userDimension,"'","\"") || "{}");
|
|
233
|
+
if(vm.loginUser.userType != "dev" && vm.loginUser.userType != "sup"){
|
|
234
|
+
let filterArea = sysParamObj.filterArea;
|
|
235
|
+
if(filterArea == "true"){
|
|
236
|
+
let loginDept = vm.USER_GLOBAL.getLoginDept() || {};
|
|
237
|
+
if(loginDept && loginDept.id){
|
|
238
|
+
if(loginDept.community){
|
|
239
|
+
vm.$set(vm.orgSearchParam,"community",loginDept.community);
|
|
240
|
+
}else if(loginDept.street){
|
|
241
|
+
vm.$set(vm.orgSearchParam,"street",loginDept.street);
|
|
242
|
+
}else if(loginDept.area){
|
|
243
|
+
vm.$set(vm.orgSearchParam,"area",loginDept.area);
|
|
244
|
+
}else if(loginDept.city){
|
|
245
|
+
vm.$set(vm.orgSearchParam,"city",loginDept.city);
|
|
246
|
+
}else if(loginDept.province){
|
|
247
|
+
vm.$set(vm.orgSearchParam,"province",loginDept.province);
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
}
|
|
232
252
|
vm.init();
|
|
233
253
|
});
|
|
234
254
|
/*vm.axios.post("/sysParamController/getPropertiesParams",{"key":"sysEntDim.id"}).then(function (res) {
|
|
@@ -93,11 +93,11 @@
|
|
|
93
93
|
<el-col :span="12" v-if="form.menuType == 'resourcePool'">
|
|
94
94
|
<el-form-item label="绑定资源" :label-width="formLabelWidth" prop="bindSource">
|
|
95
95
|
<el-cascader style="width: 100%" @change="changeBindSource"
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
96
|
+
v-if="sourcesArr.length > 0"
|
|
97
|
+
:options="sourcesArr"
|
|
98
|
+
filterable
|
|
99
|
+
clearable
|
|
100
|
+
v-model="form.bindSource">
|
|
101
101
|
</el-cascader>
|
|
102
102
|
</el-form-item>
|
|
103
103
|
</el-col>
|
|
@@ -169,12 +169,12 @@
|
|
|
169
169
|
</el-col>
|
|
170
170
|
<el-col :span="12" v-show="form.menuType == 'resourcePool' && form.menuDisplay == 'dialog'">
|
|
171
171
|
<el-form-item label="弹出框顶部间距" :label-width="formLabelWidth">
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
172
|
+
<el-input v-model="form.dialogTopSpaceValue" style="width: 100px;" @change="changeDialogTop()"></el-input>
|
|
173
|
+
<el-select v-model="form.dialogTopSpaceUnit" style="width: 60px;padding-left: 10px" :change="changeDialogTop()">
|
|
174
|
+
<el-option value="%"></el-option>
|
|
175
|
+
<el-option value="px"></el-option>
|
|
176
|
+
</el-select>
|
|
177
|
+
</el-form-item>
|
|
178
178
|
</el-col>
|
|
179
179
|
</el-row>
|
|
180
180
|
<el-row v-show="form.menuType == 'resourcePool' && form.menuDisplay == 'dialog'">
|
|
@@ -826,7 +826,7 @@
|
|
|
826
826
|
vm.$emit("refreshMenuData");
|
|
827
827
|
});
|
|
828
828
|
//刷新资源池
|
|
829
|
-
vm.initSysRources();
|
|
829
|
+
// vm.initSysRources();
|
|
830
830
|
//复制相关菜单
|
|
831
831
|
|
|
832
832
|
let fkArr = [];
|
|
@@ -899,7 +899,7 @@
|
|
|
899
899
|
vm.$emit("refreshMenuData");
|
|
900
900
|
});
|
|
901
901
|
//刷新资源池
|
|
902
|
-
vm.initSysRources();
|
|
902
|
+
// vm.initSysRources();
|
|
903
903
|
|
|
904
904
|
let fkArr = [];
|
|
905
905
|
//批量复制
|
|
@@ -1307,7 +1307,7 @@
|
|
|
1307
1307
|
// vm.form = {};
|
|
1308
1308
|
|
|
1309
1309
|
//刷新资源池
|
|
1310
|
-
vm.initSysRources();
|
|
1310
|
+
// vm.initSysRources();
|
|
1311
1311
|
|
|
1312
1312
|
//更新自定义图标
|
|
1313
1313
|
vm.axios.post(vm.api.upload.updateByFkId, {"fkId":operateObj.id + "_picture","oldFkId":this.diyIconFkid});
|
|
@@ -1359,7 +1359,7 @@
|
|
|
1359
1359
|
"menuIsUse": menuRealOpen,
|
|
1360
1360
|
"menuPath": vm.form.id
|
|
1361
1361
|
}).then(res => {
|
|
1362
|
-
|
|
1362
|
+
// vm.$emit("refresh`MenuData");
|
|
1363
1363
|
Object.assign(node.data,obj);
|
|
1364
1364
|
vm.$refs.commonTreeRef.defaultTreeUpdate(obj.id, obj);
|
|
1365
1365
|
});
|
|
@@ -1373,7 +1373,7 @@
|
|
|
1373
1373
|
vm.nodeClick(obj,node);
|
|
1374
1374
|
},0);
|
|
1375
1375
|
//刷新资源池
|
|
1376
|
-
vm.initSysRources();
|
|
1376
|
+
// vm.initSysRources();
|
|
1377
1377
|
|
|
1378
1378
|
}
|
|
1379
1379
|
});
|
|
@@ -1454,7 +1454,7 @@
|
|
|
1454
1454
|
vm.$emit("refreshMenuData");
|
|
1455
1455
|
});
|
|
1456
1456
|
//刷新资源池
|
|
1457
|
-
vm.initSysRources();
|
|
1457
|
+
// vm.initSysRources();
|
|
1458
1458
|
})
|
|
1459
1459
|
}
|
|
1460
1460
|
},
|
|
@@ -1506,16 +1506,16 @@
|
|
|
1506
1506
|
this.defaultMenuIcon = this.$options.data().defaultMenuIcon;
|
|
1507
1507
|
}
|
|
1508
1508
|
this.$message({
|
|
1509
|
-
|
|
1510
|
-
|
|
1511
|
-
|
|
1509
|
+
duration: 1000,
|
|
1510
|
+
type: '转移成功',
|
|
1511
|
+
message: res.data.operateMessage
|
|
1512
1512
|
});
|
|
1513
1513
|
this.$emit('func',false);//关闭弹窗
|
|
1514
1514
|
this.$nextTick(() => {
|
|
1515
1515
|
this.$emit("refreshMenuData");
|
|
1516
1516
|
});
|
|
1517
1517
|
//刷新资源池
|
|
1518
|
-
this.initSysRources();
|
|
1518
|
+
// this.initSysRources();
|
|
1519
1519
|
})
|
|
1520
1520
|
}
|
|
1521
1521
|
},
|
|
@@ -42,16 +42,16 @@
|
|
|
42
42
|
<div class="leftTree" style="width: 350px;height: 100%;position: relative;box-sizing: border-box;padding:10px 5px 26px 10px;">
|
|
43
43
|
<div style="border: 1px solid #ddd;box-sizing: border-box;padding: 5px;width: 100%;height: 100%">
|
|
44
44
|
<el-header style="height: auto;padding: 0px 0 10px 0">
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
45
|
+
<el-select v-model="currentOrgDim" style="width: 65%;"
|
|
46
|
+
@change="dimChange" size="small">
|
|
47
|
+
<el-option v-for="item in sysOrgDimensionArr"
|
|
48
|
+
:value="item.id" :label="item.dimName" :key="item.id">
|
|
49
49
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
50
|
+
</el-option>
|
|
51
|
+
</el-select>
|
|
52
|
+
<!-- <el-button type="warning" @click="validData" size="small"><i-->
|
|
53
|
+
<!-- class="saspiconfont pl-icon-fuzhibidui"></i>数据校验-->
|
|
54
|
+
<!-- </el-button>-->
|
|
55
55
|
<el-input
|
|
56
56
|
:placeholder="searchPlaceHolder"
|
|
57
57
|
@keyup.enter.native="filterBtnClick()"
|
|
@@ -107,7 +107,7 @@
|
|
|
107
107
|
</div>
|
|
108
108
|
<el-dialog :close-on-click-modal=false :visible.sync="orgTreeDialog" :title="orgTitle" :width="orgTreeFormData.orgType == 'area' ? '40%' : '60%'" top="20vh">
|
|
109
109
|
<el-form :model="orgTreeFormData" :rules="rules" ref="orgTreeFormRef">
|
|
110
|
-
<el-row
|
|
110
|
+
<el-row>
|
|
111
111
|
<el-col :span="24">
|
|
112
112
|
<el-form-item label="组织名称" label-width="120px" prop="orgName">
|
|
113
113
|
<el-input type="textarea" v-model="orgTreeFormData.orgName"
|
|
@@ -115,7 +115,7 @@
|
|
|
115
115
|
</el-form-item>
|
|
116
116
|
</el-col>
|
|
117
117
|
</el-row>
|
|
118
|
-
<el-row
|
|
118
|
+
<el-row>
|
|
119
119
|
<el-col :span="12">
|
|
120
120
|
<el-form-item label="上级组织" label-width="120px">
|
|
121
121
|
<el-input readonly v-model="orgTreeFormData.orgParentName"></el-input>
|
|
@@ -150,6 +150,14 @@
|
|
|
150
150
|
</el-select>
|
|
151
151
|
</el-form-item>
|
|
152
152
|
</el-col>
|
|
153
|
+
|
|
154
|
+
<el-col :span="12" v-if="currentOrgDim == '268617b3cdda11eda8ba51c4319872fb'">
|
|
155
|
+
<el-form-item label="所在地区" label-width="120px">
|
|
156
|
+
<el-cascader style="width: 100%" v-model="orgTreeFormData.region" change-on-select
|
|
157
|
+
:options="cascadeOptionsClone" :props="cascadeProps" :show-all-levels="false">
|
|
158
|
+
</el-cascader>
|
|
159
|
+
</el-form-item>
|
|
160
|
+
</el-col>
|
|
153
161
|
</el-row>
|
|
154
162
|
</el-form>
|
|
155
163
|
<div slot="footer" class="dialog-footer">
|
|
@@ -50,11 +50,21 @@
|
|
|
50
50
|
</el-form-item>
|
|
51
51
|
</el-col>
|
|
52
52
|
</el-row>
|
|
53
|
+
<el-row v-if="orgDim == '268617b3cdda11eda8ba51c4319872fb'">
|
|
54
|
+
<el-col :span="12">
|
|
55
|
+
<el-form-item label="所在地区" label-width="120px">
|
|
56
|
+
<el-cascader style="width: 100%" v-model="orgLocation" change-on-select
|
|
57
|
+
:options="areaOptions" :props="cascadeProps" :show-all-levels="false">
|
|
58
|
+
</el-cascader>
|
|
59
|
+
</el-form-item>
|
|
60
|
+
</el-col>
|
|
61
|
+
</el-row>
|
|
53
62
|
<el-row style="text-align: center">
|
|
54
63
|
<el-button type="primary" @click="updateOrgName" icon="el-icon-success"
|
|
55
64
|
size="small">保存
|
|
56
65
|
</el-button>
|
|
57
66
|
</el-row>
|
|
67
|
+
|
|
58
68
|
</el-form>
|
|
59
69
|
</el-collapse-item>
|
|
60
70
|
</el-collapse>
|
|
@@ -142,11 +152,6 @@
|
|
|
142
152
|
@click="deleteUser()">删除
|
|
143
153
|
</el-button>
|
|
144
154
|
|
|
145
|
-
<el-button type="success" size="small" icon="el-icon-plus"
|
|
146
|
-
style="margin-left: 10px" v-if="devUser"
|
|
147
|
-
@click="openBatchAddPosUser()">批量插入岗位
|
|
148
|
-
</el-button>
|
|
149
|
-
|
|
150
155
|
</el-header>
|
|
151
156
|
<el-main style="height: 100%;" ref="tableMain">
|
|
152
157
|
<el-table :data="crud.dataStore.records" :ref="crud.tableRef" stripe border
|
|
@@ -349,11 +354,6 @@
|
|
|
349
354
|
style="margin-left: 10px"
|
|
350
355
|
@click="deleteUser()">删除
|
|
351
356
|
</el-button>
|
|
352
|
-
|
|
353
|
-
<el-button type="success" size="small" icon="el-icon-plus"
|
|
354
|
-
style="margin-left: 10px" v-if="devUser"
|
|
355
|
-
@click="openBatchAddPosUser()">批量插入岗位
|
|
356
|
-
</el-button>
|
|
357
357
|
</el-header>
|
|
358
358
|
|
|
359
359
|
<el-main style="height: 100%;" ref="tableMain">
|
|
@@ -782,50 +782,6 @@
|
|
|
782
782
|
<el-button @click="confirmDialog = false" size="small" icon="el-icon-error">取 消</el-button>
|
|
783
783
|
</div>
|
|
784
784
|
</el-dialog>
|
|
785
|
-
|
|
786
|
-
<el-dialog :close-on-click-modal=false :title="'批量添加岗位'" width="500px" height="600px" top="10vh"
|
|
787
|
-
:visible.sync="batchAddPosDialog">
|
|
788
|
-
<el-form :model="batchPosUserForm" size="small" label-width="100px" ref="batchAddPosFormRef">
|
|
789
|
-
<el-form-item label="选择岗位" prop="posId" :rules="plValidate('required')">
|
|
790
|
-
<el-select v-model="batchPosUserForm.posId" clearable allow-create filterable style="width: 100%">
|
|
791
|
-
<el-option v-for="item in allStationArr" :label="item.stationName" :value="item.id" :key="item.id">
|
|
792
|
-
|
|
793
|
-
</el-option>
|
|
794
|
-
</el-select>
|
|
795
|
-
</el-form-item>
|
|
796
|
-
<el-form-item label="用户名称" prop="userNames" :rules="plValidate('required')">
|
|
797
|
-
<el-input type="textarea" v-model="batchPosUserForm.userNames"
|
|
798
|
-
placeholder="请输入逗号分隔的中文用户名称，中文逗号与英文逗号同时仅可存在一种" :autosize="{minRows:4}">
|
|
799
|
-
|
|
800
|
-
</el-input>
|
|
801
|
-
</el-form-item>
|
|
802
|
-
</el-form>
|
|
803
|
-
<div slot="footer" class="dialog-footer">
|
|
804
|
-
<el-button type="primary" @click="batchAddPosUser" size="small" icon="el-icon-success">确定
|
|
805
|
-
</el-button>
|
|
806
|
-
<el-button @click="batchAddPosDialog = false" size="small" icon="el-icon-error">关闭
|
|
807
|
-
</el-button>
|
|
808
|
-
</div>
|
|
809
|
-
</el-dialog>
|
|
810
|
-
|
|
811
|
-
<el-dialog :close-on-click-modal=false :visible.sync="confirmDialog"
|
|
812
|
-
title="提示"
|
|
813
|
-
top="25vh" height="220px" width="600px">
|
|
814
|
-
<div class="el-message-box__container">
|
|
815
|
-
<div class="el-message-box__status el-icon-warning">
|
|
816
|
-
</div>
|
|
817
|
-
<div :class="isExsitAdminRoleUser?'el-message-box__message adminRole':'el-message-box__message'">
|
|
818
|
-
<p v-html="confirmTitle"></p>
|
|
819
|
-
</div>
|
|
820
|
-
</div>
|
|
821
|
-
<div slot="footer" class="dialog-footer" style="float: right;margin-right: 5px">
|
|
822
|
-
<el-button type="primary" @click="startSaveRole('2')" size="small" icon="el-icon-success" v-if="isExsitAdminRoleUser">覆盖用户角色</el-button>
|
|
823
|
-
<el-button type="primary" @click="startSaveRole('3')" size="small" icon="el-icon-success" v-if="isExsitAdminRoleUser">跳过上述用户</el-button>
|
|
824
|
-
<el-button type="primary" @click="startSaveRole('1')" size="small" icon="el-icon-success" v-if="!isExsitAdminRoleUser">确定</el-button>
|
|
825
|
-
<el-button @click="confirmDialog = false" size="small" icon="el-icon-error">取 消</el-button>
|
|
826
|
-
</div>
|
|
827
|
-
</el-dialog>
|
|
828
|
-
|
|
829
785
|
</el-container>
|
|
830
786
|
</div>
|
|
831
787
|
</template>
|
|
@@ -1069,9 +1025,6 @@
|
|
|
1069
1025
|
settingRoleArr:[], //设置的角色
|
|
1070
1026
|
|
|
1071
1027
|
viewMenuDialog:false,//查看菜单
|
|
1072
|
-
batchAddPosDialog:false,
|
|
1073
|
-
batchPosUserForm:{},
|
|
1074
|
-
allStationArr:[],
|
|
1075
1028
|
menuUserId:'',// 用户
|
|
1076
1029
|
menuUserType:'', //用户类型
|
|
1077
1030
|
menuUserName:'',
|
|
@@ -1093,6 +1046,7 @@
|
|
|
1093
1046
|
oldOrgId:'', //修改前的组织
|
|
1094
1047
|
|
|
1095
1048
|
setRoleOrgIdArr:[], //当前设置角色选择的组织
|
|
1049
|
+
cascadeProps: {"value": "id", "label": "dataName"} // 地区【配置
|
|
1096
1050
|
}
|
|
1097
1051
|
},
|
|
1098
1052
|
created() {
|
|
@@ -1749,42 +1703,6 @@
|
|
|
1749
1703
|
})
|
|
1750
1704
|
});
|
|
1751
1705
|
},
|
|
1752
|
-
|
|
1753
|
-
openBatchAddPosUser(){
|
|
1754
|
-
this.getDevStations().then(() => {
|
|
1755
|
-
this.batchAddPosDialog = true;
|
|
1756
|
-
this.batchPosUserForm = {};
|
|
1757
|
-
this.$nextTick(() => {
|
|
1758
|
-
this.$refs.batchAddPosFormRef.clearValidate();
|
|
1759
|
-
})
|
|
1760
|
-
})
|
|
1761
|
-
},
|
|
1762
|
-
|
|
1763
|
-
batchAddPosUser(){
|
|
1764
|
-
this.$refs.batchAddPosFormRef.validate(valid => {
|
|
1765
|
-
if(!valid){
|
|
1766
|
-
return;
|
|
1767
|
-
}
|
|
1768
|
-
this.batchPosUserForm["orgId"] = this.orgId;
|
|
1769
|
-
this.axios.post(this.api.sysOrgPosUser.batchAddPosUserByStation,this.batchPosUserForm).then(res => {
|
|
1770
|
-
if(res.data.success == "false"){
|
|
1771
|
-
this.$message({
|
|
1772
|
-
duration:0,
|
|
1773
|
-
type:"error",
|
|
1774
|
-
message:res.data.message,
|
|
1775
|
-
showClose:true
|
|
1776
|
-
})
|
|
1777
|
-
}else{
|
|
1778
|
-
this.$message.success(res.data.message);
|
|
1779
|
-
this.getDevStations().then(() => {
|
|
1780
|
-
this.crud.search();
|
|
1781
|
-
this.batchAddPosDialog = false;
|
|
1782
|
-
})
|
|
1783
|
-
}
|
|
1784
|
-
})
|
|
1785
|
-
})
|
|
1786
|
-
},
|
|
1787
|
-
|
|
1788
1706
|
updateData(row,type){
|
|
1789
1707
|
let vm = this;
|
|
1790
1708
|
vm.operateType = "update"; //修改类型
|
|
@@ -2589,24 +2507,6 @@
|
|
|
2589
2507
|
});
|
|
2590
2508
|
},
|
|
2591
2509
|
|
|
2592
|
-
getDevStations(){
|
|
2593
|
-
return new Promise(resolve => {
|
|
2594
|
-
//判断当前岗位
|
|
2595
|
-
let loginUser = this.USER_GLOBAL.getLoginUser() || {};
|
|
2596
|
-
let searchObj = {"order":"PRIORITY"};
|
|
2597
|
-
this.axios.post(this.api.sysStation.find,searchObj).then(res =>{
|
|
2598
|
-
this.allStationArr = [];
|
|
2599
|
-
(res.data || []).forEach(item =>{
|
|
2600
|
-
this.allStationObj[item.id] = item.stationName;
|
|
2601
|
-
if(item.created == loginUser.id) {
|
|
2602
|
-
this.allStationArr.push(item);
|
|
2603
|
-
this.allowStationObj[item.id] = item.stationName;
|
|
2604
|
-
}
|
|
2605
|
-
});
|
|
2606
|
-
resolve();
|
|
2607
|
-
});
|
|
2608
|
-
});
|
|
2609
|
-
},
|
|
2610
2510
|
|
|
2611
2511
|
/**
|
|
2612
2512
|
* 加载是否单组织岗位
|
|
@@ -341,13 +341,13 @@
|
|
|
341
341
|
<el-form :inline="true" :model="userCrud.searchForm" size="small"
|
|
342
342
|
class="demo-form-inline"
|
|
343
343
|
@keyup.enter.native="userCrud.doSearch(userSearch)" onSubmit="return false;">
|
|
344
|
+
<el-form-item label="用户名称">
|
|
345
|
+
<el-input v-model="userCrud.searchForm.userNamePinYin"
|
|
346
|
+
placeholder="中文、拼音全拼、简拼"></el-input>
|
|
347
|
+
</el-form-item>
|
|
344
348
|
<el-form-item label="用户账号">
|
|
345
349
|
<el-input v-model="userCrud.searchForm.userAccountLike"></el-input>
|
|
346
350
|
</el-form-item>
|
|
347
|
-
<el-form-item label="用户名称">
|
|
348
|
-
<el-input v-model="userCrud.searchForm.userNamePinYin"
|
|
349
|
-
placeholder="中文、拼音全拼、简拼"></el-input>
|
|
350
|
-
</el-form-item>
|
|
351
351
|
<el-form-item>
|
|
352
352
|
<el-button type="primary" icon="el-icon-search" @click="userCrud.doSearch(userSearch)">
|
|
353
353
|
查询
|
|
@@ -213,8 +213,10 @@
|
|
|
213
213
|
initOriginData() { // 初始化下拉数据等，仅初始化一次
|
|
214
214
|
let vm = this;
|
|
215
215
|
vm.noAuth = false;
|
|
216
|
-
vm.axios.post(vm.api.param.getSysParams
|
|
217
|
-
let
|
|
216
|
+
vm.axios.post(vm.api.param.getSysParams).then(function (res) {
|
|
217
|
+
let sysParams = res.data || {};
|
|
218
|
+
let SysDataOperation = sysParams.SysDataOperation;
|
|
219
|
+
let jsonOpt = JSON.parse(vm.platStringUtil.replaceAll(SysDataOperation,"'","\"") || "{}");
|
|
218
220
|
if (jsonOpt.opt === '否') {
|
|
219
221
|
vm.init();
|
|
220
222
|
} else {
|
|
@@ -222,29 +224,50 @@
|
|
|
222
224
|
if (vm.loginUser.userType === 'sup' || vm.loginUser.userType === 'dev') {
|
|
223
225
|
vm.init();
|
|
224
226
|
}else{
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
227
|
+
let filterArea = sysParams.filterArea;
|
|
228
|
+
if(filterArea == "true"){
|
|
229
|
+
let loginDept = vm.USER_GLOBAL.getLoginDept() || {};
|
|
230
|
+
if(!loginDept || !loginDept.id){
|
|
231
|
+
vm.noAuth = true;
|
|
232
|
+
return;
|
|
233
|
+
}
|
|
234
|
+
if(loginDept.community){
|
|
235
|
+
vm.$set(vm.treeRequestParam,"community",loginDept.community);
|
|
236
|
+
}else if(loginDept.street){
|
|
237
|
+
vm.$set(vm.treeRequestParam,"street",loginDept.street);
|
|
238
|
+
}else if(loginDept.area){
|
|
239
|
+
vm.$set(vm.treeRequestParam,"area",loginDept.area);
|
|
240
|
+
}else if(loginDept.city){
|
|
241
|
+
vm.$set(vm.treeRequestParam,"city",loginDept.city);
|
|
242
|
+
}else if(loginDept.province){
|
|
243
|
+
vm.$set(vm.treeRequestParam,"province",loginDept.province);
|
|
244
|
+
}
|
|
245
|
+
vm.init(loginDept.orgDim);
|
|
246
|
+
}else{
|
|
247
|
+
vm.axios.post(vm.api.sysOrgPosUser.find,{"userId":vm.loginUser.id}).then(posUserRes => {
|
|
248
|
+
if(posUserRes && posUserRes.data.length > 0){
|
|
249
|
+
let orgTreeId = ""; // 组织树上级
|
|
250
|
+
let dim = ""; // 所在维度
|
|
251
|
+
for(let i = 0; i<posUserRes.data.length;i++){
|
|
252
|
+
if(posUserRes.data[i].orgId){
|
|
253
|
+
if(!dim){
|
|
254
|
+
dim = posUserRes.data[i].orgDim;
|
|
255
|
+
}
|
|
256
|
+
if(posUserRes.data[i].orgDim==dim){
|
|
257
|
+
orgTreeId += ","+posUserRes.data[i].orgId;
|
|
258
|
+
}
|
|
236
259
|
}
|
|
237
260
|
}
|
|
261
|
+
if(orgTreeId.length>0){
|
|
262
|
+
orgTreeId = orgTreeId.substring(1);
|
|
263
|
+
}
|
|
264
|
+
vm.$set(vm.treeRequestParam,"orgParentTreeSelfs",orgTreeId);
|
|
265
|
+
vm.init(dim);
|
|
266
|
+
}else{
|
|
267
|
+
vm.noAuth = true; // 查不到组织架构
|
|
238
268
|
}
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
}
|
|
242
|
-
vm.$set(vm.treeRequestParam,"orgParentTreeSelfs",orgTreeId);
|
|
243
|
-
vm.init(dim);
|
|
244
|
-
}else{
|
|
245
|
-
vm.noAuth = true; // 查不到组织架构
|
|
246
|
-
}
|
|
247
|
-
})
|
|
269
|
+
})
|
|
270
|
+
}
|
|
248
271
|
}
|
|
249
272
|
}
|
|
250
273
|
});
|
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
<el-button @click="crud.dialogVisible = false" size="small" icon="el-icon-error">取 消</el-button>
|
|
117
117
|
</div>
|
|
118
118
|
</el-dialog>
|
|
119
|
-
<el-dialog :close-on-click-modal=false width="80%" height="90%" top="5vh" :visible.sync="roleSettingDialog" class="role-setting-class">
|
|
119
|
+
<el-dialog :title="dialogTit" :close-on-click-modal=false width="80%" height="90%" top="5vh" :visible.sync="roleSettingDialog" class="role-setting-class">
|
|
120
120
|
<auth-setting ref="authRef" :currentRowObj="currentRowObj" :roleSettingDialog="roleSettingDialog"
|
|
121
121
|
v-if="roleSettingDialog"
|
|
122
122
|
@closeSettingDialog="closeSettingDialog">
|
|
@@ -174,6 +174,7 @@
|
|
|
174
174
|
viewMenuDialog:false,
|
|
175
175
|
viewMenuRoleId:"",
|
|
176
176
|
entEmpowerUserRole:"",//企业授权用户默认授权角色权限
|
|
177
|
+
dialogTit:'关联权限设置',
|
|
177
178
|
|
|
178
179
|
//唯一标识验证
|
|
179
180
|
rules:{
|
|
@@ -238,6 +239,7 @@
|
|
|
238
239
|
return;
|
|
239
240
|
}
|
|
240
241
|
vm.currentRowObj = row;
|
|
242
|
+
vm.dialogTit = row.roleName + '关联权限设置';
|
|
241
243
|
vm.roleSettingDialog = true;
|
|
242
244
|
},
|
|
243
245
|
roleFormSubmit(){
|
|
@@ -415,11 +417,11 @@
|
|
|
415
417
|
padding: 10px;
|
|
416
418
|
}
|
|
417
419
|
.role-setting-class /deep/ .el-dialog__body{
|
|
418
|
-
height: calc(100% -
|
|
419
|
-
}
|
|
420
|
-
.role-setting-class /deep/ .el-dialog > .el-dialog__body{
|
|
421
|
-
top: 10px;
|
|
420
|
+
height: calc(100% - 92px);
|
|
422
421
|
}
|
|
422
|
+
/*.role-setting-class /deep/ .el-dialog > .el-dialog__body{*/
|
|
423
|
+
/* top: 10px;*/
|
|
424
|
+
/*}*/
|
|
423
425
|
.role-setting-class /deep/ .el-dialog__headerbtn{
|
|
424
426
|
z-index: 99;
|
|
425
427
|
}
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
|
|
102
102
|
|
|
103
103
|
|
|
104
|
-
<el-dialog :close-on-click-modal=false title="
|
|
104
|
+
<el-dialog :close-on-click-modal=false :title="roleTitle" width="60%" top="20vh" :visible.sync="crud.dialogVisible">
|
|
105
105
|
<el-form :model="crud.formData" :ref="crud.addFormRef">
|
|
106
106
|
<el-row>
|
|
107
107
|
<el-col :span="12">
|
|
@@ -155,7 +155,7 @@
|
|
|
155
155
|
|
|
156
156
|
<!--普通角色权限配置-->
|
|
157
157
|
|
|
158
|
-
<el-dialog :close-on-click-modal=false width="80%" height="90%" top="5vh" :visible.sync="roleSettingDialog" class="role-setting-class">
|
|
158
|
+
<el-dialog :title="dialogTit" :close-on-click-modal=false width="80%" height="90%" top="5vh" :visible.sync="roleSettingDialog" class="role-setting-class">
|
|
159
159
|
<common-setting-new ref="commonsettingRef"
|
|
160
160
|
v-if="roleSettingDialog"
|
|
161
161
|
:role-id="currentRowObj.id" :roleType="currentRoleType">
|
|
@@ -178,7 +178,7 @@
|
|
|
178
178
|
<!-- </el-dialog>-->
|
|
179
179
|
|
|
180
180
|
<!--查看当前菜单-->
|
|
181
|
-
<el-dialog :close-on-click-modal=false title="
|
|
181
|
+
<el-dialog :close-on-click-modal=false :title="viewMenuRoleTitle" width="400px" height="80%" top="10vh" :visible.sync="viewMenuDialog" class="view-menu-dialog">
|
|
182
182
|
<view-menu-opt-detail :role-id="viewMenuRoleId" :refresh-proper="viewMenuDialog"></view-menu-opt-detail>
|
|
183
183
|
<div slot="footer" class="dialog-footer">
|
|
184
184
|
<el-button type="primary" @click="viewMenuDialog = false" size="small" icon="el-icon-error">关闭</el-button>
|
|
@@ -240,6 +240,8 @@
|
|
|
240
240
|
viewMenuDialog:false,//拥有的菜单
|
|
241
241
|
roleSettingDialog:false, // 关联权限设置对话框
|
|
242
242
|
viewMenuRoleId:"", //菜单的角色ID
|
|
243
|
+
viewMenuRoleTitle:"",
|
|
244
|
+
roleTitle:"",
|
|
243
245
|
roleStatusColor: {
|
|
244
246
|
'10' : "success",
|
|
245
247
|
'20' : "warning",
|
|
@@ -254,6 +256,7 @@
|
|
|
254
256
|
roleTypeOptionTemp:[],
|
|
255
257
|
roleTypeUpdate:"", //每次修改时候的角色类型
|
|
256
258
|
saveBtnDisabled:false, // 保存按钮禁用
|
|
259
|
+
dialogTit:'关联权限设置',
|
|
257
260
|
|
|
258
261
|
|
|
259
262
|
//唯一标识验证
|
|
@@ -348,6 +351,7 @@
|
|
|
348
351
|
}
|
|
349
352
|
vm.uuIdKey = this.COMMON_FUNC.getUUID();
|
|
350
353
|
vm.currentRowObj = row;
|
|
354
|
+
vm.dialogTit = '“' + row.roleName + '”关联权限设置';
|
|
351
355
|
vm.currentRoleType = row.roleType;
|
|
352
356
|
vm.saveBtnDisabled = false;
|
|
353
357
|
vm.roleSettingDialog = true;
|
|
@@ -363,6 +367,7 @@
|
|
|
363
367
|
return;
|
|
364
368
|
}
|
|
365
369
|
this.viewMenuRoleId = row.id;
|
|
370
|
+
this.viewMenuRoleTitle = "查看“" + (row.roleName.length > 10 ? row.roleName.substring(0,10) + '...' : row.roleName) + "”角色菜单";
|
|
366
371
|
this.viewMenuDialog = true;
|
|
367
372
|
},
|
|
368
373
|
|
|
@@ -442,6 +447,7 @@
|
|
|
442
447
|
add(){
|
|
443
448
|
let vm = this;
|
|
444
449
|
vm.operate = "add";
|
|
450
|
+
this.roleTitle = "添加角色权限";
|
|
445
451
|
if(vm.loginUser.userType == "sup" || !vm.loginUser.empowerId){ // 用户是开发者，
|
|
446
452
|
vm.crud.addDefaultData["parentRoleTree"] = "-1";
|
|
447
453
|
vm.$nextTick(function () {
|
|
@@ -543,6 +549,7 @@
|
|
|
543
549
|
vm.roleTypeUpdate = row.roleType; //保存原角色类型
|
|
544
550
|
this.operate = "update";
|
|
545
551
|
this.oldRoleName = row.roleName; //赋值上次角色名
|
|
552
|
+
this.roleTitle = "“" + row.roleName + "”角色权限";
|
|
546
553
|
vm.crud.update(row);
|
|
547
554
|
},
|
|
548
555
|
|
|
@@ -666,9 +673,9 @@
|
|
|
666
673
|
border: 0;
|
|
667
674
|
}
|
|
668
675
|
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
}
|
|
676
|
+
/*.role-setting-class /deep/ .el-dialog > .el-dialog__body{*/
|
|
677
|
+
/* top: 10px;*/
|
|
678
|
+
/*}*/
|
|
672
679
|
.role-setting-class /deep/ .el-dialog__headerbtn{
|
|
673
680
|
z-index: 99;
|
|
674
681
|
}
|