From c75027743ea7c3ecc2d0885f01d11d2ad78679a3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 14:23:26 +0800
Subject: [PATCH] Merge branch 'yxh' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/medicalevaluation/index.vue | 75 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 25 deletions(-)
diff --git a/src/views/project/medicalevaluation/index.vue b/src/views/project/medicalevaluation/index.vue
index c9f1365..aed7410 100644
--- a/src/views/project/medicalevaluation/index.vue
+++ b/src/views/project/medicalevaluation/index.vue
@@ -2,6 +2,7 @@
<template>
<div class="app-container">
<el-form
+ class="opo-query-form"
:model="queryParams"
ref="queryForm"
:inline="true"
@@ -51,13 +52,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"
@@ -85,7 +86,7 @@
</el-col>
<el-col :span="12">
- <el-form-item label="鎶ュ憡鏃ユ湡">
+ <el-form-item label="璇勪及鏃堕棿">
<el-date-picker
style="width: 100%"
v-model="selecttime"
@@ -120,7 +121,17 @@
<!--<el-table v-loading="loading" border :data="donatebaseinfoList"> -->
<el-table v-loading="loading" border :data="VMedicalevaluation">
<el-table-column
- label="鎶ュ憡鏃堕棿"
+ 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"
prop="reporttime"
width="120"
@@ -140,7 +151,19 @@
/>
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鍖荤枟鏈烘瀯"
@@ -200,10 +223,13 @@
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>
@@ -385,7 +411,7 @@
clearable
size="small"
v-model="form.hospitalassesstime"
- type="date"
+ type="date" format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨闄㈢骇璇勪及鏃堕棿"
>
@@ -438,7 +464,7 @@
clearable
size="small"
v-model="form.provincialassesstime"
- type="date"
+ type="date" format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鐪佺骇璇勪及鏃堕棿"
>
@@ -492,7 +518,7 @@
clearable
size="small"
v-model="form.coreteamassesstime"
- type="date"
+ type="date" format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="璇勪及鏃堕棿"
>
@@ -628,7 +654,8 @@
"sys_organstate",
"sys_CoreAssessConclusion",
"sys_BaseAssessConclusion",
- "sys_OrganDecision"
+ "sys_OrganDecision",
+ "sys_donornode"
],
data() {
//杩欓噷瀛樻斁鏁版嵁
@@ -754,7 +781,6 @@
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")
];
}
@@ -882,22 +908,17 @@
getList(e) {
this.loading = true;
this.queryParams.params = {};
- // if (null != this.daterangeReporttime && "" != this.daterangeReporttime) {
- // this.queryParams.params["beginReporttime"] =
- // this.daterangeReporttime[0];
- // this.queryParams.params["endReporttime"] = this.daterangeReporttime[1];
- // }
+ sessionStorage.removeItem("medicalevaluation");
+ sessionStorage.setItem(
+ "medicalevaluation",
+ JSON.stringify(this.queryParams)
+ );
+
// 璺宠浆鏃剁殑榛樿杩涘害
if (e != null && e != undefined && !isNaN(e)) {
this.queryParams.recordstate = e;
}
- // if (this.selecttime[0] != null && this.selecttime[1] != null) {
- // this.queryParams.params["starttime"] = this.selecttime[0];
- // this.queryParams.params["endReporttime"] = this.selecttime[1];
- // }
- // this.queryParams.city='001'
- //console.log(JSON.stringify(this.queryParams));
if (this.starttime != "") {
this.queryParams.starttime = this.starttime;
}
@@ -1341,6 +1362,10 @@
//鑾峰彇鐢ㄦ埛鍒楄〃
this.getuserlist();
//鑾峰彇鍒楄〃
+ if (sessionStorage.getItem("medicalevaluation")) {
+ this.queryParams = JSON.parse(sessionStorage.getItem("medicalevaluation"));
+ console.log(this.queryParams, "queryParams");
+ }
this.getList();
}
// //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
--
Gitblit v1.9.3