From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/system/modules/UserModal.vue | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 2abe65b..7ba6715 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -58,13 +58,21 @@
</a-form-model-item>
<!--閮ㄩ棬鍒嗛厤-->
- <a-form-model-item label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+ <a-form-model-item v-if="isDepartType== 0" label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
<j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
</a-form-model-item>
<!--杞﹂棿鍒嗛厤-->
<a-form-model-item label="杞﹂棿鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!productionDisabled">
<j-select-production v-model="model.selectedProduction" :multi="true" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-production>
+ </a-form-model-item>
+ <a-form-model-item label="鐝粍鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="teamId">
+ <j-dict-select-tag
+ v-model="model.teamId"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,del_flag = 0"
+ placeholder="璇风淮鎶ょ彮缁�"
+ ></j-dict-select-tag>
</a-form-model-item>
<a-form-model-item label="璐熻矗閮ㄩ棬" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="departIdShow==true">
@@ -134,6 +142,7 @@
import { disabledAuthFilter } from "@/utils/authFilter"
import { duplicateCheck } from '@/api/api'
import JSelectProduction from '../../../components/jeecgbiz/JSelectProduction'
+ import {mapActions} from 'vuex'
export default {
name: "UserModal",
@@ -165,7 +174,9 @@
roles:{},
workNo:[ { required: true, message: '璇疯緭鍏ュ伐鍙�' },
{ validator: this.validateWorkNo }],
- telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '璇疯緭鍏ユ纭殑搴ф満鍙风爜' },]
+ telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '璇疯緭鍏ユ纭殑搴ф満鍙风爜' },],
+ teamId:[ { required: true, message: '璇风淮鎶ょ彮缁�' }]
+
},
departIdShow:false,
title:"鎿嶄綔",
@@ -194,7 +205,9 @@
tenantsOptions: [],
rolesOptions:[],
nextDepartOptions:[],
- nextProductionOptions:[]
+ nextProductionOptions:[],
+ isDepartType:'',
+
}
},
created () {
@@ -202,6 +215,7 @@
this.headers = {"X-Access-Token":token}
this.initRoleList()
this.initTenantList()
+ this.queryTreeData()
},
computed:{
uploadAction:function () {
@@ -209,6 +223,21 @@
}
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() =>{
+ })
+ },
add () {
this.refresh();
this.edit({activitiSync:'1',userIdentity:1});
@@ -219,9 +248,9 @@
//鏍规嵁灞忓箷瀹藉害鑷�傚簲鎶藉眽瀹藉害
this.resetScreenSize();
that.userId = record.id;
+
that.model = Object.assign({},{selectedroles:'',selecteddeparts:''}, record);
that.model = Object.assign({},{selectedroles:'',selectedProduction:''}, record);
-
//韬唤涓轰笂绾ф樉绀鸿礋璐ｉ儴闂紝鍚﹀垯涓嶆樉绀�
if(this.model.userIdentity==2){
this.departIdShow=true;
@@ -233,7 +262,7 @@
that.getUserRoles(record.id);
that.getUserDeparts(record.id);
}
- console.log('that.model=',that.model)
+ console.log('that.model',that.model)
},
isDisabledAuth(code){
return disabledAuthFilter(code);
@@ -347,8 +376,6 @@
return c;
})
},
-
-
refresh () {
this.userId=""
--
Gitblit v1.9.3