From 408360a5156afcd3724aa4d88fff38ba82e20d81 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 10 十一月 2023 15:37:03 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 557 +++++++++++++++++++----
src/views/project/fund/performancedetails/index.vue | 2
src/views/project/ethicalReview/index.vue | 2
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 21
src/views/project/donatebaseinfo/index.vue | 737 +++++++++++++++++++++++--------
src/views/project/fundcheck/expertFeeCheck/index.vue | 20
src/views/project/donatefinish/index.vue | 2
7 files changed, 1,006 insertions(+), 335 deletions(-)
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index ea365c8..45a3233 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -1,32 +1,65 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ v-show="showSearch"
+ label-width="70px"
+ >
<el-row :gutter="8">
<el-col :span="6">
<el-form-item label="濮撳悕" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable size="small"
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item align="left" label="鍖荤枟鏈烘瀯" prop="treatmenthospitalname">
- <org-selecter ref="orgSelecter" :org-type="'3'" v-model="queryParams.treatmenthospitalno"
- @keyup.enter.native="handleQuery" />
+ <el-form-item
+ align="left"
+ label="鍖荤枟鏈烘瀯"
+ prop="treatmenthospitalname"
+ >
+ <org-selecter
+ ref="orgSelecter"
+ :org-type="'3'"
+ v-model="queryParams.treatmenthospitalno"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎹愮尞鍦板競">
<el-select v-model="queryParams.city" placeholder="璇烽�夋嫨鍦板競">
- <el-option v-for="item in provinceData" :key="item.value" :label="item.label" :value="item.value">
+ <el-option
+ v-for="item in provinceData"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎹愮尞杩涘害" prop="recordstate">
- <el-select v-model="queryParams.recordstate" placeholder="璇烽�夋嫨褰撳墠杩涘害" clearable size="small">
- <el-option v-for="dict in dict.type.sys_DonationStatus" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select
+ v-model="queryParams.recordstate"
+ placeholder="璇烽�夋嫨褰撳墠杩涘害"
+ clearable
+ size="small"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_DonationStatus"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
</el-col>
@@ -34,8 +67,16 @@
<el-row :gutter="8">
<el-col :span="6">
<el-form-item label="鎶ュ憡浜�">
- <el-select v-model="queryParams.reporterno" placeholder="璇烽�夋嫨鎶ュ憡浜�">
- <el-option v-for="item in reportlist" :key="item.index" :label="item.reportername" :value="item.reporterno">
+ <el-select
+ v-model="queryParams.reporterno"
+ placeholder="璇烽�夋嫨鎶ュ憡浜�"
+ >
+ <el-option
+ v-for="item in reportlist"
+ :key="item.index"
+ :label="item.reportername"
+ :value="item.reporterno"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -43,8 +84,16 @@
<el-col :span="12">
<el-form-item label="鎶ュ憡鏃ユ湡">
- <el-date-picker style="width: 100%" v-model="selecttime" type="monthrange" range-separator="鑷�"
- start-placeholder="寮�濮嬫湀浠�" end-placeholder="缁撴潫鏈堜唤" value-format="yyyy-MM-dd" @change="getTimeList">
+ <el-date-picker
+ style="width: 100%"
+ v-model="selecttime"
+ type="monthrange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫湀浠�"
+ end-placeholder="缁撴潫鏈堜唤"
+ value-format="yyyy-MM-dd"
+ @change="getTimeList"
+ >
</el-date-picker>
</el-form-item>
</el-col>
@@ -54,23 +103,41 @@
<el-col :span="14">
<el-form-item label="绫嶈疮">
<div>
- <li_area_select ref="areaSelect" v-model="searchAddress"></li_area_select>
+ <li_area_select
+ ref="areaSelect"
+ v-model="searchAddress"
+ ></li_area_select>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handleQuery"
+ >鎼滅储</el-button
+ >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
- v-hasPermi="['project:donatebaseinfo:add']">鏂板</el-button>
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['project:donatebaseinfo:add']"
+ >鏂板</el-button
+ >
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -86,17 +153,38 @@
</el-col> -->
<el-col :span="1.5">
- <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport"
- v-hasPermi="['project:donatebaseinfo:export']">瀵煎嚭</el-button>
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ :loading="exportLoading"
+ @click="handleExport"
+ v-hasPermi="['project:donatebaseinfo:export']"
+ >瀵煎嚭</el-button
+ >
</el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar
+ :showSearch.sync="showSearch"
+ @queryTable="getList"
+ ></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="donatebaseinfoList" @selection-change="handleSelectionChange" border
- :default-sort="{ prop: 'reporttime', order: 'descending' }">
+ <el-table
+ v-loading="loading"
+ :data="donatebaseinfoList"
+ @selection-change="handleSelectionChange"
+ border
+ :default-sort="{ prop: 'reporttime', order: 'descending' }"
+ >
<!-- <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="id" /> -->
<!-- <el-table-column type="selection" width="55" align="center" /> -->
- <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reporttime" width="100">
+ <el-table-column
+ label="鎶ュ憡鏃堕棿"
+ align="center"
+ prop="reporttime"
+ width="100"
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
</template>
@@ -106,25 +194,62 @@
<el-table-column label="鎬у埆" align="center" prop="sex" width="100">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_user_sex" :value="parseInt(scope.row.sex)" />
+ <dict-tag
+ :options="dict.type.sys_user_sex"
+ :value="parseInt(scope.row.sex)"
+ />
</template>
</el-table-column>
<el-table-column label="骞撮緞" align="center" prop="age" width="100" />
- <el-table-column label="鐜版墍鍦ㄥ湴甯�" align="center" prop="registercityname" width="150" />
+ <el-table-column
+ label="鐜版墍鍦ㄥ湴甯�"
+ align="center"
+ prop="registercityname"
+ width="150"
+ />
- <el-table-column label="鍖荤枟鏈烘瀯" align="center" prop="treatmenthospitalname" />
- <el-table-column label="鎶ュ憡浜�" align="center" prop="reportername" width="100" />
+ <el-table-column
+ label="鍖荤枟鏈烘瀯"
+ align="center"
+ prop="treatmenthospitalname"
+ />
+ <el-table-column
+ label="鎶ュ憡浜�"
+ align="center"
+ prop="reportername"
+ width="100"
+ />
- <el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate" width="120">
+ <el-table-column
+ label="鎹愮尞杩涘害"
+ align="center"
+ prop="recordstate"
+ width="120"
+ >
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" />
+ <dict-tag
+ :options="dict.type.sys_DonationStatus"
+ :value="scope.row.recordstate"
+ />
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ width="200"
+ fixed="right"
+ >
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
- v-hasPermi="['project:donatebaseinfo:edit']">璇︽儏</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['project:donatebaseinfo:edit']"
+ >璇︽儏</el-button
+ >
<!-- <el-button v-if="scope.row.recordstate == 0" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)" v-hasPermi="['project:donatebaseinfo:remove']">鍒犻櫎</el-button>
@@ -137,16 +262,35 @@
</template>
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
- @pagination="getList" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
<!-- 娣诲姞鎴栦慨鏀规崘鐚熀纭�瀵硅瘽妗� -->
- <el-dialog :title="title" align="center" :visible.sync="open" :close-on-click-modal="false" width="1100px">
- <el-form ref="form" :model="form" :rules="rules" label-width="130px" label-position="right">
- <div style="
+ <el-dialog
+ :title="title"
+ align="center"
+ :visible.sync="open"
+ :close-on-click-modal="false"
+ width="1100px"
+ >
+ <el-form
+ ref="form"
+ :model="form"
+ :rules="rules"
+ label-width="130px"
+ label-position="right"
+ >
+ <div
+ style="
border-bottom: 1px solid #ddd;
border-top: 1px solid #ddd;
padding-right: 60px;
- ">
+ "
+ >
<el-row style="margin-top: 40px">
<el-col :span="8">
<el-form-item label="鎹愮尞缂栧彿" prop="donorno">
@@ -154,13 +298,24 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item align="left" label="鍖荤枟鏈烘瀯" prop="treatmenthospitalno">
- <org-selecter ref="addOrgSelect" :org-type="'3'" v-model="form.treatmenthospitalno" />
+ <el-form-item
+ align="left"
+ label="鍖荤枟鏈烘瀯"
+ prop="treatmenthospitalno"
+ >
+ <org-selecter
+ ref="addOrgSelect"
+ :org-type="'3'"
+ v-model="form.treatmenthospitalno"
+ />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="绉戝" prop="treatmentdeptno">
- <el-input v-model="form.treatmentdeptname" placeholder="璇疯緭鍏ョ瀹�" />
+ <el-input
+ v-model="form.treatmentdeptname"
+ placeholder="璇疯緭鍏ョ瀹�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -173,8 +328,12 @@
<el-col :span="6">
<el-form-item label="姘戞棌" prop="nation">
<el-select v-model="form.nation" placeholder="璇烽�夋嫨姘戞棌">
- <el-option v-for="dict in dict.type.sys_nation" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-option
+ v-for="dict in dict.type.sys_nation"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -192,22 +351,40 @@
<el-row>
<el-col :span="6">
<el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
- <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
- <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
- :value="parseInt(dict.value)"></el-option>
+ <el-select
+ v-model="form.idcardtype"
+ placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_IDType"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="璇佷欢鍙风爜" prop="idcardno">
- <el-input style="width: 174px" ref="updateBSvalue" class="sfzcode" v-model="form.idcardno"
- placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" @blur="updateMessage" />
- </el-form-item> </el-col>
+ <el-input
+ style="width: 174px"
+ ref="updateBSvalue"
+ class="sfzcode"
+ v-model="form.idcardno"
+ placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�"
+ @blur="updateMessage"
+ />
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item label="鎬у埆" prop="sex">
<el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
- <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.label" :label="dict.label"
- :value="parseInt(dict.value)"></el-option>
+ <el-option
+ v-for="dict in dict.type.sys_user_sex"
+ :key="dict.label"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -217,27 +394,42 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row>
<el-col :span="6">
<el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
- <el-date-picker clearable size="small" v-model="form.birthday" type="date" style="width: 174px"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍑虹敓鏃ユ湡">
+ <el-date-picker
+ clearable
+ size="small"
+ v-model="form.birthday"
+ type="date"
+ style="width: 174px"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鍑虹敓鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鑱屼笟" prop="occupation">
<el-select v-model="form.occupation" placeholder="璇烽�夋嫨鑱屼笟">
- <el-option v-for="dict in dict.type.sys_occupation" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-option
+ v-for="dict in dict.type.sys_occupation"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瀛﹀巻" prop="education">
<el-select v-model="form.education" placeholder="璇烽�夋嫨瀛﹀巻">
- <el-option v-for="dict in dict.type.sys_education" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-option
+ v-for="dict in dict.type.sys_education"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -246,13 +438,19 @@
<el-col :span="12">
<el-form-item label="浣忓潃" prop="residenceaddress">
<div>
- <li_area_select ref="residenceSelect" v-model="residenceAddresss"></li_area_select>
+ <li_area_select
+ ref="residenceSelect"
+ v-model="residenceAddresss"
+ ></li_area_select>
<!-- <div>{{defultAddress}}</div> -->
</div>
</el-form-item>
</el-col>
<el-col :span="11" :push="1">
- <el-input v-model="form.residenceaddress" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input
+ v-model="form.residenceaddress"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ />
</el-col>
</el-row>
@@ -260,22 +458,30 @@
<el-col :span="12">
<el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress">
<div>
- <li_area_select ref="registerSelect" v-model="registerAddresss"></li_area_select>
+ <li_area_select
+ ref="registerSelect"
+ v-model="registerAddresss"
+ ></li_area_select>
<!-- <div>{{defultAddress}}</div> -->
</div>
</el-form-item>
</el-col>
<el-col :span="11" :push="1">
- <el-input v-model="form.registeraddress" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input
+ v-model="form.registeraddress"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ />
</el-col>
</el-row>
</div>
- <div style="
+ <div
+ style="
border-bottom: 1px solid #ddd;
margin-top: 20px;
padding-right: 60px;
- ">
+ "
+ >
<el-row>
<el-col :span="8">
<el-form-item label="浣忛櫌鍙�" prop="inpatientno">
@@ -284,7 +490,10 @@
</el-col>
<el-col :span="16">
<el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname">
- <el-input v-model="form.diagnosisname" placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�" />
+ <el-input
+ v-model="form.diagnosisname"
+ placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -292,16 +501,24 @@
<el-col :span="12">
<el-form-item align="left" label="琛�鍨�" prop="bloodtype">
<el-radio-group v-model="form.bloodtype">
- <el-radio v-for="dict in dict.type.sys_BloodType" :key="dict.value" :label="dict.value">{{ dict.label
- }}</el-radio>
+ <el-radio
+ v-for="dict in dict.type.sys_BloodType"
+ :key="dict.value"
+ :label="dict.value"
+ >{{ dict.label }}</el-radio
+ >
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12" :pull="1">
<el-form-item label="Rh(D)" align="left" prop="rhyin">
<el-radio-group v-model="form.rhyin">
- <el-radio v-for="dict in dict.type.sys_bloodtype_rhd" :key="dict.value" :label="dict.value">{{
- dict.label }}</el-radio>
+ <el-radio
+ v-for="dict in dict.type.sys_bloodtype_rhd"
+ :key="dict.value"
+ :label="dict.value"
+ >{{ dict.label }}</el-radio
+ >
</el-radio-group>
</el-form-item>
</el-col>
@@ -309,20 +526,31 @@
<el-row>
<el-form-item label="鐤剧梾绫诲瀷" align="left">
<el-checkbox-group v-model="form.diseasetype">
- <el-checkbox v-for="dict in dict.type.sys_DiseaseType" :key="dict.value" :label="dict.value">
+ <el-checkbox
+ v-for="dict in dict.type.sys_DiseaseType"
+ :key="dict.value"
+ :label="dict.value"
+ >
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="鍏朵粬" prop="diseasetypeOther">
- <el-input v-model="form.diseasetypeOther" placeholder="璇疯緭鍏ュ叾浠�" />
+ <el-input
+ v-model="form.diseasetypeOther"
+ placeholder="璇疯緭鍏ュ叾浠�"
+ />
</el-form-item>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item align="left" label="浼犳煋鐥�">
<el-checkbox-group v-model="form.infectious">
- <el-checkbox v-for="dict in dict.type.sys_Infectious" :key="dict.value" :label="dict.value">
+ <el-checkbox
+ v-for="dict in dict.type.sys_Infectious"
+ :key="dict.value"
+ :label="dict.value"
+ >
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -330,7 +558,10 @@
</el-col>
<el-col :span="12">
<el-form-item align="left" label="鍏朵粬" prop="infectiousOther">
- <el-input v-model="form.infectiousOther" placeholder="璇疯緭鍏ュ叾浠�" />
+ <el-input
+ v-model="form.infectiousOther"
+ placeholder="璇疯緭鍏ュ叾浠�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -338,7 +569,11 @@
<el-col :span="9">
<el-form-item align="left" label="鐥呬汉鐘跺喌">
<el-checkbox-group v-model="form.patientstate">
- <el-checkbox v-for="dict in dict.type.sys_patientstate" :key="dict.value" :label="dict.value">
+ <el-checkbox
+ v-for="dict in dict.type.sys_patientstate"
+ :key="dict.value"
+ :label="dict.value"
+ >
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -347,7 +582,11 @@
<el-col :span="15" align="left">
<el-form-item label="鍏朵粬鎯呭喌">
<el-checkbox-group v-model="form.othercases">
- <el-checkbox v-for="dict in dict.type.sys_OtherCases" :key="dict.value" :label="dict.value">
+ <el-checkbox
+ v-for="dict in dict.type.sys_OtherCases"
+ :key="dict.value"
+ :label="dict.value"
+ >
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -356,18 +595,29 @@
</el-row>
</div>
- <div style="
+ <div
+ style="
border-bottom: 1px solid #ddd;
padding-right: 60px;
margin-top: 20px;
- ">
+ "
+ >
<el-row>
<div display="flex">
<el-row>
<el-col :span="12">
- <el-form-item label="浜插睘鐘跺喌" prop="kinship" class="relation" align="left">
+ <el-form-item
+ label="浜插睘鐘跺喌"
+ prop="kinship"
+ class="relation"
+ align="left"
+ >
<el-checkbox-group v-model="form.kinship">
- <el-checkbox v-for="dict in dict.type.sys_Kinship" :key="dict.value" :label="dict.value">
+ <el-checkbox
+ v-for="dict in dict.type.sys_Kinship"
+ :key="dict.value"
+ :label="dict.value"
+ >
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -375,7 +625,10 @@
</el-col>
<el-col :span="12">
<el-form-item label="鍏朵粬" prop="kinshipOther">
- <el-input v-model="form.kinshipOther" placeholder="璇疯緭鍏ュ叾浠�" />
+ <el-input
+ v-model="form.kinshipOther"
+ placeholder="璇疯緭鍏ュ叾浠�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -385,7 +638,11 @@
<el-col :span="24">
<el-form-item align="left" label="鏈汉鎰忔効 ">
<el-checkbox-group v-model="form.selfwill">
- <el-checkbox v-for="dict in dict.type.sys_SelfWill" :key="dict.value" :label="dict.value">
+ <el-checkbox
+ v-for="dict in dict.type.sys_SelfWill"
+ :key="dict.value"
+ :label="dict.value"
+ >
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -395,14 +652,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="涓昏浜插睘" prop="majorrelatives">
- <el-input v-model="form.majorrelatives" placeholder="璇疯緭鍏ヤ富瑕佷翰灞�" />
+ <el-input
+ v-model="form.majorrelatives"
+ placeholder="璇疯緭鍏ヤ富瑕佷翰灞�"
+ />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="涓庢崘璧犺�呭叧绯�" prop="familyrelations">
- <el-select v-model="form.familyrelations" placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�">
- <el-option v-for="dict in dict.type.sys_FamilyRelation" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ v-model="form.familyrelations"
+ placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_FamilyRelation"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -411,7 +678,11 @@
<el-col :span="12">
<el-form-item align="left" label="淇℃伅鏉ユ簮">
<el-checkbox-group v-model="form.infosources">
- <el-checkbox v-for="dict in dict.type.sys_InfoSources" :key="dict.value" :label="dict.value">
+ <el-checkbox
+ v-for="dict in dict.type.sys_InfoSources"
+ :key="dict.value"
+ :label="dict.value"
+ >
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -419,7 +690,10 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍏朵粬" prop="infosourcesOther">
- <el-input v-model="form.infosourcesOther" placeholder="璇疯緭鍏ヤ俊鎭潵婧愬叾浠�" />
+ <el-input
+ v-model="form.infosourcesOther"
+ placeholder="璇疯緭鍏ヤ俊鎭潵婧愬叾浠�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -431,72 +705,123 @@
</el-col>
<el-col :span="8">
<el-form-item label="鑱旂郴鐢佃瘽" prop="infophone">
- <el-input v-model="form.infophone" placeholder="璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽" />
+ <el-input
+ v-model="form.infophone"
+ placeholder="璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item align="left" label="绾㈠崄瀛椾細" prop="redorganno">
- <org-selecter ref="addCrossOrgSelect" :org-type="'2'" v-model="form.redorganno" />
+ <org-selecter
+ ref="addCrossOrgSelect"
+ :org-type="'2'"
+ v-model="form.redorganno"
+ />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鑱旂郴浜�" prop="contactperson">
- <el-input v-model="form.contactperson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
+ <el-input
+ v-model="form.contactperson"
+ placeholder="璇疯緭鍏ヨ仈绯讳汉"
+ />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鑱旂郴鏃堕棿" prop="contacttime">
- <el-date-picker clearable size="small" style="width: 190px" v-model="form.contacttime" type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎶ュ憡鏃堕棿">
+ <el-date-picker
+ clearable
+ size="small"
+ style="width: 190px"
+ v-model="form.contacttime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鎶ュ憡鏃堕棿"
+ >
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item align="left" label="鑾峰彇缁勭粐" prop="acquisitiontissuename">
- <org-selecter style="width: 260px" ref="orgSelecter" :org-type="'1'" v-model="form.acquisitiontissueno" />
+ <el-form-item
+ align="left"
+ label="鑾峰彇缁勭粐"
+ prop="acquisitiontissuename"
+ >
+ <org-selecter
+ style="width: 260px"
+ ref="orgSelecter"
+ :org-type="'1'"
+ v-model="form.acquisitiontissueno"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="鎶ュ憡浜�" prop="reporterno">
- <el-select ref="getReportname" v-model="form.reporterno" placeholder="璇烽�夋嫨">
- <el-option v-for="item in reporters" :key="item.reportNo" :label="item.reportName"
- :value="item.reportNo">
+ <el-select
+ ref="getReportname"
+ v-model="form.reporterno"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in reporters"
+ :key="item.reportNo"
+ :label="item.reportName"
+ :value="item.reportNo"
+ >
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone">
- <el-input v-model="form.reporterphone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ <el-input
+ v-model="form.reporterphone"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
- <el-date-picker clearable size="small" style="width: 190px" v-model="form.reporttime" type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎶ュ憡鏃堕棿">
+ <el-date-picker
+ clearable
+ size="small"
+ style="width: 190px"
+ v-model="form.reporttime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鎶ュ憡鏃堕棿"
+ >
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</div>
- <div style="padding-right: 60px; margin-top: 20px">
+ <!-- <div style="padding-right: 60px; margin-top: 20px">
<el-row>
<el-form-item label="闄勪欢" align="left" prop="annexfile">
<annex-upload ref="annex" :infoid="form.id" :donorno="form.donorno" :flowname="flowname"
:annexno="annexno" />
</el-form-item>
</el-row>
- </div>
+ </div> -->
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button v-show="showSaveBtn" type="primary" @click="submitForm">淇� 瀛�</el-button>
- <el-button v-show="showTerminationBtn" type="primary" @click="submitForm">缁堟妗堜緥</el-button>
+ <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
+ >淇濆瓨骞跺墠寰�妗堜緥宸ヤ綔鍙�</el-button
+ >
+ <el-button
+ v-show="showTerminationBtn"
+ type="primary"
+ @click="submitForm"
+ >缁堟妗堜緥</el-button
+ >
<el-button @click="cancel">鍙� 娑�</el-button>
<!-- <el-button @click="handleapproval">鎻愪氦瀹℃牳</el-button> -->
</div>
@@ -514,7 +839,7 @@
updateDonatebaseinfo,
exportDonatebaseinfo,
downloadbaseinfo,
- getdonatorno,
+ getdonatorno
// exportProvincemessage,
} from "@/api/project/donatebaseinfo";
import Li_area_select from "@/components/Address";
@@ -525,14 +850,14 @@
listOrganization,
getOrganization,
listReportname,
- listUser,
+ listUser
} from "@/api/project/organization";
export default {
components: {
Li_area_select,
OrgSelecter,
AnnexUpload,
- ReportName,
+ ReportName
},
name: "Donatebaseinfo",
dicts: [
@@ -560,7 +885,7 @@
"sys_DonationStatus",
"sys_DiseaseType",
"sys_SelfWill",
- "sys_FamilyRelation",
+ "sys_FamilyRelation"
],
data() {
return {
@@ -577,17 +902,17 @@
sheng: "",
shi: "",
qu: "",
- organizationname: null,
+ organizationname: null
},
residenceAddresss: {
sheng: "娴欐睙鐪�",
shi: "",
- qu: "",
+ qu: ""
},
registerAddresss: {
sheng: "娴欐睙鐪�",
shi: "",
- qu: "",
+ qu: ""
},
// 閬僵灞�
loading: true,
@@ -629,7 +954,7 @@
starttime: null,
endtime: null,
city: null,
- reportno: null,
+ reportno: null
// organizationname: null,
// organizationtype: null,
// idcardno: null,
@@ -645,77 +970,77 @@
// 琛ㄥ崟鏍￠獙
rules: {
name: [
- { required: true, message: "璇疯緭鍏ユ崘鐚�呭鍚�", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ユ崘鐚�呭鍚�", trigger: "blur" }
],
birthday: [
- { required: true, message: "璇烽�夋嫨鍑虹敓鏃ユ湡", trigger: "blur" },
+ { required: true, message: "璇烽�夋嫨鍑虹敓鏃ユ湡", trigger: "blur" }
],
idcardtype: [
- { required: true, message: "璇烽�夋嫨璇佷欢绫诲瀷", trigger: "blur" },
+ { required: true, message: "璇烽�夋嫨璇佷欢绫诲瀷", trigger: "blur" }
],
residenceaddress: [
- { required: true, message: "璇疯緭鍏ヤ綇鍧�", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ヤ綇鍧�", trigger: "blur" }
],
contacttime: [
{
required: true,
message: "璇疯緭鍏ョ孩鍗佸瓧浼氳仈绯绘椂闂�",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
idcardno: [
- { required: true, message: "璇锋纭緭鍏ヨ瘉浠跺彿鐮�", trigger: "blur" },
+ { required: true, message: "璇锋纭緭鍏ヨ瘉浠跺彿鐮�", trigger: "blur" }
],
sex: [{ required: true, message: "鎬у埆涓嶈兘涓虹┖", trigger: "blur" }],
age: [{ required: true, message: "璇疯緭鍏ュ勾榫�", trigger: "blur" }],
treatmenthospitalno: [
- { required: true, message: "璇烽�夋嫨鍖荤枟鏈烘瀯", trigger: "blur" },
+ { required: true, message: "璇烽�夋嫨鍖荤枟鏈烘瀯", trigger: "blur" }
],
// treatmenthospitalno: [{ required: true, message: "璇烽�夋嫨鍖荤枟鏈烘瀯", trigger: "change" }],
bloodtype: [
- { required: true, message: "璇烽�夋嫨ABO琛�鍨�", trigger: "blur" },
+ { required: true, message: "璇烽�夋嫨ABO琛�鍨�", trigger: "blur" }
],
rhyin: [{ required: true, message: "璇烽�夋嫨RHD琛�鍨�", trigger: "blur" }],
diseasetype: [
- { required: true, message: "璇烽�夋嫨RHD琛�鍨�", trigger: "blur" },
+ { required: true, message: "璇烽�夋嫨RHD琛�鍨�", trigger: "blur" }
],
inpatientno: [
- { required: true, message: "杈撳叆浣忛櫌鍙�", trigger: "blur" },
+ { required: true, message: "杈撳叆浣忛櫌鍙�", trigger: "blur" }
],
diagnosisname: [
- { required: true, message: "鐤剧梾璇婃柇涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: "鐤剧梾璇婃柇涓嶈兘涓虹┖", trigger: "blur" }
],
infoname: [
- { required: true, message: "璇疯緭鍏ヤ俊鎭憳濮撳悕", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ヤ俊鎭憳濮撳悕", trigger: "blur" }
],
infophone: [
- { required: true, message: "璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽", trigger: "blur" }
],
redorganno: [
- { required: true, message: "璇烽�夋嫨绾㈠崄瀛椾細鏈烘瀯", trigger: "blur" },
+ { required: true, message: "璇烽�夋嫨绾㈠崄瀛椾細鏈烘瀯", trigger: "blur" }
],
contactperson: [
{
required: true,
message: "绾㈠崄瀛椾細鑱旂郴浜轰笉鑳戒负绌�",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
// contactnumber: [{required: true,message: "璇疯緭鍏ョ孩鍗佸瓧浼氳仈绯荤數璇�",trigger: "change"}],
acquisitiontissueno: [
- { required: true, message: "鍣ㄥ畼鑾峰彇缁勭粐涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: "鍣ㄥ畼鑾峰彇缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
],
reporterno: [
- { required: true, message: "璇烽�夋嫨鎶ュ憡浜�", trigger: "blur" },
+ { required: true, message: "璇烽�夋嫨鎶ュ憡浜�", trigger: "blur" }
],
reporttime: [
- { required: true, message: "璇疯緭鍏ユ姤鍛婃椂闂�", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ユ姤鍛婃椂闂�", trigger: "blur" }
],
reporterphone: [
- { required: true, message: "璇疯緭鍏ユ姤鍛婁汉鑱旂郴鐢佃瘽", trigger: "blur" },
- ],
+ { required: true, message: "璇疯緭鍏ユ姤鍛婁汉鑱旂郴鐢佃瘽", trigger: "blur" }
+ ]
},
//鏄惁鏄剧ず淇濆瓨鎸夐挳
showSaveBtn: true,
@@ -739,11 +1064,11 @@
{ label: "琛㈠窞甯�", value: "8" },
{ label: "鑸熷北甯�", value: "9" },
{ label: "鍙板窞甯�", value: "A" },
- { label: "涓芥按甯�", value: "B" },
- ],
+ { label: "涓芥按甯�", value: "B" }
+ ]
};
},
- created() { },
+ created() {},
mounted(e) {
// let idd = this.$route.query.userid
@@ -760,7 +1085,7 @@
this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
this.$moment(this.$route.params.endtime)
.add(-1, "month")
- .format("YYYY-MM-DD"),
+ .format("YYYY-MM-DD")
];
}
if (this.$route.params.reporterno != "") {
@@ -798,20 +1123,20 @@
methods: {
getCurrentUser() {
- getUserProfile().then((response) => {
+ getUserProfile().then(response => {
this.currentuser = response.data;
});
},
LoadReportList() {
- listDonatebaseinfo().then((res) => {
+ listDonatebaseinfo().then(res => {
let list = res.rows;
let reportlist = [];
reportlist.push({ reporterno: "", reportername: "鍏ㄩ儴" });
- list.forEach((element) => {
+ list.forEach(element => {
reportlist.push({
reporterno: element.reporterno,
- reportername: element.reportername,
+ reportername: element.reportername
});
});
@@ -824,7 +1149,7 @@
resetArr(Arr) {
var hash = {};
- Arr = Arr.reduce(function (arr, current) {
+ Arr = Arr.reduce(function(arr, current) {
hash[current.reporterno]
? ""
: (hash[current.reporterno] = true && arr.push(current));
@@ -897,14 +1222,14 @@
selectReporters() {
//涓撹亴浜哄憳
- listReportname("zzry").then((res) => {
+ listReportname("zzry").then(res => {
this.reporters = res.data;
});
},
getuserlist() {
//鐢ㄦ埛鍒楄〃
- listUser().then((res) => {
+ listUser().then(res => {
this.users = res.data;
});
},
@@ -913,11 +1238,11 @@
this.$confirm("鏄惁纭灏嗘渚嬩笂鎶ュ鏍革紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "warning",
+ type: "warning"
})
.then(() => {
row.recordstate = 1;
- updateDonatebaseinfo(row).then((response) => {
+ updateDonatebaseinfo(row).then(response => {
this.$modal.msgSuccess("涓婃姤瀹℃牳鎴愬姛");
this.getList();
});
@@ -925,7 +1250,7 @@
.catch(() => {
this.$message({
type: "info",
- message: "宸插彇娑堜笂鎶�",
+ message: "宸插彇娑堜笂鎶�"
});
});
},
@@ -933,15 +1258,14 @@
this.approvalState = false;
// this.reset();
// const id = row.id || this.ids;
- updateDonatebaseinfo(row).then((response) => {
+ updateDonatebaseinfo(row).then(response => {
row.recordstate = 0;
});
},
updateMessage() {
try {
- const reg =
- /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+ const reg = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
if (reg.test(this.form.idcardno)) {
// 韬唤璇佸彿鐮佹槸鍚﹀悎娉�
var org_birthday = this.form.idcardno.substring(6, 14);
@@ -959,8 +1283,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
// 璧嬪�肩粰琛ㄦ牸
@@ -969,7 +1293,7 @@
this.form.age = age;
} else {
}
- } catch { }
+ } catch {}
},
// sheng: '娴欐睙鐪�',
// shi: '',
@@ -996,7 +1320,7 @@
}
this.setState({
birthday,
- sex,
+ sex
});
},
@@ -1031,7 +1355,7 @@
this.queryParams.residenceprovince = this.$refs.areaSelect.getSheng();
this.queryParams.residencecity = this.$refs.areaSelect.getShi();
this.queryParams.residencetown = this.$refs.areaSelect.getQu();
- listDonatebaseinfo(this.queryParams).then((response) => {
+ listDonatebaseinfo(this.queryParams).then(response => {
this.donatebaseinfoList = response.rows;
//console.log("listDonatebaseinfo", response.rows);
this.total = response.total;
@@ -1123,7 +1447,7 @@
majorrelatives: null,
familyrelations: null,
acquisitiontissueno: "ZJOPO",
- acquisitiontissuename: "娴欐睙鐪佷汉浣撳櫒瀹樿幏鍙栫粍缁�",
+ acquisitiontissuename: "娴欐睙鐪佷汉浣撳櫒瀹樿幏鍙栫粍缁�"
};
this.resetForm("form");
@@ -1156,7 +1480,7 @@
reportername: null,
reporttime: null,
city: null,
- treatmenthospitalno: null,
+ treatmenthospitalno: null
};
this.selecttime = [];
this.getTimeList();
@@ -1164,7 +1488,7 @@
sheng: "",
shi: "",
qu: "",
- organizationname: null,
+ organizationname: null
};
//this.$refs.areaSelect.clean();
@@ -1173,32 +1497,32 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map((item) => item.id);
+ this.ids = selection.map(item => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- this.$router.push({
- path: "/organ/donationdetails/",
- query: {
- organType: "add",
- }
- });
- // this.reset();
- // //璁剧疆鎶ュ憡浜哄拰閮ㄩ棬/缁�
- // this.form.reporterno = this.currentuser.userName;
- // this.form.reportername = this.currentuser.nickName;
- // this.form.deptid = this.currentuser.deptid;
-
- // this.showSaveBtn = true;
- // //this.$refs.annex.getAnnexList();
- // this.open = true;
- // this.$nextTick(function () {
- // this.$refs.annex.getAnnexList();
+ // this.$router.push({
+ // path: "/organ/donationdetails/",
+ // query: {
+ // organType: "add",
+ // }
// });
+ this.reset();
+ //璁剧疆鎶ュ憡浜哄拰閮ㄩ棬/缁�
+ this.form.reporterno = this.currentuser.userName;
+ this.form.reportername = this.currentuser.nickName;
+ this.form.deptid = this.currentuser.deptid;
- // this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
+ this.showSaveBtn = true;
+ //this.$refs.annex.getAnnexList();
+ this.open = true;
+ this.$nextTick(function() {
+ this.$refs.annex.getAnnexList();
+ });
+
+ this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
},
/** 淇敼鎸夐挳鎿嶄綔 */
@@ -1207,7 +1531,7 @@
path: "/organ/donationdetails/",
query: {
id: row.id,
- organType: "edit",
+ organType: "edit"
}
});
// this.showSaveBtn = true;
@@ -1240,13 +1564,13 @@
// this.registerAddresss.qu = response.data.registertownname;
// });
},
-// 缁堟妗堜緥
+ // 缁堟妗堜緥
handletermination(row) {
this.reset();
this.showSaveBtn = false;
this.showTerminationBtn = true;
const id = row.id || this.ids;
- getDonatebaseinfo(id).then((response) => {
+ getDonatebaseinfo(id).then(response => {
this.form = response.data;
this.form.diseasetype = this.form.diseasetype.split(",");
@@ -1265,14 +1589,14 @@
this.open = true;
this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
this.form.recordstate = 99;
- this.$nextTick(function () {
+ this.$nextTick(function() {
this.$refs.annex.getAnnexList();
});
});
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
- this.$refs["form"].validate((valid) => {
+ this.$refs["form"].validate(valid => {
console.log("鎻愪氦鐨勬暟鎹滑锛�", this.form);
if (valid) {
this.form.birthday = this.$moment(this.form.birthday).format(
@@ -1306,19 +1630,17 @@
this.form.reportername = this.$refs.getReportname.$data.selectedLabel;
try {
- this.form.treatmenthospitalname =
- this.$refs.addOrgSelect.getOptionByValue(
- this.form.treatmenthospitalno
- ).organizationname;
+ this.form.treatmenthospitalname = this.$refs.addOrgSelect.getOptionByValue(
+ this.form.treatmenthospitalno
+ ).organizationname;
} catch {
this.form.treatmenthospitalname = this.form.treatmenthospitalno;
}
try {
- this.form.redorganname =
- this.$refs.addCrossOrgSelect.getOptionByValue(
- this.form.redorganno
- ).organizationname;
+ this.form.redorganname = this.$refs.addCrossOrgSelect.getOptionByValue(
+ this.form.redorganno
+ ).organizationname;
} catch {
this.form.redorganname = this.form.redorganno;
}
@@ -1330,18 +1652,25 @@
// });
if (this.form.id != null) {
- updateDonatebaseinfo(this.form).then((response) => {
+ updateDonatebaseinfo(this.form).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
this.form.recordstate = 0;
- addDonatebaseinfo(this.form).then((response) => {
+ addDonatebaseinfo(this.form).then(response => {
if (response.code == 200) {
this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.$router.push({
+ path: "/organ/donationdetails/",
+ query: {
+ id: response.data.id,
+ organType: "edit"
+ }
+ });
this.open = false;
- this.getList();
+ // this.getList();
} else {
this.$modal.msgError("鏂板澶辫触锛�" + response.msg);
}
@@ -1355,14 +1684,14 @@
const ids = row.id || this.ids;
this.$modal
.confirm('鏄惁纭鍒犻櫎鎹愮尞鍩虹缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
- .then(function () {
+ .then(function() {
return delDonatebaseinfo(ids);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -1374,11 +1703,11 @@
this.exportLoading = true;
return exportDonatebaseinfo(queryParams);
})
- .then((response) => {
+ .then(response => {
this.$download.name(response.msg);
this.exportLoading = false;
})
- .catch(() => { });
+ .catch(() => {});
},
// 瀵硅薄杞垚鎸囧畾瀛楃涓插垎闅�
@@ -1404,7 +1733,7 @@
handledownload(row) {
const id = row.id || this.ids;
- downloadbaseinfo(id).then((response) => {
+ downloadbaseinfo(id).then(response => {
var fileUrl = response;
//鑾峰彇褰撳墠缃戝潃
var urlBase = process.env.VUE_APP_BASE_API;
@@ -1417,8 +1746,8 @@
curWWWPath.substring(0, pos) + urlBase + fileUrl["downloadUrl"];
aEle.click();
});
- },
- },
+ }
+ }
};
</script>
@@ -1428,4 +1757,4 @@
margin: auto !important;
padding-bottom: 0px !important;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/project/donatefinish/index.vue b/src/views/project/donatefinish/index.vue
index e8e379f..08e21c7 100644
--- a/src/views/project/donatefinish/index.vue
+++ b/src/views/project/donatefinish/index.vue
@@ -319,7 +319,7 @@
label="鍣ㄥ畼鍚嶇О"
align="center"
prop="organname"
- width="80"
+ width="100"
/>
<el-table-column
label="绉绘鍖婚櫌锛堟帴鏀跺崟浣嶏級"
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 0930948..41e658e 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -8,16 +8,16 @@
<el-step title="娼滃湪鎹愮尞" icon="el-icon-user">
<template
slot="description"
- v-if="Processdata.donateorgan.createtime"
+ v-if="Processdata.donatebaseinfo.createtime"
>
<p>
鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.donateorgan.createtime)
+ parseTime(Processdata.donatebaseinfo.createtime)
}}</span>
</p>
<p>
鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.donateorgan.updatetime)
+ parseTime(Processdata.donatebaseinfo.updatetime)
}}</span>
</p>
</template>
@@ -92,16 +92,16 @@
>
<template
slot="description"
- v-if="Processdata.organallocationService.createtime"
+ v-if="Processdata.donateorgansService.createtime"
>
<p>
鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.organallocationService.updatetime)
+ parseTime(Processdata.donateorgansService.updatetime)
}}</span>
</p>
<p>
鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.organallocationService.updatetime)
+ parseTime(Processdata.donateorgansService.updatetime)
}}</span>
</p>
</template>
@@ -746,12 +746,7 @@
@click="Reportforreview"
>涓婃姤瀹℃牳</el-button
>
- <el-button
- v-show="makeastepforward"
- type="primary"
- @click="makeastepforward"
- >涓嬩竴姝�</el-button
- >
+
<el-button @click="cancel">鍙� 娑�</el-button>
<!-- <el-button @click="handleapproval">鎻愪氦瀹℃牳</el-button> -->
</div>
@@ -971,12 +966,7 @@
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
>
- <el-button
- v-show="makeastepforward"
- type="primary"
- @click="makeastepforward"
- >涓嬩竴姝�</el-button
- >
+
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</div>
@@ -1171,12 +1161,7 @@
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
>
- <el-button
- v-show="makeastepforward"
- type="primary"
- @click="makeastepforward"
- >涓嬩竴姝�</el-button
- >
+
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</div>
@@ -1239,24 +1224,23 @@
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
>
- <el-button
- v-show="makeastepforward"
- type="primary"
- @click="makeastepforward"
- >涓嬩竴姝�</el-button
- >
+
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</div>
<!-- 鍣ㄥ畼鍒嗛厤 -->
- <div class="boxdiv" v-show="actives == 4">
+ <div class="boxdiv" v-show="actives == 4 || actives == 5 || actives == 6">
<el-form
ref="allocationform"
:model="allocationform"
:rules="allocationrules"
label-position="right"
>
- <el-form-item label-width="100px" label="閫夋嫨鍣ㄥ畼">
+ <el-form-item
+ label-width="100px"
+ label="閫夋嫨鍣ㄥ畼"
+ v-show="actives == 4"
+ >
<el-checkbox-group v-model="organalForm.organname">
<el-checkbox
v-for="dict in dict.type.sys_Organ"
@@ -1273,20 +1257,42 @@
<el-table-column
label="鍣ㄥ畼鍚嶇О"
align="center"
- width="70"
+ width="100"
prop="organname"
/>
<el-table-column
label="鍣ㄥ畼缂栧彿"
align="center"
- width="70"
+ width="100"
prop="organno"
/>
<el-table-column
label="鍒嗛厤鐘舵��"
align="center"
- width="120"
+ width="150"
+ prop="allocationstatus"
+ v-if="actives == 4"
+ >
+ <template slot-scope="scope">
+ <el-select
+ v-model="scope.row.allocationstatus"
+ placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+ >
+ <el-option
+ v-for="dict in allocationstatuslist"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鑾峰彇鐘舵��"
+ align="center"
+ width="150"
prop="organstate"
+ v-if="actives == 5"
>
<template slot-scope="scope">
<el-select
@@ -1294,7 +1300,28 @@
placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
>
<el-option
- v-for="dict in dict.type.sys_organstate"
+ v-for="dict in organstatelist"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="绉绘鐘舵��"
+ align="center"
+ width="150"
+ prop="transplantstate"
+ v-if="actives == 6"
+ >
+ <template slot-scope="scope">
+ <el-select
+ v-model="scope.row.transplantstate"
+ placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+ >
+ <el-option
+ v-for="dict in transplantstatelist"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@@ -1310,9 +1337,35 @@
>
<template slot-scope="scope">
<org-selecter
+ :disabled="
+ scope.row.allocationstatus == 2 ||
+ scope.row.organstate == 2 ||
+ scope.row.transplantstate == 2
+ "
ref="tranHosSelect"
:org-type="'4'"
v-model="scope.row.transplanthospitalno"
+ style="width: 100%"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鑾峰彇缁勭粐"
+ align="center"
+ width="230"
+ prop="gainhospitalno"
+ v-if="actives == 5"
+ >
+ <template slot-scope="scope">
+ <org-selecter
+ :disabled="
+ scope.row.allocationstatus == 2 ||
+ scope.row.organstate == 2 ||
+ scope.row.transplantstate == 2
+ "
+ ref="tranHosSelect"
+ :org-type="'4'"
+ v-model="scope.row.gainhospitalno"
style="width: 100%"
/>
</template>
@@ -1322,9 +1375,15 @@
align="center"
width="120"
prop="ageunit"
+ v-if="actives == 4"
>
<template slot-scope="scope">
<el-input
+ :disabled="
+ scope.row.allocationstatus == 2 ||
+ scope.row.organstate == 2 ||
+ scope.row.transplantstate == 2
+ "
v-model="scope.row.ageunit"
placeholder="绯荤粺缂栧彿"
/>
@@ -1335,9 +1394,15 @@
align="center"
width="200"
prop="applicanttime"
+ v-if="actives == 4"
>
<template slot-scope="scope">
<el-date-picker
+ :disabled="
+ scope.row.allocationstatus == 2 ||
+ scope.row.organstate == 2 ||
+ scope.row.transplantstate == 2
+ "
clearable
size="small"
style="width: 100%"
@@ -1354,9 +1419,106 @@
align="center"
width="120"
prop="name"
+ v-if="actives == 4"
>
<template slot-scope="scope">
- <el-input v-model="scope.row.name" placeholder="鍙椾綋濮撳悕" />
+ <el-input
+ :disabled="
+ scope.row.allocationstatus == 2 ||
+ scope.row.organstate == 2 ||
+ scope.row.transplantstate == 2
+ "
+ v-model="scope.row.name"
+ placeholder="鍙椾綋濮撳悕"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="绉绘璐熻矗浜�"
+ align="center"
+ width="120"
+ prop="transplantdoct"
+ v-if="actives == 6"
+ >
+ <template slot-scope="scope">
+ <el-input
+ :disabled="
+ scope.row.allocationstatus == 2 ||
+ scope.row.organstate == 2 ||
+ scope.row.transplantstate == 2
+ "
+ v-model="scope.row.transplantdoct"
+ placeholder="鍖诲笀濮撳悕"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="绉绘鏃堕棿"
+ align="center"
+ width="200"
+ prop="transplanttime"
+ v-if="actives == 6"
+ >
+ <template slot-scope="scope">
+ <el-date-picker
+ :disabled="
+ scope.row.allocationstatus == 2 ||
+ scope.row.organstate == 2 ||
+ scope.row.transplantstate == 2
+ "
+ clearable
+ size="small"
+ style="width: 100%"
+ v-model="scope.row.transplanttime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨绉绘鏃堕棿"
+ >
+ </el-date-picker>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鑾峰彇鍖诲笀"
+ align="center"
+ width="120"
+ prop="organgetdoct"
+ v-if="actives == 5"
+ >
+ <template slot-scope="scope">
+ <el-input
+ :disabled="
+ scope.row.allocationstatus == 2 ||
+ scope.row.organstate == 2 ||
+ scope.row.transplantstate == 2
+ "
+ v-model="scope.row.organgetdoct"
+ placeholder="鍖诲笀濮撳悕"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鑾峰彇鏃堕棿"
+ align="center"
+ width="200"
+ prop="organgettime"
+ v-if="actives == 5"
+ >
+ <template slot-scope="scope">
+ <el-date-picker
+ :disabled="
+ scope.row.allocationstatus == 2 ||
+ scope.row.organstate == 2 ||
+ scope.row.transplantstate == 2
+ "
+ clearable
+ size="small"
+ style="width: 100%"
+ v-model="scope.row.organgettime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鑾峰彇鏃堕棿"
+ >
+ </el-date-picker>
</template>
</el-table-column>
<el-table-column
@@ -1364,9 +1526,15 @@
align="center"
width="150"
prop="idcardtype"
+ v-if="actives == 4"
>
<template slot-scope="scope">
<el-select
+ :disabled="
+ scope.row.allocationstatus == 2 ||
+ scope.row.organstate == 2 ||
+ scope.row.transplantstate == 2
+ "
v-model="scope.row.idcardtype"
placeholder="绉绘浜鸿瘉浠剁被鍨�"
>
@@ -1384,18 +1552,40 @@
align="center"
width="200"
prop="idcardno"
+ v-if="actives == 4"
>
<template slot-scope="scope">
<el-input
+ :disabled="
+ scope.row.allocationstatus == 2 ||
+ scope.row.organstate == 2 ||
+ scope.row.transplantstate == 2
+ "
v-model="scope.row.idcardno"
placeholder="璇佷欢鍙风爜"
/>
</template>
</el-table-column>
+ <el-table-column
+ prop="abandonreason"
+ label="寮冪敤/浣滃簾鍘熷洜"
+ align="center"
+ width="260"
+ >
+ <template slot-scope="scope">
+ <el-row>
+ <el-input
+ clearable
+ v-model="scope.row.abandonreason"
+ placeholder="璇疯緭鍏ュ純鐢�/浣滃簾鍘熷洜"
+ />
+ </el-row>
+ </template>
+ </el-table-column>
</el-table>
</el-form-item>
</el-form>
- <div class="dialog-footer">
+ <div class="dialog-footer" v-show="actives == 4">
<el-button
v-show="!showTerminationBtn"
type="primary"
@@ -1407,12 +1597,12 @@
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
>
- <el-button
+ <!-- <el-button
v-show="makeastepforward"
type="primary"
@click="makeastepforward"
>涓嬩竴姝�</el-button
- >
+ > -->
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</div>
@@ -1762,12 +1952,7 @@
@click="Terminationcase"
>{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
>
- <el-button
- v-show="makeastepforward"
- type="primary"
- @click="makeastepforward"
- >涓嬩竴姝�</el-button
- >
+
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</div>
@@ -1894,7 +2079,7 @@
</div>
<!-- 瀹岀粨娴佺▼ -->
<div class="boxdiv" v-show="actives > 6">
- <h3>鍏ㄩ儴娴佺▼宸插畬缁擄紒</h3>
+ <h3>鍏ㄩ儴娴佺▼宸插畬缁擄紒</h3>
</div>
</div>
<!-- 闄勪欢寮圭獥 -->
@@ -1906,6 +2091,11 @@
:visible.sync="pdfVisible"
width="60%"
>
+ <div style="text-align: right;">
+ <el-button type="success" @click="drawer = true"
+ >鏂囦欢鎸囧鐩綍</el-button
+ >
+ </div>
<el-tabs
style="margin-top: 20px;"
v-model="activeName"
@@ -1913,10 +2103,6 @@
@tab-click="handleClick"
>
<el-tab-pane :label="activetele" :name="1"> </el-tab-pane>
- <!-- <el-tab-pane label="鍖诲璇勪及" :name="2"> </el-tab-pane>
- <el-tab-pane label="鎹愮尞纭" :name="3"> </el-tab-pane>
- <el-tab-pane label="浼︾悊瀹℃煡" :name="4"> </el-tab-pane>
- <el-tab-pane label="瀹屾垚鐧昏" :name="7"> </el-tab-pane> -->
</el-tabs>
<div class="pdfimg">
<div class="box-pdf">
@@ -2008,23 +2194,50 @@
<div v-else class="pdfimgmins">{{ hintitle }}</div>
</div>
</el-dialog>
+ <!-- 鎵归噺鎶藉眽 -->
+ <el-drawer title="鍣ㄥ畼鎹愮尞鐩稿叧闄勪欢" :visible.sync="drawer" direction="rtl">
+ <div style="padding:20px">
+ <el-button @click="clearFilter">鍙栨秷绛涢��</el-button>
+ <el-table ref="filterTable" :data="tableDatafile" style="width: 100%">
+ <el-table-column prop="name" label="鏂囦欢鍚�" width="250">
+ </el-table-column>
+ <el-table-column
+ prop="tag"
+ label="绫诲瀷"
+ :filters="[
+ { text: '涓浗涓�绫�(DBD)', value: '涓浗涓�绫�(DBD)' },
+ { text: '涓浗浜岀被(DCD)', value: '涓浗浜岀被(DCD)' },
+ { text: '涓浗涓夌被(DBCD)', value: '涓浗涓夌被(DBCD)' }
+ ]"
+ :filter-method="filterTag"
+ filter-placement="bottom-end"
+ >
+ <template slot-scope="scope">
+ <el-tag :type="scope.row.type" disable-transitions>{{
+ scope.row.tag
+ }}</el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+
+ <div style="margin-left: 20px;">
+ <el-button @click="drawer = false">鍙� 娑�</el-button>
+ </div>
+ </el-drawer>
</div>
</template>
<script>
import {
- addDonateannex,
listDonateannex,
Modifydonationattachment
} from "@/api/project/donateannex";
import { listReportname } from "@/api/project/organization";
import {
- getDonatecompletioninfo,
listnewDonatecompletioninfo,
addDonatecompletioninfo,
- updateDonatecompletioninfo,
- listDonatecompletioninfo,
- downloadcompletioninfo
+ updateDonatecompletioninfo
} from "@/api/project/donatecompletioninfo";
import {
getDonatebaseinfo,
@@ -2080,35 +2293,61 @@
AnnexUpload,
ReportName
},
- dicts: [
- "sys_nation",
- "sys_occupation",
- "sys_education",
- "sys_Organ",
- "sys_organstate",
- "sys_user_sex",
- "sys_IDType",
- "sys_BloodType",
- "sys_0_1",
- "sys_patientstate",
- "sys_DonationCategory",
- "sys_Kinship",
- "sys_Infectious",
- "sys_bloodtype_rhd",
- "sys_InfoSources",
- "sys_OtherCases",
- "sys_DiseaseType",
- "sys_SelfWill",
- "sys_FamilyRelation",
- "sys_OrganDecision",
- "sys_CoreAssessConclusion",
- "sys_BaseAssessConclusion",
- "sys_EthicalReview"
- ],
+ // dicts: [
+ // "sys_nation",
+ // "sys_occupation",
+ // "sys_education",
+ // "sys_Organ",
+ // "sys_user_sex",
+ // "sys_IDType",
+ // "sys_BloodType",
+ // "sys_0_1",
+ // "sys_patientstate",
+ // "sys_DonationCategory",
+ // "sys_Kinship",
+ // "sys_Infectious",
+ // "sys_bloodtype_rhd",
+ // "sys_InfoSources",
+ // "sys_OtherCases",
+ // "sys_DiseaseType",
+ // "sys_SelfWill",
+ // "sys_FamilyRelation",
+ // "sys_OrganDecision",
+ // "sys_CoreAssessConclusion",
+ // "sys_BaseAssessConclusion",
+ // "sys_EthicalReview"
+ // ],
data() {
return {
infoid: 736,
+ drawer: false,
form: {},
+ tableDatafile: [
+ {
+ name: "鐜嬪皬铏�",
+ address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�",
+ tag: "涓浗涓�绫�(DBD)",
+ type: "success"
+ },
+ {
+ name: "鐜嬪皬铏�",
+ address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�",
+ tag: "涓浗浜岀被(DCD)",
+ type: "danger"
+ },
+ {
+ name: "鐜嬪皬铏�",
+ address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�",
+ tag: "涓浗涓夌被(DBCD)",
+ type: "warning"
+ },
+ {
+ name: "鐜嬪皬铏�",
+ address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�",
+ tag: "涓浗涓夌被(DBCD)",
+ type: "warning"
+ }
+ ],
medicineform: {
infoid: null
},
@@ -2119,6 +2358,21 @@
ethicform: {
infoid: null
},
+ allocationstatuslist: [
+ { value: 0, label: "鏈垎閰�" },
+ { value: 1, label: "宸插垎閰�" },
+ { value: 2, label: "浣滃簾" }
+ ],
+ organstatelist: [
+ { value: "0", label: "鏈幏鍙�" },
+ { value: "1", label: "宸茶幏鍙�" },
+ { value: "2", label: "寮冪敤" }
+ ],
+ transplantstatelist: [
+ { value: 0, label: "鏈Щ妞�" },
+ { value: 1, label: "宸茬Щ妞�" },
+ { value: 2, label: "寮冪敤" }
+ ],
allocationform: [],
witnessform: {
infoid: null
@@ -2253,7 +2507,7 @@
fileList: [],
fileListto: [],
donatelist: [], //鎬�
- activetele:'娼滃湪鎹愮尞',
+ activetele: "娼滃湪鎹愮尞",
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
//鏂囦欢涓婁紶token
@@ -2331,9 +2585,9 @@
let searchParam = {
infoid: this.infoid
};
- if (this.actives == 1) {
+ if (this.actives == 1 && !this.medicineform.infoid) {
this.annexfilesList = this.medicinelist;
- this.activetele="鍖诲璇勪及";
+ this.activetele = "鍖诲璇勪及";
listMedicalevaluation(searchParam).then(response => {
if (response.code == 200 && response.rows[0]) {
this.medicineform = response.rows[0];
@@ -2343,9 +2597,9 @@
);
}
});
- } else if (this.actives == 2) {
+ } else if (this.actives == 2 && !this.affirmform.infoid) {
this.annexfilesList = this.affirmlist;
- this.activetele="鎹愮尞纭";
+ this.activetele = "鎹愮尞纭";
listRelativesconfirmation(searchParam).then(response => {
if (response.code == 200 && response.rows[0]) {
this.affirmform = response.rows[0];
@@ -2358,23 +2612,23 @@
this.defultAddresss.sheng = this.affirmform.residenceprovincename;
this.defultAddresss.shi = this.affirmform.residencecityname;
this.defultAddresss.qu = this.affirmform.residencetownname;
- if (this.affirmform.kinship) {
- this.affirmform.kinship = this.affirmform.kinship.split(",");
- }
- if (this.affirmform.organdecision) {
- this.affirmform.organdecision = this.affirmform.organdecision.split(
- ","
- );
- }
+ // if (this.affirmform.kinship) {
+ // this.affirmform.kinship = this.affirmform.kinship.split(",");
+ // }
+ // if (this.affirmform.organdecision) {
+ // this.affirmform.organdecision = this.affirmform.organdecision.split(
+ // ","
+ // );
+ // }
} else {
this.$modal.msgError(
"鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍澶辫触" + JSON.stringify(response)
);
}
});
- } else if (this.actives == 3) {
+ } else if (this.actives == 3 && !this.ethicform.infoid) {
this.annexfilesList = this.ethiclist;
- this.activetele="浼︾悊瀹℃煡";
+ this.activetele = "浼︾悊瀹℃煡";
listDonateflowchart(searchParam).then(response => {
if (response.code == 200 && response.rows.length == 1) {
@@ -2383,12 +2637,11 @@
console.log("浼︾悊瀹℃煡鏁版嵁涓虹┖");
}
});
- } else if (this.actives == 4) {
+ } else if (this.actives == 4 && !this.medicineform[0]) {
listDonateorgan(searchParam).then(response => {
if (response.code == 200) {
if (response.rows[0]) {
this.allocationform = response.rows;
- // this.allocationform[0].infoid = this.form.id;
}
this.organalForm.organname = [];
for (let i = 0; i < response.rows.length; i++) {
@@ -2400,7 +2653,22 @@
);
}
});
- } else if (this.actives == 5) {
+ } else if (this.actives == 5 && !this.witnessform.infoid) {
+ // 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼淇℃伅
+ if (!this.allocationform[0]) {
+ listDonateorgan(searchParam).then(resall => {
+ if (resall.code == 200) {
+ if (resall.rows[0]) {
+ this.allocationform = resall.rows;
+ }
+ } else {
+ this.$modal.msgError(
+ "鍣ㄥ畼鍒楄〃鑾峰彇澶辫触锛�" + JSON.stringify(resall)
+ );
+ }
+ });
+ }
+ // 鑾峰彇褰撳墠瑙佽瘉淇℃伅
getByInfoId(searchParam.infoid).then(response => {
if (response.code == 200) {
if (response.data) {
@@ -2413,13 +2681,28 @@
);
}
});
- } else if (this.actives == 6) {
+ } else if (this.actives == 6 && !this.allocationform.infoid) {
this.annexfilesList = this.registerlist;
- this.activetele="瀹屾垚鐧昏";
-
+ this.activetele = "瀹屾垚鐧昏";
let accpre = {
id: searchParam.infoid
};
+ // 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼
+ if (!this.allocationform[0]) {
+ listDonateorgan(searchParam).then(resall => {
+ if (resall.code == 200) {
+ if (resall.rows[0]) {
+ this.allocationform = resall.rows;
+ this.allocationform.infoid = this.infoid;
+ }
+ } else {
+ this.$modal.msgError(
+ "鍣ㄥ畼鍒楄〃鑾峰彇澶辫触锛�" + JSON.stringify(resall)
+ );
+ }
+ });
+ }
+ // 鑾峰彇瀹屾垚鐧昏淇℃伅
listnewDonatecompletioninfo(accpre).then(response => {
if (response.code == 200 && response.rows.length) {
this.accomplishform = response.rows[0];
@@ -2430,8 +2713,7 @@
});
} else if (this.actives == 0) {
this.annexfilesList = this.registerlist;
- this.activetele="娼滃湪鎹愮尞";
-
+ this.activetele = "娼滃湪鎹愮尞";
}
},
/** 淇濆瓨涓昏〃鎸夐挳 */
@@ -2580,7 +2862,6 @@
let arrallo = [];
this.allocationform.map(item => {
if (item.id) {
- console.log(formatDate(item.applicanttime));
item.applicanttime = formatDate(item.applicanttime);
updateDonateorgan(item).then(response => {});
} else {
@@ -2617,8 +2898,16 @@
}
console.log("juanxian");
if (valid) {
- console.log("juanxian");
-
+ // 淇濆瓨鍣ㄥ畼鍒嗛厤琛ㄦ暟鎹�
+ let arrallo = [];
+ this.allocationform.map(item => {
+ if (item.id) {
+ item.applicanttime = formatDate(item.applicanttime);
+ updateDonateorgan(item).then(response => {});
+ } else {
+ arrallo.push(item);
+ }
+ });
if (this.witnessform.id != null) {
console.log(456);
updateDonationwitness(this.witnessform).then(response => {
@@ -2637,6 +2926,17 @@
this.accomplishform.infoid = this.infoid;
this.$refs["accomplishform"].validate(valid => {
if (valid) {
+ // 淇濆瓨鍣ㄥ畼鍒嗛厤琛ㄦ暟鎹�
+ let arrallo = [];
+ this.allocationform.map(item => {
+ if (item.id) {
+ item.applicanttime = formatDate(item.applicanttime);
+ updateDonateorgan(item).then(response => {});
+ } else {
+ arrallo.push(item);
+ }
+ });
+ // 淇濆瓨纭淇℃伅
if (this.accomplishform.id) {
console.log(this.accomplishform);
updateDonatecompletioninfo(this.accomplishform).then(response => {
@@ -2735,7 +3035,10 @@
console.log(this.form.workflow);
console.log(this.actives);
if (this.form.workflow == this.actives) {
- this.form.workflow++;
+ if (this.form.workflow <= 6) {
+ } else {
+ this.form.workflow++;
+ }
this.submitForm();
// this.GetAttacheddata();
} else if (this.form.workflow > this.actives) {
@@ -2935,9 +3238,41 @@
const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
},
- // 淇濆瓨
- saveattachment(stype) {}
- }
+
+ clearFilter() {
+ this.$refs.filterTable.clearFilter();
+ },
+ formatter(row, column) {
+ return row.address;
+ },
+ filterTag(value, row) {
+ return row.tag === value;
+ }
+ },
+ dicts: [
+ "sys_nation",
+ "sys_occupation",
+ "sys_education",
+ "sys_Organ",
+ "sys_user_sex",
+ "sys_IDType",
+ "sys_BloodType",
+ "sys_0_1",
+ "sys_patientstate",
+ "sys_DonationCategory",
+ "sys_Kinship",
+ "sys_Infectious",
+ "sys_bloodtype_rhd",
+ "sys_InfoSources",
+ "sys_OtherCases",
+ "sys_DiseaseType",
+ "sys_SelfWill",
+ "sys_FamilyRelation",
+ "sys_OrganDecision",
+ "sys_CoreAssessConclusion",
+ "sys_BaseAssessConclusion",
+ "sys_EthicalReview"
+ ]
};
</script>
diff --git a/src/views/project/ethicalReview/index.vue b/src/views/project/ethicalReview/index.vue
index 7b1e9ca..3405e2b 100644
--- a/src/views/project/ethicalReview/index.vue
+++ b/src/views/project/ethicalReview/index.vue
@@ -682,7 +682,7 @@
this.handleQuery();
},
/** 浼︾悊瀹℃煡寮圭獥 */
- showDonationEvaluationDialog(dontateInfo) {
+ showDonationEvaluationDialog(row) {
this.$router.push({
path: "/organ/donationdetails/",
query: {
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index 5cddef8..f661042 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -2005,7 +2005,7 @@
singleDetail.bankcardno = res.bankCardNo;
singleDetail.branchbankname = res.branchbankname;
singleDetail.depositbank = res.depositBank;
- singleDetail.idcardno = res.bankCardNo;
+ singleDetail.idcardno = res.idcardNo;
singleDetail.phone = res.telephone;
singleDetail.title = res.title;
singleDetail.unitname = res.unitname;
diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
index 9b8a1ca..aebe8e1 100644
--- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -1320,7 +1320,6 @@
const obj = selection.find(obj => obj.id === item);
console.log(obj);
this.overallidsvalue.push(obj);
-
}
});
console.log(this.overallids);
@@ -1354,17 +1353,17 @@
},
Totalcalculation(tot) {
console.log(tot);
- let bojite={
- fundids:this.overallids,
- isTaxAfter:tot,
- }
+ let bojite = {
+ fundids: this.overallids,
+ isTaxAfter: tot
+ };
if (tot == 0) {
TotalcalculationFn(bojite).then(row => {
console.log(row.msg);
- if (row.code=200) {
+ if ((row.code = 200)) {
this.$modal.msgSuccess(row.msg);
- }else{
- this.$modal.msgError(row.msg);
+ } else {
+ this.$modal.msgError(row.msg);
}
});
} else {
@@ -1372,7 +1371,11 @@
const hasValue = this.overallidsvalue.every(obj => obj.istax == 1);
if (hasValue) {
TotalcalculationFn(bojite).then(row => {
- console.log(row.msg);
+ if ((row.code = 200)) {
+ this.$modal.msgSuccess(row.msg);
+ } else {
+ this.$modal.msgError(row.msg);
+ }
});
} else {
this.$modal.msgError("璇烽�夋嫨绠楃◣鍚庣殑鏁版嵁杩涜鍚堝苟璁＄畻");
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 383b157..555b24f 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -1363,23 +1363,27 @@
},
Totalcalculation(tot) {
console.log(tot);
- let bojite={
- fundids:this.overallids,
- isTaxAfter:tot,
- }
+ let bojite = {
+ fundids: this.overallids,
+ isTaxAfter: tot
+ };
if (tot == 0) {
TotalcalculationFn(bojite).then(row => {
- if (row.code=200) {
+ if ((row.code = 200)) {
this.$modal.msgSuccess(row.msg);
- }else{
- this.$modal.msgError(row.msg);
+ } else {
+ this.$modal.msgError(row.msg);
}
});
} else {
const hasValue = this.overallidsvalue.every(obj => obj.istax == 1);
if (hasValue) {
TotalcalculationFn(bojite).then(row => {
- console.log(row.msg);
+ if ((row.code = 200)) {
+ this.$modal.msgSuccess(row.msg);
+ } else {
+ this.$modal.msgError(row.msg);
+ }
});
} else {
this.$modal.msgError("璇烽�夋嫨绠楃◣鍚庣殑鏁版嵁杩涜鍚堝苟璁＄畻");
--
Gitblit v1.9.3