From a7a0b7a266fd3df381ab8f2b6dcf098ef9076533 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 30 七月 2025 10:51:26 +0800
Subject: [PATCH] 1111
---
src/views/doctor/checkAll/index.vue | 136 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 118 insertions(+), 18 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index b65dfce..1d5cb4d 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -733,6 +733,7 @@
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="textarea1"
:autosize="{ minRows: minRows, maxRows: maxRows }"
+ style="font-size: 16px"
></el-input>
</el-form-item>
</el-form>
@@ -778,6 +779,7 @@
style="width: 100%"
:header-cell-style="{ background: '#67C23A' }"
:row-key="getRowKeys"
+ :expand-row-keys="expends"
>
<!-- :expand-row-keys="expends" -->
<el-table-column type="expand">
@@ -2008,7 +2010,6 @@
flags: false,
jianqianwenzhendata: [],
jianqians: false,
- adviceLoading: false,
sex: true,
activeName: "1",
hosproy: true,
@@ -2065,7 +2066,7 @@
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
- picker.$emit("pick", [start, end]);
+ picker.$adviceLoading("pick", [start, end]);
},
},
{
@@ -2150,6 +2151,8 @@
status1: 0,
viewportHeight: 0,
expends: [],
+ expandRowKeys: [],
+ shouldExpand: false,
};
},
@@ -2539,14 +2542,26 @@
},
getConfigKey() {
- getconfigKey("sfkqtwbg").then((res) => {
+ // 浣跨敤姝ｇ‘鐨� getConfigKey 鍑芥暟锛堥渶瑕佸弬鏁帮級
+ getConfigKey("sfkqtwbg").then((res) => {
this.msgtuwen = res.msg;
+ }).catch((error) => {
+ console.warn("鑾峰彇閰嶇疆椤� sfkqtwbg 澶辫触:", error);
+ this.msgtuwen = ""; // 璁剧疆榛樿鍊�
});
- getconfigKey("sfkqjqwz").then((res) => {
+
+ getConfigKey("sfkqjqwz").then((res) => {
this.msgjianqian = res.msg;
+ }).catch((error) => {
+ console.warn("鑾峰彇閰嶇疆椤� sfkqjqwz 澶辫触:", error);
+ this.msgjianqian = ""; // 璁剧疆榛樿鍊�
});
- getconfigKey("kcf").then((res) => {
+
+ getConfigKey("kcf").then((res) => {
this.msgkcf = res.msg;
+ }).catch((error) => {
+ console.warn("鑾峰彇閰嶇疆椤� kcf 澶辫触:", error);
+ this.msgkcf = ""; // 璁剧疆榛樿鍊�
});
},
@@ -2579,12 +2594,31 @@
yichangjieguo() {
this.loading = true;
+ this.isLoading = true;
this.status1 = 0;
- yichang({
- tjNum: this.tjNumber,
- })
- .then((res) => {
- this.yichangList = res.data;
+ getConfigKey("kzycxmsfzk").then((res) => {
+ this.shouldExpand = res.msg;
+ // 鍙湁Y/y鎵嶅睍寮�锛屽叾瀹冿紙鍖呮嫭绌恒�丯銆乶ull銆乽ndefined锛夐兘涓嶅睍寮�
+ if (this.shouldExpand === "Y") {
+ this.getExpends();
+ } else {
+ this.expends = [];
+ }
+ });
+ return new Promise((resolve, reject) => {
+ yichang({
+ tjNum: this.tjNumber,
+ }).then((res) => {
+ const data = res.data;
+
+ if (!data || data.length === 0) {
+ this.$message.warning("鏆傛棤寮傚父鎶ュ憡");
+ this.loading = false;
+ this.isLoading = false; // 鍏抽棴鏁翠綋鍔犺浇妗�
+ resolve(); // 杩斿洖 Promise锛屼絾涓嶇户缁悗缁�昏緫
+ return;
+ }
+ this.yichangList = data;
this.yichangList.forEach((item) => {
item.sone.forEach((soneItem) => {
if (
@@ -2598,13 +2632,30 @@
if (!this.yichangList) {
this.$message.warning("鏆傛棤寮傚父鎶ュ憡");
}
- })
+ resolve(); // 鎴愬姛瀹屾垚
+ // 杩欓噷涔熷彲浠ユ牴鎹畇houldExpand鍐嶈皟鐢ㄤ竴娆etExpends锛岀‘淇濇暟鎹凡鍔犺浇
+ if (this.shouldExpand === "Y" || this.shouldExpand === "y") {
+ this.getExpends();
+ } else {
+ this.expends = [];
+ }
+ });
+ })
.catch((error) => {
+ this.isLoading = false;
+ this.loading = false;
console.error("鑾峰彇寮傚父缁撴灉澶辫触:", error);
this.$message.error("鑾峰彇寮傚父缁撴灉澶辫触");
+ reject(error); // 杩斿洖閿欒
})
.finally(() => {
- this.loading = false;
+ // 鍙湪娌℃湁鎻愬墠杩斿洖鐨勬儏鍐典笅鍏抽棴鍔犺浇妗�
+ if (this.isLoading) {
+ this.isLoading = false;
+ }
+ if (this.loading) {
+ this.loading = false;
+ }
});
},
@@ -2934,10 +2985,9 @@
propoChange() {
this.cusobj = { sex: this.tableAll.cusSex, isZj: 0 };
+ this.$refs.proposal.clearSearchFields();
getConfigKey("mrzscyjy").then((res) => {
this.mrjy = res.msg; // 浼氳Е鍙� watch 鈫� 璁剧疆 tjproposal = "1"
- // console.log(res, 4444);
-
// 绛夋暟鎹姸鎬佸噯澶囧ソ鍚庡啀鎵撳紑寮圭獥
this.$refs.proposal.title = "寤鸿鏂规";
this.$refs.proposal.open = true;
@@ -3132,6 +3182,18 @@
this.qingkong();
this.$refs.Pre.open = false;
this.tableAll = row;
+ let dict = "dict_tjtype";
+ getDicts(dict).then((res) => {
+ if (res.code == 200) {
+ res.data.forEach((item) => {
+ if (this.tableAll.tjCategory == item.dictValue) {
+ this.tableAll.tjCategory = item.dictLabel;
+ }
+ });
+ } else {
+ throw new Error("鑾峰彇浣撴绫诲瀷瀛楀吀澶辫触");
+ }
+ });
this.tjproject = "0";
this.tjNumber = this.tableAll.tjNumber;
@@ -3153,7 +3215,7 @@
this.isLoading = true;
this.drawer = true;
getupdateCheckType(this.tjNumber).then((response) => {
- this.isLoading = false;
+ // this.isLoading = false;
this.changedate = response.data;
if (this.changedate) {
this.changedate.forEach((item) => {
@@ -3208,7 +3270,7 @@
this.isLoading = true;
this.drawer = true;
getupdateCheckType(this.tjNumber).then((response) => {
- this.isLoading = false;
+ // this.isLoading = false;
this.changedate = response.data;
if (this.changedate) {
for (let i = 0; i < this.changedate.length; i++) {
@@ -3335,7 +3397,45 @@
id: this.MsgId,
};
- addOrder(dataList)
+ /* 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.all([statePromise, ...updatePromises])
+ .then(() => {
+ this.loading = false;
+ this.queryParams.page = 1;
+ this.queryParams.pageSize = 10;
+ this.submitForm();
+ this.$forceUpdate();
+ })
+ .catch((error) => {
+ this.loading = false;
+ console.error("鍙戠敓閿欒:", error);
+ });
+
+ /* addOrder(dataList)
.then((res) => {
if (res.code == 200) {
// gettoPdf(tjNumber)
@@ -3382,7 +3482,7 @@
.catch((error) => {
this.loading = false;
console.error("addOrderPromise 澶辫触:", error);
- });
+ }); */
} else {
this.loading = false;
this.$modal.msgError("鎻愪氦澶辫触");
--
Gitblit v1.8.0