diff --git a/src/views/system/org/OrgForm.vue b/src/views/system/org/OrgForm.vue index e5193159..42d67501 100644 --- a/src/views/system/org/OrgForm.vue +++ b/src/views/system/org/OrgForm.vue @@ -25,9 +25,12 @@ - + + + + + + @@ -42,15 +45,14 @@ placeholder="选择创建时间:年月日时分秒" /> --> - + 确 定 + 清空上级机构 取 消 @@ -118,7 +120,9 @@ const submitForm = async () => { formLoading.value = true const re = ref() try { + const data = formData.value as unknown as OrgVO + console.log(data.highLevelOrgID) if (formType.value === 'create') { re.value= await OrgApi.createOrg(data) if(re.value==='机构ID已经存在') @@ -142,7 +146,12 @@ const submitForm = async () => { formLoading.value = false } } - +// 清空上级机构 +const empty=()=> +{ + formData.value.highLevelOrgID=undefined + formData.value.highLevelOrgName=undefined +} /** 重置表单 */ const resetForm = () => { formData.value = { diff --git a/src/views/tblist/patientexamlist/index.vue b/src/views/tblist/patientexamlist/index.vue index 5701429b..9b33b6f8 100644 --- a/src/views/tblist/patientexamlist/index.vue +++ b/src/views/tblist/patientexamlist/index.vue @@ -155,12 +155,13 @@ :row-style="{ height: '56px' }" > - + + @@ -174,13 +175,23 @@ /> - - - {{ scope.row.reportstatus }} - + + + + + {{ scope.row.reportstatus }} + + + + + + 已申请 + + + @@ -458,14 +469,14 @@ const openForm = (type: string, id?: number) => { /** 申请后更新上级机构字段*/ const getuporghiorgid = async (id: number, orgId: string, reportstatus: string) => { try { - if (reportstatus == '未申请') { - await message.confirm('是否要进行申请?', '确认提示') - await PatientexamlistApi.getuporghiid(id, orgId) - message.success(t('common.delSuccess')) + await message.confirm('是否要进行申请?', '确认提示') + const data = await PatientexamlistApi.getuporghiid(id, orgId) + if (data == '申请成功') { + message.success('申请成功') // 刷新列表 await getList() } else { - await message.info('只有未申请才可以进行操作') + await message.info(data) } } catch {} } diff --git a/src/views/tblist/patientexamlistultrasonic/index.vue b/src/views/tblist/patientexamlistultrasonic/index.vue index 44d06149..10cb43fd 100644 --- a/src/views/tblist/patientexamlistultrasonic/index.vue +++ b/src/views/tblist/patientexamlistultrasonic/index.vue @@ -157,12 +157,13 @@ :row-style="{ height: '56px' }" > - + + @@ -176,13 +177,24 @@ /> - + - - {{ scope.row.reportstatus }} - + + + + + {{ scope.row.reportstatus }} + + + + + + 已申请 + + + @@ -454,14 +466,14 @@ const openForm = (type: string, id?: number) => { /** 申请后更新上级机构字段*/ const getuporghiorgid = async (id: number, orgId: string, reportstatus: string) => { try { - if (reportstatus == '未申请') { - await message.confirm('是否要进行申请?', '确认提示') - await PatientexamlistApi.getuporghiid(id, orgId) + await message.confirm('是否要进行申请?', '确认提示') + const data= await PatientexamlistApi.getuporghiid(id, orgId) + if (data == '申请成功') { message.success(t('common.delSuccess')) // 刷新列表 await getList() } else { - await message.info('只有未申请才可以进行操作') + await message.info(data) } } catch {} }