From 563230f7ebcfe6b2d07d147f8b0f29e681bb68fb Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 05 三月 2024 11:05:07 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 230 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 161 insertions(+), 69 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index c2f5102..7ac3238 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -11,14 +11,20 @@
v-if="Processdata.donatebaseinfo.createtime"
>
<p>
- 鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.donatebaseinfo.createtime)
- }}</span>
+ 鎻愪氦锛�<span
+ >{{ Processdata.donatebaseinfo.createperson
+ }} {{
+ parseTime(Processdata.donatebaseinfo.createtime)
+ }}</span
+ >
</p>
<p>
- 鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.donatebaseinfo.updatetime)
- }}</span>
+ 鏇存柊锛�<span
+ >{{ Processdata.donatebaseinfo.updateperson
+ }} {{
+ parseTime(Processdata.donatebaseinfo.updatetime)
+ }}</span
+ >
</p>
</template>
</el-step>
@@ -32,14 +38,20 @@
v-if="Processdata.medicalevaluation.createtime"
>
<p>
- 鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.medicalevaluation.createtime)
- }}</span>
+ 鎻愪氦锛�<span>
+ {{ Processdata.medicalevaluation.createperson
+ }} {{
+ parseTime(Processdata.medicalevaluation.createtime)
+ }}</span
+ >
</p>
<p>
- 鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.medicalevaluation.updatetime)
- }}</span>
+ 鏇存柊锛�<span>
+ {{ Processdata.medicalevaluation.updateperson
+ }} {{
+ parseTime(Processdata.medicalevaluation.updatetime)
+ }}</span
+ >
</p>
</template>
</el-step>
@@ -53,14 +65,20 @@
v-if="Processdata.relativesconfirmation.createtime"
>
<p>
- 鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.relativesconfirmation.createtime)
- }}</span>
+ 鎻愪氦锛�<span>
+ {{ Processdata.relativesconfirmation.createperson
+ }} {{
+ parseTime(Processdata.relativesconfirmation.createtime)
+ }}</span
+ >
</p>
<p>
- 鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.relativesconfirmation.updatetime)
- }}</span>
+ 鏇存柊锛�<span>
+ {{ Processdata.relativesconfirmation.updateperson
+ }} {{
+ parseTime(Processdata.relativesconfirmation.updatetime)
+ }}</span
+ >
</p>
</template>
</el-step>
@@ -74,14 +92,20 @@
v-if="Processdata.donateflowcharts.createtime"
>
<p>
- 鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.donateflowcharts.createtime)
- }}</span>
+ 鎻愪氦锛�<span>
+ {{ Processdata.donateflowcharts.createperson
+ }} {{
+ parseTime(Processdata.donateflowcharts.createtime)
+ }}</span
+ >
</p>
<p>
- 鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.donateflowcharts.updatetime)
- }}</span>
+ 鏇存柊锛�<span>
+ {{ Processdata.donateflowcharts.updateperson
+ }} {{
+ parseTime(Processdata.donateflowcharts.updatetime)
+ }}</span
+ >
</p>
</template>
</el-step>
@@ -95,14 +119,20 @@
v-if="Processdata.donateorgansService.createtime"
>
<p>
- 鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.donateorgansService.createtime)
- }}</span>
+ 鎻愪氦锛�<span>
+ {{ Processdata.donateorgansService.createperson
+ }} {{
+ parseTime(Processdata.donateorgansService.createtime)
+ }}</span
+ >
</p>
<p>
- 鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.donateorgansService.updatetime)
- }}</span>
+ 鏇存柊锛�<span>
+ {{ Processdata.donateorgansService.updateperson
+ }} {{
+ parseTime(Processdata.donateorgansService.updatetime)
+ }}</span
+ >
</p>
</template>
</el-step>
@@ -116,14 +146,20 @@
v-if="Processdata.donationwitness.createtime"
>
<p>
- 鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.donationwitness.createtime)
- }}</span>
+ 鎻愪氦锛�<span>
+ {{ Processdata.donationwitness.createperson
+ }} {{
+ parseTime(Processdata.donationwitness.createtime)
+ }}</span
+ >
</p>
<p>
- 鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.donationwitness.updatetime)
- }}</span>
+ 鏇存柊锛�<span>
+ {{ Processdata.donationwitness.updateperson
+ }} {{
+ parseTime(Processdata.donationwitness.updatetime)
+ }}</span
+ >
</p>
</template>
</el-step>
@@ -137,14 +173,20 @@
v-if="Processdata.donatecompletioninfo.createtime"
>
<p>
- 鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.donatecompletioninfo.createtime)
- }}</span>
+ 鎻愪氦锛�<span>
+ {{ Processdata.donatecompletioninfo.createperson
+ }} {{
+ parseTime(Processdata.donatecompletioninfo.createtime)
+ }}</span
+ >
</p>
<p>
- 鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.donatecompletioninfo.updatetime)
- }}</span>
+ 鏇存柊锛�<span>
+ {{ Processdata.donatecompletioninfo.updateperson
+ }} {{
+ parseTime(Processdata.donatecompletioninfo.updatetime)
+ }}</span
+ >
</p>
</template>
</el-step>
@@ -345,7 +387,7 @@
</el-steps>
</div>
<!-- 鍑瘉鏂囦欢 -->
- <div class="Ticket-button" >
+ <div class="Ticket-button">
<el-button @click.native.prevent="Filepopup" type="success"
>鍑瘉鏂囦欢</el-button
>
@@ -719,12 +761,13 @@
</el-form>
<div class="dialog-footer">
<el-button
- v-show="!showTerminationBtn"
+ v-show="!showTerminationBtn && workflow != 9"
type="primary"
@click="submitForm"
>淇濆瓨</el-button
>
<el-button
+ v-if="workflow != 9"
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -942,12 +985,13 @@
</el-form>
<div class="dialog-footer">
<el-button
- v-show="!showTerminationBtn"
+ v-show="!showTerminationBtn && workflow != 9"
type="primary"
@click="Savethedetails"
>淇濆瓨</el-button
>
<el-button
+ v-if="workflow != 9"
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1175,12 +1219,13 @@
</el-form>
<div class="dialog-footer">
<el-button
- v-show="!showTerminationBtn"
+ v-show="!showTerminationBtn && workflow != 9"
type="primary"
@click="Savethedetails"
>淇濆瓨</el-button
>
<el-button
+ v-if="workflow != 9"
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1246,12 +1291,13 @@
</el-form>
<div class="dialog-footer" style="min-height: 500px; margin: 20px 0; ">
<el-button
- v-show="!showTerminationBtn"
+ v-show="!showTerminationBtn && workflow != 9"
type="primary"
@click="Savethedetails"
>淇濆瓨</el-button
>
<el-button
+ v-if="workflow != 9"
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1413,12 +1459,13 @@
</el-form>
<div class="dialog-footer" v-show="actives == 4">
<el-button
- v-show="!showTerminationBtn"
+ v-show="!showTerminationBtn && workflow != 9"
type="primary"
@click="Savethedetails"
>淇濆瓨</el-button
>
<el-button
+ v-if="workflow != 9"
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1923,12 +1970,13 @@
<div class="dialog-footer">
<el-button
- v-show="!showTerminationBtn"
+ v-show="!showTerminationBtn && workflow != 9"
type="primary"
@click="Savethedetails"
>淇濆瓨</el-button
>
<el-button
+ v-if="workflow != 9"
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -2193,21 +2241,25 @@
</el-form>
<div class="dialog-footer">
<el-button
- v-show="!showTerminationBtn"
+ v-show="!showTerminationBtn && workflow != 9"
type="primary"
@click="Savethedetails"
>淇濆瓨</el-button
>
<el-button
+ v-if="workflow != 9"
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<el-button
- v-show="Reportforreview"
- type="primary"
+ v-if="workflow != 9"
+ type="success"
@click="Reportforreview"
- >鎻愪氦</el-button
+ >鎻愪氦褰掓。</el-button
+ >
+ <el-button v-else type="danger" @click="Reportforreview"
+ >鎾ら攢褰掓。</el-button
>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -2297,7 +2349,7 @@
>
<el-table-column
prop="annexname"
- align="center"
+ align="center"
:show-overflow-tooltip="true"
label="鍚嶇О"
>
@@ -2310,7 +2362,7 @@
<el-table-column
prop="name"
- align="center"
+ align="center"
:show-overflow-tooltip="true"
label="鍔熻兘"
>
@@ -2321,7 +2373,6 @@
@click.native.prevent.stop="deletedowfile(scope.row)"
>鍒犻櫎</el-button
>
-
</template>
</el-table-column>
</el-table>
@@ -2672,7 +2723,7 @@
//鎶ュ憡浜哄垪琛�
reporters: [],
//闄勪欢鍒楄〃
- annextype: '1', //闄勪欢type
+ annextype: "1", //闄勪欢type
annexfilesList: [], //闄勪欢灞曠ず鍒�
potentiallist: [], //娼滃湪闄勪欢
medicinelist: [], //鍖诲闄勪欢
@@ -2736,9 +2787,9 @@
// 琛ㄥ崟鏁版嵁
getDonatebaseinfo(this.infoid).then(response => {
this.form = response.data;
- if(response.data.terminationCase){
+ if (response.data.terminationCase) {
this.showTerminationBtn = response.data.terminationCase;
- } else{
+ } else {
this.showTerminationBtn = 0;
}
this.actives = response.data.workflow;
@@ -2859,6 +2910,9 @@
if (res.rows[0]) {
this.procureddata = res.rows;
this.procureddata.infoid = this.infoid;
+ } else {
+ this.procureddata = this.allocateddata;
+ this.procureddata.infoid = this.infoid;
}
this.organList.organprocured = [];
for (let i = 0; i < this.procureddata.length; i++) {
@@ -2889,15 +2943,15 @@
if (this.accomplishform.infoid) {
return;
}
- // 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼
- // let accpre = {
- // id: searchParam.infoid
- // };
+
if (!this.organList.organtransplant[0]) {
listDonatecomporgan(searchParam).then(res => {
if (res.code == 200) {
if (res.rows[0]) {
this.transplantdata = res.rows;
+ this.transplantdata.infoid = this.infoid;
+ } else {
+ this.transplantdata = this.allocateddata;
this.transplantdata.infoid = this.infoid;
}
for (let i = 0; i < this.transplantdata.length; i++) {
@@ -2913,7 +2967,6 @@
});
}
// 鑾峰彇瀹屾垚鐧昏淇℃伅
- // listnewDonatecompletioninfo(accpre).then(response => {
listDonatecompletioninfo(searchParam).then(response => {
if (response.code == 200 && response.rows.length) {
this.accomplishform = response.rows[0];
@@ -3018,6 +3071,7 @@
// 淇濆瓨浜岀骇琛ㄦ寜閽�
Savethedetails() {
console.log(this.actives);
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
if (this.actives == 1) {
this.medicineform.infoid = this.infoid;
this.$refs["medicineform"].validate(valid => {
@@ -3025,10 +3079,12 @@
if (this.medicineform.id != null) {
updateMedicalevaluation(this.medicineform).then(response => {
this.$modal.msgSuccess("鍖诲璇勪及淇℃伅淇敼鎴愬姛");
+ this.$modal.closeLoading();
});
} else {
addMedicalevaluation(this.medicineform).then(response => {
this.$modal.msgSuccess("鍖诲璇勪及淇℃伅鏂板鎴愬姛");
+ this.$modal.closeLoading();
});
}
this.Processvalidation();
@@ -3045,10 +3101,12 @@
this.affirmform.residencetownname = this.defultAddresss.qu;
updateRelativesconfirmation(this.affirmform).then(response => {
this.$modal.msgSuccess("鎹愮尞纭淇℃伅淇敼鎴愬姛");
+ this.$modal.closeLoading();
});
} else {
addRelativesconfirmation(this.affirmform).then(response => {
this.$modal.msgSuccess("鎹愮尞纭淇℃伅鏂板鎴愬姛");
+ this.$modal.closeLoading();
});
}
this.Processvalidation();
@@ -3062,11 +3120,13 @@
// updateDonateflowchart(this.ethicform).then(response => {
updateEthicalreviewopinions(this.ethicform).then(res => {
this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅淇敼鎴愬姛");
+ this.$modal.closeLoading();
});
} else {
//addDonateflowchart(this.ethicform).then(response => {
addEthicalreviewopinions(this.ethicform).then(res => {
this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅鏂板鎴愬姛");
+ this.$modal.closeLoading();
});
}
this.Processvalidation();
@@ -3098,6 +3158,7 @@
saveDonateorgan(this.allocateddata).then(res => {
if (res.code == 200) {
this.$modal.msgSuccess("鍣ㄥ畼鎹愮尞鍒嗛厤淇℃伅淇濆瓨鎴愬姛锛�");
+ this.$modal.closeLoading();
}
});
this.Processvalidation();
@@ -3127,10 +3188,12 @@
if (this.witnessform.id != null) {
updateDonationwitness(this.witnessform).then(response => {
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
+ this.$modal.closeLoading();
});
} else {
addDonationwitness(this.witnessform).then(response => {
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
+ this.$modal.closeLoading();
});
}
@@ -3157,15 +3220,17 @@
this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
}
});
-console.log(this.accomplishform.id,'瀹屾垚id');
+ console.log(this.accomplishform.id, "瀹屾垚id");
// 淇濆瓨纭淇℃伅
if (this.accomplishform.id) {
updateDonatecompletioninfo(this.accomplishform).then(response => {
this.$modal.msgSuccess("瀹屾垚鐧昏淇℃伅淇敼鎴愬姛");
+ this.$modal.closeLoading();
});
} else {
addDonatecompletioninfo(this.accomplishform).then(response => {
this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
+ this.$modal.closeLoading();
});
}
@@ -3427,9 +3492,37 @@
},
// 鎻愪氦褰掓。
Reportforreview() {
- fileCase({infoId:this.infoid}).then(res=>{
- console.log(res);
- })
+ if (this.form.workflow == 9) {
+ this.form.workflow = 8;
+ this.submitForm();
+ } else {
+ this.$confirm("鍗冲皢杩涜妗堜緥褰掓。, 纭鎵�鏈夋暟鎹凡淇濆瓨?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ fileCase({ infoId: this.infoid }).then(res => {
+ if (res.code == 500) {
+ this.$message.error(res.msg);
+ } else {
+ this.form.workflow = 9;
+ this.submitForm();
+ this.$message({
+ type: "success",
+ message: "褰掓。鎴愬姛!"
+ });
+ this.$router.go(-1);
+ }
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "宸插彇娑堝綊妗�"
+ });
+ });
+ }
},
// 缁堟妗堜緥
Terminationcase() {
@@ -3635,7 +3728,6 @@
this.annexfilesList.splice(indexvalue, 1);
this.Newconversion(this.annexfilesList, indexvalue, "");
},
-
clearFilter() {
this.$refs.filterTable.clearFilter();
--
Gitblit v1.9.3