From 711c0021a8c178c5ef00967711b0d3d6fa50637f Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 29 十一月 2023 17:34:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/user.vue | 660 +++++++++++++++++++++++++++++------------------------------
1 files changed, 324 insertions(+), 336 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index bbd3232..8503d84 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -199,22 +199,6 @@
export default {
data() {
- const validatePass = (rule, value, callback) => {
- if (value === '') {
- callback(new Error('璇疯緭鍏ュ瘑鐮�'));
- } else {
- callback();
- }
- };
- const validatePass2 = (rule, value, callback) => {
- if (value === '') {
- callback(new Error('璇峰啀娆¤緭鍏ュ瘑鐮�'));
- } else if (value !== this.form.password) {
- callback(new Error('涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!'));
- } else {
- callback();
- }
- };
return {
tenantId:'',
form: {},
@@ -278,310 +262,6 @@
value: 'value',
children: 'children'
}
- },
- option: {
- height:'auto',
- calcHeight: 80,
- tip: false,
- searchShow: true,
- searchMenuSpan: 6,
- columnBtn:false,
- border: true,
- index: true,
- selection: true,
- /* 涓嬮潰杩欎笁涓睘鎬ч粯璁よ缃负true锛�
- 瀹為檯鏍规嵁permissionList涓鐓х殑灞炴�ц繘琛屾帶鍒剁殑 */
- viewBtn: true,
- editBtn: true,
- delBtn: true,
- addBtn: true,
- dialogType: 'drawer',
- dialogClickModal: false,
- highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
- column: [
- {
- label: "鐧诲綍璐﹀彿",
- prop: "account",
- search: true,
- display: false
- },
- {
- label: "鎵�灞炵鎴�",
- prop: "tenantName",
- slot: true,
- display: false
- },
- {
- label: "鐢ㄦ埛濮撳悕",
- prop: "realName",
- search: true,
- display: false
- },
- {
- label: "鎵�灞炶鑹�",
- prop: "roleName",
- slot: true,
- display: false
- },
- {
- label: "瀵嗙爜绛栫暐",
- prop: "pwdStrategy",
- slot: true,
- display: false
- },
- {
- label: "鎵�灞為儴闂�",
- prop: "deptName",
- slot: true,
- display: false
- },
- {
- label: "鐢ㄦ埛骞冲彴",
- prop: "userTypeName",
- slot: true,
- display: false
- },
- {
- label: "鐢ㄦ埛骞冲彴",
- type: "select",
- dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- search: true,
- hide: true,
- display: false,
- prop: "userType",
- rules: [{
- required: true,
- message: "璇烽�夋嫨鐢ㄦ埛骞冲彴",
- trigger: "blur"
- }],
- },
- {
- label: "鐘舵��",
- display: false,
- sortable:true,
- html:true,
- prop: "userStatus",
- formatter : function (row, column) {
- return row.userStatus == 0 ? '<i class="el-icon-check" style="color: #32cd32;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: #ff0000;font-size: 20px;font-weight: 800"></i>'
- }
- },
- ],
- group: [
- {
- label: '鍩虹淇℃伅',
- prop: 'baseInfo',
- icon: 'el-icon-user-solid',
- column: [
- {
- label: "鎵�灞炵鎴�",
- prop: "tenantId",
- type: "tree",
- dicUrl: "/api/ubcs-system/tenant/select",
- props: {
- label: "tenantName",
- value: "tenantId"
- },
- hide: !website.tenantMode,
- addDisplay: website.tenantMode,
- editDisplay: website.tenantMode,
- viewDisplay: website.tenantMode,
- rules: [{
- required: true,
- message: "璇疯緭鍏ユ墍灞炵鎴�",
- trigger: "click"
- }],
- span: 24,
- value:""
- },
- {
- label: "鐧诲綍璐﹀彿",
- prop: "account",
- rules: [{
- required: true,
- message: "璇疯緭鍏ョ櫥褰曡处鍙�",
- trigger: "blur"
- }],
- },
- {
- label: "鐢ㄦ埛骞冲彴",
- type: "select",
- dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- value:'1',
- dataType: "number",
- slot: true,
- prop: "userType",
- rules: [{
- required: true,
- message: "璇烽�夋嫨鐢ㄦ埛骞冲彴",
- trigger: "blur"
- }]
- },
- {
- label: '瀵嗙爜',
- prop: 'password',
- type: "password",
- hide: true,
- editDisplay: false,
- viewDisplay: false,
- rules: [{required: true, validator: validatePass, trigger: 'blur'}]
- },
- {
- label: '纭瀵嗙爜',
- prop: 'password2',
- hide: true,
- type: "password",
- editDisplay: false,
- viewDisplay: false,
- rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
- },
- ]
- },
- {
- label: '璇︾粏淇℃伅',
- prop: 'detailInfo',
- icon: 'el-icon-s-order',
- column: [
- {
- label: "鐢ㄦ埛鏄电О",
- prop: "name",
- hide: true,
- rules: [{
- required: true,
- message: "璇疯緭鍏ョ敤鎴锋樀绉�",
- trigger: "blur"
- }]
- },
- {
- label: "鐢ㄦ埛濮撳悕",
- prop: "realName",
- rules: [{
- required: true,
- message: "璇疯緭鍏ョ敤鎴峰鍚�",
- trigger: "blur"
- }, {
- min: 2,
- max: 5,
- message: '濮撳悕闀垮害鍦�2鍒�5涓瓧绗�'
- }]
- },
- {
- label: "鎵嬫満鍙风爜",
- prop: "phone",
- overHidden: true
- },
- {
- label: "鐢靛瓙閭",
- prop: "email",
- hide: true,
- overHidden: true
- },
- {
- label: "鐢ㄦ埛鎬у埆",
- prop: "sex",
- type: "select",
- dicData: [
- {
- label: "鐢�",
- value: 1
- },
- {
- label: "濂�",
- value: 2
- },
- {
- label: "鏈煡",
- value: 3
- }
- ],
- hide: true
- },
- {
- label: "鐢ㄦ埛鐢熸棩",
- type: "date",
- prop: "birthday",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
- hide: true
- },
- {
- label: "璐﹀彿鐘舵��",
- prop: "statusName",
- hide: true,
- display: false
- }
- ]
- },
- {
- label: '鑱岃矗淇℃伅',
- prop: 'dutyInfo',
- icon: 'el-icon-s-custom',
- column: [
- {
- label: "鐢ㄦ埛缂栧彿",
- prop: "code",
- },
- {
- label: "鎵�灞炶鑹�",
- prop: "roleId",
- multiple: true,
- type: "tree",
- dicData: [],
- props: {
- label: "title"
- },
- checkStrictly: true,
- slot: true,
- rules: [{
- required: true,
- message: "璇烽�夋嫨鎵�灞炶鑹�",
- trigger: "click"
- }]
- },
- {
- label: "鎵�灞為儴闂�",
- prop: "deptId",
- type: "tree",
- multiple: true,
- dicData: [],
- props: {
- label: "title"
- },
- checkStrictly: true,
- slot: true,
- rules: [{
- required: true,
- message: "璇烽�夋嫨鎵�灞為儴闂�",
- trigger: "click"
- }]
- },
- /*{
- label: "鎵�灞炲矖浣�",
- prop: "postId",
- type: "tree",
- multiple: true,
- dicData: [],
- props: {
- label: "postName",
- value: "id"
- },
- rules: [{
- required: false,
- message: "璇烽�夋嫨鎵�灞炲矖浣�",
- trigger: "click"
- }],
- },*/
- ]
- },
- ]
},
data: [],
platformQuery: {},
@@ -714,7 +394,8 @@
pwdstrategyId:''
},
userflag:true,
- usernumber:0
+ usernumber:0,
+ userStatus:false,
};
},
watch: {
@@ -749,21 +430,322 @@
unsealBtn: this.vaildData(this.permission.user.user_unseal,false),
};
},
- // platformPermissionList() {
- // return {
- // addBtn: this.vaildData(this.permission.user.user_add, false),
- // viewBtn: this.vaildData(this.permission.user.user_view, false),
- // delBtn: this.vaildData(this.permission.user.user_delete, false),
- // editBtn: this.vaildData(this.permission.user.user_edit, false),
- // deactEnBtn: this.vaildData(this.permission.user.user_deact_en,false),
- // exportBtn: this.vaildData(this.permission.user.user_export,false),
- // pwdStrategyBtn: this.vaildData(this.permission.user.user_pwd_strategy,false),
- // importBtn: this.vaildData(this.permission.user.user_import,false),
- // resetBtn: this.vaildData(this.permission.user.user_reset,false),
- // roleBtn: this.vaildData(this.permission.user.user_role,false),
- // unsealBtn: this.vaildData(this.permission.user.user_unseal,false),
- // };
- // },
+ option() {
+ return{
+ height:'auto',
+ calcHeight: 80,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ columnBtn:false,
+ border: true,
+ index: true,
+ selection: true,
+ /* 涓嬮潰杩欎笁涓睘鎬ч粯璁よ缃负true锛�
+ 瀹為檯鏍规嵁permissionList涓鐓х殑灞炴�ц繘琛屾帶鍒剁殑 */
+ viewBtn: true,
+ editBtn: true,
+ delBtn: true,
+ addBtn: true,
+ dialogType: 'drawer',
+ dialogClickModal: false,
+ highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
+ column: [
+ {
+ label: "鐧诲綍璐﹀彿",
+ prop: "account",
+ search: true,
+ display: false
+ },
+ {
+ label: "鎵�灞炵鎴�",
+ prop: "tenantName",
+ slot: true,
+ display: false
+ },
+ {
+ label: "鐢ㄦ埛濮撳悕",
+ prop: "realName",
+ search: true,
+ display: false
+ },
+ {
+ label: "鎵�灞炶鑹�",
+ prop: "roleName",
+ slot: true,
+ display: false
+ },
+ {
+ label: "瀵嗙爜绛栫暐",
+ prop: "pwdStrategy",
+ slot: true,
+ display: false
+ },
+ {
+ label: "鎵�灞為儴闂�",
+ prop: "deptName",
+ slot: true,
+ display: false
+ },
+ {
+ label: "鐢ㄦ埛骞冲彴",
+ prop: "userTypeName",
+ slot: true,
+ display: false
+ },
+ {
+ label: "鐢ㄦ埛骞冲彴",
+ type: "select",
+ dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ search: true,
+ hide: true,
+ display: false,
+ prop: "userType",
+ rules: [{
+ required: true,
+ message: "璇烽�夋嫨鐢ㄦ埛骞冲彴",
+ trigger: "blur"
+ }],
+ },
+ {
+ label: "鐘舵��",
+ display: false,
+ sortable:true,
+ html:true,
+ prop: "userStatus",
+ formatter : function (row, column) {
+ return row.userStatus == 0 ? '<i class="el-icon-check" style="color: #32cd32;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: #ff0000;font-size: 20px;font-weight: 800"></i>'
+ }
+ },
+ ],
+ group: [
+ {
+ label: '鍩虹淇℃伅',
+ prop: 'baseInfo',
+ icon: 'el-icon-user-solid',
+ column: [
+ {
+ label: "鎵�灞炵鎴�",
+ prop: "tenantId",
+ type: "tree",
+ dicUrl: "/api/ubcs-system/tenant/select",
+ props: {
+ label: "tenantName",
+ value: "tenantId"
+ },
+ hide: !website.tenantMode,
+ addDisplay: website.tenantMode,
+ editDisplay: website.tenantMode,
+ viewDisplay: website.tenantMode,
+ rules: [{
+ required: true,
+ message: "璇疯緭鍏ユ墍灞炵鎴�",
+ trigger: "click"
+ }],
+ span: 24,
+ value:""
+ },
+ {
+ label: "鐧诲綍璐﹀彿",
+ prop: "account",
+ rules: [{
+ required: true,
+ message: "璇疯緭鍏ョ櫥褰曡处鍙�",
+ trigger: "blur"
+ }],
+ },
+ {
+ label: "鐢ㄦ埛骞冲彴",
+ type: "select",
+ dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ value:'1',
+ dataType: "number",
+ slot: true,
+ prop: "userType",
+ rules: [{
+ required: true,
+ message: "璇烽�夋嫨鐢ㄦ埛骞冲彴",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: '瀵嗙爜',
+ prop: 'password',
+ type: "password",
+ hide: true,
+ editDisplay: false,
+ viewDisplay: false,
+ rules: [{
+ required: true,
+ validator:(rule, value,callback) => {
+ if (value === '') {
+ callback(new Error('璇峰啀娆¤緭鍏ュ瘑鐮�'));
+ } else if (value !== this.form.password) {
+ callback(new Error('涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }]
+ },
+ {
+ label: '纭瀵嗙爜',
+ prop: 'password2',
+ hide: true,
+ type: "password",
+ editDisplay: false,
+ viewDisplay: false,
+ rules: [{
+ required: true,
+ validator:(rule, value,callback) => {
+ if (value === '') {
+ callback(new Error('璇峰啀娆¤緭鍏ュ瘑鐮�'));
+ } else if (value !== this.form.password) {
+ callback(new Error('涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }]
+ },
+ ]
+ },
+ {
+ label: '璇︾粏淇℃伅',
+ prop: 'detailInfo',
+ icon: 'el-icon-s-order',
+ column: [
+ {
+ label: "鐢ㄦ埛鏄电О",
+ prop: "name",
+ hide: true,
+ rules: [{
+ required: true,
+ message: "璇疯緭鍏ョ敤鎴锋樀绉�",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "鐢ㄦ埛濮撳悕",
+ prop: "realName",
+ rules: [{
+ required: true,
+ message: "璇疯緭鍏ョ敤鎴峰鍚�",
+ trigger: "blur"
+ }, {
+ min: 2,
+ max: 5,
+ message: '濮撳悕闀垮害鍦�2鍒�5涓瓧绗�'
+ }]
+ },
+ {
+ label: "鎵嬫満鍙风爜",
+ prop: "phone",
+ overHidden: true
+ },
+ {
+ label: "鐢靛瓙閭",
+ prop: "email",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "鐢ㄦ埛鎬у埆",
+ prop: "sex",
+ type: "select",
+ dicData: [
+ {
+ label: "鐢�",
+ value: 1
+ },
+ {
+ label: "濂�",
+ value: 2
+ },
+ {
+ label: "鏈煡",
+ value: 3
+ }
+ ],
+ hide: true
+ },
+ {
+ label: "鐢ㄦ埛鐢熸棩",
+ type: "date",
+ prop: "birthday",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "yyyy-MM-dd hh:mm:ss",
+ hide: true
+ },
+ {
+ label: "璐﹀彿鐘舵��",
+ prop: "statusName",
+ hide: true,
+ display: false
+ }
+ ]
+ },
+ {
+ label: '鑱岃矗淇℃伅',
+ prop: 'dutyInfo',
+ icon: 'el-icon-s-custom',
+ column: [
+ {
+ label: "鐢ㄦ埛缂栧彿",
+ prop: "code",
+ },
+ {
+ label: "鎵�灞炶鑹�",
+ prop: "roleId",
+ multiple: true,
+ type: "tree",
+ dicData: [],
+ disabled:this.userStatus,
+ props: {
+ label: "title"
+ },
+ checkStrictly: true,
+ slot: true,
+ rules: [{
+ required: true,
+ message: "璇烽�夋嫨鎵�灞炶鑹�",
+ trigger: "click"
+ }]
+ },
+ {
+ label: "鎵�灞為儴闂�",
+ prop: "deptId",
+ type: "tree",
+ multiple: true,
+ dicData: [],
+ props: {
+ label: "title"
+ },
+ checkStrictly: true,
+ slot: true,
+ rules: [{
+ required: true,
+ message: "璇烽�夋嫨鎵�灞為儴闂�",
+ trigger: "click"
+ }]
+ },
+ ]
+ },
+ ]
+
+ }
+ },
ids() {
let ids = [];
this.selectionList.forEach(ele => {
@@ -1116,6 +1098,12 @@
})
},
beforeOpen(done, type) {
+ // console.log(type)
+ if(type === "edit"){
+ this.userStatus = true;
+ }else {
+ this.userStatus = false;
+ }
//console.log(type)
// console.log('this.tenantId',this.tenantId)
// const column = this.findObject(this.option.group,'tenantId');
--
Gitblit v1.9.3