From c247686f83047948c58da0bbe3b763b95b14a757 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 22 一月 2025 18:50:52 +0800
Subject: [PATCH] 1
---
src/views/doctor/checkAll/index.vue | 255 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 160 insertions(+), 95 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index ca22f3b..40f47b1 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -190,7 +190,12 @@
/>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="120px" fixed="right">
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ width="120px"
+ fixed="right"
+ >
<template slot-scope="scope">
<el-button
fixed="right"
@@ -585,9 +590,8 @@
<el-button type="primary" @click="proposalChange"
>鐢熸垚寤鸿</el-button
>
-
</div>
-
+
<el-form
ref="numberValidateForm"
label-width="80px"
@@ -651,21 +655,60 @@
>
<el-table-column type="expand">
<template slot-scope="props">
- <div
- v-if="
- props.row.advices && props.row.advices.length > 0
- "
- >
+ <div>
<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>
+ 鏍囬锛�
+ <el-input
+ v-model="jianyi.bt"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
+ <div>
+ 鍐呭锛�
+ <el-input
+ v-model="jianyi.nr"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
+ </div>
+ </div>
+
+ <!-- 濡傛灉 advices 涓虹┖鏃讹紝娓叉煋绌虹殑杈撳叆妗� -->
+ <div v-else>
+ <div>
+ 鏍囬锛�
+ <el-input
+ v-model="emptyAdvice.bt"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
+ <div>
+ 鍐呭锛�
+ <el-input
+ v-model="emptyAdvice.nr"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
</div>
</div>
- <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div>
</template>
</el-table-column>
@@ -716,21 +759,61 @@
>
<el-table-column type="expand">
<template slot-scope="props">
- <div
- v-if="
- props.row.advices && props.row.advices.length > 0
- "
- >
+ <div>
+ <!-- 濡傛灉 advices 闈炵┖锛屾覆鏌撳叾鍐呭 -->
<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>
+ 鏍囬锛�
+ <el-input
+ v-model="jianyi.bt"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
+ <div>
+ 鍐呭锛�
+ <el-input
+ v-model="jianyi.nr"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
+ </div>
+ </div>
+
+ <!-- 濡傛灉 advices 涓虹┖鏃讹紝娓叉煋绌虹殑杈撳叆妗� -->
+ <div v-else>
+ <div>
+ 鏍囬锛�
+ <el-input
+ v-model="emptyAdvice.bt"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
+ <div>
+ 鍐呭锛�
+ <el-input
+ v-model="emptyAdvice.nr"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
</div>
</div>
- <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div>
</template>
</el-table-column>
@@ -770,7 +853,6 @@
:data="statusList"
style="width: 100%"
:header-cell-style="{ background: '#e6a23c' }"
-
>
<el-table-column
align="center"
@@ -1288,6 +1370,7 @@
gettoPdf,
getModified,
isPdfOrJimu,
+ addOrder,
} from "@/api/doctor/checkAll";
import { getInfoById } from "@/api/hosp/history";
import { getInfo } from "@/api/login";
@@ -1328,7 +1411,10 @@
data() {
return {
// 鏇存柊鎬绘寤鸿
-
+ emptyAdvice: {
+ bt: "",
+ nr: "",
+ },
initialTotalCheckAdvice: "",
initialState: "",
preObj: {},
@@ -1807,7 +1893,7 @@
if (this.tjproject == "0") {
getupdateCheckType(this.tjNumber).then((response) => {
this.changedate = response.data;
-
+
this.changedate.forEach((item) => {
this.textarea1 = item.checkAdvice;
});
@@ -1949,7 +2035,7 @@
if (row.type != 1) {
// 鍙橀鑹茬殑鏉′欢
return {
- backgroundColor: '#AAD8DF !important', // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
+ backgroundColor: "#AAD8DF !important", // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
// color: "#AAD8DF ",
};
}
@@ -2261,63 +2347,11 @@
// }
// },
change(vale) {},
- /* determine() {
- let tjNumber = this.tableAll.tjNumber;
- let advice = this.textarea1;
- let data = {
- tjNumber,
- advice,
- checkStatus: 1,
- };
- this.loading = true;
- getTjdetailList(data).then((response) => {
- if (response.code === 200) {
- this.$modal.msgSuccess("鎻愪氦鎴愬姛");
- let tjNumber = this.tjNumber;
- let data = {
- userId: this.userId,
- tjNumber: tjNumber,
- state: 1,
- id: this.MsgId,
- };
- gettoPdf(tjNumber)
- .then((res) => {
- this.$modal.msgSuccess("宸茬敓鎴愭姤鍛婏紒璇峰墠寰�鎶ュ憡鏍告敹椤甸潰纭锛�");
- })
- .catch((error) => {
- this.$modal.msgError(
- "鎵撳嵃鎶ュ憡澶辫触锛岃鍓嶅線鎶ュ憡鎵撳嵃椤甸潰琛ユ墦鎶ュ憡锛�"
- );
- })
- getfiedState(data).then((res) => {
- this.drawer = false;
- });
- this.queryParams.page = 1;
- this.queryParams.pageSize = 10;
- this.submitForm();
- this.$forceUpdate();
- });
- for (let i = 0; i < this.changedate.length; i++) {
- this.proIds = this.changedate[i].parentId;
- let remarks = this.changedate[i].remark;
- let updateOrderRemarkVos = [
- {
- tjNumber,
- proId: this.proIds.toString(),
- remarks,
- },
- ];
- getModified(updateOrderRemarkVos).then((response) => {});
- }
-
- // this.changedate.forEach((item) => {
- // this.proIds = item.parentId;
- // // this.remark = item.remark;
- // });
- }, */
determine() {
let tjNumber = this.tableAll.tjNumber;
+ let tjh = this.tableAll.tjNumber;
+ // let jyjc = this.yichangList.map(item => item.jyjc || null);
let advice = this.textarea1;
let data = {
tjNumber,
@@ -2325,10 +2359,27 @@
checkStatus: 1,
};
- // 寮�濮嬪姞杞�
- this.loading = true;
+ console.log(this.yichangList, 66);
- // 鎻愪氦鏁版嵁
+ let dataList = this.yichangList
+ .map((item) => {
+ return item.sone.map((soneItem) => ({
+ tjh,
+ parentName: item.proName,
+ jcxm: soneItem.proName,
+ map: soneItem.advices,
+ jyjc: item.jyjc, // assuming jyjc belongs to the outer item, not soneItem
+ jcjg: soneItem.proResult,
+ ckfw: soneItem.stanId,
+ dw: soneItem.proAdvice,
+ }));
+ })
+ .flat(); // 浣跨敤 flat() 鏂规硶灏嗗祵濂楁暟缁勫睍骞�
+ console.log(dataList, 777);
+
+ /* addOrder(dataList).then((res) => {
+ console.log(res, 999);
+ }); */
getTjdetailList(data)
.then((response) => {
if (response.code === 200) {
@@ -2358,6 +2409,10 @@
this.drawer = false;
});
+ const addOrderPromise = addOrder(dataList).then((res) => {
+ console.log(res, 999);
+ });
+
// 澶勭悊鍏朵粬淇敼鎿嶄綔
const updatePromises = this.changedate.map((item) => {
this.proIds = item.parentId;
@@ -2373,7 +2428,12 @@
});
// 绛夊緟鎵�鏈夎姹傚畬鎴�
- Promise.all([reportPromise, statePromise, ...updatePromises])
+ Promise.all([
+ reportPromise,
+ statePromise,
+ addOrderPromise,
+ ...updatePromises,
+ ])
.then(() => {
// 鎵�鏈夎姹傚畬鎴愶紝鍏抽棴 loading
this.loading = false;
@@ -2501,16 +2561,16 @@
width: 1700px;
height: 900px;
}
-::v-deep .el-dialog__header{
+::v-deep .el-dialog__header {
padding: 8px;
}
-::v-deep .el-dialog__body{
-padding: 0;
+::v-deep .el-dialog__body {
+ padding: 0;
}
::v-deep .el-button--medium {
padding: 10px;
}
-::v-deep .el-dialog__headerbtn{
+::v-deep .el-dialog__headerbtn {
// position: relative;
top: 13px;
}
@@ -2569,19 +2629,24 @@
}
.rightbox {
- margin-left: 60px;
- position: fixed;
- top: 107px;
- right: 56px;
+ // margin-left: 60px;
+ // position: fixed;
+ // top: 107px;
+ // right: 56px;
width: 684px;
+ position: fixed; /* 鍥哄畾瀹氫綅 */
+ right: 60px;
+
.right {
background-color: #fff;
// 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; /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛浠ラ伩鍏嶅唴瀹圭揣璐磋竟缂� */
+ padding-bottom: 200px;
}
}
--
Gitblit v1.8.0