页面修改

sso-ui/sso-ui-admin-vue3/src/api/system/dept/index.ts

@@ -10,6 +10,16 @@ export interface DeptVO {
   phone: string
   email: string
   createTime: Date
+  supportBi: number
+  businessStatus: number
+  businessPattern: number
+  applySystems: string[],
+  propertypes: string[],
+  brand: string[],
+  aliasNameOther: string,
+  aliasName: string,
+  originalName: string,
+  originalCode: string,
 }
 
 // 查询部门（精简)列表

sso-ui/sso-ui-admin-vue3/src/views/system/dept/DeptForm.vue

@@ -47,11 +47,11 @@
       <el-form-item label="机构其他别名"  prop="aliasName" >
         <el-input v-model="formData.aliasNameOther" placeholder="请输入机构别名" maxlength="30" />
       </el-form-item>
-      <el-form-item label="原机构编码"  prop="originalCode" >
-        <el-input v-model="formData.originalCode" placeholder="请输入原机构编码" maxlength="30" />
-      </el-form-item>
+<!--      <el-form-item label="原机构编码"  prop="originalCode" >-->
+<!--        <el-input v-model="formData.originalCode" placeholder="请输入原机构编码" maxlength="30" />-->
+<!--      </el-form-item>-->
       <el-form-item label="品牌名称" prop="brand">
-        <el-select v-model="formData.brand" clearable placeholder="请选择品牌名称">
+        <el-select v-model="formData.brand" multiple clearable placeholder="请选择品牌名称">
           <el-option
             v-for="dict in brandOptions"
             :key="dict.value"
@@ -61,7 +61,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="机构性质" prop="propertypes">
-        <el-select v-model="formData.propertypes" clearable placeholder="请选择机构性质">
+        <el-select v-model="formData.propertypes" multiple clearable placeholder="请选择机构性质">
           <el-option
             v-for="dict in propertypesOptions"
             :key="dict.value"
@@ -71,7 +71,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="已上系统" prop="applySystems">
-        <el-select v-model="formData.applySystems" clearable placeholder="请选择已上系统">
+        <el-select v-model="formData.applySystems" multiple clearable placeholder="请选择已上系统">
           <el-option
             v-for="dict in applySystemOptions"
             :key="dict.value"
@@ -181,12 +181,22 @@ const formData = ref({
   leaderUserName: undefined,
   phone: undefined,
   email: undefined,
+  supportBi: 1,
+  businessStatus: 1,
+  businessPattern: 1,
+  applySystems: [],
+  propertypes: [],
+  brand: [],
+  aliasNameOther: undefined,
+  aliasName: undefined,
+  originalName: undefined,
+  originalCode: undefined,
   status: CommonStatusEnum.ENABLE
 })
 const formRules = reactive<FormRules>({
-  parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
-  name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
-  code: [{ required: true, message: '部门编码不能为空', trigger: 'blur' }],
+  parentId: [{ required: true, message: '上级机构不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '机构名称不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '机构编码不能为空', trigger: 'blur' }],
   sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
   areaId: [{ required: true, message: '所在地不能为空', trigger: 'blur' }],
   supportBi: [{ required: true, message: 'BI支持不能为空', trigger: 'blur' }],
@@ -265,6 +275,16 @@ const resetForm = () => {
     leaderUserName: undefined,
     phone: undefined,
     email: undefined,
+    supportBi: 1,
+    businessStatus: 1,
+    businessPattern: 1,
+    applySystems: [],
+    propertypes: [],
+    brand: [],
+    aliasNameOther: undefined,
+    aliasName: undefined,
+    originalName: undefined,
+    originalCode: undefined,
     status: CommonStatusEnum.ENABLE
   }
   formRef.value?.resetFields()
@@ -274,7 +294,7 @@ const resetForm = () => {
 const getTree = async () => {
   deptTree.value = []
   const data = await DeptApi.getSimpleDeptList()
-  let dept: Tree = { id: 0, name: '顶级部门', children: [] }
+  let dept: Tree = { id: 0, name: '顶级机构', children: [] }
   dept.children = handleTree(data)
   deptTree.value.push(dept)
 }
@@ -297,7 +317,7 @@ const brandOptions = [
   },
   {
     value: 3,
-    label: '恒颐汇',
+    label: '萱悦庭',
   }
 ]
 

sso-ui/sso-ui-admin-vue3/src/views/system/dept/index.vue

@@ -65,7 +65,7 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
       <el-table-column prop="code" label="编码" />
-      <el-table-column prop="businessPattern" label="排序" >
+      <el-table-column prop="businessPattern" label="经营方式" >
         <template #default="scope">
           <span v-if="scope.row.businessPattern === 1">自建自营</span>
           <span v-if="scope.row.businessPattern === 2">合作项目</span>

sso-ui/sso-ui-admin-vue3/src/views/system/operatelog/index.vue

@@ -33,10 +33,10 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="操作模块" prop="subType">
+      <el-form-item label="操作名" prop="subType">
         <el-input
           v-model="queryParams.subType"
-          placeholder="请输入操作模块"
+          placeholder="请输入操作名"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"

sso-ui/sso-ui-admin-vue3/src/views/system/user/DeptTree.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="head-container">
-    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入部门名称">
+    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入机构名称">
       <template #prefix>
         <Icon icon="ep:search" />
       </template>

sso-ui/sso-ui-admin-vue3/src/views/system/user/UserClientForm.vue

@@ -71,7 +71,7 @@
           <el-button
             type="primary"
             @click="handlerLink(scope.row.clientId)"
-            v-show = "scope.row.syncStatus==1 && scope.row.permissionsLink==0"
+            v-show = "scope.row.syncStatus==1 && scope.row.permissionsLink==0 && scope.row.status==0"
             v-hasClient="[scope.row.clientId+'']"
           >
             权限设置

sso-ui/sso-ui-admin-vue3/src/views/system/user/UserForm.vue

@@ -17,7 +17,7 @@
       <el-form-item label="身份证" prop="idNumber">
         <el-input v-model="formData.idNumber" placeholder="请输入18位身份证号" @blur="idCardBlur" maxlength="18" />
       </el-form-item>
-      <el-form-item v-if="formData.id === undefined" label="手机号码" prop="mobile">
+      <el-form-item  label="手机号码" prop="mobile" disabled = "formData.id === undefined">
         <el-input v-model="formData.mobile" maxlength="11" placeholder="请输入手机号码" />
       </el-form-item>
       <el-form-item label="性别">

sso-ui/sso-ui-admin-vue3/src/views/system/user/index.vue

@@ -106,7 +106,7 @@
 <!--          />-->
           <el-table-column label="手机号" align="center" prop="mobile" width="120" />
           <el-table-column
-            label="部门"
+            label="机构"
             align="center"
             key="deptName"
             prop="deptName"