From 93a6f70b8eb631c6c1faab8f9e8a734669e49e6e Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 09 四月 2025 13:42:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb

---
 src/views/doctor/pacsCheck/index.vue |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/views/doctor/pacsCheck/index.vue b/src/views/doctor/pacsCheck/index.vue
index 6c05a19..2d370f4 100644
--- a/src/views/doctor/pacsCheck/index.vue
+++ b/src/views/doctor/pacsCheck/index.vue
@@ -6,6 +6,7 @@
       size="small"
       :inline="true"
       label-width="68px"
+      @submit.native.prevent
     >
       <el-form-item label="浣撴鍙�" prop="reportDoctorCode">
         <el-input
@@ -17,7 +18,7 @@
           style="width: 170px"
         />
       </el-form-item>
-     <!--  <el-form-item label="濮撳悕" prop="name">
+      <!--  <el-form-item label="濮撳悕" prop="name">
         <el-input
           v-model="queryParams.name"
           placeholder="璇疯緭鍏ュ鍚�"
@@ -88,7 +89,7 @@
       :data="exaLists"
       v-loading="loading"
       border
-      max-height="350"
+      height="350"
       @current-change="handleCurrentChange"
       @selection-change="handleSelectionChange"
       :row-class-name="tableRowClassName"
@@ -99,9 +100,8 @@
         align="center"
         label="閫夋嫨"
         width="40"
-      
       >
-      <!--   :selectable="isSelectable" -->
+        <!--   :selectable="isSelectable" -->
       </el-table-column>
 
       <el-table-column label="濮撳悕" align="center" prop="name" width="80px" />
@@ -131,6 +131,7 @@
         align="center"
         prop="examinationDate"
         width="150px"
+        :formatter="formatDate"
       />
 
       <el-table-column label="闂ㄨ瘖鍙�" align="center" prop="mzh" width="140px" />
@@ -330,23 +331,32 @@
     });
   },
   methods: {
-   
-    handleDateChange(val){
+    handleDateChange(val) {
       if (val && val.length === 2) {
         this.queryParams.start = val[0]; // 璁剧疆寮�濮嬫椂闂�
-        this.queryParams.end = val[1];   // 璁剧疆缁撴潫鏃堕棿
+        this.queryParams.end = val[1]; // 璁剧疆缁撴潫鏃堕棿
       } else {
         this.queryParams.start = null;
         this.queryParams.end = null;
       }
-      console.log('Query Params:', this.queryParams);
-
+      console.log("Query Params:", this.queryParams);
     },
-    isSelectable(row) {
-      return !!row.mzh;
-    },
+    // isSelectable(row) {
+    //   return !!row.mzh;
+    // },
     tableRowClassName({ row }) {
       return !row.mzh ? "row-disabled" : "";
+    },
+    formatDate(row) {
+      if (!row.examinationDate) return "";
+
+      // 浣跨敤 moment 瑙f瀽鎸囧畾鏍煎紡鐨勬棩鏈熷瓧绗︿覆
+      const date = moment(row.examinationDate, "MM DD YYYY hh:mmA");
+
+      if (!date.isValid()) return "鏃犳晥鏃ユ湡";
+
+      // 鏍煎紡鍖栦负鎵�闇�鏍煎紡
+      return date.format("YYYY-MM-DD HH:mm");
     },
 
     handleSelectionChange(val) {
@@ -368,7 +378,17 @@
 
         this.selectedFirstTable = selectedRow;
         console.log("褰撳墠閫変腑鐨勮鏁版嵁:", this.selectedFirstTable);
-        this.fetchRightTableData(selectedRow);
+        const code = this.queryParams.tjNum;
+        if (!code) {
+          this.$message.warning("浣撴鍙蜂笉鑳戒负绌�!");
+          return; // 鐩存帴杩斿洖锛岄伩鍏嶇户缁墽琛岃姹�
+        }
+        this.loading = true;
+        getRightList(code).then((response) => {
+          this.checkList = response.data;
+          this.loading = false;
+        });
+        // this.fetchRightTableData(selectedRow);
       } else {
         this.selectedFirstTable = null;
         this.checkList = [];
@@ -414,7 +434,7 @@
           if (res.code == 200) {
             this.loading = false;
             this.exaLists = res.data;
-            this.code = this.exaLists.mzh;
+            // this.code = this.exaLists.mzh;
           }
         })
         .catch((error) => {
@@ -483,7 +503,7 @@
           this.clearTimeSet = null;
           this.$modal.closeLoading();
           // this.$modal.error("鎿嶄綔澶辫触锛岃绋嶅悗閲嶈瘯");
-        })
+        });
     },
   },
 };

--
Gitblit v1.8.0