From 9281dadf578d1daee93cc9dbfb8b28ab65dcd59e Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Fri, 9 Aug 2024 11:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E5=A3=B0=E3=80=81?=
 =?UTF-8?q?=E5=BD=B1=E5=83=8F=E3=80=81=E7=94=B3=E8=AF=B7=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/applyregistration/applyform/index.vue  | 16 ++++++++--------
 src/views/dicomForm/dicomViewForm.vue            |  2 +-
 src/views/system/org/index.vue                   |  2 +-
 src/views/tblist/patientexamlist/index.vue       | 14 +++++++-------
 .../tblist/patientexamlistultrasonic/index.vue   | 14 +++++++-------
 src/views/ultrasoniccom/ultrasonicForm.vue       | 11 +++++++----
 6 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/views/applyregistration/applyform/index.vue b/src/views/applyregistration/applyform/index.vue
index c35363fb..8fb630d6 100644
--- a/src/views/applyregistration/applyform/index.vue
+++ b/src/views/applyregistration/applyform/index.vue
@@ -172,11 +172,11 @@
     >
       <el-table-column type="selection" width="55" />
       <el-table-column label="主键" align="center" prop="id" v-if="false" />
-      <el-table-column label="登记单号" align="center" prop="regId" width="100px" />
-      <el-table-column label="登记来源" align="center" prop="regSource" width="100px" />
-      <el-table-column label="检查单号" align="center" prop="examId" />
+      <el-table-column label="登记单号" align="center" prop="regId" width="150px" />
+      <el-table-column label="登记来源" align="center" prop="regSource" width="80px" />
+      <el-table-column label="检查单号" align="center" prop="examId" width="150px" />
       <el-table-column label="患者姓名" align="center" prop="pname" width="100px" />
-      <el-table-column label="性别" align="center" prop="gender" width="100px" />
+      <el-table-column label="性别" align="center" prop="gender" width="60px" />
       <el-table-column
         label="出生日期"
         align="center"
@@ -192,10 +192,10 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="检查项目名称" align="center" prop="examItemName" width="140px" />
+      <el-table-column label="检查项目名称" align="center" prop="examItemName" width="130px" />
       <el-table-column label="检查设备ID" align="center" prop="deviceId" v-if="false" />
       <el-table-column label="检查设备" align="center" prop="deviceName" width="130px" />
-      <el-table-column label="联系电话" align="center" prop="contactTel" />
+      <el-table-column label="联系电话" align="center" prop="contactTel"  width="120px"/>
       <el-table-column
         label="登记时间"
         align="center"
@@ -230,7 +230,7 @@
       <el-table-column label="检查项目代码" align="center" prop="examItemCode" v-if="false" />
       <el-table-column label="机构ID" align="center" prop="orgId" v-if="false" />
       <el-table-column label="分检医生" align="center" prop="sortDoctor" width="100px" />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" fixed="right" width="180px">
         <template #default="scope">
           <el-button
             link
@@ -271,7 +271,7 @@
 </template>
 
 <script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { ApplyformApi, ApplyformVO, UPFJApplyformVO } from '@/api/applyregistration/applyform'
 import ApplyformForm from './ApplyformForm.vue'
diff --git a/src/views/dicomForm/dicomViewForm.vue b/src/views/dicomForm/dicomViewForm.vue
index e7d3f085..359b6139 100644
--- a/src/views/dicomForm/dicomViewForm.vue
+++ b/src/views/dicomForm/dicomViewForm.vue
@@ -488,7 +488,7 @@ const newSrc = ref('')
 /** 打开弹窗 */
 const open = async (id: number, orgid: string, regid: string) => {
   resetForm()
-  const Src = `/public/dicom/dicomViewPc1.html?t=${new Date().getTime()}`
+  const Src = `/dicom/dicomViewPc1.html?t=${new Date().getTime()}`
   newSrc.value = Src
 
   console.log('orgid' + orgid)
diff --git a/src/views/system/org/index.vue b/src/views/system/org/index.vue
index 0466c870..825ebe6e 100644
--- a/src/views/system/org/index.vue
+++ b/src/views/system/org/index.vue
@@ -156,7 +156,7 @@
       />
       <el-table-column label="上级机构的机构名称" align="center" prop="highLevelOrgName" />
       <el-table-column label="机构logo的URL" align="center" prop="orgLogoUrl" v-if="false"/>
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" fixed="right" width="350px">
         <template #default="scope">
           <el-button
             link
diff --git a/src/views/tblist/patientexamlist/index.vue b/src/views/tblist/patientexamlist/index.vue
index 1bdcc5dd..680ebf54 100644
--- a/src/views/tblist/patientexamlist/index.vue
+++ b/src/views/tblist/patientexamlist/index.vue
@@ -284,10 +284,10 @@
         </template>
       </el-table-column>
       <el-table-column label="主键" align="center" prop="id" v-if="false" />
-      <el-table-column label="检查ID" align="center" prop="examId" />
+      <el-table-column label="检查单号" align="center" prop="examId" width="140px" />
       <el-table-column label="患者姓名" align="center" prop="pname" />
       <el-table-column label="性别" align="center" prop="gender" />
-      <el-table-column label="出生日期" align="center" prop="birthday" />
+      <el-table-column label="出生日期" align="center" prop="birthday"  v-if="false"/>
       <el-table-column
         label="检查日期"
         align="center"
@@ -296,10 +296,10 @@
         width="180px"
       />
       <el-table-column label="设备类型" align="center" prop="deviceType" />
-      <el-table-column label="Se/Im" align="center" prop="seDc" />
-      <el-table-column label="检查项目名称" align="center" prop="examItemName" />
+      <el-table-column label="Se/Im" align="center" prop="seDc" width="80px"/>
+      <el-table-column label="检查项目名称" align="center" prop="examItemName"  width="180px"/>
 
-      <el-table-column label="报告状态" align="center" prop="reportstatus">
+      <el-table-column label="报告状态" align="center" prop="reportstatus" width="100px">
         <template #default="scope">
           <el-tag :type="scope.row.reportstatus === '已审核' ? 'danger' : 'success'">
             <span style="">{{ scope.row.reportstatus }}</span>
@@ -321,7 +321,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="机构名称" align="center" prop="orgName" />
+      <el-table-column label="机构名称" align="center" prop="orgName" width="180px"/>
       <el-table-column label="机构ID" align="center" prop="orgId" v-if="false" />
       <el-table-column
         label="上级判读机构id列表：orgid1,orgid2,orgid3"
@@ -365,7 +365,7 @@
         width="180px"
         v-if="false"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" fixed="right">
         <template #default="scope">
           <el-button
             size="small"
diff --git a/src/views/tblist/patientexamlistultrasonic/index.vue b/src/views/tblist/patientexamlistultrasonic/index.vue
index ace8d5a8..a11f8dc6 100644
--- a/src/views/tblist/patientexamlistultrasonic/index.vue
+++ b/src/views/tblist/patientexamlistultrasonic/index.vue
@@ -274,10 +274,10 @@
             </template>
       </el-table-column>
       <el-table-column label="主键" align="center" prop="id" v-if="false"/>
-      <el-table-column label="检查ID" align="center" prop="examId" />
+      <el-table-column label="检查单号" align="center" prop="examId"  width="140px"/>
       <el-table-column label="患者姓名" align="center" prop="pname" />
       <el-table-column label="性别" align="center" prop="gender" />
-      <el-table-column label="出生日期" align="center" prop="birthday" />
+      <el-table-column label="出生日期" align="center" prop="birthday"  v-if="false"/>
       <el-table-column
         label="检查日期"
         align="center"
@@ -286,10 +286,10 @@
         width="180px"
       />
       <el-table-column label="设备类型" align="center" prop="deviceType" />
-      <el-table-column label="Se/Im" align="center" prop="seDc" />
-      <el-table-column label="检查项目名称" align="center" prop="examItemName" />
+      <el-table-column label="Se/Im" align="center" prop="seDc" width="80px" />
+      <el-table-column label="检查项目名称" align="center" prop="examItemName" width="160px" />
 
-      <el-table-column label="报告状态" align="center" prop="reportstatus" >
+      <el-table-column label="报告状态" align="center" prop="reportstatus" width="100px">
       <template #default="scope">
       <el-tag :type="scope.row.reportstatus === '已审核' ? 'danger':'success'">
         <span style="">{{ scope.row.reportstatus }}</span>
@@ -311,7 +311,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="机构名称" align="center" prop="orgName" />
+      <el-table-column label="机构名称" align="center" prop="orgName"  width="180px"/>
       <el-table-column label="机构ID" align="center" prop="orgId"  v-if="false"/>
       <el-table-column label="上级判读机构id列表：orgid1,orgid2,orgid3" align="center" prop="highLevelOrgId" v-if="false" />
       <el-table-column
@@ -350,7 +350,7 @@
         width="180px"
         v-if="false"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" fixed="right">
         <template #default="scope">
           <el-button
            size="small"
diff --git a/src/views/ultrasoniccom/ultrasonicForm.vue b/src/views/ultrasoniccom/ultrasonicForm.vue
index 211b3773..a1fc2da7 100644
--- a/src/views/ultrasoniccom/ultrasonicForm.vue
+++ b/src/views/ultrasoniccom/ultrasonicForm.vue
@@ -69,7 +69,7 @@
         </el-tabs>
       </div>
       <div class="my-middle">
-        <!--用户信息区域-->
+        <!--用户信息区域    "-->
 
         <el-tabs
           v-model="activeName"
@@ -737,10 +737,11 @@ const upimagedeleteor = async () => {
 }
 //菜单切换
 const handleTabChange = async () => {
+
   if (activeName.value == 'report') {
     if (applyFormVO.value.reportstatus == '已分析' || applyFormVO.value.reportstatus == '已审核') {
       showDiv()
-      if (reportimages.value.length === 0) {
+      if (reportimages.value.length ==0 ) {
         const imageslist = await ultrasoniccomApi.getimageslist(orgId.value, regId.value, '1')
         console.log(imageslist)
         reportimages.value = imageslist
@@ -750,6 +751,8 @@ const handleTabChange = async () => {
     }
   }
 }
+
+
 //隐藏报告
 function hideDiv() {
   var div = document.getElementById('printMe')
@@ -885,7 +888,7 @@ const open = async (id: number, orgid: string, regid: string) => {
   formLoading.value = true
   try {
     //通用
-    const dd = await ultrasoniccomApi.getreporttemplatelist('', String(fordevicemValue.value), '')
+    const dd = await ultrasoniccomApi.getreporttemplatelist(orgid, String(fordevicemValue.value), '')
     treeData.value = dd
     console.log('返回值1' + dd)
     console.log('返回值2' + treeData.value)
@@ -901,7 +904,7 @@ const open = async (id: number, orgid: string, regid: string) => {
 
     //获取登录人信息
     getlogininfo()
-  
+    
   } finally {
     formLoading.value = false
   }