人员档案修改

src/api/personarchive/index.ts

@@ -33,8 +33,8 @@ export interface PersonArchiveVO {
   surgeryhistorydesc: string // 手术史描述
   traumahistorydesc: string // 外伤史描述
   transfusionhistorydesc: string // 输血史描述
-  createtime: Date // 创建时间
+  createtime: string // 创建时间
-  updatetime: Date // 更新时间
+  updatetime: string // 更新时间
   createby: string // 创建人
   updateby: string // 更新人
 }
@@ -51,6 +51,11 @@ export const PersonArchiveApi = {
     return await request.get({ url: `/system/person-archive/get?id=` + id })
   },
 
+  // 根据人员列表id查询人员档案
+  getPersonArchiveByUserid: async (userid: number) => {
+    return await request.get({ url: `/system/person-archive/getByUserid?userid=` + userid })
+  },
+
   // 新增人员档案
   createPersonArchive: async (data: PersonArchiveVO) => {
     return await request.post({ url: `/system/person-archive/create`, data })
@@ -66,6 +71,11 @@ export const PersonArchiveApi = {
     return await request.delete({ url: `/system/person-archive/delete?id=` + id })
   },
 
+  // 根据人员列表id删除人员档案
+  deletePersonArchiveByUserid: async (userid: number) => {
+    return await request.delete({ url: `/system/person-archive/deleteByUserid?userid=` + userid })
+  },
+
   // 导出人员档案 Excel
   exportPersonArchive: async (params) => {
     return await request.download({ url: `/system/person-archive/export-excel`, params })

src/views/devices/DevFrom.vue

@@ -115,7 +115,7 @@ const userProfile = ref()
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
@@ -123,7 +123,6 @@ const open = async (type: string, id?: number) => {
   resetForm()
   // 首先获取用户信息
   userProfile.value = await getUserProfile()
-  console.log(userProfile.value.dept.name)
 }
 
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -150,7 +149,6 @@ const submitForm = async () => {
     } as DeviceVO
     
     if (formType.value === 'create') {
-      console.log(data)
       await DeviceApi.createDevice(data)
       message.success(t('common.createSuccess'))
     } else {

src/views/person/index.vue

@@ -37,16 +37,6 @@
               class="!w-200px"
             />
           </el-form-item>
-          <el-form-item label="创建时间" prop="createtime">
-            <el-date-picker
-              v-model="queryParams.createtime"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              type="datetimerange"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              class="!w-240px"
-            />
-          </el-form-item>
           <el-form-item>
             <el-button @click="handleQuery"><Icon icon="ep:search" />搜索</el-button>
             <el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button>

src/views/personarchive/PersonArchiveForm.vue

@@ -9,15 +9,6 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="人员表ID" prop="userid">
-            <el-input v-model="formData.userid" placeholder="请输入人员表ID" />
-          </el-form-item>
-          <el-form-item label="机构ID" prop="orgid">
-            <el-input v-model="formData.orgid" placeholder="请输入机构ID" />
-          </el-form-item>
-          <el-form-item label="机构名称" prop="orgname">
-            <el-input v-model="formData.orgname" placeholder="请输入机构名称" />
-          </el-form-item>
           <el-form-item label="姓名" prop="name">
             <el-input v-model="formData.name" placeholder="请输入姓名" />
           </el-form-item>
@@ -33,6 +24,9 @@
           <el-form-item label="身份证号" prop="idcard">
             <el-input v-model="formData.idcard" placeholder="请输入身份证号" />
           </el-form-item>
+          <el-form-item label="联系电话" prop="phone">
+            <el-input v-model="formData.phone" placeholder="请输入联系电话" />
+          </el-form-item>
           <el-form-item label="户籍住址" prop="address">
             <el-cascader
             v-model="selectedOptions"
@@ -43,9 +37,6 @@
             class="w-[450px]"
           />
           </el-form-item>
-          <el-form-item label="联系电话" prop="phone">
-            <el-input v-model="formData.phone" placeholder="请输入联系电话" />
-          </el-form-item>
           <el-form-item label="血型" prop="bloodtype">
             <el-select v-model="formData.bloodtype" placeholder="请选择血型">
               <el-option label="A型" value="A" />
@@ -62,13 +53,6 @@
               <el-option label="较差" value="较差" />
             </el-select>
           </el-form-item>
-          <el-form-item label="身高cm" prop="height">
-            <el-input v-model="formData.height" placeholder="请输入身高cm" />
-          </el-form-item>
-          <el-form-item label="体重kg" prop="weight">
-            <el-input v-model="formData.weight" placeholder="请输入体重kg" />
-          </el-form-item>
-
           <el-form-item label="饮酒情况" prop="drinking">
             <el-select v-model="formData.drinking" placeholder="请选择饮酒情况">
               <el-option label="从不" value="从不" />
@@ -76,8 +60,17 @@
               <el-option label="经常" value="经常" />
             </el-select>
           </el-form-item>
+          <el-form-item label="腰围cm" prop="waist">
+            <el-input v-model="formData.waist" placeholder="请输入腰围cm" />
+          </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="身高cm" prop="height">
+            <el-input v-model="formData.height" placeholder="请输入身高cm" />
+          </el-form-item>
+          <el-form-item label="体重kg" prop="weight">
+            <el-input v-model="formData.weight" placeholder="请输入体重kg" />
+          </el-form-item>
           <el-form-item label="残疾情况" prop="disability">
             <el-select v-model="formData.disability" placeholder="请选择残疾情况">
               <el-option label="无" :value="0" />
@@ -107,7 +100,6 @@
           <el-form-item v-if="formData.exposure === 1" label="暴露史描述" prop="exposuredesc">
             <el-input v-model="formData.exposuredesc" placeholder="请输入暴露史描述" />
           </el-form-item>
-
           <el-form-item label="疾病史" prop="diseasehistory">
             <el-select v-model="formData.diseasehistory" placeholder="请选择疾病史">
               <el-option label="无" :value="0" />
@@ -147,32 +139,6 @@
           <el-form-item v-if="formData.transfusionhistory === 1" label="输血史描述" prop="transfusionhistorydesc">
             <el-input v-model="formData.transfusionhistorydesc" placeholder="请输入输血史描述" />
           </el-form-item>
-
-          <el-form-item label="创建时间" prop="createtime">
-            <el-date-picker
-              v-model="formData.createtime"
-              type="date"
-              value-format="x"
-              placeholder="选择创建时间"
-            />
-          </el-form-item>
-          <el-form-item label="更新时间" prop="updatetime">
-            <el-date-picker
-              v-model="formData.updatetime"
-              type="date"
-              value-format="x"
-              placeholder="选择更新时间"
-            />
-          </el-form-item>
-          <el-form-item label="创建人" prop="createby">
-            <el-input v-model="formData.createby" placeholder="请输入创建人" />
-          </el-form-item>
-          <el-form-item label="更新人" prop="updateby">
-            <el-input v-model="formData.updateby" placeholder="请输入更新人" />
-          </el-form-item>
-          <el-form-item label="腰围cm" prop="waist">
-            <el-input v-model="formData.waist" placeholder="请输入腰围cm" />
-          </el-form-item>
           <el-form-item label="臀围cm" prop="hip">
             <el-input v-model="formData.hip" placeholder="请输入臀围cm" />
           </el-form-item>
@@ -199,6 +165,7 @@ interface CascaderOption {
   label: string
   children?: CascaderOption[]
 }
+import dayjs from 'dayjs'
 
 /** 人员档案 表单 */
 defineOptions({ name: 'PersonArchiveForm' })
@@ -284,16 +251,16 @@ const formData = ref<{
   updateby: undefined,
 })
 const formRules = reactive({
-  userid: [{ required: true, message: '人员表ID不能为空', trigger: 'blur' }],
-  orgid: [{ required: true, message: '机构ID不能为空', trigger: 'blur' }],
-  orgname: [{ required: true, message: '机构名称不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+  idcard: [{ required: true, message: '身份证号不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
 const selectedOptions = ref<string[]>([]) // 添加级联选择器的值
 const options = ref<CascaderOption[]>(regionData as unknown as CascaderOption[])
-
+const userData = ref()
 /** 处理地址变化 */
 const handleAddressChange = (value: any) => {
   if (value && value.length === 3) {
@@ -311,7 +278,8 @@ watch(() => formData.value.address, (newValue) => {
 })
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, id?: number, userProfile?: any) => {
+  userData.value = userProfile
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
@@ -320,7 +288,7 @@ const open = async (type: string, id?: number) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await PersonArchiveApi.getPersonArchive(id)
+      formData.value = await PersonArchiveApi.getPersonArchiveByUserid(id)
       // 处理地址数据
       if (formData.value.address) {
         const addressParts = formData.value.address.split('/')
@@ -354,9 +322,15 @@ const submitForm = async () => {
   try {
     const data = formData.value as unknown as PersonArchiveVO
     if (formType.value === 'create') {
+      data.orgid = userData.value.dept.id
+      data.orgname = userData.value.nickname
+      data.createtime = dayjs().format('YYYY-MM-DD HH:mm:ss')
       await PersonArchiveApi.createPersonArchive(data)
       message.success(t('common.createSuccess'))
     } else {
+      data.orgid = userData.value.dept.id
+      data.orgname = userData.value.nickname
+      data.updatetime = dayjs().format('YYYY-MM-DD HH:mm:ss')
       await PersonArchiveApi.updatePersonArchive(data)
       message.success(t('common.updateSuccess'))
     }

src/views/personarchive/index.vue

@@ -1,40 +1,25 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
       <el-form-item label="姓名" prop="name">
         <el-input
-          v-model="queryParams.name"
+v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter="handleQuery"
-          placeholder="请输入姓名"
+          class="!w-240px" />
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
       </el-form-item>
       <el-form-item label="身份证号" prop="idcard">
         <el-input
-          v-model="queryParams.idcard"
+v-model="queryParams.idcard" placeholder="请输入身份证号" clearable @keyup.enter="handleQuery"
-          placeholder="请输入身份证号"
+          class="!w-240px" />
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="handleQuery">
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
-        <el-button
+        </el-button>
-          type="success"
+        <el-button @click="resetQuery">
-          plain
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
-          @click="handleExport"
+        </el-button>
-          :loading="exportLoading" 
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading">
-        >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
       </el-form-item>
@@ -43,52 +28,58 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :stripe="true">
+      <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column label="性别" align="center" prop="gender" >
+      <el-table-column label="性别" align="center" prop="gender">
         <template #default="scope">
           <el-tag v-if="scope.row.gender === 1" type="success">男</el-tag>
           <el-tag v-else type="danger">女</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="身份证号" align="center" prop="idcard" />
-      <el-table-column label="年龄" align="center" prop="age" />
+      <el-table-column label="血型" align="center" prop="bloodtype">
-      <el-table-column label="血型" align="center" prop="bloodtype" >
         <template #default="scope">
           <el-tag v-if="scope.row.bloodtype === 'A'" type="success">A</el-tag>
           <el-tag v-else-if="scope.row.bloodtype === 'B'" type="danger">B</el-tag>
           <el-tag v-else-if="scope.row.bloodtype === 'AB'" type="warning">AB</el-tag>
-          <el-tag v-else type="info">O</el-tag>
+          <el-tag v-else-if="scope.row.bloodtype === 'O'" type="info">O</el-tag>
+          <el-tag v-else type="info">其他</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="联系电话" align="center" prop="phone" />
-      <el-table-column label="户籍住址" align="center" prop="address" />
+      <el-table-column label="户籍住址" align="center" prop="address" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" min-width="120px">
+      <el-table-column label="操作" align="center" width="160">
         <template #default="scope">
-          <el-button
+          <div class="flex items-center justify-center">
-            link
+            <el-button type="primary" link @click="openForm('update', scope.row.id)">
-            type="primary"
+              详情
-            @click="openForm('update', scope.row.id)"
+            </el-button>
-          >
+            <el-dropdown @command="(command) => handleCommand(command, scope.row)">
-            详情
+              <el-button type="primary" link>
-          </el-button>
+                <Icon icon="ep:d-arrow-right" /> 更多
-          <el-button
+              </el-button>
-            link
+              <template #dropdown>
-            type="danger"
+                <el-dropdown-menu>
-            @click="handleDelete(scope.row.id)"
+                  <el-dropdown-item command="handleCreate">
-          >
+                    <Icon icon="ep:plus" />创建档案
-            删除
+                  </el-dropdown-item>
-          </el-button>
+                  <el-dropdown-item command="handleDelete">
+                    <el-button type="danger" link>
+                      <Icon icon="ep:delete" />删除
+                    </el-button>
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
+          </div>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
     <Pagination
-      :total="total"
+:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNo"
+      @pagination="getList" />
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -101,6 +92,7 @@ import download from '@/utils/download'
 import { PersonArchiveApi, PersonArchiveVO } from '@/api/personarchive'
 import PersonArchiveForm from './PersonArchiveForm.vue'
 import { getUserProfile } from '@/api/system/user/profile'
+import { PersonApi, PersonVO } from '@/api/person'
 
 /** 人员档案 列表 */
 defineOptions({ name: 'PersonArchive' })
@@ -157,9 +149,9 @@ const getList = async () => {
   loading.value = true
   try {
     //首先获取用户信息
-    const userProfile = await getUserProfile()
+    userProfile.value = await getUserProfile()
-    queryParams.orgid = userProfile.dept.id
+    queryParams.orgid = userProfile.value.dept.id
-    const data = await PersonArchiveApi.getPersonArchivePage(queryParams)
+    const data = await PersonApi.getPersonPage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -181,8 +173,19 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
+const openForm = async (type: string, id?: number) => {
-  formRef.value.open(type, id)
+  if (type == 'update') {
+    const res = await PersonArchiveApi.getPersonArchiveByUserid(id)
+    if (!res) {
+      message.error('该人员没有档案')
+      return
+    }
+    else{
+      formRef.value.open(type, id, userProfile.value)
+    }
+  } else {
+    formRef.value.open(type, id, userProfile.value)
+  }
 }
 
 /** 删除按钮操作 */
@@ -191,11 +194,11 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await PersonArchiveApi.deletePersonArchive(id)
+    await PersonArchiveApi.deletePersonArchiveByUserid(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 导出按钮操作 */
@@ -213,6 +216,31 @@ const handleExport = async () => {
   }
 }
 
+/** 操作分发 */
+const handleCommand = async (command: string, row: PersonArchiveVO) => {
+  switch (command) {
+    case 'handleCreate':
+      if(row.id){
+        const res = await PersonArchiveApi.getPersonArchiveByUserid(row.id)
+        if(res){
+          message.error('该人员档案已存在')
+          return
+        }
+        else{
+          openForm('create')
+        }
+      }else{
+        openForm('create')
+      }
+      break
+    case 'handleDelete':
+      handleDelete(row.id)
+      break
+    default:
+      break
+  }
+}
+
 /** 初始化 **/
 onMounted(() => {
   getList()