From 53606eac81e6d3a76937c4cb6f45ad61581cb4da Mon Sep 17 00:00:00 2001 From: qx <1084500556@qq.com> Date: 星期四, 05 六月 2025 14:41:55 +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, 96 insertions(+), 28 deletions(-) diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue index 3e35e8f..8952269 100644 --- a/src/views/doctor/examination/index.vue +++ b/src/views/doctor/examination/index.vue @@ -52,6 +52,15 @@ /> </el-select> </el-form-item> + <el-form-item label="椤圭洰" prop="tcm"> + <el-input + v-model="queryParams.tcm" + placeholder="璇疯緭鍏ヤ綋妫�鍙�" + clearable + @keyup.enter.native="handleQuery" + style="width: 170px" + /> + </el-form-item> <el-form-item label="鐧昏鏃堕棿" prop="createTimeList"> <el-date-picker v-model="createTimeList" @@ -92,7 +101,7 @@ </el-radio-group> <div style="width: 100%; margin-left: 10px; display: flex"> - <div style="width: 40.5%; margin-right: 20px"> + <div style="width: 45%"> <el-table id="ta" v-loading="loading" @@ -103,25 +112,26 @@ :row-class-name="tableRowClassName" highlight-current-row @current-change="handleCurrentChange" + > <!-- <el-table-column type="selection" width="40" align="center" /> --> <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" - width="160px" + min-width="160" /> <el-table-column label="濮撳悕" align="center" prop="cusName" - width="80px" + min-width="80" /> <el-table-column label="鎬у埆" align="center" prop="cusSex" - width="50px" + min-width="50" > <template slot-scope="scope"> <span v-if="scope.row.cusSex == '0'">鐢�</span> @@ -136,23 +146,35 @@ <!-- </template> --> </el-table-column> <el-table-column + label="骞撮緞" + align="center" + prop="age" + min-width="100" + /> + <el-table-column label="鎵嬫満鍙�" align="center" prop="cusPhone" - width="100px" + min-width="100" + /> + <el-table-column + label="濂楅鍚�" + align="center" + prop="tcm" + min-width="100" /> <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjTime" - width="120px" + min-width="120" /> <el-table-column v-if="checkStatus == '1'" label="瀹℃牳鐘舵��" align="center" prop="confirmStatus" - width="80px" + min-width="80" > <template slot-scope="scope"> <span @@ -174,17 +196,17 @@ </template> </el-table-column> <!-- v-hasPermi="['reservation:reservation:edit']" --> - <el-table-column label="鎿嶄綔" align="center" width="120px"> + <el-table-column label="鎿嶄綔" align="center" min-width="120px"> <template slot-scope="scope"> <el-button size="mini" type="text" @click="tongbu(scope.row)" - disabled + >鍚屾</el-button > <!-- :disabled="dis" --> - <el-button + <!-- <el-button disabled size="mini" type="text" @@ -198,7 +220,7 @@ disabled @click="bohui(scope.row)" >椹冲洖</el-button - > + > --> </template> <!-- v-show=" (xianshi == 'Y' || xianshi == 'y') && @@ -208,7 +230,7 @@ </el-table-column> </el-table> </div> - <div style="width: 40%"> + <div style="width: 45%; margin-left: 5%"> <el-table v-loading="loading" border @@ -218,20 +240,21 @@ :data="xiangmuList" highlight-current-row @row-click="handleRowClick" + > <!-- <el-table-column type="selection" width="40" align="center" /> --> <el-table-column label="绉戝" align="center" prop="deptName" - width="100" + min-width="100" :show-overflow-tooltip="true" /> <el-table-column label="椤圭洰" align="center" prop="proName" - width="150" + min-width="150" :show-overflow-tooltip="true" /> <el-table-column @@ -239,7 +262,7 @@ align="center" prop="type" :show-overflow-tooltip="true" - width="100" + min-width="100" > <template slot-scope="scope"> <span @@ -283,7 +306,7 @@ label="妫�鏌ユ椂闂�" align="center" prop="bcupdateTime" - width="160" + min-width="160" /> <!-- <el-table-column label="淇濆瓨鍖荤敓" @@ -297,7 +320,7 @@ prop="zhupdateTime" width="160" /> --> - <el-table-column label="鎿嶄綔" align="center" width="120px"> + <el-table-column label="鎿嶄綔" align="center" min-width="120px"> <template slot-scope="scope"> <el-button size="mini" @@ -307,19 +330,21 @@ @click="qijian(scope.row)" >{{ scope.row.type === 0 ? "寮冩" : "鎭㈠" }}</el-button > - <!-- <el-button + <el-button size="mini" type="text" - @click="qijian(scope.row)" - >鎭㈠</el-button - > --> + @click="yijian(scope.row)" + v-if="yijiantype == 'N'" + >宸叉</el-button + > <el-button size="mini" type="text" :disabled="scope.row.type === 0 || scope.row.type === 2" @click="queryResultone(scope.row)" - >缁撴灉鏌ヨ</el-button + >缁撴灉</el-button > + <!-- --> <!-- @click="chaxun(scope.row) " --> </template> </el-table-column> @@ -345,6 +370,11 @@ <el-table-column label="妫�娴嬬粨鏋�" prop="pro_result"> </el-table-column> <el-table-column label="鍙傝�冭寖鍥�" prop="ckfw"> </el-table-column> + <el-table-column label="寮傚父鏍囧織" prop="ycbz"> + <template slot-scope="scope"> + {{ scope.row.ycbz == 0 ? "姝e父" : "寮傚父" }} + </template> + </el-table-column> </el-table> </div> @@ -401,6 +431,7 @@ cSWebGetPro, dataSynchronization, qijian, + yijian, resultList, typeOne, huifu, @@ -423,6 +454,7 @@ loading: true, selectedTjNumber: "", drawer: false, + yijiantype: null, type: null, CompanyList: [], CheckBox: {}, @@ -436,6 +468,7 @@ name: null, beginTime: null, endTime: null, + tcm:"", tjCompName: "", }, // 缁戝畾鍗曢�夋寜閽� @@ -499,7 +532,7 @@ }, methods: { changRed({ row }) { - if (row.ycbz != "" && row.ycbz != null && row.ycbz === "1") { + if (row.ycbz != "" && row.ycbz != null && row.ycbz === 1) { // 鍙橀鑹茬殑鏉′欢 return { color: "red", // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor @@ -695,6 +728,7 @@ beginTime: null, endTime: null, tjCompName: "", + tcm:"" }), (this.CheckBox.drugManufacturerId = ""); this.handleQuery(); @@ -744,6 +778,10 @@ typeOne(tjNumber).then((res) => { this.type = res.data; + }); + + getConfigKey("sfyccsyjan").then((res) => { + this.yijiantype = res.msg; }); cSWebGetPro(tjNumber).then((res) => { @@ -812,7 +850,24 @@ }); } }, - + yijian(row) { + const tjNUm = this.selectedTjNumber; + const proId = row.proId; + row.isLoading = true; + yijian(tjNUm, proId).then((res) => { + if (res.code == 200) { + this.$modal.msgSuccess("宸叉鎴愬姛"); + cSWebGetPro(tjNUm).then((res) => { + if (res.code === 200) { + this.xiangmuList = res.data; + row.isLoading = false; + } + }); + } + }).catch(() => { + row.isLoading = false; + }); + }, handleRowClick(row, column, event) { // console.log(row, 2323); this.name = row.proName; @@ -824,8 +879,6 @@ const proId = row.proId; resultList(tjNum, proId).then((res) => { this.jieguoList = res.data; - console.log(this.jieguoList, 998877); - this.jyjc = this.jieguoList[0].jyjc; const ycbz = this.jieguoList[0].ycbz; /* if (ycbz === "" || ycbz === null) { @@ -854,14 +907,12 @@ }, 300000); }, tongbu(row) { - // this.$refs.tb.toggleRowSelection(row); this.$modal.loading("姝e湪鍚屾锛岃绋嶅��..."); this.setTime(); let tjNumber = row.tjNumber; dataSynchronization(tjNumber) .then((res, error) => { if (res.code == 200) { - // this.$forceUpdate(); this.handleCurrentChange(row); clearInterval(this.clearTimeSet); this.clearTimeSet = null; @@ -958,4 +1009,21 @@ .check-description.no-result { color: #bbb; /* 濡傛灉娌℃湁缁撹锛屾枃瀛椾负娣$伆鑹� */ } + +::v-deep .el-table { + width: 100% !important; +} + +::v-deep .el-table__body { + width: 100% !important; +} + +::v-deep .el-table__header { + width: 100% !important; +} + +/* 濡傛灉闇�瑕侀殣钘忔í鍚戞粴鍔ㄦ潯 */ +::v-deep .el-table__body-wrapper::-webkit-scrollbar-horizontal { + display: none; +} </style> \ No newline at end of file -- Gitblit v1.8.0