From 3323c96f78bb09b1b2d435d863a593c9a099c269 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 22 四月 2024 15:22:04 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/donationdetails/index.vue | 74 +++++++++++++++++++-----------------
src/views/project/fund/performancedetails/index.vue | 10 ++--
2 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 1b5b4b7..06225b6 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -2958,7 +2958,7 @@
if (res.code == 200) {
if (res.rows[0]) {
this.transplantdata = res.rows;
- this.transplantdata.infoid = this.infoid;
+ // this.transplantdata.infoid = this.infoid;
} else {
this.transplantdata = this.allocateddata;
this.transplantdata = this.transplantdata.map(obj => {
@@ -3246,8 +3246,8 @@
saveDonationwitnessorgan(this.procureddata).then(res => {
if (res == 200) {
this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
- this.$modal.closeLoading();
}
+ this.$modal.closeLoading();
});
});
} else {
@@ -3292,49 +3292,53 @@
// 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅
// this.transplantdata.infoid = this.infoid;
- console.log(this.form);
- this.transplantdata.forEach(item => {
- listDonorchargeorgan({
- infoid: item.infoid,
- organno: item.organno
- }).then(res => {
- console.log("aaa");
- if (res.rows[0]) {
- let objfn = res.rows[0];
- console.log(objfn, "sass");
- objfn.caseno = item.caseno;
- objfn.hospitalno = item.hospitalno;
- objfn.name = item.name;
- objfn.receiveTime = item.transplanttime;
- console.log(objfn, "sass");
- updateDonorchargeorgan(objfn).then(res1 => {});
- } else {
- item.id = null;
- addDonorchargeorgan(item).then(res2 => {});
- }
- });
- });
- saveDonatecomporgan(this.transplantdata).then(res => {
- if (res == 200) {
- this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
- } else {
- this.$modal.msgSuccess(res.msg);
- return;
- }
- });
+ // this.transplantdata.forEach(item => {
+ // listDonorchargeorgan({
+ // infoid: item.infoid,
+ // organno: item.organno
+ // }).then(res => {
+ // console.log("aaa");
+ // if (res.rows[0]) {
+ // let objfn = res.rows[0];
+ // console.log(objfn, "sass");
+ // objfn.caseno = item.caseno;
+ // objfn.hospitalno = item.hospitalno;
+ // objfn.name = item.name;
+ // objfn.receiveTime = item.transplanttime;
+ // console.log(objfn, "sass");
+ // updateDonorchargeorgan(objfn).then(res1 => {});
+ // } else {
+ // item.id = null;
+ // addDonorchargeorgan(item).then(res2 => {});
+ // }
+ // });
+ // });
- console.log(this.accomplishform.id, "瀹屾垚id");
// 淇濆瓨纭淇℃伅
if (this.accomplishform.id) {
updateDonatecompletioninfo(this.accomplishform).then(response => {
this.$modal.msgSuccess("瀹屾垚鐧昏淇℃伅淇敼鎴愬姛");
- this.$modal.closeLoading();
+ saveDonatecomporgan(this.transplantdata).then(res => {
+ if (res == 200) {
+ this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鐧昏淇℃伅淇濆瓨鎴愬姛锛�");
+ } else {
+ this.$modal.msgSuccess(res.msg);
+ }
+ this.$modal.closeLoading();
+ });
});
} else {
addDonatecompletioninfo(this.accomplishform).then(response => {
this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
+ saveDonatecomporgan(this.transplantdata).then(res => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鐧昏淇℃伅淇濆瓨鎴愬姛锛�");
+ } else {
+ this.$modal.msgError(res.msg);
+ }
+ this.$modal.closeLoading();
+ });
this.istb = true;
- this.$modal.closeLoading();
// this.$modal
// .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�")
// .then(() => {
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index 8aafd44..0b83e4c 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -205,7 +205,7 @@
></el-cascader> -->
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="jxrq"
align="center"
label="缁╂晥鏃ユ湡"
@@ -219,7 +219,7 @@
>
</el-date-picker>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="amount"
align="center"
@@ -2831,19 +2831,19 @@
var columnnames = [
"applytype",
"itemid",
- "jxrq",
+ // "jxrq",
"beneficiaryname",
"idcardno",
"depositbank",
"bankcardno",
- "remark",
+ "remark"
];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = "鍚堣";
return;
}
-
+
//鍘婚櫎閮ㄥ垎瀛楁璁＄畻
if (columnnames.indexOf(column.property) > -1) {
return;
--
Gitblit v1.9.3