From eef7c19891e437ef18e79ced890d6aaf0db6113d Mon Sep 17 00:00:00 2001 From: qx <1084500556@qq.com> Date: 星期三, 11 六月 2025 10:53:28 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb --- src/views/doctor/inspectCheck/index.vue | 678 +++++++++++++++++++------------------------------------ 1 files changed, 235 insertions(+), 443 deletions(-) diff --git a/src/views/doctor/inspectCheck/index.vue b/src/views/doctor/inspectCheck/index.vue index a8db6c9..7a3a261 100644 --- a/src/views/doctor/inspectCheck/index.vue +++ b/src/views/doctor/inspectCheck/index.vue @@ -1,305 +1,67 @@ <template> <div class="app-container"> - <el-form - :model="queryParams" - ref="queryForm" - size="small" - :inline="true" - label-width="68px" - @submit.native.prevent - > + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px" @submit.native.prevent> <el-form-item label="浣撴鍙�" prop="reportDoctorCode"> - <el-input - ref="inputName" - v-model="queryParams.tjNum" - placeholder="璇疯緭鍏ヤ綋妫�鍙�" - clearable - @keyup.enter.native="handleQuery" - style="width: 170px" - /> + <el-input ref="inputName" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable + @keyup.enter.native="handleQuery" style="width: 170px" /> </el-form-item> <el-form-item> - <el-button - type="primary" - icon="el-icon-search" - size="mini" - @click="handleQuery" - style="margin-right: 15px" - >鏌ヨ</el-button - > - <el-button - icon="el-icon-refresh" - type="primary" - size="mini" - @click="resetQuery" - >閲嶇疆</el-button - > - <el-button - icon="el-icon-check" - type="primary" - size="mini" - style="margin-right: 15px" - @click="tongbu" - >鍚屾</el-button - > + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-right: 15px"> + 鏌ヨ + </el-button> + <el-button icon="el-icon-refresh" type="primary" size="mini" @click="resetQuery"> + 閲嶇疆 + </el-button> + <el-button icon="el-icon-check" type="primary" size="mini" style="margin-right: 15px" @click="tongbu"> + 鍚屾 + </el-button> </el-form-item> </el-form> - - <!-- <div class="table-title"> - <h3>妫�楠岃褰�</h3> - </div> --> <div class="box"> - <div - style="text-align: center; background-color: #aad8df; margin-top: 10px" - > + <div class="table-header"> 妫�楠岃褰� - <!-- {{ item.parent || "" }} --> </div> <div> - <el-table - :data="exaLists" - border - style="width: 100%" - @selection-change="handleSelectionChange" - :header-cell-style="{ background: '#aad8df' }" - height="350" - > - <el-table-column - fixed - type="selection" - align="center" - label="閫夋嫨" - width="40" - > - </el-table-column> - <el-table-column - label="濮撳悕" - align="center" - prop="name" - width="80px" - /> - <el-table-column - label="鎬у埆" - align="center" - prop="gender" - width="80px" - /> - <el-table-column - label="骞撮緞" - align="center" - prop="patientAge" - width="80px" - > - </el-table-column> - <el-table-column - label="閫佹绉戝" - align="center" - prop="deptName" - width="100px" - /> - - <el-table-column - label="妫�楠岄」鐩�" - align="center" - prop="checkParts" - width="350px" - :show-overflow-tooltip="true" - /> - <el-table-column - label="椤圭洰缂栧彿" - align="center" - prop="jcxmid" - width="150px" - /> - <el-table-column - label="瀹℃牳鍖诲笀" - align="center" - prop="shys" - width="150px" - /> - <el-table-column - label="鎶ュ憡鏃堕棿" - align="center" - prop="examinationDate" - width="150px" - - /> - <!-- :formatter="formatDate" --> - - <el-table-column - label="闂ㄨ瘖鍙�" - align="center" - prop="mzh" - width="140px" - /> - <el-table-column - label="鐢宠鍗曞彿" - align="center" - prop="brid" - width="145px" - /> - <el-table-column - label="鎶ュ憡鍖诲笀" - align="center" - prop="reportDoctorName" - width="120px" - /> - <el-table-column - label="妫�楠屽尰甯堝悕" - align="center" - prop="checkDoctorName" - width="120px" - /> - <el-table-column align="center" label="妫�娴嬮」鐩�" width="100px "> + <el-table :data="exaLists" border style="width: 100%" @selection-change="handleSelectionChange" + :header-cell-style="{ background: '#aad8df', fontSize: '14px', color: '#333' }" height="350" ref="firstTable"> + <el-table-column fixed type="selection" align="center" label="閫夋嫨" width="50" /> + <el-table-column label="濮撳悕" align="center" prop="name" width="80" /> + <el-table-column label="鎬у埆" align="center" prop="gender" width="80" /> + <el-table-column label="骞撮緞" align="center" prop="patientAge" width="80" /> + <el-table-column label="閫佹绉戝" align="center" prop="deptName" width="100" /> + <el-table-column label="妫�楠岄」鐩�" align="center" prop="checkParts" width="350" :show-overflow-tooltip="true" /> + <el-table-column label="椤圭洰缂栧彿" align="center" prop="jcxmid" width="150" /> + <el-table-column label="瀹℃牳鍖诲笀" align="center" prop="shys" width="150" /> + <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="examinationDate" width="150" /> + <el-table-column label="闂ㄨ瘖鍙�" align="center" prop="mzh" width="140" /> + <el-table-column label="鐢宠鍗曞彿" align="center" prop="brid" width="145" /> + <el-table-column label="鎶ュ憡鍖诲笀" align="center" prop="reportDoctorName" width="120" /> + <el-table-column label="妫�楠屽尰甯堝悕" align="center" prop="checkDoctorName" width="120" /> + <el-table-column align="center" label="妫�娴嬮」鐩�" width="100"> <template slot-scope="scope"> <div>{{ scope.row.proName }}</div> </template> </el-table-column> - <el-table-column - align="center" - prop="proResult" - label="妫�娴嬬粨鏋�" - width="180" - > - </el-table-column> - <el-table-column align="center" prop="company" label="鍗曚綅"> - <!-- <template slot-scope="scope"> - <div v-if="scope.row.project != null"> - {{ scope.row.standard.company || "" }} - </div> - <div v-else>{{ scope.row.proAdvice }}</div> - </template> --> - </el-table-column> - <el-table-column - align="center" - prop="conclusion" - label="寮傚父" - width="180" - ></el-table-column> - <el-table-column - align="center" - prop="tjStandardGtValue" - label=" 鍙傝�冭寖鍥�" - > - <!-- <template slot-scope="scope"> - <div v-if="scope.row.project != null"> - {{ - scope.row.standard.tjStandardGtValue || - "/" + "-" + scope.row.standard.tjStandardLtValue || - "/" - }} - </div> - </template> --> - </el-table-column> + <el-table-column align="center" prop="proResult" label="妫�娴嬬粨鏋�" width="180" /> + <el-table-column align="center" prop="company" label="鍗曚綅" width="80" /> + <el-table-column align="center" prop="conclusion" label="寮傚父" width="180" /> + <el-table-column align="center" prop="tjStandardGtValue" label="鍙傝�冭寖鍥�" width="120" /> </el-table> </div> </div> - - <!-- <el-table - id="ta" - ref="tb" - :data="exaLists" - v-loading="loading" - border - max-height="350" - @current-change="handleCurrentChange" - @selection-change="handleSelectionChange" - :row-class-name="tableRowClassName" - > - <el-table-column - fixed - type="selection" - align="center" - label="閫夋嫨" - width="40" - :selectable="isSelectable" - > - </el-table-column> - - <el-table-column label="濮撳悕" align="center" prop="name" width="80px" /> - <el-table-column label="鎬у埆" align="center" prop="gender" width="80px" /> - <el-table-column - label="骞撮緞" - align="center" - prop="patientAge" - width="80px" - > - </el-table-column> - <el-table-column - label="閫佹绉戝" - align="center" - prop="deptName" - width="100px" - /> - - <el-table-column - label="妫�鏌ラ」鐩�" - align="center" - prop="checkParts" - width="150px" - /> - <el-table-column - label="鎶ュ憡鏃堕棿" - align="center" - prop="examinationDate" - width="150px" - /> - - <el-table-column label="闂ㄨ瘖鍙�" align="center" prop="mzh" width="140px" /> - <el-table-column - label="鐢宠鍗曞彿" - align="center" - prop="brid" - width="145px" - /> - <el-table-column - label="缁撴灉鐘舵��" - align="center" - prop="diagnosis" - width="150" - :show-overflow-tooltip="true" - /> - <el-table-column - label="鎶ュ憡鍖诲笀" - align="center" - prop="reportDoctorName" - width="120px" - /> - <el-table-column - label="妫�鏌ュ尰甯堝悕" - align="center" - prop="checkDoctorName" - width="120px" - /> - - <el-table-column - label="缁撴灉琛ㄧ幇" - align="center" - prop="examination" - :show-overflow-tooltip="true" - /> - </el-table> --> - <div class="table-title"> - <h3>浣撴璁板綍</h3> - </div> - <el-table - border - height="350" - ref="tab1" - :data="checkList" - v-loading="loading" - style="width: 100%" + <h3> + 浣撴璁板綍锛� + <span class="highlight">濮撳悕锛歿{ infoList.tjCustomerName || "鏆傛棤" }}</span> + <span class="highlight">鎬у埆锛歿{ infoList.tjCustomerSex == 0 ? "鐢�" : infoList.tjCustomerSex == 1 ? "濂�" : "鏆傛棤" }}</span> + <span class="highlight">骞撮緞锛歿{ infoList.tjCustomerAge || "鏆傛棤" }}</span> + </h3> +</div> + <el-table border height="350" ref="tab1" :data="checkList" v-loading="loading" style="width: 100%" @selection-change="handleSelectionChangeSecond" - > - <el-table-column type="selection" width="55"> </el-table-column> - <el-table-column - label="鐘舵��" - align="center" - prop="type" - :show-overflow-tooltip="true" - min-width="60" - > + :header-cell-style="{ background: '#aad8df', fontSize: '14px', color: '#333' }"> + <el-table-column type="selection" width="60" /> + <el-table-column label="鐘舵��" align="center" prop="type" :show-overflow-tooltip="true" min-width="60"> <template slot-scope="scope"> <span v-if="scope.row.type == '0'">鏈</span> <span v-if="scope.row.type == '1'">宸叉</span> @@ -307,76 +69,44 @@ <span v-if="scope.row.type == '3'">寤舵湡</span> </template> </el-table-column> - <el-table-column - label="绉戝" - align="center" - prop="deptName" - min-width="115" - /> - <el-table-column - label="椤圭洰" - align="center" - prop="proName" - min-width="160" - /> - <el-table-column - label="鏀惰垂鏂瑰紡" - align="center" - prop="sffs" - min-width="80" - /> - <el-table-column - label="鏄惁鏀惰垂" - align="center" - prop="isPay" - min-width="80" - /> - <el-table-column - label="妫�楠屾椂闂�" - align="center" - prop="bcupdateTime" - min-width="160" - /> - - <el-table-column - label="鏈�鍚庝慨鏀规椂闂�" - align="center" - prop="zhupdateTime" - min-width="160" - /> + <el-table-column label="绉戝" align="center" prop="deptName" min-width="115" /> + <el-table-column label="椤圭洰" align="center" prop="proName" min-width="160" /> + <el-table-column label="鏀惰垂鏂瑰紡" align="center" prop="sffs" min-width="80" /> + <el-table-column label="鏄惁鏀惰垂" align="center" prop="isPay" min-width="80" /> + <el-table-column label="妫�楠屾椂闂�" align="center" prop="bcupdateTime" min-width="160" /> + <el-table-column label="鏈�鍚庝慨鏀规椂闂�" align="center" prop="zhupdateTime" min-width="160" /> </el-table> </div> </template> - - <script> +<script> import { getlisList, getJyTjList, asyncPacs } from "@/api/doctor/pacsCheck"; +import { getOrderList } from "@/api/hosp/order"; import moment from "moment"; export default { dicts: ["dict_tj_status"], data() { return { + isProcessing: false, // 闃叉姝诲惊鐜� + isDeselection: false, // 鏍囪鏄惁涓哄彇娑堥�変腑 + infoList: {}, dis: false, code: null, createTimeList: "", total: 0, loading: false, isSyncing: false, - // 鏌ヨ鍙傛暟 + isFetchingRightTableData: false, queryParams: { - // page: 1, - // pageSize: 20, name: null, start: null, end: null, tjNum: null, }, - // 缁戝畾鍗曢�夋寜閽� checkStatus: "0", exaLists: [], - selectedFirstTable: null, // 绗竴涓〃鏍奸�変腑琛� - selectedSecondTable: [], // 绗簩涓〃鏍奸�変腑琛� - // 琛ㄥ崟鍙傛暟 + selectedFirstTable: null, + selectedSecondTable: [], form: {}, clearTimeSet: null, tjNumbers: "", @@ -425,112 +155,159 @@ this.$refs.inputName.focus(); }); }, + methods: { handleDateChange(val) { if (val && val.length === 2) { - this.queryParams.start = val[0]; // 璁剧疆寮�濮嬫椂闂� - this.queryParams.end = val[1]; // 璁剧疆缁撴潫鏃堕棿 + this.queryParams.start = val[0]; + this.queryParams.end = val[1]; } else { this.queryParams.start = null; this.queryParams.end = null; } console.log("Query Params:", this.queryParams); }, - /* 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"); - }, */ - // isSelectable(row) { - // return !!row.mzh; - // }, tableRowClassName({ row }) { - return !row.mzh ? "row-disabled" : ""; + return !row.brid ? "row-disabled" : ""; }, - handleSelectionChange(val) { - // console.log(val); - /* if (val.length > 1) { - let del_row = val.shift(); - this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑 - } - console.log(val, 999); */ +handleSelectionChange(val) { + this.selectedFirstTable = val; - if (val.length > 0) { - // const selectedRow = val[0]; - // console.log(val[0], 555); - - this.selectedFirstTable = val; - console.log("褰撳墠閫変腑鐨勮鏁版嵁:", this.selectedFirstTable); - this.fetchRightTableData(val); - } else { - this.selectedFirstTable = null; - this.checkList = []; - } - }, - // 鏍规嵁閫変腑鐨勮鏁版嵁璇锋眰鍙宠竟琛ㄦ牸鏁版嵁 - fetchRightTableData() { - const code = queryParams.tjNum; - // if (!code) return; - getJyTjList(code).then((response) => { - this.checkList = response.data; - this.loading = false; + this.$nextTick(() => { + if (val.length === 0) { + console.log('鏃犻�変腑琛岋紝娓呯┖閫夋嫨鍜� checkList'); + this.checkList = []; + this.exaLists.forEach(row => { + this.$refs.firstTable && this.$refs.firstTable.toggleRowSelection(row, false); }); + return; + } + + const firstSelectedRow = val[0]; + let filterKey = firstSelectedRow.checkParts ? 'checkParts' : 'brid'; + let filterValue = firstSelectedRow.checkParts || firstSelectedRow.brid; + + console.log(`鎸� ${filterKey} 绛涢��: ${filterValue}`); + const selectedSet = new Set( + this.exaLists + .filter(row => row[filterKey] === filterValue) + .map(item => item.tempId) + ); + console.log(`閫変腑鐨� ${filterKey} 闆嗗悎 (tempId):`, selectedSet); + + this.exaLists.forEach(row => { + if (!row.brid) { + console.warn(`鍚嶇О涓� ${row.name} 鐨勮娌℃湁鐢宠鍗曞彿锛岃烦杩囬�夋嫨`); + return; + } + const shouldSelect = selectedSet.has(row.tempId); + console.log(`琛� tempId: ${row.tempId}, ${filterKey}: ${row[filterKey]}, 鏄惁閫変腑: ${shouldSelect}`); + this.$refs.firstTable.toggleRowSelection(row, shouldSelect); + }); + + if (!this.isFetchingRightTableData) { + this.isFetchingRightTableData = true; + this.fetchRightTableData().finally(() => { + this.isFetchingRightTableData = false; + }); + } + }); +}, + + fetchRightTableData() { + const code = this.queryParams.tjNum; + if (!code) { + console.warn('鏈彁渚涗綋妫�鍙凤紝璺宠繃 fetchRightTableData'); + this.checkList = []; + this.loading = false; + return Promise.resolve(); + } + this.loading = true; + return getJyTjList(code) + .then((response) => { + this.checkList = response.data || []; + this.loading = false; + }) + .catch((error) => { + console.error('鑾峰彇 checkList 澶辫触:', error); + this.checkList = []; + this.loading = false; + throw error; + }); }, handleSelectionChangeSecond(selectedRows) { this.selectedSecondTable = selectedRows; if (selectedRows.length > 1) { let del_row = selectedRows.shift(); - this.$refs.tab1.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑 + this.$refs.tab1.toggleRowSelection(del_row, false); } console.log("褰撳墠閫変腑鐨勮鏁版嵁:", this.selectedSecondTable); }, - getList() { + + async handleQuery() { + if (!this.queryParams.tjNum) { + this.$message.error("浣撴鍙蜂笉鑳戒负绌�"); + return; + } + + this.loading = true; + try { + // 骞惰鎵ц涓や釜鏌ヨ + const [orderResponse, lisResponse] = await Promise.all([ + getOrderList(this.queryParams).catch((error) => { + console.error('鑾峰彇 orderList 澶辫触:', error); + return { data: { list: [] } }; // 杩斿洖绌烘暟鎹互缁х画鎵ц + }), + getlisList(this.queryParams), + ]); + + // 澶勭悊 getOrderList 缁撴灉 + if (orderResponse.data?.list?.length > 0) { + this.infoList = orderResponse.data.list[0]; + } else { + this.infoList = {}; + console.warn('getOrderList 杩斿洖绌哄垪琛�'); + } + + // 澶勭悊 getlisList 缁撴灉 + if (lisResponse.code === 200) { + this.exaLists = lisResponse.data.map((item, index) => ({ + ...item, + brid: item.brid?.trim(), // 娓呯悊绌烘牸 + mzh: item.mzh?.trim(), + tempId: index, + })); + console.log('Loaded exaLists:', this.exaLists); + + // 鑾峰彇鍙充晶琛ㄦ牸鏁版嵁 + await this.fetchRightTableData(); + } else { + this.exaLists = []; + this.$message.error(lisResponse.msg || "鏌ヨ妫�楠岃褰曞け璐�"); + } + } catch (error) { + console.error('鏌ヨ澶辫触:', error); + this.$message.error(error?.msg || "鏌ヨ澶辫触锛岃绋嶅悗閲嶈瘯"); + this.exaLists = []; + this.checkList = []; + this.infoList = {}; + } finally { + this.loading = false; + } + + // 澶勭悊鏃堕棿鑼冨洿 if (this.createTimeList) { this.queryParams.start = this.createTimeList[0]; this.queryParams.end = this.createTimeList[1]; - } else if (this.createTimeList == null) { + } else { this.queryParams.start = null; this.queryParams.end = null; } }, - /** 鎼滅储鎸夐挳鎿嶄綔 */ - handleQuery() { - // this.queryParams.page = 1; - this.loading = true; - if (!this.queryParams.tjNum) { - this.loading = false; - this.$message.error("浣撴鍙蜂笉鑳戒负绌�"); - return; // 缁堟璇锋眰 - } - getlisList(this.queryParams) - .then((res) => { - if (res.code == 200) { - this.loading = false; - this.exaLists = res.data; - // const code = this.exaLists[0].mzh; - const code = this.queryParams.tjNum; - getJyTjList(code).then((response) => { - this.checkList = response.data; - }); - } - }) - .catch((error) => { - this.loading = false; - this.$message.error(res.msg || "鏌ヨ澶辫触锛岃绋嶅悗閲嶈瘯"); - }); - this.getList(); - }, - - /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { this.createTimeList = []; this.resetForm("queryForm"); @@ -540,45 +317,37 @@ end: null, tjNum: null, }; - - // 娓呯┖鍏朵粬渚濊禆鏁版嵁 this.checkList = []; this.exaLists = []; + this.infoList = {}; }, handleCurrentChange(row) { this.currentRow = row; - // console.log('褰撳墠閫変腑鐨勮:', row); }, setTime() { - //璁剧疆瀹氭椂鍣� this.clearTimeSet = setInterval(() => { this.$modal.closeLoading(); }, 300000); }, - tongbu(row) { + + tongbu() { this.$modal.loading("姝e湪鍚屾锛岃绋嶅��..."); this.setTime(); const requestData = { - lis: this.selectedFirstTable.map((item) => ({ + lis: this.selectedFirstTable ? this.selectedFirstTable.map((item) => ({ ...item, tjNum: this.queryParams.tjNum, - })), - jcxmid: this.selectedFirstTable.jcxmid, - shys: this.selectedFirstTable.shys, - tj: this.selectedSecondTable[0], // 鍙充晶琛ㄦ牸閫変腑鏁版嵁 + })) : [], + jcxmid: this.selectedFirstTable && this.selectedFirstTable.length > 0 ? this.selectedFirstTable[0].jcxmid : null, + shys: this.selectedFirstTable && this.selectedFirstTable.length > 0 ? this.selectedFirstTable[0].shys : null, + tj: this.selectedSecondTable[0], }; - - /* if (!this.selectedSecondTable || this.selectedSecondTable.length === 0) { - this.$message.error("鑷冲皯閫変竴鏉℃暟鎹紒"); - return; - } */ - asyncPacs(requestData) .then((res) => { - if (res.code == 200) { - this.fetchRightTableData(this.selectedFirstTable); + if (res.code === 200) { + this.fetchRightTableData(); clearInterval(this.clearTimeSet); this.clearTimeSet = null; this.$modal.closeLoading(); @@ -594,38 +363,61 @@ }); }, }, -}; -</script> - - <style lang="scss" scoped> -#ta .el-table__header-wrapper .el-checkbox { - display: none; +};</script> +<style lang="scss" scoped> +.app-container { + padding: 20px; + background: #f5f7fa; +} + +.table-header { + text-align: center; + background-color: #aad8df; + padding: 10px; + font-size: 16px; + font-weight: bold; + color: #333; + margin-top: 10px; + border-radius: 4px 4px 0 0; +} + +.table-title { + text-align: left; + margin: 20px 0; + padding: 10px 0; +} + +.table-title h3 { + font-size: 16px; + color: #333; + margin: 0; + line-height: 1.5; + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 20px; +} + +.table-title .highlight { + font-weight: bold; + color: #2c3e50; +} + +.el-table { + border-radius: 4px; + font-size: 14px; } .el-table .warning-row { background: #e5f3ff !important; } + ::v-deep .el-table__body tr.current-row > td { background: #edf2fa !important; } -.table-title { - text-align: center; - margin-bottom: 10px; -} .row-disabled { - color: #ccc; /* 璁剧疆绂佺敤琛岀殑瀛椾綋棰滆壊 */ - pointer-events: none; /* 绂佹榧犳爣鎿嶄綔 */ - background-color: #f5f5f5; /* 璁剧疆绂佺敤琛岀殑鑳屾櫙鑹� */ -} - -.pag { - width: 100%; - display: flex; - justify-content: center; -} - -.pag1 { - width: 30%; + color: #999; + background-color: #f5f5f5; } </style> \ No newline at end of file -- Gitblit v1.8.0