From 8e4792300d095bdc94e7ec8cd6b5ef1ad3fc4b0c Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 13 二月 2025 16:52:37 +0800
Subject: [PATCH] qx
---
src/views/doctor/checkAll/index.vue | 360 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 277 insertions(+), 83 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 63dd0d4..f22e922 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -655,21 +655,44 @@
>
<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
+ 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>
鏍囬锛�
- <!-- {{ jianyi.bt || "" }} -->
<el-input
- v-model="jianyi.bt"
+ v-model="emptyAdvice.bt"
size="small"
type="textarea"
autosize
@@ -678,7 +701,7 @@
<div>
鍐呭锛�
<el-input
- v-model="jianyi.nr"
+ v-model="emptyAdvice.nr"
size="small"
type="textarea"
autosize
@@ -686,13 +709,13 @@
</div>
</div>
</div>
- <!-- <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div> -->
</template>
</el-table-column>
<el-table-column
align="center"
label="妫�娴嬮」鐩�"
+ :show-overflow-tooltip="true"
width="353"
>
<template slot-scope="scope">
@@ -722,6 +745,14 @@
width="78"
>
</el-table-column>
+ <el-table-column
+ fixed="right"
+ label="鎿嶄綔"
+ width="100">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="danger" size="small">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
</el-table>
</template>
<template v-if="item.jyjc == '1'">
@@ -737,23 +768,45 @@
>
<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>
鏍囬锛�
- <!-- {{ jianyi.bt || "" }} -->
<el-input
- v-model="jianyi.bt"
+ v-model="emptyAdvice.bt"
size="small"
type="textarea"
autosize
@@ -762,7 +815,7 @@
<div>
鍐呭锛�
<el-input
- v-model="jianyi.nr"
+ v-model="emptyAdvice.nr"
size="small"
type="textarea"
autosize
@@ -770,7 +823,6 @@
</div>
</div>
</div>
- <!-- <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div> -->
</template>
</el-table-column>
@@ -778,6 +830,7 @@
align="center"
label="妫�娴嬮」鐩�"
width="232"
+ :show-overflow-tooltip="true"
>
<template slot-scope="scope">
<div>{{ scope.row.proName }}</div>
@@ -1342,6 +1395,7 @@
import { getNewDateList } from "@/api/hosp/order";
import { getconfigKey } from "@/api/login";
import moment from "moment";
+import { get } from "sortablejs";
export default {
components: {
@@ -1368,7 +1422,10 @@
data() {
return {
// 鏇存柊鎬绘寤鸿
-
+ emptyAdvice: {
+ bt: "",
+ nr: "",
+ },
initialTotalCheckAdvice: "",
initialState: "",
preObj: {},
@@ -1558,7 +1615,27 @@
tjNum: this.tjNumber,
}).then((res) => {
this.yichangList = res.data;
+
+ console.log(this.yichangList, 3232);
this.getExpends();
+
+ this.yichangList.forEach((item) => {
+ item.sone.forEach((soneItem) => {
+ if (
+ !Array.isArray(soneItem.advices) ||
+ soneItem.advices.length === 0
+ ) {
+ // 濡傛灉 advices 鏄┖锛岃缃粯璁ゅ��
+ soneItem.advices = [
+ {
+ bt: "",
+ nr: "",
+ },
+ ];
+ }
+ });
+ });
+
if (!this.yichangList) {
_this.$message({
type: "warning ",
@@ -2302,10 +2379,120 @@
// },
change(vale) {},
+ // 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,
+ // advice,
+ // checkStatus: 1,
+ // };
+
+ // 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) {
+ // this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+
+ // // 鍑嗗鐢熸垚鎶ュ憡鐨勮姹傛暟鎹�
+ // let reportData = {
+ // userId: this.userId,
+ // tjNumber: tjNumber,
+ // state: 1,
+ // id: this.MsgId,
+ // };
+
+ // // 鐢熸垚鎶ュ憡骞朵繚鎸� loading 鎵撳紑
+ // const reportPromise = gettoPdf(tjNumber)
+ // .then((res) => {
+ // this.$modal.msgSuccess("宸茬敓鎴愭姤鍛婏紒璇峰墠寰�鎶ュ憡鏍告敹椤甸潰纭锛�");
+ // })
+ // .catch((error) => {
+ // this.$modal.msgError(
+ // "鎵撳嵃鎶ュ憡澶辫触锛岃鍓嶅線鎶ュ憡鎵撳嵃椤甸潰琛ユ墦鎶ュ憡锛�"
+ // );
+ // });
+
+ // // 鏇存柊鐘舵�佸苟鎻愪氦淇敼璇锋眰
+ // const statePromise = getfiedState(reportData).then((res) => {
+ // this.drawer = false;
+ // });
+
+ // // const addOrderPromise = addOrder(dataList).then((res) => {
+ // // console.log(res, 999);
+ // // });
+
+ // // 澶勭悊鍏朵粬淇敼鎿嶄綔
+ // const updatePromises = this.changedate.map((item) => {
+ // this.proIds = item.parentId;
+ // let remarks = item.remark;
+ // let updateOrderRemarkVos = [
+ // {
+ // tjNumber,
+ // proId: this.proIds.toString(),
+ // remarks,
+ // },
+ // ];
+ // return getModified(updateOrderRemarkVos); // 杩斿洖 Promise
+ // });
+
+ // // 绛夊緟鎵�鏈夎姹傚畬鎴�
+ // Promise.all([
+ // reportPromise,
+ // statePromise,
+ // // addOrderPromise,
+ // ...updatePromises,
+ // ])
+ // .then(() => {
+ // // 鎵�鏈夎姹傚畬鎴愶紝鍏抽棴 loading
+ // this.loading = false;
+ // // 鏇存柊鍒嗛〉淇℃伅
+ // this.queryParams.page = 1;
+ // this.queryParams.pageSize = 10;
+ // this.submitForm();
+ // this.$forceUpdate();
+ // })
+ // .catch((error) => {
+ // // 澶勭悊閿欒鎯呭喌
+ // this.loading = false;
+ // console.error("鍙戠敓閿欒:", error);
+ // });
+ // } else {
+ // // 鎻愪氦澶辫触锛屽叧闂� loading
+ // this.loading = false;
+ // }
+ // })
+ // .catch((error) => {
+ // // 鎻愪氦璇锋眰澶辫触锛屽叧闂� loading
+ // this.loading = false;
+ // console.error("鎻愪氦璇锋眰澶辫触:", error);
+ // });
+ // },
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,
@@ -2313,7 +2500,7 @@
checkStatus: 1,
};
- console.log(this.yichangList, 66);
+ console.log(this.yichangList, 6644);
let dataList = this.yichangList
.map((item) => {
@@ -2322,18 +2509,14 @@
parentName: item.proName,
jcxm: soneItem.proName,
map: soneItem.advices,
- jyjc: item.jyjc, // assuming jyjc belongs to the outer item, not soneItem
+ jyjc: item.jyjc,
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) {
@@ -2347,55 +2530,62 @@
id: this.MsgId,
};
- // 鐢熸垚鎶ュ憡骞朵繚鎸� loading 鎵撳紑
- const reportPromise = gettoPdf(tjNumber)
+ // 璋冪敤 addOrderPromise
+ console.log(dataList, 5555);
+
+ addOrder(dataList)
.then((res) => {
- this.$modal.msgSuccess("宸茬敓鎴愭姤鍛婏紒璇峰墠寰�鎶ュ憡鏍告敹椤甸潰纭锛�");
+ console.log(res, 999);
+ if (res.code == 200) {
+ gettoPdf(tjNumber)
+ .then((res) => {
+ this.$modal.msgSuccess(
+ "宸茬敓鎴愭姤鍛婏紒璇峰墠寰�鎶ュ憡鏍告敹椤甸潰纭锛�"
+ );
+ })
+ .catch(() => {
+ this.$modal.msgError(
+ "鎵撳嵃鎶ュ憡澶辫触锛岃鍓嶅線鎶ュ憡鎵撳嵃椤甸潰琛ユ墦鎶ュ憡锛�"
+ );
+ });
+ const statePromise = getfiedState(reportData).then(() => {
+ this.drawer = false;
+ });
+ const updatePromises = this.changedate.map((item) => {
+ this.proIds = item.parentId;
+ let remarks = item.remark;
+ let updateOrderRemarkVos = [
+ {
+ tjNumber,
+ proId: this.proIds.toString(),
+ remarks,
+ },
+ ];
+ return getModified(updateOrderRemarkVos); // 杩斿洖 Promise
+ });
+
+ // 绛夊緟鎵�鏈夎姹傚畬鎴�
+ Promise.all([statePromise, ...updatePromises])
+ .then(() => {
+ // 鎵�鏈夎姹傚畬鎴愶紝鍏抽棴 loading
+ this.loading = false;
+ // 鏇存柊鍒嗛〉淇℃伅
+ this.queryParams.page = 1;
+ this.queryParams.pageSize = 10;
+ this.submitForm();
+ this.$forceUpdate();
+ })
+ .catch((error) => {
+ // 澶勭悊閿欒鎯呭喌
+ this.loading = false;
+ console.error("鍙戠敓閿欒:", error);
+ });
+ }
})
.catch((error) => {
- this.$modal.msgError(
- "鎵撳嵃鎶ュ憡澶辫触锛岃鍓嶅線鎶ュ憡鎵撳嵃椤甸潰琛ユ墦鎶ュ憡锛�"
- );
- });
-
- // 鏇存柊鐘舵�佸苟鎻愪氦淇敼璇锋眰
- const statePromise = getfiedState(reportData).then((res) => {
- this.drawer = false;
- });
-
- const addOrderPromise = addOrder(dataList).then((res) => {
- console.log(res, 999);
- });
-
- // 澶勭悊鍏朵粬淇敼鎿嶄綔
- const updatePromises = this.changedate.map((item) => {
- this.proIds = item.parentId;
- let remarks = item.remark;
- let updateOrderRemarkVos = [
- {
- tjNumber,
- proId: this.proIds.toString(),
- remarks,
- },
- ];
- return getModified(updateOrderRemarkVos); // 杩斿洖 Promise
- });
-
- // 绛夊緟鎵�鏈夎姹傚畬鎴�
- Promise.all([reportPromise, statePromise,addOrderPromise, ...updatePromises])
- .then(() => {
- // 鎵�鏈夎姹傚畬鎴愶紝鍏抽棴 loading
+ // 濡傛灉 addOrderPromise 澶辫触锛屽鐞嗛敊璇�
this.loading = false;
- // 鏇存柊鍒嗛〉淇℃伅
- this.queryParams.page = 1;
- this.queryParams.pageSize = 10;
- this.submitForm();
- this.$forceUpdate();
- })
- .catch((error) => {
- // 澶勭悊閿欒鎯呭喌
- this.loading = false;
- console.error("鍙戠敓閿欒:", error);
+ console.error("addOrderPromise 澶辫触:", error);
});
} else {
// 鎻愪氦澶辫触锛屽叧闂� loading
@@ -2574,7 +2764,7 @@
.box {
display: flex;
- height: 100vh;
+ // height: 100vh;
}
.rightbox {
@@ -2583,14 +2773,18 @@
// 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; /* 鍏佽鍨傜洿婊氬姩 */
+ max-height: 900px;
+ height: calc(100vh - 100px);
+ /* 鍋囪浣犳兂涓洪《閮ㄥ拰搴曢儴鐣欏嚭涓�浜涚┖闂� */
+ overflow-y: auto !important; /* 鍏佽鍨傜洿婊氬姩 */
padding: 0 0 50px; /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛浠ラ伩鍏嶅唴瀹圭揣璐磋竟缂� */
+ padding-bottom: 200px;
}
}
--
Gitblit v1.8.0