From 5117eb472133409f395e444abd4bae8915c2ba06 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 04 八月 2025 15:17:37 +0800
Subject: [PATCH] 1
---
src/views/doctor/checkAll/index.vue | 349 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 231 insertions(+), 118 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 6041adc..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>
@@ -808,7 +808,6 @@
style="width: 100%"
:header-cell-style="{ background: '#67C23A' }"
:row-key="getRowKeys"
- v-loading="loading"
>
<!-- :expand-row-keys="expends" -->
<el-table-column type="expand">
@@ -2581,39 +2580,51 @@
},
yichangjieguo() {
- this.isLoading = true;
+ 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() {
@@ -2940,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;
@@ -3161,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;
@@ -3184,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 + "姝ｅ湪淇敼璇ヤ俊鎭�, 鏄惁寮哄埗杩涘幓?",
@@ -3239,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({
@@ -3339,6 +3450,7 @@
let tjNumber = this.tableAll.tjNumber;
let tjh = this.tableAll.tjNumber;
let advice = this.textarea1;
+ this.isLoading = true;
let data = {
tjNumber,
advice,
@@ -3365,7 +3477,8 @@
getTjdetailList(data)
.then((response) => {
if (response.code === 200) {
- this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ this.isLoading = false;
+ this.$modal.msgSuccess(response.msg);
// 娓呯┖瀛楁
this.zhiyeJl = "";
this.zhiyeJg = "";
@@ -3376,7 +3489,7 @@
state: 1,
id: this.MsgId,
};
- gettoPdf(tjNumber)
+ /* gettoPdf(tjNumber)
.then((res) => {
this.$modal.msgSuccess("宸茬敓鎴愭姤鍛婏紒璇峰墠寰�鎶ュ憡鏍告敹椤甸潰纭锛�");
})
@@ -3384,7 +3497,7 @@
this.$modal.msgError(
"鎵撳嵃鎶ュ憡澶辫触锛岃鍓嶅線鎶ュ憡鎵撳嵃椤甸潰琛ユ墦鎶ュ憡锛�"
);
- });
+ }); */
const statePromise = getfiedState(reportData).then(() => {
this.drawer = false;
});
--
Gitblit v1.8.0