~yxh/opo-web.git

			@@ -1,6 +1,7 @@
			<template>
			<div class="app-container">
			<el-form
			class="opo-query-form"
			:model="queryParams"
			ref="queryForm"
			:inline="true"
			@@ -50,13 +51,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"
			@@ -126,7 +127,7 @@
			</el-form-item>
			</el-col>



			</el-row> -->
			</el-form>

			@@ -155,7 +156,21 @@
			/>
			</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.age2 && scope.row.age2 !== 0
			? `${scope.row.age2}${scope.row.ageunit2}`
			: ""
			}`.trim()
			}}
			</template>
			</el-table-column>
			<el-table-column
			label="医疗机构"
			align="center"
			@@ -179,12 +194,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>

			@@ -286,8 +309,8 @@
			clearable
			size="small"
			v-model="form.completetime"
			type="date"
			value-format="yyyy-MM-dd hh:mm:ss"
			type="date" format="yyyy-MM-dd"
			value-format="yyyy-MM-dd HH:mm:ss"
			placeholder="选择完成时间"
			>
			</el-date-picker>
			@@ -356,7 +379,7 @@
			size="small"
			style="width: 90%"
			v-model="scope.row.transplanttime"
			type="date"
			type="date" format="yyyy-MM-dd"
			value-format="yyyy-MM-dd HH:mm:ss"
			placeholder="选择器官移植时间"
			>
			@@ -528,6 +551,8 @@
			import Li_area_select from "@/components/Address";
			import OrgSelecter from "@/views/project/components/orgselect";
			import AnnexUpload from "@/views/project/components/annexupload";
			import { getToken } from "@/utils/auth";

			import {
			listDonateorgan,
			addDonateorgan,
			@@ -559,7 +584,7 @@
			"sys_Infectious",
			"sys_InfoSources",
			"sys_OtherCases",
			"sys_DonationStatus",
			"sys_donornode",
			"sys_DiseaseType",
			"sys_SelfWill",
			"sys_FamilyRelation",
			@@ -640,6 +665,9 @@
			open: false,
			// 获取组织名称时间范围
			daterangeReporttime: [],
			headers: {
			Authorization: "Bearer " + getToken()
			},
			// 查询参数
			queryParams: {
			pageNum: 1,
			@@ -692,9 +720,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 = "";
			@@ -707,9 +736,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 != "") {
			@@ -945,6 +972,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"