From db38e2783a8e9a4c9f886aa15cf895caef9290ec Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 09 十月 2024 15:57:15 +0800
Subject: [PATCH] 1

---
 src/views/master/person/main/personPerson.vue |    2 +-
 src/views/console/system/addUser.vue          |   22 +++++++++-------------
 src/views/master/person/main/save.vue         |    5 +----
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/views/console/system/addUser.vue b/src/views/console/system/addUser.vue
index f9ce99f..800739f 100644
--- a/src/views/console/system/addUser.vue
+++ b/src/views/console/system/addUser.vue
@@ -34,9 +34,7 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="鏁版嵁鏉冮檺" prop="deptId">
-						<el-select v-model="form.deptId" multiple style="width: 100%" @change="deptIdChange">
-							<el-option v-for="item in deptIdList" :key="item.id" :label="item.title" :value="item.id"/>
-						</el-select>
+						<el-tree-select v-model="form.deptId" clearable multiple show-checkbox placeholder="鏁版嵁鏉冮檺閰嶇疆" default-expand-all :data="deptIdList" :props="{ label: 'title' ,id: 'id',children: 'children'}" node-key="id" ref="deptIdTree" style="width: 100%" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
@@ -134,9 +132,6 @@
 			roleIdChange(val) {  //鏁版嵁鏉冮檺
 				this.form.roleIdStr = val.join(",");
 			},
-			deptIdChange(val) {  //鏁版嵁鏉冮檺
-				this.form.deptIdStr = val.join(",");
-			},
 			//鏄剧ず
 			open(mode='add'){
 				this.mode = mode;
@@ -157,11 +152,10 @@
 			},
 			//琛ㄥ崟鎻愪氦鏂规硶
 			submit(){
+				var obj = Object.assign({}, this.addPersonForm);
 				var obj = Object.assign({},this.form);
-				obj.deptId = obj.deptIdStr;
-				obj.roleId = obj.roleIdStr;
-				delete obj.deptIdStr;
-				delete obj.roleIdStr;
+				obj.deptId = obj.deptId.join(",");
+				obj.roleId = obj.roleId.join(",");
 				this.$refs.dialogForm.validate(async (valid) => {
 					if (valid) {
 						//this.isSaveing = true;
@@ -218,10 +212,12 @@
 			showDetail(data) {
 				this.$HTTP.get("/api/blade-user/detail?id="+data.id).then(res=> {
 					if(res.code == 200) {
-						res.data.deptIdStr = res.data.deptId;
-						res.data.roleIdStr = res.data.roleId;
 						res.data.roleId = res.data.roleId.split(",");
-						res.data.deptId = [res.data.deptId];
+						if (res.data.deptId) {
+							res.data.deptId = res.data.deptId.split(",");
+						} else {
+							res.data.deptId = [];
+						}
 						this.form = res.data;
 						this.getEmployee(res.data.employeeId);
 					}
diff --git a/src/views/master/person/main/personPerson.vue b/src/views/master/person/main/personPerson.vue
index 24db503..875a0b5 100644
--- a/src/views/master/person/main/personPerson.vue
+++ b/src/views/master/person/main/personPerson.vue
@@ -2,7 +2,7 @@
  * @Author: lzhe lzhe@example.com
  * @Date: 2024-03-26 10:28:33
  * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-09-24 15:47:04
+ * @LastEditTime: 2024-10-09 13:56:01
  * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/master/person/main/personPerson.vue
  * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
diff --git a/src/views/master/person/main/save.vue b/src/views/master/person/main/save.vue
index f043da6..67470c1 100644
--- a/src/views/master/person/main/save.vue
+++ b/src/views/master/person/main/save.vue
@@ -68,10 +68,7 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="鏁版嵁鏉冮檺閰嶇疆">
-						<el-select v-model="addPersonForm.deptId" multiple filterable style="width: 100%"
-							placeholder="鏁版嵁鏉冮檺閰嶇疆" @change="deptIdChange">
-							<el-option v-for="item in deptIdList" :key="item.id" :label="item.title" :value="item.id" />
-						</el-select>
+						<el-tree-select v-model="addPersonForm.deptId" clearable multiple show-checkbox placeholder="鏁版嵁鏉冮檺閰嶇疆" default-expand-all :data="deptIdList" :props="{ label: 'title' ,id: 'id',children: 'children'}" node-key="id" ref="deptIdTree" style="width: 100%" />
 					</el-form-item>
 				</el-col>
 			</el-row>

--
Gitblit v1.9.3