From 377ea7fb2bdb82bc8dd09cdc1a725ca1bf9f3a81 Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Fri, 12 Jul 2024 18:08:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E5=BA=9F=E5=92=8C?= =?UTF-8?q?=E5=88=86=E6=A3=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/applyregistration/applyform/index.ts | 28 +++ src/api/tblist/patientexamlist/index.ts | 2 +- .../applyform/ApplyformForm.vue | 198 ++++++------------ .../applyregistration/applyform/index.vue | 26 ++- 4 files changed, 113 insertions(+), 141 deletions(-) diff --git a/src/api/applyregistration/applyform/index.ts b/src/api/applyregistration/applyform/index.ts index 640bd3b6..868a1b9f 100644 --- a/src/api/applyregistration/applyform/index.ts +++ b/src/api/applyregistration/applyform/index.ts @@ -27,6 +27,13 @@ export interface ApplyformVO { departmentCode:string //执行科室代码 } +//分检操作使用 +export interface UPFJApplyformVO { + + id: string // 主键 + device: string // 设备内容 +} + // 申请登记记录 API export const ApplyformApi = { // 查询申请登记记录分页 @@ -58,4 +65,25 @@ export const ApplyformApi = { exportApplyform: async (params) => { return await request.download({ url: `/applyregistration/applyform/export-excel`, params }) }, + + // 获取设备表记录 + getDevicelist: async (orgId: string) => { + return await request.get({ url: `/applyregistration/applyform/getdevice?orgId=` + orgId }) + }, + + // 更新分检相关内容 + updateFJApplyform: async (data:UPFJApplyformVO) => { + return await request.post({ url: `/applyregistration/applyform/updateapplyform`,data }) + }, + + // 删除申请登记记录 + cancelApplyform: async (id: number) => { + return await request.delete({ url: `/applyregistration/applyform/cancel?id=` + id }) + }, + + // 获取执行科室列表 + getapplfmDeptlist: async (orgId: string) => { + return await request.get({ url: `/applyregistration/applyform/applfmdeptlist?orgId=` + orgId }) + }, + } diff --git a/src/api/tblist/patientexamlist/index.ts b/src/api/tblist/patientexamlist/index.ts index efeed4f3..7f64472b 100644 --- a/src/api/tblist/patientexamlist/index.ts +++ b/src/api/tblist/patientexamlist/index.ts @@ -61,6 +61,6 @@ export const PatientexamlistApi = { getuporghiid: async (id: number,orgId:String) => { - return await request.download({ url: `/tblist/patientexamlist/UPDATEHigOrg?id=${id}&&orgId=${orgId}` }) + return await request.get({ url: `/tblist/patientexamlist/UPDATEHigOrg?id=${id}&&orgId=${orgId}` }) }, } diff --git a/src/views/applyregistration/applyform/ApplyformForm.vue b/src/views/applyregistration/applyform/ApplyformForm.vue index 7392d2d9..2270be37 100644 --- a/src/views/applyregistration/applyform/ApplyformForm.vue +++ b/src/views/applyregistration/applyform/ApplyformForm.vue @@ -2,99 +2,25 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 请选择字典生成 - - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/src/views/applyregistration/applyform/index.vue b/src/views/applyregistration/applyform/index.vue index d5911229..42f0766d 100644 --- a/src/views/applyregistration/applyform/index.vue +++ b/src/views/applyregistration/applyform/index.vue @@ -129,7 +129,7 @@ 搜索 重置 - 新增 - + --> 分检 @@ -330,18 +330,26 @@ const resetQuery = () => { /** 添加/修改操作 */ const formRef = ref() -const openForm = (type: string, id?: number) => { - formRef.value.open(type, id) +const openForm = (type: string,pname:string ,orgid: string,ID:number,status:string) => { + if(status=="未分检") + { + formRef.value.open(type, orgid,pname,ID) + } + else + { + message.warning("只有未分检才可以进行分检操作") + } + } -/** 删除按钮操作 */ +/** 作废按钮操作 */ const handleDelete = async (id: number) => { try { // 删除的二次确认 - await message.delConfirm() + await message.delConfirm("是否作废选择内容") // 发起删除 - await ApplyformApi.deleteApplyform(id) - message.success(t('common.delSuccess')) + await ApplyformApi.cancelApplyform(id) + message.success("作废成功") // 刷新列表 await getList() } catch {}