From a84a399991afc41e97fecdabf35deffa75668761 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 22 一月 2025 16:14:10 +0800
Subject: [PATCH] 111
---
src/views/doctor/checkAll/index.vue | 743 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 492 insertions(+), 251 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index b99cdc6..40f47b1 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
@@ -183,7 +190,12 @@
/>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="90px" fixed="right">
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ width="120px"
+ fixed="right"
+ >
<template slot-scope="scope">
<el-button
fixed="right"
@@ -247,7 +259,7 @@
<div class="top">
<table
style="
- width: 98%;
+ width: 100%;
margin: 10px 10px;
border: 1px solid #dfe6ec;
border-collapse: collapse;
@@ -311,32 +323,34 @@
<div style="margin-right: 10px; display: flex" class="btnbox">
<div class="btn1" v-if="msgtuwen == 'y' || msgtuwen == 'Y'">
- <el-button @click="Graphicreport()" type="primary"
- >鍥炬枃鎶ュ憡</el-button
- >
+ <el-button @click="Graphicreport()" type="primary">
+ <span class="vertical-text">鍥炬枃鎶ュ憡</span>
+ </el-button>
</div>
<div class="btn1">
<el-button @click="historicalreport()" type="primary"
- >鍘嗗彶鎶ュ憡</el-button
+ ><span class="vertical-text">鍘嗗彶鎶ュ憡</span></el-button
>
</div>
<div v-if="tableAll.tjCategory == '02'" class="btn1">
<el-button @click="medicalhistory()" type="primary"
- >鑱屼笟鐥呭彶</el-button
+ ><span class="vertical-text">鑱屼笟鐥呭彶</span></el-button
>
</div>
<div class="btn1" v-if="msgjianqian == 'y' || msgjianqian == 'Y'">
- <el-button @click="jianqian()" type="primary">妫�鍓嶉棶璇�</el-button>
+ <el-button @click="jianqian()" type="primary"
+ ><span class="vertical-text">妫�鍓嶉棶璇�</span></el-button
+ >
</div>
<div class="btn1">
<el-button @click="xiangmuqingkuang()" type="primary"
- >椤圭洰鎯呭喌</el-button
+ ><span class="vertical-text">椤圭洰鎯呭喌</span></el-button
>
</div>
<div class="btn1">
<el-button @click="yichangjieguo()" type="primary"
- >寮傚父缁撴灉</el-button
+ ><span class="vertical-text">寮傚父缁撴灉</span></el-button
>
</div>
</div>
@@ -345,9 +359,9 @@
class="left"
style="
font-size: 14px;
- height: calc(100% - 11%);
- width: 1300px;
+ width: 1100px;
margin-left: 10px;
+ padding: 0 0 50px;
"
>
<div v-for="(item, index) in changedate" :key="index">
@@ -368,7 +382,7 @@
:row-style="changRed"
:header-cell-style="{ background: '#aad8df' }"
>
- <el-table-column align="center" label="妫�娴嬮」鐩�" width="240">
+ <el-table-column align="center" label="妫�娴嬮」鐩�" width="464">
<template slot-scope="scope">
<div>{{ scope.row.proName }}</div>
</template>
@@ -388,6 +402,12 @@
<div v-else>{{ scope.row.proAdvice }}</div>
</template>
</el-table-column>
+ <el-table-column
+ align="center"
+ prop="conclusion"
+ label="寮傚父"
+ width="180"
+ ></el-table-column>
<el-table-column align="center" prop="" label=" 鍙傝�冭寖鍥�">
<template slot-scope="scope">
<div v-if="scope.row.project != null">
@@ -611,7 +631,7 @@
<div class="rightbox">
<div class="right">
- <template v-if="status == 0">
+ <template v-if="status1 == 0">
<div v-for="(item, index) in yichangList" :key="index">
<div
style="
@@ -622,39 +642,202 @@
>
{{ item.proName || "" }}
</div>
- <el-table
- :stripe="true"
- :row-style="red"
- :data="item.sone"
- border
- style="width: 100%"
- :header-cell-style="{ background: '#67C23A' }"
- >
- <el-table-column align="center" label="妫�娴嬮」鐩�" width="220">
- <template slot-scope="scope">
- <div>{{ scope.row.proName }}</div>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- prop="proResult"
- label="妫�娴嬬粨鏋�"
- width="160"
+ <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>
+ <el-table-column type="expand">
+ <template slot-scope="props">
+ <div>
+ <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>
+ 鏍囬锛�
+ <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>
- <el-table-column
- align="center"
- prop="stanId"
- label=" 鍙傝�冭寖鍥�"
+ <!-- 濡傛灉 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>
+ </template>
+ </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="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>
- <el-table-column align="center" prop="proAdvice" label="鍗曚綅">
- </el-table-column>
- </el-table>
+ <el-table-column type="expand">
+ <template slot-scope="props">
+ <div>
+ <!-- 濡傛灉 advices 闈炵┖锛屾覆鏌撳叾鍐呭 -->
+ <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>
+ 鏍囬锛�
+ <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>
+ </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>
- <template v-if="status == 1">
+ <template v-if="status1 == 1">
<div>
<div
style="
@@ -670,19 +853,11 @@
:data="statusList"
style="width: 100%"
:header-cell-style="{ background: '#e6a23c' }"
- :expand-row-keys="expends"
- :row-key="getRowKeys"
- :stripe="true"
>
- <el-table-column type="expand">
- <template slot-scope="props">
- <span>{{ props.row.deptName }}</span>
- </template>
- </el-table-column>
<el-table-column
align="center"
label="閮ㄩ棬"
- width="160"
+ width="144"
prop="deptName"
>
</el-table-column>
@@ -690,7 +865,7 @@
align="center"
prop="proName"
label="椤圭洰"
- width="160"
+ width="260"
>
</el-table-column>
@@ -699,11 +874,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>
@@ -1195,6 +1370,7 @@
gettoPdf,
getModified,
isPdfOrJimu,
+ addOrder,
} from "@/api/doctor/checkAll";
import { getInfoById } from "@/api/hosp/history";
import { getInfo } from "@/api/login";
@@ -1235,6 +1411,10 @@
data() {
return {
// 鏇存柊鎬绘寤鸿
+ emptyAdvice: {
+ bt: "",
+ nr: "",
+ },
initialTotalCheckAdvice: "",
initialState: "",
preObj: {},
@@ -1254,7 +1434,6 @@
cusobj: {},
xiaojie: "",
isdisabled: false,
- dialogVisible: false,
src: "",
url: "",
userId: "",
@@ -1362,7 +1541,7 @@
tjCategory: undefined,
payType: undefined,
},
- status: 0, // 0灞曠ず寮傚父1灞曠ず椤圭洰鎯呭喌
+ status1: 0, // 0灞曠ず寮傚父1灞曠ず椤圭洰鎯呭喌
viewportHeight: 0,
expends: [],
};
@@ -1395,18 +1574,21 @@
},
//璁剧疆table涓殑鎵╁睍椤癸紝灞曞紑鐨刬d锛屾澶勬垜闇�瑕佸叏閮ㄥ睍寮�
getExpends() {
- var proId = this.statusList.map((item) => item.proId);
- this.expends = proId;
+ // 閫氳繃flatMap灏嗘瘡涓猻one鏁扮粍涓殑ID鎻愬彇鍑烘潵锛屽苟杩斿洖涓�涓墎骞冲寲鐨処D鏁扮粍
+ this.expends = this.yichangList.flatMap((item) =>
+ item.sone.map((subItem) => subItem.proId)
+ );
},
+
getRowKeys(row) {
return row.proId;
},
// 椤圭洰鎯呭喌
xiangmuqingkuang() {
cSWebGetPro(this.tjNumber).then((res) => {
- this.status = 1;
+ this.status1 = 1;
this.statusList = res.data;
- this.getExpends();
+
if (this.statusList.length == 0) {
_this.$message.msgSuccess("鏆傛棤椤圭洰鎯呭喌");
}
@@ -1416,23 +1598,27 @@
this.drawer = false;
},
yichangjieguo() {
- this.status = 0;
+ this.status1 = 0;
let _this = this;
yichang({
tjNum: this.tjNumber,
}).then((res) => {
this.yichangList = res.data;
- if (this.yichangList.length == 0) {
- _this.$message.msgSuccess("鏆傛棤寮傚父鎶ュ憡");
+ this.getExpends();
+ if (!this.yichangList) {
+ _this.$message({
+ type: "warning ",
+ message: "鏆傛棤寮傚父鎶ュ憡",
+ });
}
});
},
getdate() {
getNewDateList().then((res) => {
- this.startTime = [
+ /* this.startTime = [
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
- ];
+ ]; */
this.getList();
});
},
@@ -1707,6 +1893,7 @@
if (this.tjproject == "0") {
getupdateCheckType(this.tjNumber).then((response) => {
this.changedate = response.data;
+
this.changedate.forEach((item) => {
this.textarea1 = item.checkAdvice;
});
@@ -1845,10 +2032,11 @@
};
},
redxiangmu({ row }) {
- if (row.type == 0) {
+ if (row.type != 1) {
// 鍙橀鑹茬殑鏉′欢
return {
- color: "red", // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
+ backgroundColor: "#AAD8DF !important", // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
+ // color: "#AAD8DF ",
};
}
},
@@ -1883,39 +2071,160 @@
getState(this.tjNumber).then((res) => {
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 || "";
+ });
- if (this.status.status === "1") {
+ // 杩欓噷璁剧疆鍒濆鍊�
+ 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) {
@@ -1925,7 +2234,13 @@
// item3.standard.tjStandardLtValue = "";
// }
// });
+ // item.remark = "";
});
+
+ // 淇濆瓨鎬绘寤鸿
+ this.totalCheckAdvice = this.changedate.map(
+ (item) => item.totalCheckAdvice
+ );
} else {
this.$message({
type: "warning ",
@@ -1936,78 +2251,6 @@
});
}
});
- } 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;
}
});
@@ -2104,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,
@@ -2168,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) {
@@ -2201,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;
@@ -2216,7 +2428,12 @@
});
// 绛夊緟鎵�鏈夎姹傚畬鎴�
- Promise.all([reportPromise, statePromise, ...updatePromises])
+ Promise.all([
+ reportPromise,
+ statePromise,
+ addOrderPromise,
+ ...updatePromises,
+ ])
.then(() => {
// 鎵�鏈夎姹傚畬鎴愶紝鍏抽棴 loading
this.loading = false;
@@ -2249,80 +2466,75 @@
.mainbox {
position: relative;
}
-.tanchu {
- background-color: red;
-}
.btn {
margin: 20px 0px;
}
-/* 鎸夐挳鐨勫垵濮嬬姸鎬� */
.btnbox {
display: flex;
flex-direction: column;
gap: 10px; /* 鎸夐挳涔嬮棿鐨勯棿璺� */
position: fixed; /* 浣挎暣涓寜閽尯鍩熷浐瀹氬湪椤甸潰 */
- right: 0; /* 鍥哄畾鍦ㄩ〉闈㈠彸渚� */
- top: 20%; /* 鍒濆浣嶇疆 */
+ right: 0; /* 鍥哄畾鍦ㄩ〉闈㈠彸渚� */
+ top: 20%; /* 鍒濆浣嶇疆 */
z-index: 10;
}
/* 姣忎釜鎸夐挳鐨勬牱寮� */
.btn1 {
- animation: fadeInUp 0.5s ease-out forwards; /* 鎸夐挳鍔犺浇鏃剁殑娣″叆鍔ㄧ敾 */
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
+ animation: fadeInUp 0.5s ease-out forwards; /* 鎸夐挳鍔犺浇鏃剁殑娣″叆鍔ㄧ敾 */
cursor: pointer;
- writing-mode: vertical-rl; /* 鎸夐挳鏂囨湰绔栫洿鎺掑垪 */
- text-align: center; /* 鏂囧瓧灞呬腑 */
+ text-align: center;
+}
+.vertical-text {
+ writing-mode: vertical-rl;
+ text-orientation: upright;
}
/* 璁剧疆鍔ㄧ敾鏁堟灉 */
@keyframes fadeInUp {
0% {
opacity: 0;
- transform: translateY(20px) scale(0.5); /* 鍒濆鐘舵�侊細閫忔槑涓旂缉灏� */
+ transform: translateY(20px) scale(0.5); /* 鍒濆鐘舵�侊細閫忔槑涓旂缉灏� */
}
100% {
opacity: 1;
- transform: translateY(0) scale(1); /* 鏈�缁堢姸鎬侊細瀹屽叏鏄剧ず涓旀甯稿ぇ灏� */
+ transform: translateY(0) scale(1); /* 鏈�缁堢姸鎬侊細瀹屽叏鏄剧ず涓旀甯稿ぇ灏� */
}
}
/* 姣忎釜鎸夐挳鐨勪綅缃拰鍔ㄧ敾寤惰繜 */
.btnbox > div:nth-child(1) {
- top: 20%; /* 绗竴涓寜閽殑浣嶇疆 */
- animation-delay: 0s; /* 鏃犲欢杩� */
+ top: 20%; /* 绗竴涓寜閽殑浣嶇疆 */
+ animation-delay: 0s; /* 鏃犲欢杩� */
}
.btnbox > div:nth-child(2) {
- top: 30%; /* 绗簩涓寜閽殑浣嶇疆 */
+ top: 30%; /* 绗簩涓寜閽殑浣嶇疆 */
animation-delay: 0.2s;
}
.btnbox > div:nth-child(3) {
- top: 40%; /* 绗笁涓寜閽殑浣嶇疆 */
+ top: 40%; /* 绗笁涓寜閽殑浣嶇疆 */
animation-delay: 0.4s;
}
.btnbox > div:nth-child(4) {
- top: 50%; /* 绗洓涓寜閽殑浣嶇疆 */
+ top: 50%; /* 绗洓涓寜閽殑浣嶇疆 */
animation-delay: 0.6s;
}
.btnbox > div:nth-child(5) {
- top: 60%; /* 绗簲涓寜閽殑浣嶇疆 */
+ top: 60%; /* 绗簲涓寜閽殑浣嶇疆 */
animation-delay: 0.8s;
}
.btnbox > div:nth-child(6) {
- top: 70%; /* 绗叚涓寜閽殑浣嶇疆 */
+ top: 70%; /* 绗叚涓寜閽殑浣嶇疆 */
animation-delay: 1s;
}
.main {
- height: 700px;
+ height: 800px;
overflow: hidden;
}
@@ -2345,7 +2557,23 @@
-moz-border-radius: 2em;
border-radius: 2em;
}
-
+::v-deep .el-dialog {
+ width: 1700px;
+ height: 900px;
+}
+::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;
height: 800px;
@@ -2379,9 +2607,8 @@
display: flex;
justify-content: center;
align-items: center;
- padding: 0px 20px;
z-index: 1000; /* 纭繚鎸夐挳灞傜骇鍦ㄥ叾浠栧唴瀹逛笂鏂� */
- width: 100%;
+ width: 300px;
background-color: white; /* 鍙牴鎹渶瑕佽皟鏁磋儗鏅鑹� */
}
@@ -2397,24 +2624,29 @@
}
.box {
display: flex;
- position: sticky;
- top: 0px;
- height: 85vh;
- overflow: auto; // 纭繚鐖跺鍣ㄥ彲浠ユ粴鍔�
+
+ height: 100vh;
}
.rightbox {
- margin-left: 30px;
- overflow-y: scroll;
- position: sticky;
- top: 0px;
+ // margin-left: 60px;
+ // position: fixed;
+ // top: 107px;
+ // right: 56px;
+ width: 684px;
+ position: fixed; /* 鍥哄畾瀹氫綅 */
+ right: 60px;
+
.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; /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛浠ラ伩鍏嶅唴瀹圭揣璐磋竟缂� */
+ padding-bottom: 200px;
}
}
@@ -2437,6 +2669,15 @@
.kong {
box-shadow: none;
}
+::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