Merge branch 'dev' of http://111.2.21.141:33001/ystl_myq/hospital-project into dev

src/api/roles.ts

@@ -1,3 +1,11 @@
+/*
+ * @Author: zhanghaifeng
+ * @Date: 2024-11-04 16:39:08
+ * @LastEditors: zhanghaifeng
+ * @LastEditTime: 2024-11-07 13:56:39
+ * @Description:
+ * @FilePath: /hospital-project/src/api/roles.ts
+ */
 import { http } from "@/utils/http";
 
 type pageRole = {
@@ -30,6 +38,9 @@ export const postAddRole = data => {
 export const postUpdateRole = data => {
   return http.request<pageRole>("post", "/sysRole/updateRole", { data });
 };
+export const postUpdateRoleName = data => {
+  return http.request<pageRole>("post", "/sysRole/updateRoleName", { data });
+};
 // 查询角色下用户
 export const postPageUserByRole = data => {
   return http.request<pageRoleList>("post", "/sysRole/pageUserByRole", {

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 () => {

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>

src/store/modules/user.ts

@@ -45,10 +45,12 @@ export const useUserStore = defineStore({
       return new Promise<UserResult>((resolve, reject) => {
         getLogin(data)
           .then(data => {
-            if (data) {
+            if (data.code && data.code === 200) {
               // token超时时间
               setToken(data.data);
               resolve(data);
+            } else {
+              reject(data.msg);
             }
           })
           .catch(error => {

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>

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,

src/views/background/framework/proson/components/newDepartment.vue

@@ -64,25 +64,27 @@ const handleClose = () => {
 const saveDepartment = () => {
   formRef.value.validate(valid => {
     if (valid) {
-      dialogVisibleAdd.value = false;
       postAddDeptApi();
       emit("handleClick");
+      handleClose();
     }
   });
 };
 const open = node => {
+  console.log(node, "-------");
   dialogVisibleAdd.value = true;
   postUserListApi();
-  postListTreeApi();
   if (node) {
     // form.leader
     form.deptName = "";
     form.deptCode = "";
     form.hospitalCode = "";
     form.leader = "";
-    form.parentCode = "";
     optiones.parentOptions = [];
     optiones.parentOptions.push(node.data);
+    form.parentCode = node.data.deptCode;
+  } else {
+    postListTreeApi();
   }
 };
 // 添加子部门数据
@@ -141,7 +143,7 @@ defineExpose({
             <el-option
               v-for="item in optiones.leaderOptions"
               :key="item.value"
-              :label="item.userName"
+              :label="item.realName"
               :value="item.userCode"
             />
           </el-select>

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>

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>

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(() => {

src/views/background/framework/roles/components/addRole.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, reactive } from "vue";
 import { ElMessageBox, ElMessage } from "element-plus";
-import { postAddRole, postUpdateRole } from "@/api/roles";
+import { postAddRole, postUpdateRole, postUpdateRoleName } from "@/api/roles";
 const emit = defineEmits(["handleClick"]);
 const dialogVisibleAdd = ref(false);
 const dialogTitle = ref("新增");
@@ -14,7 +14,7 @@ const postAddRoleApi = async () => {
   const res =
     dialogTitle.value == "新增"
       ? await postAddRole(form)
-      : await postUpdateRole(form);
+      : await postUpdateRoleName(form);
   if (res.code === 200) {
     emit("handleClick");
     ElMessage({

src/views/login/index.vue

@@ -92,7 +92,6 @@ const onLogin = async (formEl: FormInstance | undefined) => {
         .catch(err => {
           loading.value = false;
           message(err, { type: "error" });
-          console.log("登录失败", err);
           return fields;
         });
     } else {

src/views/password/index.vue

@@ -48,17 +48,17 @@ const UpdatePasswordApi = async () => {
 };
 const rules = {
   oldPwd: [
-    { required: true, message: "请输入密码", trigger: "blur" },
-    {
-      validator: (rule, value, callback) => {
-        if (value !== passWord.value) {
-          callback(new Error("旧密码不正确"));
-        } else {
-          callback();
-        }
-      },
-      trigger: "blur"
-    }
+    { required: true, message: "请输入密码", trigger: "blur" }
+    // {
+    //   validator: (rule, value, callback) => {
+    //     if (value !== passWord.value) {
+    //       callback(new Error("旧密码不正确"));
+    //     } else {
+    //       callback();
+    //     }
+    //   },
+    //   trigger: "blur"
+    // }
   ],
   newPwd: [
     { required: true, message: "请输入 6 - 14 位密码", trigger: "blur" },