Browse Source

fix: 清理云效bug

haifeng.zhang 6 days ago
parent
commit
c36de889fc

+ 10 - 2
src/api/select.ts

@@ -1,3 +1,11 @@
+/*
+ * @Author: zhanghaifeng
+ * @Date: 2024-11-04 16:39:08
+ * @LastEditors: zhanghaifeng
+ * @LastEditTime: 2024-11-07 11:18:09
+ * @Description:
+ * @FilePath: /hospital-project/src/api/select.ts
+ */
 import { http } from "@/utils/http";
 import { ref } from "vue";
 export const select = ref<any>([]);
@@ -9,9 +17,9 @@ type QuotaPageList = {
   msg: string;
   data: Array<any>;
 };
-export const selectDictList = data => {
+export const selectDictList = params => {
   return http.request<QuotaPageList>("get", "/commonDict/selectDictList", {
-    data
+    params
   });
 };
 export const getSelectDictListtApi = async () => {

+ 2 - 1
src/components/UserPageTable/index.vue

@@ -56,6 +56,7 @@ const handleCurrentChange = val => {
 defineExpose({
   handleNodeClick,
   postOrganizationUserPageApi,
+  handleCurrentChange,
   tableData
 });
 
@@ -96,7 +97,7 @@ const getTime = day => {
         prop="gender"
         label="性别"
       />
-      <el-table-column label="年龄">
+      <el-table-column label="出生年月">
         <template #default="{ row }">
           <span>{{ getTime(row.birth) }}</span>
         </template>

+ 4 - 3
src/views/background/framework/proson/components/addPerson.vue

@@ -136,16 +136,17 @@ defineExpose({
         style="max-width: 600px"
       >
         <el-form-item prop="realName" label="姓名">
-          <el-input v-model="form.realName" />
+          <el-input v-model="form.realName" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item prop="hospitalCode" label="工号">
-          <el-input v-model="form.hospitalCode" />
+          <el-input v-model="form.hospitalCode" placeholder="请输入工号" />
         </el-form-item>
         <el-form-item prop="deptCode" label="部门">
           <el-tree-select
             ref="treeSelectRef"
             v-model="form.deptCode"
             :data="deptTree"
+            placeholder="请选择部门"
             :props="{
               label: 'deptName',
               value: 'deptCode',
@@ -183,7 +184,7 @@ defineExpose({
           </el-select>
         </el-form-item>
         <el-form-item label="手机号">
-          <el-input v-model="form.phone" />
+          <el-input v-model="form.phone" placeholder="请输入手机号" />
         </el-form-item>
       </el-form>
       <template #footer>

+ 3 - 3
src/views/background/framework/proson/components/changeRole.vue

@@ -6,10 +6,10 @@ import { postPageRole } from "@/api/roles";
 import { postAssignmentUser } from "@/api/userSetting";
 const formRef = ref();
 const form = reactive({
-  region: ""
+  region: []
 });
 const handleClose = () => {
-  form.region = "";
+  form.region = [];
   dialogVisibleAdd.value = !dialogVisibleAdd.value;
 };
 const rolesList = reactive({
@@ -24,11 +24,11 @@ const rolesList = reactive({
 const postAddUserGroupApi = async () => {
   const { code, msg } = await postAssignmentUser(rolesList.assignmentParams);
   if (code === 200) {
-    dialogVisibleAdd.value = false;
     ElMessage({
       message: "添加成功",
       type: "success"
     });
+    handleClose();
   } else {
     ElMessage({
       message: msg,

+ 2 - 2
src/views/background/framework/proson/components/newDepartment.vue

@@ -64,9 +64,9 @@ const handleClose = () => {
 const saveDepartment = () => {
   formRef.value.validate(valid => {
     if (valid) {
-      dialogVisibleAdd.value = false;
       postAddDeptApi();
       emit("handleClick");
+      handleClose();
     }
   });
 };
@@ -141,7 +141,7 @@ defineExpose({
             <el-option
               v-for="item in optiones.leaderOptions"
               :key="item.value"
-              :label="item.userName"
+              :label="item.realName"
               :value="item.userCode"
             />
           </el-select>

+ 2 - 2
src/views/background/framework/proson/components/personDetailsDrawer.vue

@@ -234,12 +234,12 @@ const rules = reactive({
         </div>
       </template>
       <template #footer>
-        <el-button v-if="editShow" type="warning" @click="editClick"
+        <el-button v-if="editShow" type="primary" @click="editClick"
           >编辑</el-button
         >
         <div v-else>
           <el-button @click="cancelClick">取消</el-button>
-          <el-button type="primary" @click="confirmClick">确认</el-button>
+          <el-button type="primary" @click="confirmClick">保存</el-button>
         </div>
       </template>
     </el-drawer>

+ 1 - 1
src/views/background/framework/proson/components/prosonEditDrawer.vue

@@ -179,7 +179,7 @@ const timer = ref("");
                 <el-option
                   v-for="item in optiones.leaderOptions"
                   :key="item.value"
-                  :label="item.userName"
+                  :label="item.realName"
                   :value="item.userCode"
                 />
               </el-select>

+ 2 - 3
src/views/background/framework/proson/prosonDepartment.vue

@@ -64,9 +64,8 @@ const deletePerson = row => {
     type: "warning"
   })
     .then(() => {
-      getDeleteUserApi(
-        row.userCode,
-        UserTable.value.postOrganizationUserPageApi
+      getDeleteUserApi(row.userCode, () =>
+        UserTable.value.handleCurrentChange(1)
       );
     })
     .catch(() => {