From 6a341a52246c20a662808f055ea446aa06b92a0d Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 01 八月 2025 12:07:34 +0800
Subject: [PATCH] 1
---
src/views/doctor/checkAll/index.vue | 78 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 8235084..05aa679 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -2010,7 +2010,6 @@
flags: false,
jianqianwenzhendata: [],
jianqians: false,
- adviceLoading: false,
sex: true,
activeName: "1",
hosproy: true,
@@ -2067,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]);
},
},
{
@@ -2543,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 = ""; // 璁剧疆榛樿鍊�
});
},
@@ -2582,7 +2593,9 @@
},
yichangjieguo() {
- this.loading = true;
+ // 绉婚櫎琛ㄦ牸loading鐘舵�侊紝閬垮厤鍦ㄧ偣鍑昏鎯呮椂鏄剧ず琛ㄦ牸loading妗�
+ // this.loading = true;
+ // 涓嶈鍦ㄨ繖閲岃缃� isLoading = true锛屽洜涓哄畠鍦� handleClick 涓凡缁忚璁剧疆浜�
this.status1 = 0;
getConfigKey("kzycxmsfzk").then((res) => {
this.shouldExpand = res.msg;
@@ -2593,11 +2606,22 @@
this.expends = [];
}
});
- yichang({
- tjNum: this.tjNumber,
- })
- .then((res) => {
- this.yichangList = res.data;
+ return new Promise((resolve, reject) => {
+ yichang({
+ tjNum: this.tjNumber,
+ }).then((res) => {
+ const data = res.data;
+
+ if (!data || data.length === 0) {
+ // 绉婚櫎璀﹀憡娑堟伅锛岀敤鎴蜂笉甯屾湜鐪嬪埌"鏆傛棤寮傚父鎶ュ憡"鐨勫脊妗�
+ // this.$message.warning("鏆傛棤寮傚父鎶ュ憡");
+ // 绉婚櫎琛ㄦ牸loading鐘舵�佽缃�
+ // this.loading = false;
+ // 涓嶅湪杩欓噷鍏抽棴 isLoading锛屽洜涓哄畠鐢� handleClick 绠＄悊
+ resolve(); // 杩斿洖 Promise锛屼絾涓嶇户缁悗缁�昏緫
+ return;
+ }
+ this.yichangList = data;
this.yichangList.forEach((item) => {
item.sone.forEach((soneItem) => {
if (
@@ -2608,27 +2632,33 @@
}
});
});
- if (!this.yichangList) {
+ /* 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;
+ // 涓嶅湪杩欓噷鍏抽棴 isLoading锛屽洜涓哄畠鐢� handleClick 绠＄悊
+ // 绉婚櫎琛ㄦ牸loading鐘舵�佽缃�
+ // this.loading = false;
console.error("鑾峰彇寮傚父缁撴灉澶辫触:", error);
this.$message.error("鑾峰彇寮傚父缁撴灉澶辫触");
+ reject(error); // 杩斿洖閿欒
})
.finally(() => {
- this.isLoading = false;
- this.loading = false;
+ // 绉婚櫎琛ㄦ牸loading鐘舵�佽缃紝鍥犱负 isLoading 鐢� handleClick 绠＄悊
+ // if (this.loading) {
+ // this.loading = false;
+ // }
});
},
-
fuchaxiangmu() {
this.loading = true;
@@ -3186,7 +3216,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) => {
@@ -3212,6 +3242,10 @@
this.zhiyeJl = "";
this.zhiyeJg = "鏈彂鐜扮洰鏍囨�х柧鐥�";
}
+ }).catch((error) => {
+ this.isLoading = false;
+ console.error("鑾峰彇妫�鏌ョ被鍨嬪け璐�:", error);
+ this.$message.error("鑾峰彇妫�鏌ョ被鍨嬪け璐�");
});
});
}
@@ -3241,7 +3275,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++) {
@@ -3266,6 +3300,10 @@
this.zhiyeJl = "";
this.zhiyeJg = "鏈彂鐜扮洰鏍囨�х柧鐥�";
}
+ }).catch((error) => {
+ this.isLoading = false;
+ console.error("鑾峰彇妫�鏌ョ被鍨嬪け璐�:", error);
+ this.$message.error("鑾峰彇妫�鏌ョ被鍨嬪け璐�");
});
});
}
--
Gitblit v1.8.0