From b0ada463a6e028073a315aa5bf7c3e0182995b98 Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Thu, 22 Aug 2024 20:27:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E5=A3=B0=20?=
 =?UTF-8?q?=E5=BD=B1=E5=83=8F=20=E6=9C=BA=E6=9E=84=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=92=8C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/org/OrgForm.vue              | 23 +++++++++-----
 src/views/tblist/patientexamlist/index.vue    | 31 +++++++++++++------
 .../patientexamlistultrasonic/index.vue       | 30 ++++++++++++------
 3 files changed, 58 insertions(+), 26 deletions(-)

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 @@
       <el-form-item label="报告上显示名称" prop="reportName" label-width="130px">
         <el-input v-model="formData.reportName" placeholder="请输入报告上显示名称" />
       </el-form-item>
-      <!-- <el-form-item label="上级判读医院机构ID" prop="highLevelOrgID">
-        <el-input v-model="formData.highLevelOrgID" placeholder="请输入上级判读医院机构ID" />
-      </el-form-item> -->
+      <el-form-item label="上级机构名称" prop="highLevelOrgName" label-width="130px">
+        <el-input v-model="formData.highLevelOrgName" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="上级机构编码" prop="highLevelOrgID" label-width="130px">
+        <el-input v-model="formData.highLevelOrgID" :disabled="true"/>
+      </el-form-item>
       <!-- <el-form-item label="能收到微信消息提醒的微信列表,格式为：wxopenid1,wxopenid2,wxopenid3" prop="wxOpenidlist">
         <el-input v-model="formData.wxOpenidlist" placeholder="请输入能收到微信消息提醒的微信列表,格式为：wxopenid1,wxopenid2,wxopenid3" />
       </el-form-item> -->
@@ -42,15 +45,14 @@
           placeholder="选择创建时间：年月日时分秒"
         />
       </el-form-item> -->
-      <!-- <el-form-item label="上级机构的机构名称" prop="highLevelOrgName">
-        <el-input v-model="formData.highLevelOrgName" placeholder="请输入上级机构的机构名称" />
-      </el-form-item> -->
+  
       <el-form-item label="机构logo的URL" prop="orgLogoUrl" label-width="130px">
         <el-input v-model="formData.orgLogoUrl" placeholder="请输入机构logo的URL" />
       </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="submitForm"  :disabled="formLoading" style="background-color: rgb(56, 119, 246); font-size: 14; color: rgb(255, 255, 255)">确 定</el-button>
+      <el-button @click="empty" style="background-color: rgb(56, 119, 246); font-size: 14; color: rgb(255, 255, 255)">清空上级机构</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
@@ -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' }"
     >
       <el-table-column type="index" width="50px" />
-      <el-table-column label="" width="100px">
+      <el-table-column label="" width="100px" v-if="false">
         <template #default="scope">
           <el-image :src="scope.row.thumbnailImgUrl" />
         </template>
       </el-table-column>
       <el-table-column label="主键" align="center" prop="id" v-if="false" />
+      <el-table-column label="检查项目名称" align="center" prop="examItemName" width="180px" />
       <el-table-column label="检查单号" align="center" prop="examId" width="250px" />
       <el-table-column label="患者姓名" align="center" prop="pname" width="200px" />
       <el-table-column label="性别" align="center" prop="gender" />
@@ -174,13 +175,23 @@
       />
       <el-table-column label="设备类型" align="center" prop="deviceType" />
       <el-table-column label="序列/数量" align="center" prop="seDc" width="100px" />
-      <el-table-column label="检查项目名称" align="center" prop="examItemName" width="180px" />
 
       <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>
-          </el-tag>
+          <!-- 使用Flexbox布局将内容垂直排列 -->
+          <div style="display: flex; flex-direction: column; align-items: center">
+            <div>
+              <el-tag :type="scope.row.reportstatus === '已审核' ? 'danger' : 'success'">
+                <span style="">{{ scope.row.reportstatus }}</span>
+              </el-tag>
+            </div>
+            <!-- 根据highLevelOrgId是否为空判断是否显示"已申请" -->
+            <div v-if="scope.row.highLevelOrgId">
+              <el-tag>
+                <span>已申请</span>
+              </el-tag>
+            </div>
+          </div>
         </template>
       </el-table-column>
 
@@ -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' }"
     >
       <el-table-column type="index" width="50px" />
-      <el-table-column label="" width="100px">
+      <el-table-column label="" width="100px" v-if="false">
         <template #default="scope">
           <el-image :src="scope.row.thumbnailImgUrl" />
         </template>
       </el-table-column>
       <el-table-column label="主键" align="center" prop="id" v-if="false" />
+      <el-table-column label="检查项目名称" align="center" prop="examItemName" width="160px" />
       <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" />
@@ -176,13 +177,24 @@
       />
       <el-table-column label="设备类型" align="center" prop="deviceType" />
       <el-table-column label="序列/数量" align="center" prop="seDc" width="100px" />
-      <el-table-column label="检查项目名称" align="center" prop="examItemName" width="160px" />
+  
 
       <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>
-          </el-tag>
+           <!-- 使用Flexbox布局将内容垂直排列 -->
+           <div style="display: flex; flex-direction: column; align-items: center">
+            <div>
+              <el-tag :type="scope.row.reportstatus === '已审核' ? 'danger' : 'success'">
+                <span style="">{{ scope.row.reportstatus }}</span>
+              </el-tag>
+            </div>
+            <!-- 根据highLevelOrgId是否为空判断是否显示"已申请" -->
+            <div v-if="scope.row.highLevelOrgId">
+              <el-tag>
+                <span>已申请</span>
+              </el-tag>
+            </div>
+          </div>
         </template>
       </el-table-column>
 
@@ -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 {}
 }