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 | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/src/views/doctor/pacsCheck/index.vue b/src/views/doctor/pacsCheck/index.vue
index daf5306..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,8 +100,8 @@
align="center"
label="閫夋嫨"
width="40"
- :selectable="isSelectable"
>
+ <!-- :selectable="isSelectable" -->
</el-table-column>
<el-table-column label="濮撳悕" align="center" prop="name" width="80px" />
@@ -130,6 +131,7 @@
align="center"
prop="examinationDate"
width="150px"
+ :formatter="formatDate"
/>
<el-table-column label="闂ㄨ瘖鍙�" align="center" prop="mzh" width="140px" />
@@ -329,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 瑙ｆ瀽鎸囧畾鏍煎紡鐨勬棩鏈熷瓧绗︿覆
+ const date = moment(row.examinationDate, "MM DD YYYY hh:mmA");
+
+ if (!date.isValid()) return "鏃犳晥鏃ユ湡";
+
+ // 鏍煎紡鍖栦负鎵�闇�鏍煎紡
+ return date.format("YYYY-MM-DD HH:mm");
},
handleSelectionChange(val) {
@@ -354,11 +365,11 @@
let del_row = val.shift();
this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
- console.log(val, 999);
+ // console.log(val, 999);
if (val.length > 0) {
const selectedRow = val[0];
- console.log(val[0], 555);
+ // console.log(val[0], 555);
/* if (!selectedRow.mzh) {
this.$refs.tb.toggleRowSelection(selectedRow, false);
this.$message.warning("褰撳墠琛屾棤鏈夋晥闂ㄨ瘖鍙凤紝涓嶈兘閫変腑");
@@ -367,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 = [];
@@ -375,8 +396,9 @@
},
// 鏍规嵁閫変腑鐨勮鏁版嵁璇锋眰鍙宠竟琛ㄦ牸鏁版嵁
fetchRightTableData(selectedRow) {
- const code = selectedRow.mzh;
- if (!code) return;
+ const code = this.queryParams.tjNum;
+ // const code = selectedRow.mzh;
+ // if (!code) return;
this.loading = true;
getRightList(code).then((response) => {
this.checkList = response.data;
@@ -386,6 +408,10 @@
handleSelectionChangeSecond(selectedRows) {
this.selectedSecondTable = selectedRows;
+ if (selectedRows.length > 1) {
+ let del_row = selectedRows.shift();
+ this.$refs.tab1.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
console.log("褰撳墠閫変腑鐨勮鏁版嵁:", this.selectedSecondTable);
},
getList() {
@@ -408,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) => {
@@ -449,6 +475,7 @@
this.$modal.loading("姝ｅ湪鍚屾锛岃绋嶅��...");
this.setTime();
// console.log(val, 66);
+ this.selectedFirstTable.tjnum = this.queryParams.tjNum;
const requestData = {
pacs: this.selectedFirstTable, // 宸︿晶琛ㄦ牸閫変腑鏁版嵁
tj: this.selectedSecondTable[0], // 鍙充晶琛ㄦ牸閫変腑鏁版嵁
@@ -476,7 +503,7 @@
this.clearTimeSet = null;
this.$modal.closeLoading();
// this.$modal.error("鎿嶄綔澶辫触锛岃绋嶅悗閲嶈瘯");
- })
+ });
},
},
};
--
Gitblit v1.8.0