From 203805e1c05f4723cb7340abab2b50d3826c403d Mon Sep 17 00:00:00 2001 From: lkk <364857242@qq.com> Date: 星期二, 10 十二月 2024 18:58:07 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb --- src/views/doctor/examination/index.vue | 124 ++++++++++++++++++++++++++++------------ 1 files changed, 86 insertions(+), 38 deletions(-) diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue index 9cee46c..b7d7ee1 100644 --- a/src/views/doctor/examination/index.vue +++ b/src/views/doctor/examination/index.vue @@ -74,11 +74,12 @@ ref="tb" :data="exaList" border - height="520px" - @selection-change="handleSelectionChange" + height="520" :row-class-name="tableRowClassName" + highlight-current-row + @current-change="handleCurrentChange" > - <el-table-column type="selection" width="40" align="center" /> + <!-- <el-table-column type="selection" width="40" align="center" /> --> <el-table-column label="浣撴鍙�" align="center" @@ -158,8 +159,9 @@ size="mini" type="text" v-show=" - scope.row.confirmStatus == '299' || - scope.row.confirmStatus == 288 + (xianshi == 'Y' || xianshi == 'y') && + (scope.row.confirmStatus == '299' || + scope.row.confirmStatus == 288) " @click="tongguo(scope.row)" >閫氳繃</el-button @@ -168,8 +170,9 @@ size="mini" type="text" v-show=" - scope.row.confirmStatus == '301' || - scope.row.confirmStatus == 288 + (xianshi == 'Y' || xianshi == 'y') && + (scope.row.confirmStatus == '301' || + scope.row.confirmStatus == 288) " @click="bohui(scope.row)" >椹冲洖</el-button @@ -182,7 +185,7 @@ <el-table v-loading="loading" border - height="520px" + height="520" ref="tab1" :data="xiangmuList" > @@ -234,12 +237,12 @@ prop="qdcreateTime" width="160" /> --> - <el-table-column + <!-- <el-table-column label="妫�鏌ュ尰鐢�" align="center" prop="doctorName" width="100" - /> + /> --> <el-table-column label="妫�鏌ユ椂闂�" align="center" @@ -261,22 +264,26 @@ </el-table> </div> </div> - <div style="margin-right: 67%"> - <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :pager-count="5" :current-page.sync="currentPage1" :current-page="page" + <div class="pag"> + <div class="pag1"> + <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :pager-count="5" :current-page.sync="currentPage1" :current-page="page" :page-sizes="pageSize" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total"> </el-pagination> --> - <pagination - v-show="total > 0" - :total="total" - :page.sync="queryParams.page" - :limit.sync="queryParams.pageSize" - @pagination="getList" - /> + <pagination + v-show="total > 0" + :total="total" + :pager-count="5" + :page.sync="queryParams.page" + :limit.sync="queryParams.pageSize" + @pagination="getList" + /> + </div> </div> </div> </template> <script> +import { getConfigKey } from "@/api/system/config"; import { getCsList, confirmOrder, @@ -309,7 +316,9 @@ checkStatus: "0", exaList: [], // 琛ㄥ崟鍙傛暟 + xianshi: '', form: {}, + clearTimeSet: null, tjNumbers: "", multipleSelection: "", tjnum: "", @@ -352,6 +361,7 @@ }, created() { this.getdate(); + // this.getNowTime(); }, mounted() { @@ -361,6 +371,9 @@ }, methods: { getdate() { + getConfigKey("tj_confirm").then((res) => { + this.xianshi = res.msg; + }); getNewDateList().then((res) => { this.createTimeList = [ moment(res.data).format("YYYY-MM-DD 00:00:00"), @@ -477,7 +490,6 @@ }, // 鍗曢�夋閫変腑鏁版嵁 handleSelectionChange(selection) { - console.log(11111); this.selectList = selection; this.multipleSelection = []; if (selection.length > 1) { @@ -510,6 +522,21 @@ } } }, + handleCurrentChange(val) { + this.currentRow = val; + let tjNumber = val.tjNumber; + cSWebGetPro(tjNumber).then((res) => { + this.xiangmuList = res.data; + this.xiangmuList.forEach((item) => { + // console.log(item); + // if (item.type == 0) { + // this.dis = true; + // } else { + // this.dis = false; + // } + }); + }); + }, // 閫氳繃鎸夐挳 tongguo(row) { this.tjNumbers = row.tjNumber; @@ -532,26 +559,34 @@ }); }); }, + setTime() { + //璁剧疆瀹氭椂鍣� + this.clearTimeSet = setInterval(() => { + this.$modal.closeLoading(); + }, 300000); + }, tongbu(row) { + // this.$refs.tb.toggleRowSelection(row); + this.$modal.loading("姝e湪鍚屾锛岃绋嶅��..."); + this.setTime(); let tjNumber = row.tjNumber; - dataSynchronization(tjNumber).then((res) => { - if (res.code == 200) { - // this.$forceUpdate(); - // this.getList(); - this.$modal.msgSuccess("鍚屾鎴愬姛锛�"); - cSWebGetPro(tjNumber).then((res) => { - this.xiangmuList = res.data; - this.xiangmuList.forEach((item) => { - // console.log(item); - // if (item.type == 0) { - // this.dis = true; - // } else { - // this.dis = false; - // } - }); - }); - } - }); + dataSynchronization(tjNumber) + .then((res, error) => { + if (res.code == 200) { + // this.$forceUpdate(); + this.handleCurrentChange(row); + clearInterval(this.clearTimeSet); + this.clearTimeSet = null; + this.$modal.closeLoading(); + this.$modal.msgSuccess("鍚屾鎴愬姛锛�"); + } + }) + .catch((error) => { + this.handleCurrentChange(row); + clearInterval(this.clearTimeSet); + this.clearTimeSet = null; + this.$modal.closeLoading(); + }); }, // 椹冲洖鎸夐挳 bohui(row) { @@ -585,4 +620,17 @@ .el-table .warning-row { background: #e5f3ff !important; } +::v-deep .el-table__body tr.current-row > td { + background: #edf2fa !important; +} + +.pag { + width: 100%; + display: flex; + justify-content: center; +} + +.pag1 { + width: 30%; +} </style> \ No newline at end of file -- Gitblit v1.8.0