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/donationwitness/index.vue | 64 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/src/views/project/donationwitness/index.vue b/src/views/project/donationwitness/index.vue
index df0127f..a6bbd22 100644
--- a/src/views/project/donationwitness/index.vue
+++ b/src/views/project/donationwitness/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"
@@ -134,6 +134,16 @@
border
:data="donatebaseinfoList"
>
+ <el-table-column
+ label="妗堜緥鏃堕棿"
+ align="center"
+ prop="donatetime"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.donatetime, "{y}-{m}-{d}") }}</span>
+ </template>
+ </el-table-column>
<el-table-column
label="鎶ュ憡鏃堕棿"
align="center"
@@ -189,12 +199,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>
@@ -839,7 +857,6 @@
import { updatedonatorno } from "@/api/project/relativesconfirmation";
import { getToken } from "@/utils/auth";
-
export default {
components: {
Li_area_select,
@@ -873,7 +890,7 @@
"sys_Infectious",
"sys_InfoSources",
"sys_OtherCases",
- "sys_DonationStatus",
+ "sys_donornode",
"sys_DiseaseType",
"sys_SelfWill",
"sys_FamilyRelation",
@@ -1025,12 +1042,15 @@
};
},
created() {
- this.getuserlist();
+ if (sessionStorage.getItem("donationwitness")) {
+ this.queryParams = JSON.parse(sessionStorage.getItem("donationwitness"));
+ console.log(this.queryParams, "queryParams");
+ }
this.getCoordinatorList1();
this.getCoordinatorList2();
- this.getList();
},
- activated() {
+ activated() {},
+ mounted(e) {
this.selecttime = "";
this.reportervalue = "";
this.reportlist = [];
@@ -1041,9 +1061,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 != "") {
@@ -1069,15 +1087,14 @@
}
this.getTimeList();
this.getList();
- },
- mounted(e) {
this.getuserlist();
// this.selectReporters();
this.tempRecordState = this.$route.params.tempRecordState;
- this.starttime = this.$route.params.starttime;
+ // this.starttime = this.$route.params.starttime;
+ // this.endtime = this.$route.params.endtime;
console.log("浼犳潵鐨勫��", this.starttime);
- this.endtime = this.$route.params.endtime;
+ console.log("浼犳潵鐨勫��", this.endtime);
this.LoadReportList();
},
@@ -1188,6 +1205,11 @@
getList(e) {
this.loading = true;
this.queryParams.params = {};
+ sessionStorage.removeItem("donationwitness");
+ sessionStorage.setItem(
+ "donationwitness",
+ JSON.stringify(this.queryParams)
+ );
if (this.starttime != "") {
this.queryParams.starttime = this.starttime;
}
@@ -1352,7 +1374,7 @@
path: "/organ/donationdetails/",
query: {
id: row.id,
- organType: "edit",
+ organType: "edit"
}
});
// this.reset();
@@ -1606,7 +1628,7 @@
console.log(url);
const link = document.createElement("a");
link.href = url;
- const name=fileUrl["downloadName"]
+ const name = fileUrl["downloadName"];
link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚�
document.body.appendChild(link);
link.click();
--
Gitblit v1.9.3