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 @@
+
+
+
+
+
+
+
@@ -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({
parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
@@ -106,6 +128,7 @@ const formRules = reactive({
const formRef = ref() // 表单 Ref
const deptTree = ref() // 树形结构
const employeeOptions = ref([]) // 用户列表
+const instanceIdsOptions = ref([]) // 实例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 @@
-
+