From 21ead72243112d675806161b5125d185d5c4f443 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 12 三月 2024 16:27:59 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 34 ++++++++--------
src/views/project/donatebaseinfo/index.vue | 18 +++++----
src/views/project/donorcharge/donorchargedetail/index.vue | 58 +++++++---------------------
3 files changed, 42 insertions(+), 68 deletions(-)
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 360fcb0..437e4e6 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -566,7 +566,7 @@
<el-radio
v-for="dict in dict.type.sys_bloodtype_rhd"
:key="dict.value"
- :label="dict.value"
+ :label="dict.label"
>{{ dict.label }}</el-radio
>
</el-radio-group>
@@ -1014,7 +1014,9 @@
// reporttime: null,
},
// 琛ㄥ崟鍙傛暟
- form: {},
+ form: {
+ rhyin:'0'
+ },
//ads
reporters: [],
users: [],
@@ -1573,9 +1575,9 @@
this.showSaveBtn = true;
//this.$refs.annex.getAnnexList();
this.open = true;
- this.$nextTick(function() {
- this.$refs.annex.getAnnexList();
- });
+ // this.$nextTick(function() {
+ // this.$refs.annex.getAnnexList();
+ // });
this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
},
@@ -1644,9 +1646,9 @@
this.open = true;
this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
this.form.recordstate = 99;
- this.$nextTick(function() {
- this.$refs.annex.getAnnexList();
- });
+ // this.$nextTick(function() {
+ // this.$refs.annex.getAnnexList();
+ // });
});
},
/** 鎻愪氦鎸夐挳 */
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 1ba20d7..1ce9e1c 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -2807,12 +2807,12 @@
getDonatebaseinfoflow(this.infoid).then(res => {
if (res.code==200) {
this.Processdata = res.data;
- this.donatebaseinfo=this.Processdata.donatecompletioninfo;
- this.medicalevaluation=this.Processdata.donatecompletioninfo;
- this.relativesconfirmation=this.Processdata.donatecompletioninfo;
- this.donateflowcharts=this.Processdata.donatecompletioninfo;
- this.donateorgansService=this.Processdata.donatecompletioninfo;
- this.donationwitness=this.Processdata.donatecompletioninfo;
+ this.donatebaseinfo=this.Processdata.donatebaseinfo;
+ this.medicalevaluation=this.Processdata.medicalevaluation;
+ this.relativesconfirmation=this.Processdata.relativesconfirmation;
+ this.donateflowcharts=this.Processdata.donateflowcharts;
+ this.donateorgansService=this.Processdata.donateorgansService;
+ this.donationwitness=this.Processdata.donationwitness;
this.donatecompletioninfo=this.Processdata.donatecompletioninfo;
}else{
this.$message.error('渚ц竟鏍忎俊鎭幏鍙栧け璐�');
@@ -2946,7 +2946,7 @@
this.procureddata = res.rows;
this.procureddata.infoid = this.infoid;
} else {
- this.procureddata = this.allocateddata;
+ this.procureddata = this.allocateddata.filter(obj => obj.organname !== '宸﹁倽' && obj.organname !== '鍙宠倽');;
this.procureddata.infoid = this.infoid;
}
this.organList.organprocured = [];
@@ -3292,15 +3292,15 @@
addDonatecompletioninfo(this.accomplishform).then(response => {
this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
this.$modal.closeLoading();
- this.$modal
- .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�")
- .then(() => {
- this.$router.push({
- path: "/finance/donorchargedetail/",
- query: { id: 0, operation: "add", data: this.form }
- });
- })
- .catch(() => {});
+ // this.$modal
+ // .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�")
+ // .then(() => {
+ // this.$router.push({
+ // path: "/finance/donorchargedetail/",
+ // query: { gxinzt: true, operation: "add", data: this.form, }
+ // });
+ // })
+ // .catch(() => {});
});
}
@@ -3560,7 +3560,7 @@
this.submitForm();
Modifydonationattachment(this.donatelist).then(res => {});
this.listDonateannex();
- this.GetAttacheddata();
+ // this.GetAttacheddata();
} else {
this.submitForm();
// this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
diff --git a/src/views/project/donorcharge/donorchargedetail/index.vue b/src/views/project/donorcharge/donorchargedetail/index.vue
index 4d4134f..9ee3282 100644
--- a/src/views/project/donorcharge/donorchargedetail/index.vue
+++ b/src/views/project/donorcharge/donorchargedetail/index.vue
@@ -388,7 +388,7 @@
{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
]
},
-
+ gxinzt: false,
baselist: [],
donorList: [],
organchargelist: [],
@@ -531,6 +531,8 @@
this.operationType = this.$route.query.operation;
this.curId = this.$route.query.id;
this.curCase = this.$route.query.data;
+ this.gxinzt = this.$route.query.gxinzt;
+ console.log(this.curCase);
console.log("this.$route.query", this.$route.query);
if (this.operationType == "add") {
@@ -583,46 +585,13 @@
this.form.age = this.curCase.age;
this.form.donationcategory = this.curCase.donationcategory;
- //鑾峰彇瀹屾垚鐧昏鐨勫櫒瀹樿〃
- if (this.curCase.id > 0) {
- } else {
- this.curCase.id = 0;
- }
- let searchParam = {
- infoid: this.curCase.id
- };
- listDonatecomporgan(searchParam).then(res => {
- if (res.code == 200) {
- // 鏌ヨ鍣ㄥ畼璐圭敤琛�
- let tempParam = {
- organcode: null,
- organname: null,
- charge: null
- };
- listOrgancharge(tempParam).then(res1 => {
- if (res1.code == 200) {
- this.organchargelist = res1.rows;
- }
-
- //鎻掑叆鍣ㄥ畼琛�
- res.rows.forEach(item => {
- //鑾峰彇璐圭敤閲戦
- this.organchargelist.map(rescharge => {
- if (rescharge.organcode == item.organno) {
- this.donorchargeorgans.push({
- organno: item.organno,
- organname: item.organname,
- organcharge: rescharge.charge,
- infoid: item.infoid,
- hospitalname: item.transplanthospitalname,
- hospitalno: item.transplanthospitalno,
- organtime: item.transplanttime,
- chargestate: "0"
- });
- }
- });
- });
- });
+ this.organParams.infoid = this.curCase.id;
+ listDonorchargeorgan(this.organParams).then(res => {
+ console.log("listDonorchargeorgan", res);
+ this.donorchargeorgans = res.rows;
+ if (this.donorchargeorgans.length > 0) {
+ } else {
+ this.addRow(0);
}
});
}
@@ -638,7 +607,7 @@
this.form = response.data;
console.log("getDonorcharge", response);
//鍣ㄥ畼璐圭敤淇℃伅
- this.organParams.donorchargeid = this.curId;
+ this.organParams.infoid = this.form.infoid;
console.log("this.organParams", this.organParams);
listDonorchargeorgan(this.organParams).then(res => {
console.log("listDonorchargeorgan", res);
@@ -647,6 +616,9 @@
if (this.donorchargeorgans.length > 0) {
} else {
this.addRow(0);
+ }
+ if ((this.gxinzt = true)) {
+ this.submitForm();
}
});
});
@@ -663,7 +635,7 @@
this.title = "鏌ョ湅鎹愮尞妗堜緥鍣ㄥ畼璐圭敤琛�";
//鍣ㄥ畼璐圭敤淇℃伅
- this.organParams.donorchargeid = this.curId;
+ this.organParams.infoid = this.form.infoid;
listDonorchargeorgan(this.organParams).then(res => {
this.donorchargeorgans = res.rows;
if (this.donorchargeorgans.length > 0) {
--
Gitblit v1.9.3