From c6b785037442a26b5b45e4bc9834e49c47e3fb09 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期五, 14 二月 2025 17:23:18 +0800
Subject: [PATCH] 取消自动关闭读卡器
---
src/views/doctor/examination/index.vue | 246 ++++++++++++++++++++++++++++++++----------------
1 files changed, 162 insertions(+), 84 deletions(-)
diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index 2c5e4c1..3e35e8f 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -7,6 +7,15 @@
:inline="true"
label-width="68px"
>
+ <el-form-item label="濮撳悕" prop="name">
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ style="width: 110px"
+ />
+ </el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNumber">
<el-input
ref="inputName"
@@ -18,15 +27,7 @@
style="width: 170px"
/>
</el-form-item>
- <el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 110px"
- />
- </el-form-item>
+
<el-form-item
label="鍗曚綅鍚嶇О"
prop="tjCompName"
@@ -207,7 +208,7 @@
</el-table-column>
</el-table>
</div>
- <div style="width: 50%">
+ <div style="width: 40%">
<el-table
v-loading="loading"
border
@@ -302,13 +303,20 @@
size="mini"
type="text"
:disabled="scope.row.type === 1"
+ :loading="scope.row.isLoading"
@click="qijian(scope.row)"
- >寮冩</el-button
+ >{{ scope.row.type === 0 ? "寮冩" : "鎭㈠" }}</el-button
>
+ <!-- <el-button
+ size="mini"
+ type="text"
+ @click="qijian(scope.row)"
+ >鎭㈠</el-button
+ > -->
<el-button
size="mini"
type="text"
- :disabled="scope.row.type === 0"
+ :disabled="scope.row.type === 0 || scope.row.type === 2"
@click="queryResultone(scope.row)"
>缁撴灉鏌ヨ</el-button
>
@@ -320,20 +328,15 @@
</div>
<el-drawer title="鎴戞槸鏍囬" :visible.sync="drawer" :with-header="false">
- <div class="a" v-for="(item, index) in jieguoList" :key="index">
- <template v-if="item.jyjc == 0">
- <div
- style="
- text-align: center;
- background-color: #aad8df;
- margin-top: 10px;
- "
- >
- {{ item.pro_name || "" }}
- </div>
+ <div style="text-align: center; background-color: #aad8df">
+ {{ name || "" }}
+ </div>
+ <div class="a">
+ <div v-if="jyjc == 0">
<el-table
:data="jieguoList"
border
+ :row-style="changRed"
style="width: 100%"
:header-cell-style="{ background: '#AAD8DF' }"
>
@@ -343,32 +346,32 @@
</el-table-column>
<el-table-column label="鍙傝�冭寖鍥�" prop="ckfw"> </el-table-column>
</el-table>
- </template>
- <template v-if="item.jyjc == 1">
- <div
- style="
- text-align: center;
- background-color: #aad8df;
- margin-top: 10px;
- "
- >
- {{ item.pro_name || "" }}
- </div>
+ </div>
- <div style="padding: 0 10px; margin-bottom: 10px; margin-top: 10px">
- <div>妫�鏌ユ墍瑙侊細{{ item.pro_result }}</div>
+ <div v-if="jyjc == 1">
+ <div style="text-align: center; background-color: #aad8df"></div>
+ <div class="check-result-container">
+ <div class="check-item">
+ <div class="check-title">妫�鏌ユ墍瑙侊細</div>
+ <div
+ class="check-description"
+ :style="{ color: isRed ? 'red' : '' }"
+ >
+ {{ jieguoList[0].pro_result }}
+ </div>
+ </div>
- <div style="margin-top: 10px">
- 妫�鏌ョ粨璁猴細{{ item.yxzd || "鏆傛棤缁撹" }}
+ <div class="check-item">
+ <div class="check-title">妫�鏌ョ粨璁猴細</div>
+ <div
+ class="check-description"
+ :style="{ color: isRed ? 'red' : '' }"
+ >
+ {{ jieguoList[0].yxzd || "鏆傛棤缁撹" }}
+ </div>
</div>
</div>
-
- <!-- <el-table-column label="妫�娴嬮」鐩�" prop="pro_name">
- </el-table-column>
- <el-table-column label="妫�娴嬬粨鏋�" prop="pro_result">
- </el-table-column> -->
- <!-- <el-table-column label="鍙傝�冭寖鍥�" prop="ckfw"> </el-table-column> -->
- </template>
+ </div>
</div>
</el-drawer>
@@ -400,6 +403,7 @@
qijian,
resultList,
typeOne,
+ huifu,
} from "@/api/doctor/examination";
import { getCompany, queryCompany } from "@/api/team/tuanti";
import { getNewDateList } from "@/api/hosp/order";
@@ -410,7 +414,9 @@
data() {
return {
jieguoList: [],
+ jyjc: null,
dis: false,
+ isLoading:false,
createTimeList: "",
currentRow: null,
total: 0,
@@ -430,13 +436,14 @@
name: null,
beginTime: null,
endTime: null,
- tjCompName:''
+ tjCompName: "",
},
// 缁戝畾鍗曢�夋寜閽�
checkStatus: "0",
exaList: [],
// 琛ㄥ崟鍙傛暟
xianshi: "",
+ name: "",
form: {},
clearTimeSet: null,
tjNumbers: "",
@@ -491,21 +498,28 @@
});
},
methods: {
- red() {
- return {
- color: "red",
- };
+ changRed({ row }) {
+ if (row.ycbz != "" && row.ycbz != null && row.ycbz === "1") {
+ // 鍙橀鑹茬殑鏉′欢
+ return {
+ color: "red", // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
+ };
+ }
},
getdate() {
getConfigKey("tj_confirm").then((res) => {
this.xianshi = res.msg;
- console.log(this.xianshi, 999);
+ // console.log(this.xianshi, 999);
});
getNewDateList().then((res) => {
- this.createTimeList = [
- moment(res.data).format("YYYY-MM-DD 00:00:00"),
- moment(res.data).format("YYYY-MM-DD 23:59:00"),
- ];
+ // console.log(res,222);
+
+ // this.createTimeList = [
+ // moment(res.data).format("YYYY-MM-DD 00:00:00"),
+ // moment(res.data).format("YYYY-MM-DD 23:59:00"),
+ // ];
+ // console.log(this.createTimeList,8855);
+
this.getList();
});
},
@@ -547,8 +561,7 @@
// 閫夋鏁版嵁
searchSelect(val) {
this.CheckBox = val;
- console.log(this.CheckBox,9999);
-
+ // console.log(this.CheckBox, 9999);
},
getList() {
this.loading = true;
@@ -565,8 +578,8 @@
// 鑾峰彇鍗曚綅淇℃伅闆嗗悎
getCompany(this.queryParam).then((response) => {
this.CompanyList = response.data;
- console.log( this.CompanyList,555);
-
+ // console.log(this.CompanyList, 555);
+
this.loading = false;
});
@@ -624,7 +637,7 @@
hb() {
// console.log(this.queryParams.tjNumber);
if (this.queryParams.tjNumber != null) {
- this.handleQuery();
+ // this.handleQuery();
this.submitForm();
}
},
@@ -672,7 +685,7 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.createTimeList = [];
- this.queryParams ={
+ (this.queryParams = {
page: 1,
pageSize: 20,
checkStatus: null,
@@ -681,13 +694,12 @@
name: null,
beginTime: null,
endTime: null,
- tjCompName:''
- },
- this.CheckBox.drugManufacturerId = ''
+ tjCompName: "",
+ }),
+ (this.CheckBox.drugManufacturerId = "");
this.handleQuery();
-
+
this.loading = true;
-
},
// 鍗曢�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -729,11 +741,9 @@
this.currentRow = val;
let tjNumber = val.tjNumber;
this.selectedTjNumber = val.tjNumber;
- console.log(this.currentRow, 4455);
typeOne(tjNumber).then((res) => {
this.type = res.data;
- console.log(res, 3322);
});
cSWebGetPro(tjNumber).then((res) => {
@@ -775,31 +785,66 @@
qijian(row) {
const tjNUm = this.selectedTjNumber;
const proId = row.proId;
-
- qijian(tjNUm, proId).then((res) => {
- if (res.code == 200) {
- cSWebGetPro(tjNUm).then((res) => {
- if (res.code === 200) {
- // 鏇存柊鍙宠竟琛ㄦ牸鐨勬暟鎹�
- this.xiangmuList = res.data;
- }
- });
- }
- });
+ row.isLoading = true;
+ if (row.type == "2") {
+ huifu(tjNUm, proId).then((res) => {
+ if (res.code == 200) {
+ cSWebGetPro(tjNUm).then((res) => {
+ if (res.code === 200) {
+ // 鏇存柊鍙宠竟琛ㄦ牸鐨勬暟鎹�
+ this.xiangmuList = res.data;
+ row.isLoading = false
+ }
+ });
+ }
+ });
+ } else {
+ qijian(tjNUm, proId).then((res) => {
+ if (res.code == 200) {
+ cSWebGetPro(tjNUm).then((res) => {
+ if (res.code === 200) {
+ // 鏇存柊鍙宠竟琛ㄦ牸鐨勬暟鎹�
+ this.xiangmuList = res.data;
+ this.isLoading = false
+ }
+ });
+ }
+ });
+ }
},
- chaxun() {},
+
handleRowClick(row, column, event) {
- console.log(row);
+ // console.log(row, 2323);
+ this.name = row.proName;
+ // console.log(this.name, 99999);
},
queryResultone(row) {
// 鎵撳紑鎶藉眽
- this.drawer = true;
-
const tjNum = this.selectedTjNumber;
const proId = row.proId;
resultList(tjNum, proId).then((res) => {
- console.log(res, 666);
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) {
+ return;
+ } */
+
+ // 璁剧疆鏄惁闇�瑕佹敼鍙橀鑹�
+ if (ycbz === "1") {
+ this.isRed = true; // 璁剧疆鏍囪瘑锛屾敼鍙樺瓧浣撻鑹�
+ console.log(this.isRed, 444);
+ } else {
+ this.isRed = false; // 鎭㈠榛樿棰滆壊
+ }
+
+ if (res.data.length > 0) {
+ this.drawer = true;
+ } else {
+ this.$message.warning("璇ラ」鐩病鏈夌粨鏋�");
+ }
});
},
setTime() {
@@ -872,6 +917,9 @@
display: flex;
justify-content: center;
}
+.red-text {
+ color: red !important;
+}
.pag1 {
width: 30%;
@@ -880,4 +928,34 @@
.a ::v-deep .el-table__cell {
padding: 1px 0 !important;
}
+.check-result-container {
+ // background-color: #fafafa;
+ padding: 20px;
+ border-radius: 8px;
+ // box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+ margin: 0 auto;
+ max-width: 700px;
+}
+
+.check-item {
+ margin-bottom: 20px;
+}
+
+.check-title {
+ font-size: 16px;
+ font-weight: bold;
+ color: #333;
+ // margin-bottom: 8px;
+}
+
+.check-description {
+ font-size: 14px;
+ color: #555; /* 涓伆鑹叉枃瀛� */
+ line-height: 1.6; /* 琛岄珮锛屽鍔犲彲璇绘�� */
+ padding: 8px 0; /* 涓婁笅鍐呰竟璺� */
+}
+
+.check-description.no-result {
+ color: #bbb; /* 濡傛灉娌℃湁缁撹锛屾枃瀛椾负娣＄伆鑹� */
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0