Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl

# Conflicts:
#	.env.base
#	yarn.lock

.env.base

@@ -4,10 +4,10 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
+#VITE_BASE_URL='http://118.31.23.45:48080'
+# VITE_BASE_URL='http://114.55.169.15: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'
 
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'

.env.dev

@@ -4,8 +4,10 @@ VITE_NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
+#VITE_BASE_URL='http://47.98.161.246:48080'
 VITE_BASE_URL='http://localhost:48080'
 
+
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "i18n-ally.localesPaths": [
-        "src/locales"
-    ]
-}

src/views/Basic/Dept/DeptForm.vue

@@ -56,26 +56,6 @@
             <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">
@@ -96,7 +76,6 @@ 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() // 消息弹窗
@@ -112,8 +91,7 @@ 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' }],
@@ -128,7 +106,6 @@ 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) => {
@@ -149,10 +126,6 @@ const open = async (type: string, id?: number) => {
   getEmployeeSimpleList().then((data) => {
     employeeOptions.value = data
   })
-  //实例
-  getSimpleAppList().then((data) => {
-    instanceIdsOptions.value = data
-  })
   // 获得部门树
   await getTree()
 }
@@ -193,8 +166,7 @@ const resetForm = () => {
     sort: 1,
     leaderUserId: undefined,
     status: CommonStatusEnum.ENABLE,
-    remark: undefined,
+    remark: undefined
-    instanceIds: undefined
   }
   formRef.value?.resetFields()
 }

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="instanceNames" label="业务系统" width="200" />
+    <el-table-column prop="" label="业务系统" width="200" />
     <el-table-column prop="sort" label="排序" width="80" />
     <el-table-column prop="status" label="状态" width="100">
       <template #default="scope">