Update 调整文字

UI/VAP_V3.VUE/src/api/system/_org.ts

@@ -2,7 +2,7 @@ import Rs from "@@/services/RequestService"
 
 class orgApi {
 	tableUrl = "/system/org/list"
-	// 查询部门列表
+	// 查询组织结构列表
 	listOrg = (query?: any) => {
 		return Rs.get({
 			url: "/system/org/list",
@@ -11,21 +11,21 @@ class orgApi {
 		})
 	}
 
-	// 查询部门列表（排除节点）
+	// 查询组织结构列表（排除节点）
 	listOrgExcludeChild = (orgId: string) => {
 		return Rs.get({
 			url: "/system/org/list/exclude/" + orgId
 		})
 	}
 
-	// 查询部门详细
+	// 查询组织结构详细
 	getOrg = (orgId: string) => {
 		return Rs.get({
 			url: "/system/org/" + orgId
 		})
 	}
 
-	// 新增部门
+	// 新增组织结构
 	addOrg = (data: any) => {
 		return Rs.post({
 			url: "/system/org",
@@ -33,7 +33,7 @@ class orgApi {
 		})
 	}
 
-	// 修改部门
+	// 修改组织结构
 	updateOrg = (data: any) => {
 		return Rs.put({
 			url: "/system/org",
@@ -41,7 +41,7 @@ class orgApi {
 		})
 	}
 
-	// 删除部门
+	// 删除组织结构
 	delOrg = (orgId: string | string[]) => {
 		return Rs.del({
 			url: "/system/org/" + orgId

UI/VAP_V3.VUE/src/api/system/_role.ts

@@ -102,7 +102,7 @@ class roleApi {
 		})
 	}
 
-	// 根据角色ID查询部门树结构
+	// 根据角色ID查询组织结构树结构
 	orgTreeSelect = (roleId: string) => {
 		return Rs.get({
 			url: "/system/role/orgTree/" + roleId,

UI/VAP_V3.VUE/src/api/system/_user.ts

@@ -123,7 +123,7 @@ class userApi {
 		})
 	}
 
-	// 查询部门下拉树结构
+	// 查询组织结构下拉树结构
 	orgTreeSelect = () => {
 		return Rs.get({
 			url: "/system/user/orgTree"

UI/VAP_V3.VUE/src/views/account/profile/index.vue

@@ -50,7 +50,7 @@ onMounted(init)
 							<dl>
 								<dt>
 									<i class="text-dark me-1 bi bi-briefcase-fill"></i>
-									所属部门：
+									所属组织结构：
 								</dt>
 								<dd>{{ user.org?.orgName }} / {{ user.postGroup }}</dd>
 							</dl>

UI/VAP_V3.VUE/src/views/monitor/online/index.vue

@@ -6,7 +6,7 @@ const tableOpts = reactive<any>({
 	columns: [
 		{ field: "tokenId", name: `会话编号`, width: 300, tooltip: true },
 		{ field: "userName", name: `登录名称` },
-		{ field: "orgName", name: `所属部门` },
+		{ field: "orgName", name: `所属组织结构` },
 		{ field: "ipaddr", name: `主机` },
 		{ field: "loginLocation", name: `登录地点` },
 		{ field: "os", name: `操作系统`, tooltip: true },

UI/VAP_V3.VUE/src/views/system/org/index.vue

@@ -6,12 +6,12 @@ const tableRef = ref()
 const modalRef = ref()
 const opts = reactive({
 	columns: [
-		{ field: "orgId", name: "部门编号", visible: false },
-		{ field: "orgName", name: "部门名称", visible: true },
+		{ field: "orgId", name: "组织结构编号", visible: false },
+		{ field: "orgName", name: "组织结构名称", visible: true },
 		{ field: "leaderName", name: "负责人", visible: true },
 		{ field: "phone", name: "联系电话", visible: true },
 		{ field: "email", name: "邮箱", visible: true },
-		{ field: "status", name: "部门状态", visible: true, width: 100 },
+		{ field: "status", name: "组织结构状态", visible: true, width: 100 },
 		{ field: "createTime", name: "创建时间", visible: true, width: 185 },
 		{ field: "actions", name: `操作`, width: 150 }
 	],
@@ -22,10 +22,10 @@ const opts = reactive({
 	searchFormItems: [
 		{
 			field: "orgName",
-			label: "部门名称",
+			label: "组织结构名称",
 			class: "w-100",
 			required: false,
-			placeholder: "请输入部门名称",
+			placeholder: "请输入组织结构名称",
 			listeners: {
 				keyup: (e: KeyboardEvent) => {
 					if (e.code == "Enter") {
@@ -36,12 +36,12 @@ const opts = reactive({
 		},
 		{
 			field: "status",
-			label: "部门状态",
+			label: "组织结构状态",
 			class: "w-100",
 			required: false,
 			component: "Dict",
 			props: {
-				placeholder: "请选择部门状态",
+				placeholder: "请选择组织结构状态",
 				dictType: "sys_normal_disable"
 			}
 		}
@@ -67,14 +67,14 @@ const opts = reactive({
 	deleteEntityFun: apis.system.orgApi.delOrg,
 	//exportUrl: apis.system.orgApi.exportUrl,
 	exportName: "O",
-	modalTitle: "部门",
+	modalTitle: "组织结构",
 	resetForm: () => {
 		form.value = emptyFormData.value
 		getOrgTreeSelect()
 	},
 	formRules: {
-		parentId: [{ required: true, message: "父部门不能为空", trigger: "blur" }],
-		orgName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
+		parentId: [{ required: true, message: "父组织结构不能为空", trigger: "blur" }],
+		orgName: [{ required: true, message: "组织结构名称不能为空", trigger: "blur" }],
 		orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
 		email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
 		phone: [
@@ -171,7 +171,7 @@ function handleDelete(rows: any[]) {
 	const ids = rows.map((v: any) => v.orgId)
 	const _orgNames = rows.map((v: any) => v.orgName)
 	message
-		.confirm('是否确认删除部门为"' + _orgNames + '"的数据项？')
+		.confirm('是否确认删除组织结构为"' + _orgNames + '"的数据项？')
 		.then(() => {
 			return apis.system.orgApi.delOrg(ids).then(() => {
 				handleQuery()
@@ -279,7 +279,7 @@ function getUserListByOrgId(orgId: number) {
 			<template #form>
 				<el-row>
 					<el-col :span="24">
-						<el-form-item label="父部门" prop="parentId">
+						<el-form-item label="父组织结构" prop="parentId">
 							<el-tree-select
 								v-model="form.parentId"
 								:data="orgOptions"
@@ -288,13 +288,13 @@ function getUserListByOrgId(orgId: number) {
 								value-key="orgId"
 								:render-after-expand="false"
 								:default-expand-all="true"
-								placeholder="选择上级部门"
+								placeholder="选择上级组织结构"
 								check-strictly />
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
-						<el-form-item label="部门名称" prop="orgName">
-							<el-input v-model="form.orgName" placeholder="请输入部门名称" />
+						<el-form-item label="组织结构名称" prop="orgName">
+							<el-input v-model="form.orgName" placeholder="请输入组织结构名称" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
@@ -328,7 +328,7 @@ function getUserListByOrgId(orgId: number) {
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
-						<el-form-item label="部门状态" prop="status">
+						<el-form-item label="组织结构状态" prop="status">
 							<el-radio-group v-model="form.status">
 								<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">
 									{{ dict.label }}

UI/VAP_V3.VUE/src/views/system/role/index.vue

@@ -14,12 +14,12 @@ const dataScopeOptions = [
 		type: "primary"
 	},
 	{
-		label: "本部门数据",
+		label: "本组织结构数据",
 		value: "3",
 		type: "success"
 	},
 	{
-		label: "本部门及以下数据",
+		label: "本组织结构及以下数据",
 		value: "4",
 		type: "warning"
 	},
@@ -387,7 +387,7 @@ function getRoleMenuTreeSelect(roleId: string) {
 		return data
 	})
 }
-/** 根据角色ID查询部门树结构 */
+/** 根据角色ID查询组织结构树结构 */
 function getOrgTree(roleId: string) {
 	return apis.system.roleApi.orgTreeSelect(roleId).then(({ data }) => {
 		orgOptions.value = data.orgs
@@ -433,12 +433,12 @@ function getMenuAllCheckedKeys() {
 	checkedKeys.unshift(...halfCheckedKeys)
 	return checkedKeys
 }
-/** 所有部门节点数据 */
+/** 所有组织结构节点数据 */
 function getOrgAllCheckedKeys() {
 	if (orgRef.value) {
-		// 目前被选中的部门节点
+		// 目前被选中的组织结构节点
 		const checkedKeys = orgRef.value.getCheckedKeys()
-		// 半选中的部门节点
+		// 半选中的组织结构节点
 		const halfCheckedKeys = orgRef.value.getHalfCheckedKeys()
 		checkedKeys.unshift(...halfCheckedKeys)
 		return checkedKeys

UI/VAP_V3.VUE/src/views/system/user/index.vue

@@ -18,8 +18,8 @@ const tableOpts = reactive({
 		{ field: "userId", name: `用户编号`, width: 85, visible: false },
 		{ field: "userName", name: `用户名称` },
 		{ field: "nickName", name: `用户昵称` },
-		{ field: "orgName", name: `部门` },
-		{ field: "leaderName", name: `部门负责人` },
+		{ field: "orgName", name: `组织结构` },
+		{ field: "leaderName", name: `组织结构负责人` },
 		{ field: "phonenumber", name: `手机号码` },
 		{ field: "status", name: `状态` },
 		{ field: "createTime", name: `创建时间` },
@@ -145,14 +145,14 @@ const modalOpts = reactive({
 		},
 		{
 			field: "orgId",
-			label: "归属部门",
+			label: "归属组织结构",
 			class: "w-100",
 			required: true,
 			data: () => orgOptions.value,
 			component: "vst",
 			props: {
 				//dataFun: loadOrg,
-				placeholder: "请选择归属部门"
+				placeholder: "请选择归属组织结构"
 			},
 			span: 12
 		},
@@ -445,7 +445,7 @@ onMounted(() => {
 <template>
 	<div class="app-container">
 		<el-row :gutter="20">
-			<!--部门数据-->
+			<!--组织结构数据-->
 			<el-col :span="4" :xs="24">
 				<OrgTree
 					ref="orgTreeRef"