src/api/liswork/order/index.ts

@@ -9,17 +9,6 @@ export function queryRegRequestInfo(query: Object) {
     params: query
   })
 }
-
-//获取病人信息
-export function queryPatInfo(query: Object) {
-  return request({
-    url: '/regRequestInfo/patInfo',
-    method: 'get',
-    params: query
-  })
-}
-
-
 //保存病人信息
 export function saveReqInfo(query: Object) {
   return request({

src/views/liswork/Issueorder/index.vue

@@ -122,7 +122,7 @@
 <script setup name="Issueorder">
 import Info from './components/info.vue'
 import { getDictData, formatDict, dictData } from '@/hooks'
-import { getXmItemInfo, saveReqInfo, queryRegRequestInfo, queryReqDetail, reqPrint, cancelReq, queryPatInfo } from '@/api/liswork/order'
+import { getXmItemInfo, saveReqInfo, queryRegRequestInfo, queryReqDetail, reqPrint, cancelReq } from '@/api/liswork/order'
 import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getFirstLetter } from '@/utils/pinyin';
@@ -282,11 +282,7 @@ const handleQuery = () => {
 }
 // 获取病人代号查询信息
 const getBrdhHandle = (val) => {
-  queryPatInfo({ patId: val }).then(res => {
+  console.log("🚀 ~ getBrdhHandle ~ val:", val)
-    if (res.data) {
-      labpat.value = res.data
-    }
-  })
 
 }
 //保存

src/views/system/dept/index.vue

@@ -26,11 +26,11 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId" showOverflow
+    <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId"
       :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       height="calc(100vh - 250px)">
-      <el-table-column prop="deptName" label="部门名称"></el-table-column>
+      <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="100"></el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" width="100">
         <template #default="scope">
           <dict-tag :options="sys_normal_disable" :value="scope.row.status" />

src/views/system/user/index.vue

@@ -20,8 +20,8 @@
         <pane size="84">
           <el-col>
             <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="用户代号" prop="userName">
+              <el-form-item label="用户名称" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="请输入用户代号" clearable style="width: 240px"
+                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
                   @keyup.enter="handleQuery" />
               </el-form-item>
               <el-form-item label="手机号码" prop="phonenumber">
@@ -72,7 +72,7 @@
               height="calc(100vh - 350px)">
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" />
-              <el-table-column label="用户代号" align="center" key="userName" prop="userName"
+              <el-table-column label="用户名称" align="center" key="userName" prop="userName"
                 v-if="columns.userName.visible" :show-overflow-tooltip="true" />
               <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName"
                 v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
@@ -151,8 +151,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户代号" prop="userName">
+            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户代号" maxlength="30" />
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -292,7 +292,7 @@ const upload = reactive({
 // 列显隐信息
 const columns = ref<Record<string, TableShowColumns>>({
   userId: { label: '用户编号', visible: true },
-  userName: { label: '用户代号', visible: true },
+  userName: { label: '用户名称', visible: true },
   nickName: { label: '用户昵称', visible: true },
   deptName: { label: '部门', visible: true },
   phonenumber: { label: '手机号码', visible: true },
@@ -311,10 +311,7 @@ const data = reactive({
     deptId: undefined
   } as UserQueryParams,
   rules: {
-    userName: [{ required: true, message: "用户代号不能为空", trigger: "blur" },
+    userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
-    { min: 2, max: 20, message: "用户代号长度必须介于 2 和 20 之间", trigger: "blur" },
-    { pattern: /^[A-Za-z0-9]+$/, message: '用户代号只能输入字母和数字', trigger: ['blur', 'change'] }
-    ],
     nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
     password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
@@ -365,6 +362,7 @@ function filterDisabledDept(deptList: TreeSelect[]) {
     return true
   })
 }
+
 /** 节点单击事件 */
 function handleNodeClick(data: any) {
   queryParams.value.deptId = data.id
@@ -545,7 +543,6 @@ function handleAdd() {
     open.value = true
     title.value = "添加用户"
     form.value.password = initPassword.value
-    form.value.deptId = queryParams.value.deptId
   })
 }