From 1d1f47e55da5e0f4f20fe5eb20fc426aebb7966a Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期一, 04 八月 2025 15:19:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/doctor/checkAll/index.vue | 340 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 226 insertions(+), 114 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index f0a9a02..f0c4367 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -779,7 +779,7 @@
<el-button
type="primary"
@click="determine"
- :disabled="isdisabled"
+ :disabled="isdisabled || isLoading"
>鎻愪氦骞剁敓鎴愭姤鍛�</el-button
>
</div>
@@ -2583,36 +2583,48 @@
this.loading = true;
this.status1 = 0;
this.yichangList = [];
- yichang({
- tjNum: this.tjNumber,
- })
- .then((res) => {
- // this.isLoading = false
- this.yichangList = res.data;
- this.yichangList.forEach((item) => {
- item.sone.forEach((soneItem) => {
- if (
- !Array.isArray(soneItem.advices) ||
- soneItem.advices.length === 0
- ) {
- soneItem.advices = [{ bt: "", nr: "" }];
- }
+ return new Promise((resolve, reject) => {
+ yichang({
+ tjNum: this.tjNumber,
+ })
+ .then((res) => {
+ const data = res.data;
+
+ if (!data || data.length === 0) {
+ this.loading = false;
+ resolve(); // 杩斿洖 Promise锛屼絾涓嶇户缁悗缁�昏緫
+ return;
+ }
+ this.yichangList = data;
+
+ this.yichangList.forEach((item) => {
+ item.sone.forEach((soneItem) => {
+ if (
+ !Array.isArray(soneItem.advices) ||
+ soneItem.advices.length === 0
+ ) {
+ soneItem.advices = [{ bt: "", nr: "" }];
+ }
+ });
});
+ /* if (!this.yichangList) {
+ this.$message.warning("鏆傛棤寮傚父鎶ュ憡");
+ } */
+ resolve(); // 鎴愬姛瀹屾垚
+ })
+ .catch((error) => {
+ this.loading = false;
+ console.error("鑾峰彇寮傚父缁撴灉澶辫触:", error);
+ this.$message.error("鑾峰彇寮傚父缁撴灉澶辫触");
+ reject(error); // 杩斿洖閿欒
+ })
+ .finally(() => {
+ if (this.loading) {
+ this.loading = false;
+ }
});
- if (!this.yichangList) {
- this.$message.warning("鏆傛棤寮傚父鎶ュ憡");
- }
- })
- .catch((error) => {
- this.isLoading = false;
- console.error("鑾峰彇寮傚父缁撴灉澶辫触:", error);
- this.$message.error("鑾峰彇寮傚父缁撴灉澶辫触");
- })
- .finally(() => {
- this.isLoading = false;
- this.loading = false;
- });
+ });
},
fuchaxiangmu() {
@@ -2939,6 +2951,7 @@
radiotjprojectChange() {
if (this.tjproject == "0") {
getupdateCheckType(this.tjNumber).then((response) => {
+ this.isLoading = false;
this.changedate = response.data;
this.changedate.forEach((item) => {
this.textarea1 = item.checkAdvice;
@@ -3160,6 +3173,65 @@
this.formobj = {};
},
+ /* handleClick(row) {
+ 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;
+
+ getState(this.tjNumber).then((res) => {
+ this.status = res.data;
+ if (this.status) {
+ if (this.status.status === "1") {
+ // 娌℃湁寮哄埗杩涘叆寮规锛岀洿鎺ュ紑鍚姞杞藉拰寮规
+ this.isLoading = true;
+ this.drawer = true;
+ // 鐩存帴鍦╤andleClick涓疄鐜板苟琛屽姞杞�
+ this.loadDataInHandleClick();
+ } else {
+ this.$confirm(
+ "" + this.status.name + "姝ｅ湪淇敼璇ヤ俊鎭�, 鏄惁寮哄埗杩涘幓?",
+ "鎻愮ず",
+ {
+ confirmButtonText: "鏄�",
+ cancelButtonText: "鍚�",
+ type: "warning",
+ }
+ )
+ .then(() => {
+ // 鍏抽棴琛ㄦ牸鐨刲oading鐘舵��
+ this.loading = false;
+ // 鐢ㄦ埛纭寮哄埗杩涘叆锛屽紑鍚姞杞藉拰寮规
+ this.isLoading = true;
+ this.drawer = true;
+ // 鐩存帴鍦╤andleClick涓疄鐜板苟琛屽姞杞斤紙寮哄埗杩涘叆妯″紡锛�
+ this.loadDataInHandleClick(true);
+ })
+ .catch(() => {
+ this.isLoading = false; // 鍙栨秷鏃朵篃瑕佸叧闂姞杞芥
+ this.$message({
+ type: "info",
+ message: "宸插彇娑堣繘鍏�",
+ });
+ });
+ }
+ }
+ });
+ }, */
+
handleClick(row) {
this.qingkong();
this.$refs.Pre.open = false;
@@ -3183,50 +3255,70 @@
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.isLoading = true;
- this.drawer = true;
- getupdateCheckType(this.tjNumber).then((response) => {
- // this.isLoading = false
- this.changedate = response.data;
- if (this.changedate) {
- this.changedate.forEach((item) => {
- this.textarea1 = item.checkAdvice || "";
- });
- 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.isLoading = true;
+ this.drawer = true;
+
+ // 骞惰鎵ц寮傚父缁撴灉銆佺敤鎴蜂俊鎭幏鍙栧拰浣撴椤圭洰鏁版嵁鑾峰彇
+ Promise.all([
+ this.yichangjieguo(),
+ getInfo(),
+ getupdateCheckType(this.tjNumber),
+ ])
+ .then(([yichangResult, userInfo, checkTypeResult]) => {
+ this.userId = userInfo.user.userId;
+ if (this.userId) {
+ let data = {
+ userId: this.userId,
+ tjNumber: this.tjNumber,
+ state: 0,
+ };
+ getModifiedState(data)
+ .then((res) => {
+ this.MsgId = res.msg;
+ // 鎵�鏈夋暟鎹兘宸插姞杞藉畬鎴愶紝鍏抽棴loading
+ this.isLoading = false;
+
+ this.changedate = checkTypeResult.data;
+ if (this.changedate) {
+ this.changedate.forEach((item) => {
+ this.textarea1 = item.checkAdvice || "";
+ });
+ 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;
+ }
+ // 鍥炴樉 zhiyeJl 鍜� zhiyeJg
+ this.zhiyeJl = this.changedate[0].zhiyejl || "";
+ this.zhiyeJg =
+ this.changedate[0].zhiyejg || "鏈彂鐜扮洰鏍囨�х柧鐥�";
+ } else {
+ this.$message({
+ type: "warning",
+ message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
+ });
+ // 濡傛灉娌℃湁鏁版嵁锛屾竻绌哄瓧娈�
+ this.zhiyeJl = "";
+ this.zhiyeJg = "鏈彂鐜扮洰鏍囨�х柧鐥�";
}
- // 鍥炴樉 zhiyeJl 鍜� zhiyeJg
- this.zhiyeJl = this.changedate[0].zhiyejl || "";
- this.zhiyeJg =
- this.changedate[0].zhiyejg || "鏈彂鐜扮洰鏍囨�х柧鐥�";
- } else {
- this.$message({
- type: "warning",
- message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
- });
- // 濡傛灉娌℃湁鏁版嵁锛屾竻绌哄瓧娈�
- this.zhiyeJl = "";
- this.zhiyeJg = "鏈彂鐜扮洰鏍囨�х柧鐥�";
- }
- });
- });
- }
- });
+ })
+ .catch((error) => {
+ this.isLoading = false;
+ console.error("淇敼鐘舵�佸け璐�:", error);
+ this.$message.error("淇敼鐘舵�佸け璐�");
+ });
+ } else {
+ this.isLoading = false;
+ }
+ })
+ .catch((error) => {
+ this.isLoading = false;
+ console.error("骞惰鍔犺浇鏁版嵁澶辫触:", error);
+ this.$message.error("鍔犺浇鏁版嵁澶辫触锛岃閲嶈瘯");
+ });
} else {
this.$confirm(
"" + this.status.name + "姝ｅ湪淇敼璇ヤ俊鎭�, 鏄惁寮哄埗杩涘幓?",
@@ -3238,49 +3330,69 @@
}
)
.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.isLoading = true;
- this.drawer = true;
- getupdateCheckType(this.tjNumber).then((response) => {
- // this.isLoading = false
- this.changedate = response.data;
- if (this.changedate) {
- for (let i = 0; i < this.changedate.length; i++) {
- this.remark = this.changedate[i].remark;
+ // 寮�鍚姞杞藉拰寮规
+ this.isLoading = true;
+ this.drawer = true;
+
+ // 骞惰鎵ц寮傚父缁撴灉銆佺敤鎴蜂俊鎭幏鍙栧拰浣撴椤圭洰鏁版嵁鑾峰彇
+ Promise.all([
+ this.yichangjieguo(),
+ getInfo(),
+ getupdateCheckType(this.tjNumber),
+ ])
+ .then(([yichangResult, userInfo, checkTypeResult]) => {
+ this.userId = userInfo.user.userId;
+ if (this.userId) {
+ let data = {
+ userId: this.userId,
+ tjNumber: this.tjNumber,
+ state: 0,
+ };
+ getforceIn(data)
+ .then((res) => {
+ this.MsgId = res.msg;
+ // 鎵�鏈夋暟鎹兘宸插姞杞藉畬鎴愶紝鍏抽棴loading
+ this.isLoading = false;
+
+ this.changedate = checkTypeResult.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 || "";
+ });
+ // 鍥炴樉 zhiyeJl 鍜� zhiyeJg
+ this.zhiyeJl = this.changedate[0].zhiyejl || "";
+ this.zhiyeJg =
+ this.changedate[0].zhiyejg || "鏈彂鐜扮洰鏍囨�х柧鐥�";
+ } else {
+ this.$message({
+ type: "warning",
+ message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
+ });
+ // 濡傛灉娌℃湁鏁版嵁锛屾竻绌哄瓧娈�
+ this.zhiyeJl = "";
+ this.zhiyeJg = "鏈彂鐜扮洰鏍囨�х柧鐥�";
}
- this.initialState = JSON.parse(
- JSON.stringify(this.changedate)
- );
- this.changedate.forEach((item) => {
- this.textarea1 = item.checkAdvice || "";
- });
- // 鍥炴樉 zhiyeJl 鍜� zhiyeJg
- this.zhiyeJl = this.changedate[0].zhiyejl || "";
- this.zhiyeJg =
- this.changedate[0].zhiyejg || "鏈彂鐜扮洰鏍囨�х柧鐥�";
- } else {
- this.$message({
- type: "warning",
- message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
- });
- // 濡傛灉娌℃湁鏁版嵁锛屾竻绌哄瓧娈�
- this.zhiyeJl = "";
- this.zhiyeJg = "鏈彂鐜扮洰鏍囨�х柧鐥�";
- }
- });
- });
- }
- });
+ })
+ .catch((error) => {
+ this.isLoading = false;
+ console.error("寮哄埗杩涘叆澶辫触:", error);
+ this.$message.error("寮哄埗杩涘叆澶辫触");
+ });
+ } else {
+ this.isLoading = false;
+ }
+ })
+ .catch((error) => {
+ this.isLoading = false;
+ console.error("骞惰鍔犺浇鏁版嵁澶辫触:", error);
+ this.$message.error("鍔犺浇鏁版嵁澶辫触锛岃閲嶈瘯");
+ });
})
.catch(() => {
this.$message({
@@ -3366,7 +3478,7 @@
.then((response) => {
if (response.code === 200) {
this.isLoading = false;
- this.$modal.msgSuccess(response.msg);
+ this.$modal.msgSuccess(response.msg);
// 娓呯┖瀛楁
this.zhiyeJl = "";
this.zhiyeJg = "";
--
Gitblit v1.8.0