From e21e9ad99c4c2a306d15cb270dc41520450ac9f2 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 12 十二月 2023 00:16:02 +0800
Subject: [PATCH] yxh：修改了预审核提示信息
---
src/views/project/donationdetails/index.vue | 1031 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 729 insertions(+), 302 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index c421180..f43ff28 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>
@@ -33,7 +33,7 @@
>
<p>
鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.medicalevaluation.updatetime)
+ parseTime(Processdata.medicalevaluation.createtime)
}}</span>
</p>
<p>
@@ -54,7 +54,7 @@
>
<p>
鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.relativesconfirmation.updatetime)
+ parseTime(Processdata.relativesconfirmation.createtime)
}}</span>
</p>
<p>
@@ -71,16 +71,16 @@
>
<template
slot="description"
- v-if="Processdata.ethicalreviewopinions.createtime"
+ v-if="Processdata.donateflowcharts.createtime"
>
<p>
鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.ethicalreviewopinions.updatetime)
+ parseTime(Processdata.donateflowcharts.createtime)
}}</span>
</p>
<p>
鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.ethicalreviewopinions.updatetime)
+ parseTime(Processdata.donateflowcharts.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.createtime)
}}</span>
</p>
<p>
鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.organallocationService.updatetime)
+ parseTime(Processdata.donateorgansService.updatetime)
}}</span>
</p>
</template>
@@ -117,7 +117,7 @@
>
<p>
鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.donationwitness.updatetime)
+ parseTime(Processdata.donationwitness.createtime)
}}</span>
</p>
<p>
@@ -138,7 +138,7 @@
>
<p>
鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.donatecompletioninfo.updatetime)
+ parseTime(Processdata.donatecompletioninfo.createtime)
}}</span>
</p>
<p>
@@ -156,7 +156,7 @@
<div style="background: #fff;">
<!-- 椤堕儴鏁版嵁 -->
<div class="boxdiv">
- <div class="top-text">鎹愮尞鑰呰褰曞伐浣滃彴</div>
+ <div class="top-text">鎹愮尞妗堜緥淇℃伅</div>
<el-form
ref="form"
:model="form"
@@ -205,31 +205,34 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="姘戞棌" prop="nation">
- <el-select v-model="form.nation" placeholder="璇烽�夋嫨姘戞棌">
+ <el-form-item label="鎬у埆" prop="sex">
+ <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
<el-option
- v-for="dict in dict.type.sys_nation"
- :key="dict.value"
+ v-for="dict in dict.type.sys_user_sex"
+ :key="dict.label"
:label="dict.label"
- :value="dict.value"
+ :value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="绫嶈疮" prop="nativeplace">
- <el-input
- v-model="form.nativeplace"
- placeholder="璇疯緭鍏ュ浗绫�"
- />
+ <el-form-item label="骞撮緞" prop="age">
+ <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍥界睄" prop="nationality">
- <el-input
- v-model="form.nationality"
- placeholder="璇疯緭鍏ュ浗绫�"
- />
+ <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>
</el-form-item>
</el-col>
</el-row>
@@ -261,101 +264,46 @@
/>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鎬у埆" prop="sex">
- <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
+ </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="dict in dict.type.sys_user_sex"
- :key="dict.label"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></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="6">
- <el-form-item label="骞撮緞" prop="age">
- <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
+ <el-col :span="8">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone">
+ <el-input
+ v-model="form.reporterphone"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ />
</el-form-item>
</el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
+ <el-col :span="8">
+ <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
<el-date-picker
clearable
size="small"
- v-model="form.birthday"
- type="date"
- style="width: 174px"
+ style="width: 190px"
+ v-model="form.reporttime"
+ type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鍑虹敓鏃ユ湡"
+ 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-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-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="浣忓潃" prop="residenceaddress">
- <div>
- <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-col>
- </el-row>
-
- <el-row>
- <el-col :span="12">
- <el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress">
- <div>
- <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-col>
</el-row>
</div>
@@ -429,6 +377,95 @@
placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�"
/>
</el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <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-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="绫嶈疮" prop="nativeplace">
+ <el-input v-model="form.nativeplace" placeholder="璇疯緭鍏ュ浗绫�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍥界睄" prop="nationality">
+ <el-input v-model="form.nationality" placeholder="璇疯緭鍏ュ浗绫�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <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-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-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="浣忓潃" prop="residenceaddress">
+ <div>
+ <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-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress">
+ <div>
+ <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-col>
</el-row>
<el-row>
@@ -623,6 +660,20 @@
</el-col>
</el-row>
<el-row>
+ <el-col :span="6">
+ <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-col :span="8">
<el-form-item label="淇℃伅鍛�" prop="infoname">
<el-input v-model="form.infoname" placeholder="璇疯緭鍏ヤ俊鎭憳" />
@@ -670,63 +721,6 @@
</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>
- </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-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-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>
- </el-form-item>
- </el-col>
- </el-row>
</el-form>
<div class="dialog-footer">
<el-button
@@ -746,13 +740,8 @@
@click="Reportforreview"
>涓婃姤瀹℃牳</el-button
>
- <el-button
- v-show="makeastepforward"
- type="primary"
- @click="makeastepforward"
- >涓嬩竴姝�</el-button
- >
- <el-button @click="cancel">鍙� 娑�</el-button>
+
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
<!-- <el-button @click="handleapproval">鎻愪氦瀹℃牳</el-button> -->
</div>
</div>
@@ -971,13 +960,13 @@
@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>
+ > -->
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
</div>
<!-- 鎹愮尞纭 -->
@@ -989,6 +978,13 @@
label-width="100px"
label-position="right"
>
+ <el-form-item label-width="100px" label="閫夋嫨鍣ㄥ畼">
+ <el-checkbox-group v-model="organdecision">
+ <el-checkbox v-for="item in organlist" :label="item">
+ {{ item }}
+ </el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
<el-row>
<el-col :span="6">
<el-form-item label="瀛愬コ鏁伴噺" prop="kinshipChildrennum">
@@ -1171,13 +1167,13 @@
@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>
+ > -->
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
</div>
<!-- 浼︾悊瀹℃煡 -->
@@ -1239,24 +1235,28 @@
@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>
+ > -->
+ <!-- <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 +1273,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 +1316,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 +1353,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 +1391,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 +1410,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 +1435,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 +1542,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 +1568,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,13 +1613,13 @@
@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>
+ > -->
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
</div>
<!-- 鑾峰彇瑙佽瘉 -->
@@ -1762,13 +1968,14 @@
@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>
+ > -->
+
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
</div>
<!-- 瀹屾垚鐧昏 -->
@@ -1889,8 +2096,12 @@
@click="Reportforreview"
>涓婃姤瀹℃牳</el-button
>
- <el-button @click="cancel">鍙� 娑�</el-button>
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
+ </div>
+ <!-- 瀹岀粨娴佺▼ -->
+ <div class="boxdiv" v-show="actives > 6">
+ <h3>鍏ㄩ儴娴佺▼宸插畬缁擄紒</h3>
</div>
</div>
<!-- 闄勪欢寮圭獥 -->
@@ -1902,17 +2113,18 @@
: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"
type="card"
@tab-click="handleClick"
>
- <el-tab-pane label="娼滃湪鎹愮尞" :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-tab-pane :label="activetele" :name="1"> </el-tab-pane>
</el-tabs>
<div class="pdfimg">
<div class="box-pdf">
@@ -2004,23 +2216,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,
@@ -2076,35 +2315,19 @@
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"
- ],
data() {
return {
infoid: 736,
+ drawer: false,
form: {},
+ tableDatafile: [
+ {
+ name: "鐜嬪皬铏�",
+ address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�",
+ tag: "涓浗涓�绫�(DBD)",
+ type: "success"
+ }
+ ],
medicineform: {
infoid: null
},
@@ -2112,9 +2335,42 @@
infoid: null,
organdecision: []
},
+ organdecision: [],
ethicform: {
infoid: null
},
+ organlist: [
+ "蹇冭剰",
+ "鍏ㄨ倽",
+ "宸﹁倽",
+ "鍙宠倽",
+ "宸﹁偩",
+ "鍙宠偩",
+ "鍏ㄨ偩",
+ "宸﹁偤",
+ "鍙宠偤",
+ "灏忚偁",
+ "鑵轰綋",
+ "閬椾綋",
+ "宸︾溂瑙掕啘",
+ "鍙崇溂瑙掕啘",
+ "鍏朵粬"
+ ],
+ 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
@@ -2233,7 +2489,32 @@
},
// 鍚勭骇鏄庣粏鏁堥獙
medicinerules: {},
- affirmrules: {},
+ affirmrules: {
+ name: [
+ { required: true, message: "浜插睘濮撳悕涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ phone: [
+ { required: true, message: "瀹跺睘鑱旂郴鐢佃瘽涓嶄负绌�", trigger: "blur" }
+ ],
+ signfamilyrelations: [
+ { required: true, message: "涓庢崘鐚�呭叧绯�", trigger: "blur" }
+ ],
+ idcardno: [
+ { required: true, message: "璇佷欢鍙蜂笉鑳戒负绌�", trigger: "blur" }
+ ],
+ organdecision: [
+ { required: true, message: "鎹愮尞鍐冲畾涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ responsibleuserid: [
+ { required: true, message: "璐熻矗浜轰笉鑳戒负绌�", trigger: "blur" }
+ ],
+ coordinateduserido: [
+ { required: true, message: "鍗忚皟鍛�1涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ coordinateduseridt: [
+ { required: true, message: "鍗忚皟鍛�2涓嶈兘涓虹┖", trigger: "blur" }
+ ]
+ },
ethicrules: {},
allocationrules: {},
witnessrules: {},
@@ -2248,6 +2529,8 @@
registerlist: [], //瀹屾垚闄勪欢
fileList: [],
fileListto: [],
+ donatelist: [], //鎬�
+ activetele: "娼滃湪鎹愮尞",
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
//鏂囦欢涓婁紶token
@@ -2267,6 +2550,9 @@
};
},
+ created() {
+ this.infoid = this.$route.query.id;
+ },
mounted() {
// this.id = this.$route.query.id;
this.Getbasicinformation();
@@ -2274,7 +2560,7 @@
},
methods: {
- // 鑾峰彇涓昏〃鏁版嵁
+ // 鑾峰彇涓昏〃鍙婇檮灞炴暟鎹�
Getbasicinformation() {
// 宸︿晶娴佺▼鏁版嵁
getDonatebaseinfoflow(this.infoid).then(res => {
@@ -2313,29 +2599,42 @@
this.residenceAddresss.shi = response.data.residencecityname;
this.residenceAddresss.qu = response.data.residencetownname;
this.registerAddresss.qu = response.data.registertownname;
+ // 鑾峰彇浜岀骇琛�
+ this.GetAttacheddata();
});
},
// 鑾峰彇浜岀骇琛ㄦ暟鎹�
GetAttacheddata() {
let searchParam = {
- infoid: this.form.id
+ infoid: this.infoid
};
if (this.actives == 1) {
this.annexfilesList = this.medicinelist;
+ this.activetele = "鍖诲璇勪及";
+ if (this.medicineform.infoid) {
+ return;
+ }
listMedicalevaluation(searchParam).then(response => {
if (response.code == 200 && response.rows[0]) {
this.medicineform = response.rows[0];
} else {
- this.$modal.msgError(
- "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response)
- );
+ // this.$modal.msgError(
+ // "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response)
+ // );
}
});
} else if (this.actives == 2) {
this.annexfilesList = this.affirmlist;
+ this.activetele = "鎹愮尞纭";
+ if (this.affirmform.infoid) {
+ return;
+ }
listRelativesconfirmation(searchParam).then(response => {
if (response.code == 200 && response.rows[0]) {
this.affirmform = response.rows[0];
+ if (this.affirmform.organdecision) {
+ this.organdecision = this.affirmform.organdecision.split(",");
+ }
if (!this.affirmform) {
this.affirmform = {};
this.affirmform.residenceprovincename = "";
@@ -2345,75 +2644,113 @@
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)
- );
+ // this.$modal.msgError(
+ // "鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍澶辫触" + JSON.stringify(response)
+ // );
}
});
} else if (this.actives == 3) {
this.annexfilesList = this.ethiclist;
-
+ this.activetele = "浼︾悊瀹℃煡";
+ if (this.ethicform.infoid) {
+ return;
+ }
listDonateflowchart(searchParam).then(response => {
- if (response.code == 200 && response.rows.length == 1) {
+ if (response.code == 200 && response.rows.length) {
this.ethicform = response.rows[0];
} else {
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++) {
this.organalForm.organname.push(response.rows[i].organno);
}
} else {
- this.$modal.msgError(
- "鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅澶辫触锛�" + JSON.stringify(response)
- );
+ // this.$modal.msgError(
+ // "鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅澶辫触锛�" + JSON.stringify(response)
+ // );
}
});
- } 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) {
this.witnessform = response.data;
- this.witnessform.infoid = this.form.id;
+ this.witnessform.infoid = this.infoid;
}
} else {
- this.$modal.msgError(
- "鑾峰彇瑙佽瘉淇℃伅鎷垮彇澶辫触锛�" + JSON.stringify(response)
- );
+ // this.$modal.msgError(
+ // "鑾峰彇瑙佽瘉淇℃伅鎷垮彇澶辫触锛�" + JSON.stringify(response)
+ // );
}
});
} else if (this.actives == 6) {
this.annexfilesList = this.registerlist;
+ this.activetele = "瀹屾垚鐧昏";
+ if (this.allocationform.infoid) {
+ return;
+ }
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];
- this.accomplishform.infoid = this.form.id;
+ this.accomplishform.infoid = this.infoid;
} else {
- this.$modal.msgError("瀹屾垚鐧昏澶辫触锛�" + JSON.stringify(response));
+ // this.$modal.msgError("瀹屾垚鐧昏澶辫触锛�" + JSON.stringify(response));
}
});
} else if (this.actives == 0) {
- this.annexfilesList = this.registerlist;
+ this.annexfilesList = this.potentiallist;
+ this.activetele = "娼滃湪鎹愮尞";
}
},
/** 淇濆瓨涓昏〃鎸夐挳 */
@@ -2469,10 +2806,16 @@
}
if (this.form.id != null) {
+ if (this.form.workflow == 0) {
+ this.form.workflow = 1;
+ }
updateDonatebaseinfo(this.form).then(response => {
this.$modal.msgSuccess("淇濆瓨鎴愬姛");
+ Modifydonationattachment(this.donatelist).then(res => {
+ console.log(res);
+ });
this.Getbasicinformation();
- this.Processvalidation();
+ // this.Processvalidation();
this.open = false;
});
} else {
@@ -2481,8 +2824,11 @@
addDonatebaseinfo(this.form).then(response => {
if (response.code == 200) {
this.$modal.msgSuccess("鏂板鎴愬姛");
+ Modifydonationattachment(this.donatelist).then(res => {
+ console.log(res);
+ });
this.Getbasicinformation();
- this.Processvalidation();
+ // this.Processvalidation();
this.open = false;
} else {
this.$modal.msgError("鏂板澶辫触锛�" + response.msg);
@@ -2496,7 +2842,7 @@
Savethedetails() {
console.log(this.actives);
if (this.actives == 1) {
- this.medicineform.infoid = this.form.id;
+ this.medicineform.infoid = this.infoid;
this.$refs["medicineform"].validate(valid => {
if (valid) {
if (this.medicineform.id != null) {
@@ -2508,11 +2854,12 @@
this.$modal.msgSuccess("鍖诲璇勪及淇℃伅鏂板鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
} else if (this.actives == 2) {
- this.affirmform.infoid = this.form.id;
+ this.affirmform.infoid = this.infoid;
+ this.affirmform.organdecision = this.organdecision.join(",");
this.$refs["affirmform"].validate(valid => {
if (valid) {
if (this.affirmform.id != null) {
@@ -2527,11 +2874,11 @@
this.$modal.msgSuccess("鎹愮尞纭淇℃伅鏂板鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
} else if (this.actives == 3) {
- this.ethicform.infoid = this.form.id;
+ this.ethicform.infoid = this.infoid;
this.$refs["ethicform"].validate(valid => {
if (valid) {
if (this.ethicform.id != null) {
@@ -2543,17 +2890,16 @@
this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅鏂板鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
} else if (this.actives == 4) {
- this.allocationform.infoid = this.form.id;
+ this.allocationform.infoid = this.infoid;
this.$refs["allocationform"].validate(valid => {
if (valid) {
let arrallo = [];
this.allocationform.map(item => {
if (item.id) {
- console.log(formatDate(item.applicanttime));
item.applicanttime = formatDate(item.applicanttime);
updateDonateorgan(item).then(response => {});
} else {
@@ -2565,11 +2911,11 @@
this.$modal.msgSuccess("鍣ㄥ畼鎹愮尞淇℃伅鏂板鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
} else if (this.actives == 5) {
- this.witnessform.infoid = this.form.id;
+ this.witnessform.infoid = this.infoid;
this.$refs["witnessform"].validate(valid => {
let coordinatedusernameIndex = this.coordinatorlist1.findIndex(
item => this.witnessform.coordinateduserido == item.reportNo
@@ -2590,8 +2936,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 => {
@@ -2603,13 +2957,24 @@
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
} else if (this.actives == 6) {
- this.accomplishform.infoid = this.form.id;
+ 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 => {
@@ -2620,18 +2985,24 @@
this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
}
},
// 鍒囨崲tab
on_click(e) {
- console.log(e);
// if (e != "" || e != null) {
- this.actives = e;
+ console.log(this.form.workflow);
+ console.log(e);
+ let asdx = this.form.workflow + 1;
+ if (asdx >= e) {
+ this.actives = e;
+ this.GetAttacheddata();
+ } else {
+ this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
+ }
// }
- this.Processvalidation();
},
// 鍣ㄥ畼鍒嗛厤鏍忕洰鎺у埗
changeorganState(value) {
@@ -2652,11 +3023,11 @@
organname: temporganname,
organno: value,
id: null,
- infoid: this.form.id,
+ infoid: this.infoid,
donorno: this.form.donorno,
transplanthospitalname: null,
transplanthospitalno: null,
- organstate: "2"
+ organstate: 0
});
}
} else {
@@ -2682,7 +3053,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
} else {
- this.allocationform.splice(deleteIndex, 1);
+ this.allocationform.splice(organIndex, 1);
}
}
})
@@ -2703,13 +3074,23 @@
Processvalidation() {
console.log(this.form.workflow);
console.log(this.actives);
- if (this.form.workflow == this.actives) {
- this.form.workflow++;
- this.GetAttacheddata();
+ if (this.form.workflow + 1 == this.actives) {
+ if (this.form.workflow <= 6) {
+ this.form.workflow++;
+ } else {
+ }
+ this.submitForm();
+ // this.GetAttacheddata();
} else if (this.form.workflow > this.actives) {
+ // this.submitForm();
+ Modifydonationattachment(this.donatelist).then(res => {
+ console.log(res);
+ });
+ this.listDonateannex();
this.GetAttacheddata();
} else {
- this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
+ this.submitForm();
+ // this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
return;
}
console.log(this.form.workflow);
@@ -2780,12 +3161,16 @@
this.registerlist = arr;
}
// 鍒犻櫎鏃朵慨鏀逛富鍒梔elFlag
+ console.log(delvalue);
const index = this.donatelist.indexOf(delvalue);
+ console.log(index);
if (index !== -1) {
if (delvalue.id) {
this.donatelist[index].delFlag = 1;
+ console.log("淇敼鑰佹暟鎹悗", this.donatelist);
} else {
this.donatelist.splice(index, 1);
+ console.log("鍒犻櫎鏂版暟鎹悗", this.donatelist);
}
} else {
console.log("鏌ヨ涓嶅埌鍙兘鏄柊鏁版嵁鏃爄d");
@@ -2793,6 +3178,7 @@
// 鏂板鏃朵慨鏀逛富鍒�
if (addvalue.annexurl) {
this.donatelist.push(addvalue);
+ console.log("鏂板鍚�", this.donatelist);
}
},
//鏂囦欢涓婁紶
@@ -2809,10 +3195,15 @@
// this.form.filename = file.raw.name;
this.previewpdf = true;
this.$modal.msgSuccess(response.msg);
- this.fileListto.push({
+ let addvalue = {
annexname: file.name,
- annexurl: response.fileName
- });
+ annexurl: response.fileName,
+ delFlag: 0,
+ infoid: this.infoid,
+ annexfilestype: this.actives
+ };
+ this.fileListto.push(addvalue);
+ this.Newconversion(this.fileListto, "", addvalue);
this.pdfimgsrcList.push(
this.Networkheader + "/prod-api" + response.fileName
);
@@ -2882,7 +3273,9 @@
);
this.pdfimgsrcList.splice(indexlist, 1);
const index = this.getIndexInArray(this.fileListto, row);
+ this.Newconversion(this.fileListto, this.fileListto[index], "");
this.fileListto.splice(index, 1);
+ console.log(index);
},
// 鐐瑰嚮涓婄Щ
moveupdowfile(row) {
@@ -2890,27 +3283,60 @@
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>
<style lang="scss" scoped>
.particularsdiv {
- display: flex;
+ display: -webkit-box;
background-color: #f5f7fa;
height: 100%;
.left-course {
background: #fff;
- width: 20%;
+ width: 17vw;
text-align: center;
margin: 20px 10px;
padding: 10px;
margin-top: 0;
+ min-height: 888px;
.postfilx {
- width: 15%;
+ width: 15vw;
text-align: center;
margin: 20px 10px;
padding: 10px;
@@ -2976,6 +3402,7 @@
padding-right: 66px;
}
.boxdiv {
+ max-width: 85vw;
font-size: 18px;
padding: 0 30px;
padding-bottom: 10px;
--
Gitblit v1.9.3