From 0b5a704e49545b4059b9eebe247adea8ec14911f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 05 六月 2025 11:45:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/donatefinish/index.vue | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/views/project/donatefinish/index.vue b/src/views/project/donatefinish/index.vue
index 8c5889b..fc5c30a 100644
--- a/src/views/project/donatefinish/index.vue
+++ b/src/views/project/donatefinish/index.vue
@@ -50,13 +50,13 @@
<el-col :span="6">
<el-form-item label="鎹愮尞杩涘害" prop="recordstate">
<el-select
- v-model="queryParams.recordstate"
+ v-model="queryParams.workflow"
placeholder="璇烽�夋嫨璁板綍鐘舵��"
clearable
size="small"
>
<el-option
- v-for="dict in dict.type.sys_DonationStatus"
+ v-for="dict in dict.type.sys_donornode"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@@ -179,12 +179,20 @@
width="100"
/>
- <el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
+ <el-table-column
+ label="鎹愮尞杩涘害"
+ align="center"
+ prop="workflow"
+ width="120"
+ >
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_DonationStatus"
- :value="scope.row.recordstate"
- />
+ <div v-if="!scope.row.terminationCase">
+ <dict-tag
+ :options="dict.type.sys_donornode"
+ :value="scope.row.workflow"
+ />
+ </div>
+ <div v-else>浠诲姟缁堟</div>
</template>
</el-table-column>
@@ -561,7 +569,7 @@
"sys_Infectious",
"sys_InfoSources",
"sys_OtherCases",
- "sys_DonationStatus",
+ "sys_donornode",
"sys_DiseaseType",
"sys_SelfWill",
"sys_FamilyRelation",
@@ -697,9 +705,10 @@
};
},
created() {
- // this.getDicts('country').then(res=>{
- // this.nationality =res.data
- // })
+ if (sessionStorage.getItem("donatefinish")) {
+ this.queryParams = JSON.parse(sessionStorage.getItem("donatefinish"));
+ console.log(this.queryParams, "queryParams");
+ }
},
activated() {
this.selecttime = "";
@@ -712,9 +721,7 @@
if (this.$route.params.starttime != null && this.$route.params.endtime) {
this.selecttime = [
this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
- this.$moment(this.$route.params.endtime)
- .add(-1, "month")
- .format("YYYY-MM-DD")
+ this.$moment(this.$route.params.endtime).format("YYYY-MM-DD")
];
}
if (this.$route.params.reporterno != "") {
@@ -950,6 +957,8 @@
getList() {
this.loading = true;
this.queryParams.params = {};
+ sessionStorage.removeItem("donatefinish");
+ sessionStorage.setItem("donatefinish", JSON.stringify(this.queryParams));
if (null != this.daterangeReporttime && "" != this.daterangeReporttime) {
this.queryParams.params[
"beginReporttime"
--
Gitblit v1.9.3