From 942697763a76be6f6e9402d34015c8a94336406c Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 24 六月 2025 16:37:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb

---
 src/views/doctor/checkAll/index.vue |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 2cd77aa..8927f08 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -92,7 +92,8 @@
         </el-table-column>
         <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" :show-overflow-tooltip="true" width="110px" />
         <el-table-column label="鐢佃瘽" align="center" prop="cusPhone" :show-overflow-tooltip="true" width="130px" />
-        <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="shsj" :show-overflow-tooltip="true" width="180px" />
+        <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="shsj" :show-overflow-tooltip="true" width="180px" v-if="tjStatus == 1" />
+        <el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime" :show-overflow-tooltip="true" width="180px" v-if="tjStatus == 0" />
         <!-- <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" :show-overflow-tooltip="true" width="160px" /> -->
         <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" :show-overflow-tooltip="true" width="160px" />
         <el-table-column label="鐘舵��" align="center" prop="tjStatus" :show-overflow-tooltip="true" width="120px"
@@ -144,10 +145,8 @@
             <tr style="border: 1px solid #dfe6ec; border-collapse: collapse; height: 36px;">
               <td style="border: 1px solid #dfe6ec; border-collapse: collapse">濮撳悕锛�</td>
               <td style="border: 1px solid #dfe6ec; border-collapse: collapse">{{ tableAll.cusName }}</td>
-              <td style="border: 1px solid #dfe6ec; border-collapse: collapse">鎬у埆锛�</td>
-              <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
-                {{ tableAll.cusSex == 0 ? "鐢�" : tableAll.cusSex == 1 ? "濂�" : "鏈煡" }}
-              </td>
+              <td style="border: 1px solid #dfe6ec; border-collapse: collapse">鎬у埆锛� {{ tableAll.cusSex == 0 ? "鐢�" : tableAll.cusSex == 1 ? "濂�" : "鏈煡" }}</td>
+              <td style="border: 1px solid #dfe6ec; border-collapse: collapse">骞撮緞锛歿{ tableAll.age }}</td>
             </tr>
             <tr style="border: 1px solid #dfe6ec; border-collapse: collapse; height: 36px;">
               <td style="border: 1px solid #dfe6ec; border-collapse: collapse">浣撴鍗曞彿锛�</td>
@@ -415,6 +414,7 @@
                         </template>
                       </el-table-column>
                       <el-table-column align="center" prop="proResult" label="妫�娴嬬粨鏋�" width="403"></el-table-column>
+                      
                     </el-table>
                   </template>
                 </div>
@@ -437,6 +437,11 @@
                       </template>
                     </el-table-column>
                     <el-table-column label="妫�鏌ユ椂闂�" align="center" prop="bcupdateTime" width="160" />
+                     <el-table-column label="鎿嶄綔" align="center" width="130px">
+                      <template slot-scope="scope">
+                        <el-button type="primary" size="mini" @click="huifu" v-if="scope.row.type == '2'">鎭㈠</el-button>
+                      </template>
+                    </el-table-column>
                   </el-table>
                 </div>
               </template>
@@ -826,7 +831,7 @@
 import { getCompany, queryCompany } from "@/api/team/tuanti";
 import { reportHistory, yichang, shanchu } from "@/api/doctor/check";
 import { getPdf, revoke } from "@/api/hosp/order";
-import { cSWebGetPro } from "@/api/doctor/examination";
+import { cSWebGetPro,huifu, } from "@/api/doctor/examination";
 import ViewPdf from "@/components/ViewPdf";
 import Historicalreport from "@/components/Historicalreport";
 import { getDicts } from "@/api/system/dict/data";
@@ -1866,6 +1871,17 @@
       this.submitForm();
     },
 
+    
+    huifu(row){
+      const tjNUm = this.tjNumber;
+      const proId = row.proId;
+        huifu(tjNUm, proId).then((res) => {
+          if (res.code == 200) {
+           this.xiangmuqingkuang()
+          }
+        });
+    },
+
     changRed({ row }) {
       if (row.ycbz != "" && row.ycbz != null) {
         return {

--
Gitblit v1.8.0