From 39af4bcc870587da7e50e11dc9c059684d6ee4ad Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期四, 12 十二月 2024 18:22:06 +0800
Subject: [PATCH] 1
---
src/views/doctor/checkAll/index.vue | 509 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 294 insertions(+), 215 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index ef54aa3..cd5b5d4 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -144,12 +144,19 @@
width="130px"
/>
- <el-table-column
+ <!-- <el-table-column
label="浣撴鏃堕棿"
align="center"
prop="tjTime"
:show-overflow-tooltip="true"
width="110px"
+ /> -->
+ <el-table-column
+ label="瀹℃牳鏃堕棿"
+ align="center"
+ prop="shsj"
+ :show-overflow-tooltip="true"
+ width="180px"
/>
<el-table-column
label="瀹屾垚鏃堕棿"
@@ -163,10 +170,10 @@
align="center"
prop="tjStatus"
:show-overflow-tooltip="true"
- width="50px"
+ width="120px"
>
<template slot-scope="scope">
- <span>{{ scope.row.tjStatus == "1" ? "宸叉" : "鏈" }}</span>
+ <span>{{ scope.row.tjStatus == "1" ? "宸插鏍�" : "鏈鏍�" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -326,7 +333,9 @@
>
</div>
<div class="btn1" v-if="msgjianqian == 'y' || msgjianqian == 'Y'">
- <el-button @click="jianqian()" type="primary"><span class="vertical-text">妫�鍓嶉棶璇�</span></el-button>
+ <el-button @click="jianqian()" type="primary"
+ ><span class="vertical-text">妫�鍓嶉棶璇�</span></el-button
+ >
</div>
<div class="btn1">
@@ -345,9 +354,9 @@
class="left"
style="
font-size: 14px;
- height: calc(100% - 11%);
width: 1100px;
margin-left: 10px;
+ padding: 0 0 50px;
"
>
<div v-for="(item, index) in changedate" :key="index">
@@ -624,105 +633,117 @@
</div>
<template v-if="item.jyjc == '0'">
<el-table
- :stripe="true"
- :row-style="red"
- :data="item.sone"
- border
- style="width: 100%"
- :header-cell-style="{ background: '#67C23A' }"
- :expand-row-keys="expends"
- :row-key="getRowKeys"
- >
- <el-table-column type="expand">
- <template slot-scope="props">
- <div
- v-if="props.row.advices && props.row.advices.length > 0"
- >
+ :stripe="true"
+ :row-style="red"
+ :data="item.sone"
+ border
+ style="width: 100%"
+ :header-cell-style="{ background: '#67C23A' }"
+ :expand-row-keys="expends"
+ :row-key="getRowKeys"
+ >
+ <el-table-column type="expand">
+ <template slot-scope="props">
<div
- v-for="(jianyi, index1) in props.row.advices"
- :key="index1"
- style="padding: 0 10px; margin-bottom: 10px"
+ v-if="
+ props.row.advices && props.row.advices.length > 0
+ "
>
- <div>鏍囬锛歿{ jianyi.bt || "" }}</div>
- <div>鍐呭锛歿{ jianyi.nr || "" }}</div>
+ <div
+ v-for="(jianyi, index1) in props.row.advices"
+ :key="index1"
+ style="padding: 0 10px; margin-bottom: 10px"
+ >
+ <div>鏍囬锛歿{ jianyi.bt || "" }}</div>
+ <div>鍐呭锛歿{ jianyi.nr || "" }}</div>
+ </div>
</div>
- </div>
- <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div>
- </template>
- </el-table-column>
+ <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div>
+ </template>
+ </el-table-column>
- <el-table-column align="center" label="妫�娴嬮」鐩�" width="335">
- <template slot-scope="scope">
- <div>{{ scope.row.proName }}</div>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- prop="proResult"
- label="妫�娴嬬粨鏋�"
- width="85"
- >
- </el-table-column>
+ <el-table-column
+ align="center"
+ label="妫�娴嬮」鐩�"
+ width="353"
+ >
+ <template slot-scope="scope">
+ <div>{{ scope.row.proName }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="proResult"
+ label="妫�娴嬬粨鏋�"
+ width="85"
+ >
+ </el-table-column>
- <el-table-column
- align="center"
- prop="stanId"
- label=" 鍙傝�冭寖鍥�"
- width="117"
- >
- </el-table-column>
+ <el-table-column
+ align="center"
+ prop="stanId"
+ label=" 鍙傝�冭寖鍥�"
+ width="117"
+ >
+ </el-table-column>
- <el-table-column
- align="center"
- prop="proAdvice"
- label="鍗曚綅"
- width="78"
- >
- </el-table-column>
- </el-table>
+ <el-table-column
+ align="center"
+ prop="proAdvice"
+ label="鍗曚綅"
+ width="78"
+ >
+ </el-table-column>
+ </el-table>
</template>
<template v-if="item.jyjc == '1'">
<el-table
- :stripe="true"
- :row-style="red"
- :data="item.sone"
- border
- style="width: 100%"
- :header-cell-style="{ background: '#67C23A' }"
- :expand-row-keys="expends"
- :row-key="getRowKeys"
- >
- <el-table-column type="expand">
- <template slot-scope="props">
- <div
- v-if="props.row.advices && props.row.advices.length > 0"
- >
- <div
- v-for="(jianyi, index1) in props.row.advices"
- :key="index1"
- style="padding: 0 10px; margin-bottom: 10px"
- >
- <div>鏍囬锛歿{ jianyi.bt || "" }}</div>
- <div>鍐呭锛歿{ jianyi.nr || "" }}</div>
- </div>
- </div>
- <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div>
- </template>
- </el-table-column>
-
- <el-table-column align="center" label="妫�娴嬮」鐩�" width="250">
- <template slot-scope="scope">
- <div>{{ scope.row.proName }}</div>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- prop="proResult"
- label="妫�娴嬬粨鏋�"
- width="366"
+ :stripe="true"
+ :row-style="red"
+ :data="item.sone"
+ border
+ style="width: 100%"
+ :header-cell-style="{ background: '#67C23A' }"
+ :expand-row-keys="expends"
+ :row-key="getRowKeys"
>
- </el-table-column>
- </el-table>
+ <el-table-column type="expand">
+ <template slot-scope="props">
+ <div
+ v-if="
+ props.row.advices && props.row.advices.length > 0
+ "
+ >
+ <div
+ v-for="(jianyi, index1) in props.row.advices"
+ :key="index1"
+ style="padding: 0 10px; margin-bottom: 10px"
+ >
+ <div>鏍囬锛歿{ jianyi.bt || "" }}</div>
+ <div>鍐呭锛歿{ jianyi.nr || "" }}</div>
+ </div>
+ </div>
+ <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ align="center"
+ label="妫�娴嬮」鐩�"
+ width="232"
+ >
+ <template slot-scope="scope">
+ <div>{{ scope.row.proName }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="proResult"
+ label="妫�娴嬬粨鏋�"
+ width="403"
+ >
+ </el-table-column>
+ </el-table>
</template>
</div>
</template>
@@ -747,7 +768,7 @@
<el-table-column
align="center"
label="閮ㄩ棬"
- width="185"
+ width="144"
prop="deptName"
>
</el-table-column>
@@ -764,11 +785,11 @@
align="center"
prop="type"
:show-overflow-tooltip="true"
- width="60"
+ width="120"
>
<template slot-scope="scope">
- <span v-if="scope.row.type == '0'">鏈</span>
- <span v-if="scope.row.type == '1'">宸叉</span>
+ <span v-if="scope.row.type == '0'">鏈鏍�</span>
+ <span v-if="scope.row.type == '1'">宸插鏍�</span>
<span v-if="scope.row.type == '2'">寮冩</span>
<span v-if="scope.row.type == '3'">寤舵湡</span>
</template>
@@ -1319,7 +1340,6 @@
cusobj: {},
xiaojie: "",
isdisabled: false,
- dialogVisible: false,
src: "",
url: "",
userId: "",
@@ -1491,11 +1511,11 @@
}).then((res) => {
this.yichangList = res.data;
this.getExpends();
- if(!this.yichangList){
+ if (!this.yichangList) {
this.$message({
- type: "warning ",
- message: "鏆傛棤寮傚父鎶ュ憡",
- });
+ type: "warning ",
+ message: "鏆傛棤寮傚父鎶ュ憡",
+ });
}
});
},
@@ -1957,37 +1977,158 @@
this.status = res.data;
if (this.status) {
if (this.status.status === "1") {
+ this.yichangjieguo();
+ getInfo().then((response) => {
+ this.userId = response.user.userId;
+ if (this.userId) {
+ let data = {
+ userId: this.userId,
+ tjNumber: this.tjNumber,
+ state: 0,
+ };
+ getModifiedState(data).then((res) => {
+ this.MsgId = res.msg;
+ this.drawer = true;
+ getupdateCheckType(this.tjNumber).then((response) => {
+ this.changedate = response.data;
+ if (this.changedate) {
+ this.changedate.forEach((item) => {
+ this.textarea1 = item.checkAdvice || "";
+ });
+
+ // 杩欓噷璁剧疆鍒濆鍊�
+ this.initialTotalCheckAdvice = this.textarea1; // 淇濆瓨鎬绘寤鸿
+
+ // 淇濆瓨鍒濆鐘舵��
+ this.initialState = JSON.parse(
+ JSON.stringify(this.changedate)
+ );
+
+ for (let i = 0; i < this.changedate.length; i++) {
+ this.remark = this.changedate[i].remark;
+ }
+ this.changedate.forEach((item) => {
+ // this.remark = item.remark;
+ // item.sons.forEach((item3) => {
+ // if (item3.standard.tjStandardGtValue === null) {
+ // item3.standard.tjStandardGtValue = "";
+ // }
+ // if (item3.standard.tjStandardLtValue === null) {
+ // item3.standard.tjStandardLtValue = "";
+ // }
+ // });
+ });
+ } else {
+ this.$message({
+ type: "warning ",
+ message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
+ });
+ }
+ });
+ });
+ }
+ });
+ } else {
+ this.$confirm(
+ "" + this.status.name + "姝ｅ湪淇敼璇ヤ俊鎭�, 鏄惁寮哄埗杩涘幓?",
+ "鎻愮ず",
+ {
+ confirmButtonText: "鏄�",
+ cancelButtonText: "鍚�",
+ type: "warning",
+ }
+ )
+ .then(() => {
+ this.yichangjieguo();
+ getInfo().then((response) => {
+ this.userId = response.user.userId;
+
+ if (this.userId) {
+ let data = {
+ userId: this.userId,
+ tjNumber: this.tjNumber,
+ state: 0,
+ };
+ getforceIn(data).then((res) => {
+ this.MsgId = res.msg;
+ this.drawer = true;
+ getupdateCheckType(this.tjNumber).then((response) => {
+ this.changedate = response.data;
+ if (this.changedate) {
+ for (let i = 0; i < this.changedate.length; i++) {
+ this.remark = this.changedate[i].remark;
+ }
+ this.initialState = JSON.parse(
+ JSON.stringify(this.changedate)
+ );
+
+ this.changedate.forEach((item) => {
+ this.textarea1 = item.checkAdvice || "";
+
+ // this.remark = item.remark;
+ // item.sons.forEach((item3) => {
+ // if (item3.standard.tjStandardGtValue === null) {
+ // item3.standard.tjStandardGtValue = "";
+ // }
+ // if (item3.standard.tjStandardLtValue === null) {
+ // item3.standard.tjStandardLtValue = "";
+ // }
+ // });
+ // item.remark = "";
+ });
+
+ // 淇濆瓨鎬绘寤鸿
+ this.totalCheckAdvice = this.changedate.map(
+ (item) => item.totalCheckAdvice
+ );
+ } else {
+ this.$message({
+ type: "warning ",
+ message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
+ });
+ }
+ });
+ });
+ }
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "宸插彇娑堣繘鍏�",
+ });
+ });
+
+ this.drawer = false;
+ }
+ } else {
+ this.drawer = true;
this.yichangjieguo();
getInfo().then((response) => {
this.userId = response.user.userId;
+
if (this.userId) {
let data = {
userId: this.userId,
tjNumber: this.tjNumber,
state: 0,
};
- getModifiedState(data).then((res) => {
+ getforceIn(data).then((res) => {
this.MsgId = res.msg;
this.drawer = true;
getupdateCheckType(this.tjNumber).then((response) => {
this.changedate = response.data;
if (this.changedate) {
- this.changedate.forEach((item) => {
- this.textarea1 = item.checkAdvice || "";
- });
-
- // 杩欓噷璁剧疆鍒濆鍊�
- this.initialTotalCheckAdvice = this.textarea1; // 淇濆瓨鎬绘寤鸿
-
- // 淇濆瓨鍒濆鐘舵��
+ for (let i = 0; i < this.changedate.length; i++) {
+ this.remark = this.changedate[i].remark;
+ }
this.initialState = JSON.parse(
JSON.stringify(this.changedate)
);
- for (let i = 0; i < this.changedate.length; i++) {
- this.remark = this.changedate[i].remark;
- }
this.changedate.forEach((item) => {
+ this.textarea1 = item.checkAdvice || "";
+
// this.remark = item.remark;
// item.sons.forEach((item3) => {
// if (item3.standard.tjStandardGtValue === null) {
@@ -1997,7 +2138,13 @@
// item3.standard.tjStandardLtValue = "";
// }
// });
+ // item.remark = "";
});
+
+ // 淇濆瓨鎬绘寤鸿
+ this.totalCheckAdvice = this.changedate.map(
+ (item) => item.totalCheckAdvice
+ );
} else {
this.$message({
type: "warning ",
@@ -2008,86 +2155,7 @@
});
}
});
- } else {
- this.$confirm(
- "" + this.status.name + "姝ｅ湪淇敼璇ヤ俊鎭�, 鏄惁寮哄埗杩涘幓?",
- "鎻愮ず",
- {
- confirmButtonText: "鏄�",
- cancelButtonText: "鍚�",
- type: "warning",
- }
- )
- .then(() => {
- this.yichangjieguo();
- getInfo().then((response) => {
- this.userId = response.user.userId;
-
- if (this.userId) {
- let data = {
- userId: this.userId,
- tjNumber: this.tjNumber,
- state: 0,
- };
- getforceIn(data).then((res) => {
- this.MsgId = res.msg;
- this.drawer = true;
- getupdateCheckType(this.tjNumber).then((response) => {
- this.changedate = response.data;
- if (this.changedate) {
- for (let i = 0; i < this.changedate.length; i++) {
- this.remark = this.changedate[i].remark;
- }
- this.initialState = JSON.parse(
- JSON.stringify(this.changedate)
- );
-
- this.changedate.forEach((item) => {
- this.textarea1 = item.checkAdvice || "";
-
- // this.remark = item.remark;
- // item.sons.forEach((item3) => {
- // if (item3.standard.tjStandardGtValue === null) {
- // item3.standard.tjStandardGtValue = "";
- // }
- // if (item3.standard.tjStandardLtValue === null) {
- // item3.standard.tjStandardLtValue = "";
- // }
- // });
- // item.remark = "";
- });
-
- // 淇濆瓨鎬绘寤鸿
- this.totalCheckAdvice = this.changedate.map(
- (item) => item.totalCheckAdvice
- );
- } else {
- this.$message({
- type: "warning ",
- message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
- });
- }
- });
- });
- }
- });
- })
- .catch(() => {
- this.$message({
- type: "info",
- message: "宸插彇娑堣繘鍏�",
- });
- });
-
- this.drawer = false;
}
- } else {
- this.$message({
- type: "warning",
- message: "璇风◢鍚庨噸璇�",
- });
- }
-
});
// 鑾峰彇灏忕粨
@@ -2328,9 +2396,6 @@
.mainbox {
position: relative;
}
-.tanchu {
- background-color: red;
-}
.btn {
margin: 20px 0px;
}
@@ -2348,12 +2413,11 @@
.btn1 {
animation: fadeInUp 0.5s ease-out forwards; /* 鎸夐挳鍔犺浇鏃剁殑娣″叆鍔ㄧ敾 */
cursor: pointer;
- text-align: center;
+ text-align: center;
}
.vertical-text {
writing-mode: vertical-rl;
text-orientation: upright;
-
}
/* 璁剧疆鍔ㄧ敾鏁堟灉 */
@@ -2400,7 +2464,7 @@
}
.main {
- height: 700px;
+ height: 800px;
overflow: hidden;
}
@@ -2424,11 +2488,21 @@
border-radius: 2em;
}
::v-deep .el-dialog {
- width: 1200px;
- height: 800px;
+ width: 1700px;
+ height: 900px;
}
-::v-deep .el-button--medium {
- padding: 10px;
+::v-deep .el-dialog__header{
+ padding: 8px;
+}
+::v-deep .el-dialog__body{
+padding: 0;
+}
+::v-deep .el-button--medium {
+ padding: 10px;
+}
+::v-deep .el-dialog__headerbtn{
+ // position: relative;
+ top: 13px;
}
/* .el-dialog {
width: 1264px;
@@ -2463,7 +2537,6 @@
display: flex;
justify-content: center;
align-items: center;
- padding: 0px 20px;
z-index: 1000; /* 纭繚鎸夐挳灞傜骇鍦ㄥ叾浠栧唴瀹逛笂鏂� */
width: 300px;
background-color: white; /* 鍙牴鎹渶瑕佽皟鏁磋儗鏅鑹� */
@@ -2481,24 +2554,24 @@
}
.box {
display: flex;
- position: sticky;
- top: 0px;
- height: 85vh;
- overflow: auto; // 纭繚鐖跺鍣ㄥ彲浠ユ粴鍔�
+
+ height: 100vh;
}
.rightbox {
margin-left: 60px;
- overflow-y: scroll;
- position: sticky;
- top: 0px;
+ position: fixed;
+ top: 107px;
+ right: 56px;
width: 684px;
+
.right {
- position: sticky;
- top: 0px;
background-color: #fff;
- box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+ // box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
z-index: 10;
+ max-height: calc(100vh - 100px); /* 鍋囪浣犳兂涓洪《閮ㄥ拰搴曢儴鐣欏嚭涓�浜涚┖闂� */
+ overflow-y: auto; /* 鍏佽鍨傜洿婊氬姩 */
+ padding: 0 0 50px; /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛浠ラ伩鍏嶅唴瀹圭揣璐磋竟缂� */
}
}
@@ -2524,6 +2597,12 @@
::v-deep .el-table--medium .el-table__cell {
padding: 5px 0;
}
+::-webkit-scrollbar {
+ display: none;
+}
+::v-deep .el-drawer {
+ padding: 0 0 50px;
+}
</style>
--
Gitblit v1.8.0