From cb4f0a4680733cf30df86f02d0339c5db017dec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Sun, 12 Mar 2023 02:39:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E3=80=81=E8=A7=92=E8=89=B2=E3=80=81=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E3=80=81=E6=9C=BA=E6=9E=84=E3=80=81=E5=B2=97=E4=BD=8D=E8=BF=99?=
 =?UTF-8?q?=E4=BA=9B=E5=B7=A6=E6=A0=91=E5=8F=B3=E8=A1=A8=E5=BE=97=E5=88=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=97=B6=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A0=91=E5=90=8E=E5=AF=B9=E5=BA=94=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=84=E8=A1=A8=E5=8D=95=E8=B7=9F=E7=9D=80=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/src/views/biz/org/form.vue    |  5 ++-
 snowy-admin-web/src/views/biz/org/index.vue   |  4 +-
 .../src/views/biz/position/form.vue           |  5 ++-
 .../src/views/biz/position/index.vue          |  4 +-
 snowy-admin-web/src/views/biz/user/form.vue   | 45 +++++++++++--------
 snowy-admin-web/src/views/biz/user/index.vue  |  2 +-
 .../src/views/dev/dict/category/bizIndex.vue  |  2 +-
 .../src/views/dev/dict/category/form.vue      |  7 ++-
 .../src/views/dev/dict/category/frmIndex.vue  |  2 +-
 snowy-admin-web/src/views/sys/org/form.vue    |  7 ++-
 snowy-admin-web/src/views/sys/org/index.vue   |  5 +--
 .../src/views/sys/position/form.vue           |  5 ++-
 .../src/views/sys/position/index.vue          |  4 +-
 snowy-admin-web/src/views/sys/role/form.vue   | 10 ++++-
 snowy-admin-web/src/views/sys/role/index.vue  |  2 +-
 snowy-admin-web/src/views/sys/user/form.vue   | 45 +++++++++++--------
 snowy-admin-web/src/views/sys/user/index.vue  |  2 +-
 17 files changed, 98 insertions(+), 58 deletions(-)

diff --git a/snowy-admin-web/src/views/biz/org/form.vue b/snowy-admin-web/src/views/biz/org/form.vue
index add91905..29c849aa 100644
--- a/snowy-admin-web/src/views/biz/org/form.vue
+++ b/snowy-admin-web/src/views/biz/org/form.vue
@@ -84,12 +84,15 @@
 	const submitLoading = ref(false)
 
 	// 打开抽屉
-	const onOpen = (record) => {
+	const onOpen = (record, parentId) => {
 		visible = true
 		extJson.value = ref([])
 		formData.value = {
 			sortCode: 99
 		}
+		if (parentId) {
+			formData.value.parentId = parentId
+		}
 		if (record) {
 			const param = {
 				id: record.id
diff --git a/snowy-admin-web/src/views/biz/org/index.vue b/snowy-admin-web/src/views/biz/org/index.vue
index 99c815ad..d7faea0f 100644
--- a/snowy-admin-web/src/views/biz/org/index.vue
+++ b/snowy-admin-web/src/views/biz/org/index.vue
@@ -19,7 +19,7 @@
 					<a-row :gutter="24">
 						<a-col :span="8">
 							<a-form-item name="searchKey" label="名称关键词">
-								<a-input v-model:value="searchFormState.searchKey" placeholder="请输入机构名称关键词"></a-input>
+								<a-input v-model:value="searchFormState.searchKey" placeholder="请输入机构名称关键词" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
@@ -48,7 +48,7 @@
 				>
 					<template #operator class="table-operator">
 						<a-space>
-							<a-button type="primary" @click="form.onOpen()" v-if="hasPerm('bizOrgAdd')">
+							<a-button type="primary" @click="form.onOpen(undefined, searchFormState.parentId)" v-if="hasPerm('bizOrgAdd')">
 								<template #icon><plus-outlined /></template>
 								新增
 							</a-button>
diff --git a/snowy-admin-web/src/views/biz/position/form.vue b/snowy-admin-web/src/views/biz/position/form.vue
index 3ad31858..57eade07 100644
--- a/snowy-admin-web/src/views/biz/position/form.vue
+++ b/snowy-admin-web/src/views/biz/position/form.vue
@@ -68,11 +68,14 @@
 	const submitLoading = ref(false)
 
 	// 打开抽屉
-	const onOpen = (record) => {
+	const onOpen = (record, orgId) => {
 		visible = true
 		formData.value = {
 			sortCode: 99
 		}
+		if (orgId) {
+			formData.value.orgId = orgId
+		}
 		if (record) {
 			formData.value = Object.assign({}, record)
 		}
diff --git a/snowy-admin-web/src/views/biz/position/index.vue b/snowy-admin-web/src/views/biz/position/index.vue
index 9b31e221..eb022b98 100644
--- a/snowy-admin-web/src/views/biz/position/index.vue
+++ b/snowy-admin-web/src/views/biz/position/index.vue
@@ -19,7 +19,7 @@
 					<a-row :gutter="24">
 						<a-col :span="8">
 							<a-form-item name="searchKey" label="名称关键词">
-								<a-input v-model:value="searchFormState.searchKey" placeholder="请输入岗位名称关键词"></a-input>
+								<a-input v-model:value="searchFormState.searchKey" placeholder="请输入岗位名称关键词" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
@@ -48,7 +48,7 @@
 				>
 					<template #operator class="table-operator">
 						<a-space>
-							<a-button type="primary" @click="form.onOpen()" v-if="hasPerm('bizPositionAdd')">
+							<a-button type="primary" @click="form.onOpen(undefined, searchFormState.orgId)" v-if="hasPerm('bizPositionAdd')">
 								<template #icon><plus-outlined /></template>
 								新增
 							</a-button>
diff --git a/snowy-admin-web/src/views/biz/user/form.vue b/snowy-admin-web/src/views/biz/user/form.vue
index f91c8216..b6e75509 100644
--- a/snowy-admin-web/src/views/biz/user/form.vue
+++ b/snowy-admin-web/src/views/biz/user/form.vue
@@ -351,33 +351,42 @@
 	let formData = ref({})
 
 	// 打开抽屉
-	const onOpen = (record) => {
+	const onOpen = (record, orgId) => {
 		visible = true
 		formData.value = {
 			gender: '男',
 			positionJson: []
 		}
+		if (orgId) {
+			formData.value.orgId = orgId
+			// 通过机构再查询职位、主管
+			nextTick(() => {
+				selePositionData(orgId)
+			})
+		}
 		if (record) {
 			convertFormData(record)
 		}
-		// 机构选择器数据
-		bizUserApi.userOrgTreeSelector().then((res) => {
-			if (res !== null) {
-				treeData.value = res
-				// 默认展开2级
-				treeData.value.forEach((item) => {
-					// 因为0的顶级
-					if (item.parentId === '0') {
-						treeDefaultExpandedKeys.value.push(item.id)
-						// 取到下级ID
-						if (item.children) {
-							item.children.forEach((items) => {
-								treeDefaultExpandedKeys.value.push(items.id)
-							})
+		nextTick(() => {
+			// 机构选择器数据
+			bizUserApi.userOrgTreeSelector().then((res) => {
+				if (res !== null) {
+					treeData.value = res
+					// 默认展开2级
+					treeData.value.forEach((item) => {
+						// 因为0的顶级
+						if (item.parentId === '0') {
+							treeDefaultExpandedKeys.value.push(item.id)
+							// 取到下级ID
+							if (item.children) {
+								item.children.forEach((items) => {
+									treeDefaultExpandedKeys.value.push(items.id)
+								})
+							}
 						}
-					}
-				})
-			}
+					})
+				}
+			})
 		})
 	}
 	// 关闭抽屉
diff --git a/snowy-admin-web/src/views/biz/user/index.vue b/snowy-admin-web/src/views/biz/user/index.vue
index bdead4e1..65726eaf 100644
--- a/snowy-admin-web/src/views/biz/user/index.vue
+++ b/snowy-admin-web/src/views/biz/user/index.vue
@@ -60,7 +60,7 @@
 				>
 					<template #operator class="table-operator">
 						<a-space>
-							<a-button type="primary" @click="form.onOpen()" v-if="hasPerm('bizUserAdd')">
+							<a-button type="primary" @click="form.onOpen(undefined, searchFormState.orgId)" v-if="hasPerm('bizUserAdd')">
 								<template #icon><plus-outlined /></template>
 								<span>{{ $t('common.addButton') }}{{ $t('model.user') }}</span>
 							</a-button>
diff --git a/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue b/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue
index 25a44ee6..e4e2595e 100644
--- a/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue
+++ b/snowy-admin-web/src/views/dev/dict/category/bizIndex.vue
@@ -39,7 +39,7 @@
 								</a-button>
 							</a-col>
 							<a-col :span="8">
-								<a-button type="primary" @click="form.onOpen(undefined, 'BIZ')">
+								<a-button type="primary" @click="form.onOpen(undefined, 'BIZ', searchFormState.parentId)">
 									<template #icon><plus-outlined /></template>
 									新增
 								</a-button>
diff --git a/snowy-admin-web/src/views/dev/dict/category/form.vue b/snowy-admin-web/src/views/dev/dict/category/form.vue
index 24534d9e..e64b873d 100644
--- a/snowy-admin-web/src/views/dev/dict/category/form.vue
+++ b/snowy-admin-web/src/views/dev/dict/category/form.vue
@@ -39,7 +39,7 @@
 				/>
 			</a-form-item>
 			<a-form-item label="排序：" name="sortCode">
-				<a-input-number style="width: 100%" v-model:value="formData.sortCode" :max="100" />
+				<a-input-number style="width: 100%" v-model:value="formData.sortCode" :max="1000" />
 			</a-form-item>
 		</a-form>
 		<template #footer>
@@ -66,12 +66,15 @@
 	const defaultExpandedKeys = ref([0])
 
 	// 打开抽屉
-	const onOpen = (record, type) => {
+	const onOpen = (record, type, parentId) => {
 		visible = true
 		formData.value = {
 			sortCode: 99,
 			category: type
 		}
+		if (parentId) {
+			formData.value.parentId = parentId
+		}
 		if (record) {
 			formData.value = Object.assign({}, record)
 			formData.value.category = type
diff --git a/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue b/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue
index 9606e8ca..ab6cdede 100644
--- a/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue
+++ b/snowy-admin-web/src/views/dev/dict/category/frmIndex.vue
@@ -39,7 +39,7 @@
 								</a-button>
 							</a-col>
 							<a-col :span="8">
-								<a-button type="primary" @click="form.onOpen(undefined, 'FRM')">
+								<a-button type="primary" @click="form.onOpen(undefined, 'FRM', searchFormState.parentId)">
 									<template #icon><plus-outlined /></template>
 									新增
 								</a-button>
diff --git a/snowy-admin-web/src/views/sys/org/form.vue b/snowy-admin-web/src/views/sys/org/form.vue
index a4efb094..354c38e5 100644
--- a/snowy-admin-web/src/views/sys/org/form.vue
+++ b/snowy-admin-web/src/views/sys/org/form.vue
@@ -25,7 +25,7 @@
 					}"
 					selectable="false"
 					tree-line
-				></a-tree-select>
+				/>
 			</a-form-item>
 			<a-form-item label="组织名称：" name="name">
 				<a-input v-model:value="formData.name" placeholder="请输入组织名称" allow-clear />
@@ -84,12 +84,15 @@
 	const submitLoading = ref(false)
 
 	// 打开抽屉
-	const onOpen = (record) => {
+	const onOpen = (record, parentId) => {
 		visible = true
 		extJson.value = ref([])
 		formData.value = {
 			sortCode: 99
 		}
+		if (parentId) {
+			formData.value.parentId = parentId
+		}
 		if (record) {
 			const param = {
 				id: record.id
diff --git a/snowy-admin-web/src/views/sys/org/index.vue b/snowy-admin-web/src/views/sys/org/index.vue
index d95a882e..93e98722 100644
--- a/snowy-admin-web/src/views/sys/org/index.vue
+++ b/snowy-admin-web/src/views/sys/org/index.vue
@@ -8,8 +8,7 @@
 					:tree-data="treeData"
 					:field-names="treeFieldNames"
 					@select="treeSelect"
-				>
-				</a-tree>
+				/>
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
@@ -48,7 +47,7 @@
 				>
 					<template #operator class="table-operator">
 						<a-space>
-							<a-button type="primary" @click="form.onOpen()">
+							<a-button type="primary" @click="form.onOpen(undefined, searchFormState.parentId)">
 								<template #icon><plus-outlined /></template>
 								新增
 							</a-button>
diff --git a/snowy-admin-web/src/views/sys/position/form.vue b/snowy-admin-web/src/views/sys/position/form.vue
index e6ef952c..e25f1041 100644
--- a/snowy-admin-web/src/views/sys/position/form.vue
+++ b/snowy-admin-web/src/views/sys/position/form.vue
@@ -67,11 +67,14 @@
 	const submitLoading = ref(false)
 
 	// 打开抽屉
-	const onOpen = (record) => {
+	const onOpen = (record, orgId) => {
 		visible = true
 		formData.value = {
 			sortCode: 99
 		}
+		if (orgId) {
+			formData.value.orgId = orgId
+		}
 		if (record) {
 			formData.value = Object.assign({}, record)
 		}
diff --git a/snowy-admin-web/src/views/sys/position/index.vue b/snowy-admin-web/src/views/sys/position/index.vue
index cf7f9f3e..770cdeeb 100644
--- a/snowy-admin-web/src/views/sys/position/index.vue
+++ b/snowy-admin-web/src/views/sys/position/index.vue
@@ -19,7 +19,7 @@
 					<a-row :gutter="24">
 						<a-col :span="8">
 							<a-form-item name="searchKey" label="名称关键词">
-								<a-input v-model:value="searchFormState.searchKey" placeholder="请输入职位名称关键词"></a-input>
+								<a-input v-model:value="searchFormState.searchKey" placeholder="请输入职位名称关键词" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
@@ -48,7 +48,7 @@
 				>
 					<template #operator class="table-operator">
 						<a-space>
-							<a-button type="primary" @click="form.onOpen()">
+							<a-button type="primary" @click="form.onOpen(undefined, searchFormState.orgId)">
 								<template #icon><plus-outlined /></template>
 								新增
 							</a-button>
diff --git a/snowy-admin-web/src/views/sys/role/form.vue b/snowy-admin-web/src/views/sys/role/form.vue
index 2e341973..62fb13f3 100644
--- a/snowy-admin-web/src/views/sys/role/form.vue
+++ b/snowy-admin-web/src/views/sys/role/form.vue
@@ -67,11 +67,19 @@
 	const submitLoading = ref(false)
 
 	// 打开抽屉
-	const onOpen = (record) => {
+	const onOpen = (record, category, orgId) => {
 		visible = true
 		formData.value = {
 			sortCode: 99
 		}
+		// 判断角色的类型
+		if (category) {
+			formData.value.category = category
+		}
+		if (orgId) {
+			formData.value.category = 'ORG'
+			formData.value.orgId = orgId
+		}
 		if (record) {
 			formData.value = Object.assign({}, record)
 		}
diff --git a/snowy-admin-web/src/views/sys/role/index.vue b/snowy-admin-web/src/views/sys/role/index.vue
index c681a3d1..727a3f39 100644
--- a/snowy-admin-web/src/views/sys/role/index.vue
+++ b/snowy-admin-web/src/views/sys/role/index.vue
@@ -49,7 +49,7 @@
 				>
 					<template #operator class="table-operator">
 						<a-space>
-							<a-button type="primary" @click="form.onOpen()">
+							<a-button type="primary" @click="form.onOpen(undefined, searchFormState.category, searchFormState.orgId)">
 								<template #icon><plus-outlined /></template>
 								新增角色
 							</a-button>
diff --git a/snowy-admin-web/src/views/sys/user/form.vue b/snowy-admin-web/src/views/sys/user/form.vue
index d2fe201a..05724726 100644
--- a/snowy-admin-web/src/views/sys/user/form.vue
+++ b/snowy-admin-web/src/views/sys/user/form.vue
@@ -349,33 +349,42 @@
 	let formData = ref({})
 
 	// 打开抽屉
-	const onOpen = (record) => {
+	const onOpen = (record, orgId) => {
 		visible = true
 		formData.value = {
 			gender: '男',
 			positionJson: []
 		}
+		if (orgId) {
+			formData.value.orgId = orgId
+			// 通过机构再查询职位、主管
+			nextTick(() => {
+				selePositionData(orgId)
+			})
+		}
 		if (record) {
 			convertFormData(record)
 		}
-		// 机构选择器数据
-		userApi.userOrgTreeSelector().then((res) => {
-			if (res !== null) {
-				treeData.value = res
-				// 默认展开2级
-				treeData.value.forEach((item) => {
-					// 因为0的顶级
-					if (item.parentId === '0') {
-						treeDefaultExpandedKeys.value.push(item.id)
-						// 取到下级ID
-						if (item.children) {
-							item.children.forEach((items) => {
-								treeDefaultExpandedKeys.value.push(items.id)
-							})
+		nextTick(() => {
+			// 机构选择器数据
+			userApi.userOrgTreeSelector().then((res) => {
+				if (res !== null) {
+					treeData.value = res
+					// 默认展开2级
+					treeData.value.forEach((item) => {
+						// 因为0的顶级
+						if (item.parentId === '0') {
+							treeDefaultExpandedKeys.value.push(item.id)
+							// 取到下级ID
+							if (item.children) {
+								item.children.forEach((items) => {
+									treeDefaultExpandedKeys.value.push(items.id)
+								})
+							}
 						}
-					}
-				})
-			}
+					})
+				}
+			})
 		})
 	}
 	// 关闭抽屉
diff --git a/snowy-admin-web/src/views/sys/user/index.vue b/snowy-admin-web/src/views/sys/user/index.vue
index 46ff5543..8585524f 100644
--- a/snowy-admin-web/src/views/sys/user/index.vue
+++ b/snowy-admin-web/src/views/sys/user/index.vue
@@ -60,7 +60,7 @@
 				>
 					<template #operator class="table-operator">
 						<a-space>
-							<a-button type="primary" @click="form.onOpen()">
+							<a-button type="primary" @click="form.onOpen(undefined, searchFormState.orgId)">
 								<template #icon><plus-outlined /></template>
 								<span>{{ $t('common.addButton') }}{{ $t('model.user') }}</span>
 							</a-button>