diff --git a/src/api/system/org/index.ts b/src/api/system/org/index.ts index c609472a..d62b84bc 100644 --- a/src/api/system/org/index.ts +++ b/src/api/system/org/index.ts @@ -16,6 +16,7 @@ export interface OrgVO { orgLogoUrl: string // 机构logo的URL dcmprefix:string//机构dcm前缀 dcmurl:string//dcm地址 + enableCloudDicom:string //是否启用云胶片 } // 机构管理 API diff --git a/src/api/ultrasoniccom/index.ts b/src/api/ultrasoniccom/index.ts index f3251c62..9c173e38 100644 --- a/src/api/ultrasoniccom/index.ts +++ b/src/api/ultrasoniccom/index.ts @@ -44,6 +44,10 @@ export const ultrasoniccomApi = { insimagescreenshot: async (data:insimagescreenshotVO) => { return await request.post({ url: `/ultrasoniccom/ultrasonic/insimagescreenshot`,data}) } , + ftpimage: async (data:insimagescreenshotVO) => { + return await request.post({ url: `/ultrasoniccom/ultrasonic/ftpimage`,data}) + } , + // 查询图片表视频数据 getImageVideo: async (regID:string) => { return await request.get({ url: `/ultrasoniccom/ultrasonic/GetImageVideo?regID=${regID}` }) diff --git a/src/views/system/org/OrgForm.vue b/src/views/system/org/OrgForm.vue index 4eaeb32b..1c372814 100644 --- a/src/views/system/org/OrgForm.vue +++ b/src/views/system/org/OrgForm.vue @@ -7,7 +7,7 @@ label-width="100px" v-loading="formLoading" > - + @@ -29,7 +29,7 @@ - + - + @@ -55,10 +55,25 @@ + + + + + + @@ -89,15 +104,15 @@ const formData = ref({ createDate: undefined, highLevelOrgName: undefined, orgLogoUrl: undefined, - dcmprefix:undefined, - dcmurl:undefined + dcmprefix: undefined, + dcmurl: undefined, + enableCloudDicom: '0' }) const formRules = reactive({ - orgID: [{ required: true, message: '请输入机构编码', trigger: 'blur' }], orgName: [{ required: true, message: '请输入机构名称', trigger: 'blur' }], contactTel: [{ required: true, message: '请输入机构联系人', trigger: 'blur' }], - contactPerson: [{ required: true, message: '请输入机构联系电话', trigger: 'blur' }], + contactPerson: [{ required: true, message: '请输入机构联系电话', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref @@ -112,6 +127,7 @@ const open = async (type: string, id?: number) => { formLoading.value = true try { formData.value = await OrgApi.getOrg(id) + console.log(formData.value.enableCloudDicom) } finally { formLoading.value = false } @@ -128,21 +144,16 @@ const submitForm = async () => { formLoading.value = true const re = ref() try { - const data = formData.value as unknown as OrgVO - console.log(data.highLevelOrgID) + console.log(data.enableCloudDicom) if (formType.value === 'create') { - re.value= await OrgApi.createOrg(data) - if(re.value==='机构ID已经存在') - { + re.value = await OrgApi.createOrg(data) + if (re.value === '机构ID已经存在') { message.error(re.value) return - } - else - { + } else { message.success(t('common.createSuccess')) } - } else { await OrgApi.updateOrg(data) message.success(t('common.updateSuccess')) @@ -155,10 +166,9 @@ const submitForm = async () => { } } // 清空上级机构 -const empty=()=> -{ - formData.value.highLevelOrgID=undefined - formData.value.highLevelOrgName=undefined +const empty = () => { + formData.value.highLevelOrgID = undefined + formData.value.highLevelOrgName = undefined } /** 重置表单 */ const resetForm = () => { @@ -175,9 +185,10 @@ const resetForm = () => { createDate: undefined, highLevelOrgName: undefined, orgLogoUrl: undefined, - dcmprefix:undefined, - dcmurl:undefined + dcmprefix: undefined, + dcmurl: undefined, + enableCloudDicom: '0' } formRef.value?.resetFields() } - \ No newline at end of file + diff --git a/src/views/tblist/patientexamlist/index.vue b/src/views/tblist/patientexamlist/index.vue index 4186cb1b..c34b6f37 100644 --- a/src/views/tblist/patientexamlist/index.vue +++ b/src/views/tblist/patientexamlist/index.vue @@ -265,30 +265,33 @@ style="color: rgb(56, 119, 246)" size="small" type="primary" - @click="getuporghiorgid(scope.row.id, scope.row.orgId, scope.row.reportstatus)" + @click.stop="getuporghiorgid(scope.row.id, scope.row.orgId, scope.row.reportstatus)" v-hasPermi="['tblist:patientexamlist:query']" > 申请 - + - 调图 + 报告 @@ -524,7 +527,6 @@ const getuporghiorgid = async (id: number, orgId: string, reportstatus: string) // 打开本地exe 通过注册表 const openexe= (id: number, orgid: string, regid: string, examId: string)=> { -console.log(orgid) // 先查询数据 try { const url = `f1://${examId+','+orgid+','+regid}`;