From 18657144f04cb12efe4b1d23bf925bdedd739c9d Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 18 七月 2025 18:01:50 +0800
Subject: [PATCH] 1
---
src/views/doctor/checkAll/index.vue | 48 ++++++++++++++++++++++--
src/components/proposal/index.vue | 13 ++----
2 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/src/components/proposal/index.vue b/src/components/proposal/index.vue
index a83fb7b..99714b8 100644
--- a/src/components/proposal/index.vue
+++ b/src/components/proposal/index.vue
@@ -205,8 +205,8 @@
methods: {
clearSearchFields() {
- this.searchAdv = ''
- this.searchCyjy = ''
+ this.searchAdv = "";
+ this.searchCyjy = "";
},
setTjProposal(mode) {
if (this.tjproposal !== mode) {
@@ -218,8 +218,6 @@
this.loading = true;
this.openone = true;
getTjHyBgList(this.queryParams).then((res) => {
- console.log(res, 6666);
-
this.dataList = res.data.records;
this.loading = false;
});
@@ -280,8 +278,8 @@
},
radiotjproposalChange() {
if (this.tjproposal == "0") {
- this.searchAdv = "";
- this.searchCyjy = "";
+ // this.searchAdv = "";
+ // this.searchCyjy = "";
this.queryParams1.isZj = this.fList.isZj;
this.queryParams1.userId = null;
this.getList();
@@ -310,7 +308,7 @@
},
radiotjproposalChange1() {
if (this.tjproposal == "0") {
- this.searchCyjy = "";
+ // this.searchCyjy = "";
this.queryParams.isZj = this.fList.isZj;
this.queryParams.userId = null;
this.getList();
@@ -319,7 +317,6 @@
getInfo().then((res) => {
this.queryParams.userId = res.user.userId;
this.queryParams.isZj = null;
- console.log(this.queryParams, 22222);
getCyTjAdviceKjbqBySex(this.queryParams).then((res) => {
if (res.data) {
this.dataList = res.data.records;
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 367ba91..aa23276 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -2601,10 +2601,12 @@
}
})
.catch((error) => {
+ this.isLoading = false;
console.error("鑾峰彇寮傚父缁撴灉澶辫触:", error);
this.$message.error("鑾峰彇寮傚父缁撴灉澶辫触");
})
.finally(() => {
+ this.isLoading = false;
this.loading = false;
});
},
@@ -3165,7 +3167,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) => {
@@ -3220,7 +3222,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++) {
@@ -3347,7 +3349,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)
@@ -3394,7 +3434,7 @@
.catch((error) => {
this.loading = false;
console.error("addOrderPromise 澶辫触:", error);
- });
+ }); */
} else {
this.loading = false;
this.$modal.msgError("鎻愪氦澶辫触");
--
Gitblit v1.8.0