From 85f5b87f843ae91fbd305aaf3d03af97877af76e Mon Sep 17 00:00:00 2001
From: zcx <377075991@qq.com>
Date: Sat, 12 Apr 2025 20:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.base | 4 +++-
.vscode/settings.json | 5 +++++
src/views/Basic/Dept/DeptForm.vue | 32 +++++++++++++++++++++++++++++--
src/views/Basic/Dept/index.vue | 2 +-
4 files changed, 39 insertions(+), 4 deletions(-)
create mode 100644 .vscode/settings.json
diff --git a/.env.base b/.env.base
index 0aa0c82..3032c19 100644
--- a/.env.base
+++ b/.env.base
@@ -4,7 +4,9 @@ VITE_NODE_ENV=development
VITE_DEV=true
# 请求路径
-VITE_BASE_URL='http://47.98.161.246:48080'
+VITE_BASE_URL='http://localhost:48080'
+
+# VITE_BASE_URL='http://47.98.161.246:48080'
# VITE_BASE_URL='http://114.55.169.15:48080'
# 上传路径
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..4e71344
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+ "i18n-ally.localesPaths": [
+ "src/locales"
+ ]
+}
\ No newline at end of file
diff --git a/src/views/Basic/Dept/DeptForm.vue b/src/views/Basic/Dept/DeptForm.vue
index 4ad68e1..89e2269 100644
--- a/src/views/Basic/Dept/DeptForm.vue
+++ b/src/views/Basic/Dept/DeptForm.vue
@@ -56,6 +56,26 @@
<el-input-number v-model="formData.sort" :min="0" />
</el-form-item>
</el-col>
+ <el-col :span="12" :offset="0">
+ <el-form-item label="开通系统" prop="instanceIds">
+ <el-select
+ v-model="formData.instanceIds"
+ placeholder="选择开通系统"
+ multiple
+ collapse-tags
+ clearable
+ filterable
+ >
+ <el-option
+ v-for="item in instanceIdsOptions"
+ :key="item.instanceId"
+ :label="item.instanceName"
+ :disabled="item.status == 1"
+ :value="item.instanceId"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24" :offset="0">
@@ -76,6 +96,7 @@ import { defaultProps, handleTree } from '@/utils/tree'
import * as DeptApi from '@/api/system/dept'
import { getEmployeeSimpleList } from '@/api/pers/employee'
import { CommonStatusEnum } from '@/utils/constants'
+import { getSimpleAppList } from '@/api/system/app'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@@ -91,7 +112,8 @@ const formData = ref({
sort: 1,
leaderUserId: undefined,
status: CommonStatusEnum.ENABLE,
- remark: undefined
+ remark: undefined,
+ instanceIds: undefined
})
const formRules = reactive<any>({
parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
@@ -106,6 +128,7 @@ const formRules = reactive<any>({
const formRef = ref() // 表单 Ref
const deptTree = ref() // 树形结构
const employeeOptions = ref<any>([]) // 用户列表
+const instanceIdsOptions = ref<any>([]) // 实例ids
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
@@ -126,6 +149,10 @@ const open = async (type: string, id?: number) => {
getEmployeeSimpleList().then((data) => {
employeeOptions.value = data
})
+ //实例
+ getSimpleAppList().then((data) => {
+ instanceIdsOptions.value = data
+ })
// 获得部门树
await getTree()
}
@@ -166,7 +193,8 @@ const resetForm = () => {
sort: 1,
leaderUserId: undefined,
status: CommonStatusEnum.ENABLE,
- remark: undefined
+ remark: undefined,
+ instanceIds: undefined
}
formRef.value?.resetFields()
}
diff --git a/src/views/Basic/Dept/index.vue b/src/views/Basic/Dept/index.vue
index dbcae05..3a0b924 100644
--- a/src/views/Basic/Dept/index.vue
+++ b/src/views/Basic/Dept/index.vue
@@ -22,7 +22,7 @@
<el-table v-loading="loading" :data="list" row-key="id" default-expand-all border>
<el-table-column prop="name" label="部门名称" />
<el-table-column prop="leaderUserName" label="负责人" width="120" />
- <el-table-column prop="" label="业务系统" width="200" />
+ <el-table-column prop="instanceNames" label="业务系统" width="200" />
<el-table-column prop="sort" label="排序" width="80" />
<el-table-column prop="status" label="状态" width="100">
<template #default="scope">