From daf7bbe252c412bd5f58ab134b9a96f814f338be Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期四, 18 十二月 2025 11:09:11 +0800
Subject: [PATCH] 日期更改
---
src/views/project/donationdetails/index.vue | 618 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 358 insertions(+), 260 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 38ef758..701baac 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -184,6 +184,7 @@
ref="getReportname"
v-model="form.reporterno"
placeholder="璇烽�夋嫨"
+ filterable
>
<el-option
v-for="item in reporters"
@@ -204,14 +205,14 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
+ <el-form-item label="鎶ュ憡鏃ユ湡" align="left" prop="reporttime">
<el-date-picker
clearable
size="small"
v-model="form.reporttime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鎶ュ憡鏃堕棿"
+ placeholder="閫夋嫨鎶ュ憡鏃ユ湡"
>
</el-date-picker>
</el-form-item>
@@ -285,7 +286,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="6" v-if="form.treatmenthospitalno">
<el-form-item
align="left"
label="鍖荤枟鏈烘瀯"
@@ -298,7 +299,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="6" v-if="form.treatmentdeptname">
<el-form-item label="绉戝" prop="treatmentdeptno">
<el-input
v-model="form.treatmentdeptname"
@@ -367,19 +368,50 @@
>
<el-row>
<el-col :span="8">
- <el-form-item label="浣忛櫌鍙�" prop="inpatientno">
- <el-input v-model="form.inpatientno" placeholder="浣忛櫌鍙�" />
- </el-form-item>
- </el-col>
- <el-col :span="16">
- <el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname">
+ <el-form-item
+ label="鎵�鍦ㄥ尰鐤楁満鏋�"label-width="120px"
+ prop="currentMedicalInstitution"
+ >
<el-input
- v-model="form.diagnosisname"
- placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�"
+ v-model="form.currentMedicalInstitution"
+ placeholder="璇疯緭鍏�"
/>
</el-form-item>
</el-col>
+ <el-col :span="10">
+ <el-form-item
+ label-width="150px"
+ label="鎵�鍦ㄥ尰鐤楁満鏋勭瀹�"
+ prop="currentDept"
+ >
+ <el-input v-model="form.currentDept" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
</el-row>
+ <el-row>
+ <el-col :span="8">
+ <el-form-item
+ label="棣栨鍖荤枟鏈烘瀯"
+ label-width="120px"
+ prop="firstMedicalInstitution"
+ >
+ <el-input
+ v-model="form.firstMedicalInstitution"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item
+ label-width="150px"
+ label="棣栨鍖荤枟鏈烘瀯绉戝"
+ prop="firstDept"
+ >
+ <el-input v-model="form.firstDept" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+
<el-row>
<!-- <el-col :span="6">
<el-form-item label="姘戞棌" prop="nation">
@@ -401,73 +433,6 @@
<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="6">
- <el-form-item
- label="鎵�鍦ㄥ尰鐤楁満鏋�"
- prop="currentMedicalInstitution"
- >
- <el-input
- v-model="form.currentMedicalInstitution"
- placeholder="璇疯緭鍏�"
- />
- </el-form-item>
- </el-col>
- <el-col :span="10">
- <el-form-item
- label-width="130px"
- label="鎵�鍦ㄥ尰鐤楁満鏋勭瀹�"
- prop="currentDept"
- >
- <el-input v-model="form.currentDept" placeholder="璇疯緭鍏�" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="棣栨鍖荤枟鏈烘瀯" prop="firstMedicalInstitution">
- <el-input
- v-model="form.firstMedicalInstitution"
- placeholder="璇疯緭鍏�"
- />
- </el-form-item>
- </el-col>
- <el-col :span="10">
- <el-form-item
- label-width="130px"
- label="棣栨鍖荤枟鏈烘瀯绉戝"
- prop="firstDept"
- >
- <el-input v-model="form.firstDept" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
</el-row>
@@ -510,8 +475,14 @@
/>
</el-col>
</el-row>
+
<el-row>
- <el-col :span="12">
+ <el-col :span="4">
+ <el-form-item label="浣忛櫌鍙�" prop="inpatientno">
+ <el-input v-model="form.inpatientno" placeholder="浣忛櫌鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="9">
<el-form-item align="left" label="琛�鍨�" prop="bloodtype">
<el-radio-group v-model="form.bloodtype">
<el-radio
@@ -523,7 +494,7 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="12" :pull="1">
+ <el-col :span="9" :pull="1">
<el-form-item label="Rh(D)" align="left" prop="rhyin">
<el-radio-group v-model="form.rhyin">
<el-radio
@@ -536,6 +507,44 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="16">
+ <el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname">
+ <el-input
+ v-model="form.diagnosisname"
+ 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-form-item label="鐤剧梾绫诲瀷" align="left" prop="diseasetype">
<el-checkbox-group v-model="form.diseasetype">
@@ -592,7 +601,9 @@
</el-checkbox-group>
</el-form-item>
</el-col>
- <el-col :span="15" align="left">
+ </el-row>
+ <el-row>
+ <el-col :span="15">
<el-form-item label="鍏朵粬鎯呭喌" prop="othercases">
<el-checkbox-group v-model="form.othercases">
<el-checkbox
@@ -640,7 +651,7 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item align="left" label="鏈汉鎰忔効 ">
+ <el-form-item align="left" label="鏈汉鎰忔効 " prop="selfwill">
<el-checkbox-group v-model="form.selfwill">
<el-checkbox
v-for="dict in dict.type.sys_SelfWill || []"
@@ -959,6 +970,7 @@
align="left"
>
<el-select
+ filterable
v-model="medicineform.coreteamassessconclusion"
placeholder="璇烽�夋嫨鏍稿績鎴愬憳缁撹"
>
@@ -1022,7 +1034,11 @@
<el-row>
<el-col :span="6">
<el-form-item label="鎹愯禒鑰呮皯鏃�" prop="nation">
- <el-select v-model="affirmform.nation" placeholder="璇烽�夋嫨姘戞棌">
+ <el-select
+ filterable
+ v-model="affirmform.nation"
+ placeholder="璇烽�夋嫨姘戞棌"
+ >
<el-option
v-for="dict in dict.type.sys_nation || []"
:key="dict.value"
@@ -1050,6 +1066,7 @@
<el-col :span="6">
<el-form-item label="鎹愯禒鑰呰亴涓�" prop="occupation">
<el-select
+ filterable
v-model="affirmform.occupation"
placeholder="璇烽�夋嫨鑱屼笟"
>
@@ -1212,6 +1229,7 @@
<el-col :span="6">
<el-form-item label="璐熻矗浜�" prop="responsibleuserid">
<el-select
+ filterable
v-model="affirmform.responsibleuserid"
placeholder="璇烽�夋嫨"
>
@@ -1230,6 +1248,7 @@
<el-select
v-model="affirmform.coordinateduserido"
placeholder="璇烽�夋嫨"
+ filterable
>
<el-option
v-for="item in coordinatorlist1"
@@ -1246,6 +1265,7 @@
<el-select
v-model="affirmform.coordinateduseridt"
placeholder="璇烽�夋嫨"
+ filterable
>
<el-option
v-for="item in coordinatorlist1"
@@ -1418,20 +1438,7 @@
width="90"
prop="organno"
/> -->
- <el-table-column
- label="鍒嗛厤绯荤粺缂栧彿"
- align="center"
- width="120"
- prop="caseno"
- >
- <template slot-scope="scope">
- <el-input
- v-model="scope.row.caseno"
- placeholder="鍒嗛厤绯荤粺缂栧彿"
- />
- </template>
- </el-table-column>
- <el-table-column
+ <el-table-column
label="鍒嗛厤鎺ユ敹鏃堕棿"
align="center"
width="200"
@@ -1450,6 +1457,20 @@
</el-date-picker>
</template>
</el-table-column>
+ <el-table-column
+ label="鍒嗛厤绯荤粺缂栧彿"
+ align="center"
+ width="120"
+ prop="caseno"
+ >
+ <template slot-scope="scope">
+ <el-input
+ v-model="scope.row.caseno"
+ placeholder="鍒嗛厤绯荤粺缂栧彿"
+ />
+ </template>
+ </el-table-column>
+
<el-table-column
label="鍙椾綋濮撴皬"
align="center"
@@ -1549,24 +1570,15 @@
label-position="right"
>
<el-row>
- <el-col :span="24">
+ <el-col :span="10">
<el-form-item
- align="left"
- label="鎹愮尞绫诲埆"
- prop="donationcategory"
+ label="鎹愮尞鍖婚櫌"
+ prop="donateHospital "
>
- <el-radio-group v-model="witnessform.donationcategory">
- <el-radio
- v-for="dict in dict.type.sys_DonationCategory || []"
- :key="dict.value"
- :label="dict.value"
- >{{ dict.label }}</el-radio
- >
- </el-radio-group>
+ <el-input v-model="witnessform.donateHospital " placeholder="璇疯緭鍏ユ崘鐚尰闄�" />
</el-form-item>
</el-col>
</el-row>
- <el-row> </el-row>
<el-row>
<el-col :span="6">
<el-form-item
@@ -1594,6 +1606,19 @@
/>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item
+ align="left"
+ label="姝讳骸鍘熷洜"
+ label-width="120px"
+ prop="deathreason"
+ >
+ <el-input
+ v-model="witnessform.deathreason"
+ placeholder="璇疯緭鍏ユ浜″師鍥�"
+ />
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item
align="left"
@@ -1611,20 +1636,28 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="6">
+
+ </el-row>
+ <el-row>
+ <el-col :span="24">
<el-form-item
align="left"
- label="姝讳骸鍘熷洜"
- label-width="120px"
- prop="deathreason"
+ label="鎹愮尞绫诲埆"
+ prop="donationcategory"
>
- <el-input
- v-model="witnessform.deathreason"
- placeholder="璇疯緭鍏ユ浜″師鍥�"
- />
+ <el-radio-group v-model="witnessform.donationcategory">
+ <el-radio
+ v-for="dict in dict.type.sys_DonationCategory || []"
+ :key="dict.value"
+ :label="dict.value"
+ >{{ dict.label }}</el-radio
+ >
+ </el-radio-group>
</el-form-item>
</el-col>
</el-row>
+ <el-row> </el-row>
+
<el-row>
<el-col :span="6">
<el-form-item
@@ -1707,159 +1740,168 @@
clearable
v-model="witnessform.coordinatorSignTime"
type="datetime"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item
- label="鑵逛富鍔ㄨ剦锛氭彃绠℃椂闂�"
- align="left"
- label-width="140px"
- prop="abdominalaortacannulatime"
- >
- <el-date-picker
- clearable
- v-model="witnessform.abdominalaortacannulatime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鑵逛富鍔ㄨ剦鎻掔鏃堕棿"
+ <div
+ v-if="
+ witnessform.abdominalaortacannulatime ||
+ witnessform.abdominalaortaperfusiontime ||
+ witnessform.pulmonaryarterycannulatime ||
+ witnessform.pulmonaryarteryperfusiontime
+ "
+ >
+ <el-row>
+ <el-col :span="6">
+ <el-form-item
+ label="鑵逛富鍔ㄨ剦锛氭彃绠℃椂闂�"
+ align="left"
+ label-width="140px"
+ prop="abdominalaortacannulatime"
>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item
- label="鐏屾敞鏃堕棿"
- align="left"
- label-width="120px"
- prop="abdominalaortaperfusiontime"
- >
- <el-date-picker
- clearable
- v-model="witnessform.abdominalaortaperfusiontime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿"
+ <el-date-picker
+ clearable
+ v-model="witnessform.abdominalaortacannulatime"
+ type="datetime"
+ 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="鐏屾敞鏃堕棿"
+ align="left"
+ label-width="120px"
+ prop="abdominalaortaperfusiontime"
>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item
- label="闂ㄩ潤鑴夛細鎻掔鏃堕棿"
- align="left"
- label-width="140px"
- prop="portalveincannulatime"
- >
- <el-date-picker
- clearable
- v-model="witnessform.portalveincannulatime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨闂ㄩ潤鑴夎剦鎻掔鏃堕棿"
+ <el-date-picker
+ clearable
+ v-model="witnessform.abdominalaortaperfusiontime"
+ type="datetime"
+ 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="闂ㄩ潤鑴夛細鎻掔鏃堕棿"
+ align="left"
+ label-width="140px"
+ prop="portalveincannulatime"
>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item
- label="鐏屾敞鏃堕棿"
- align="left"
- label-width="120px"
- prop="portalveinperfusiontime"
- >
- <el-date-picker
- clearable
- v-model="witnessform.portalveinperfusiontime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
+ <el-date-picker
+ clearable
+ v-model="witnessform.portalveincannulatime"
+ type="datetime"
+ 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="鐏屾敞鏃堕棿"
+ align="left"
+ label-width="120px"
+ prop="portalveinperfusiontime"
>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item
- label="鑲哄姩鑴夛細鎻掔鏃堕棿"
- align="left"
- label-width="140px"
- prop="pulmonaryarterycannulatime"
- >
- <el-date-picker
- clearable
- v-model="witnessform.pulmonaryarterycannulatime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨闂ㄩ潤鑴夋彃绠℃椂闂�"
+ <el-date-picker
+ clearable
+ v-model="witnessform.portalveinperfusiontime"
+ 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="6">
+ <el-form-item
+ label="鑲哄姩鑴夛細鎻掔鏃堕棿"
+ align="left"
+ label-width="140px"
+ prop="pulmonaryarterycannulatime"
>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item
- label="鐏屾敞鏃堕棿"
- align="left"
- label-width="120px"
- prop="pulmonaryarteryperfusiontime"
- >
- <el-date-picker
- clearable
- v-model="witnessform.pulmonaryarteryperfusiontime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
+ <el-date-picker
+ clearable
+ v-model="witnessform.pulmonaryarterycannulatime"
+ type="datetime"
+ 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="鐏屾敞鏃堕棿"
+ align="left"
+ label-width="120px"
+ prop="pulmonaryarteryperfusiontime"
>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item
- label="涓诲姩鑴夛細鎻掔鏃堕棿"
- align="left"
- label-width="140px"
- prop="aortacannulatime"
- >
- <el-date-picker
- clearable
- v-model="witnessform.aortacannulatime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨涓诲姩鑴夋彃绠℃椂闂�"
+ <el-date-picker
+ clearable
+ v-model="witnessform.pulmonaryarteryperfusiontime"
+ type="datetime"
+ 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="涓诲姩鑴夛細鎻掔鏃堕棿"
+ align="left"
+ label-width="140px"
+ prop="aortacannulatime"
>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item
- label="鐏屾敞鏃堕棿"
- align="left"
- label-width="120px"
- prop="aortaperfusiontime"
- >
- <el-date-picker
- clearable
- v-model="witnessform.aortaperfusiontime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
+ <el-date-picker
+ clearable
+ v-model="witnessform.aortacannulatime"
+ type="datetime"
+ 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="鐏屾敞鏃堕棿"
+ align="left"
+ label-width="120px"
+ prop="aortaperfusiontime"
>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
+ <el-date-picker
+ clearable
+ v-model="witnessform.aortaperfusiontime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
<el-row>
<el-col>
<el-form-item label-width="100px" label="鑾峰彇鍣ㄥ畼">
<el-checkbox-group v-model="organList.organprocured">
<el-checkbox
- v-for="dict in sysOrganlistL"
+ v-for="dict in dict.type.sys_Organ || []"
:key="dict.value"
:label="dict.value"
@change="changeorganprocured(dict.value)"
@@ -1878,6 +1920,9 @@
border
:key="tableKey"
:data="procureddata"
+ lazy
+ :load="loadRowData"
+ :row-key="row => row.organno"
>
<el-table-column
label="鍣ㄥ畼鍚嶇О"
@@ -1912,8 +1957,10 @@
/>
</template>
</el-table-column> -->
+
<el-table-column
- label="鑾峰彇寮�濮嬫椂闂�"
+ v-if="organgettimetrue"
+ label="鍣ㄥ畼绂讳綋鏃堕棿"
align="center"
width="200"
prop="organgettime"
@@ -1926,11 +1973,12 @@
v-model="scope.row.organgettime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="璇疯緭鍏ヨ幏鍙栧紑濮嬫椂闂�"
+ placeholder="璇疯緭鍏ュ櫒瀹樼浣撴椂闂�"
>
</el-date-picker>
</template>
</el-table-column>
+
<el-table-column
label="鑾峰彇鍖婚櫌"
align="center"
@@ -1961,6 +2009,25 @@
/>
</template>
</el-table-column>
+ <el-table-column
+ label="鑾峰彇寮�濮嬫椂闂�"
+ align="center"
+ width="200"
+ prop="organStartTime"
+ >
+ <template slot-scope="scope">
+ <el-date-picker
+ clearable
+ size="small"
+ style="width: 100%"
+ v-model="scope.row.organStartTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇疯緭鍏ヨ幏鍙栧紑濮嬫椂闂�"
+ >
+ </el-date-picker>
+ </template>
+ </el-table-column>
<!-- <el-table-column
label="鍙椾綋濮撴皬"
align="center"
@@ -1984,6 +2051,7 @@
<el-select
v-model="scope.row.organstate"
placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+ filterable
>
<el-option
v-for="dict in organstatelist"
@@ -2057,6 +2125,7 @@
<el-select
v-model="witnessform.coordinateduserido"
placeholder="璇烽�夋嫨"
+ filterable
>
<el-option
v-for="item in coordinatorlist1"
@@ -2073,6 +2142,7 @@
<el-select
v-model="witnessform.coordinateduseridt"
placeholder="璇烽�夋嫨"
+ filterable
>
<el-option
v-for="item in coordinatorlist1"
@@ -2243,6 +2313,7 @@
<el-select
v-model="scope.row.transplantstate"
placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+ filterable
>
<el-option
v-for="dict in transplantstatelist"
@@ -2299,6 +2370,7 @@
<el-select
v-model="accomplishform.responsibleuserid"
placeholder="璇烽�夋嫨"
+ filterable
>
<el-option
v-for="item in leaderlist"
@@ -2315,6 +2387,7 @@
<el-select
v-model="accomplishform.coordinateduserido"
placeholder="璇烽�夋嫨"
+ filterable
>
<el-option
v-for="item in coordinatorlist1"
@@ -2331,6 +2404,7 @@
<el-select
v-model="accomplishform.coordinateduseridt"
placeholder="璇烽�夋嫨"
+ filterable
>
<el-option
v-for="item in coordinatorlist1"
@@ -2751,6 +2825,7 @@
kinshiplist: ["閰嶅伓", "鐖朵翰", "姣嶄翰", "瀛愬コ", "鍙楁墭浜�"],
organselection: [
"鑲濊剰",
+ "鍙岃偩",
"宸﹁偩",
"鍙宠偩",
"蹇冭剰",
@@ -2789,6 +2864,7 @@
allocateddata: [],
allocateddataform: {},
procureddata: [],
+ organgettimetrue: false,
transplantdata: [],
sysOrganlistL: [
{ label: "蹇冭剰", value: "C38" },
@@ -2897,6 +2973,12 @@
],
majorrelatives: [
{ required: true, message: "璇疯緭鍏ヤ富瑕佷翰灞�", trigger: "blur" }
+ ],
+ selfwill: [
+ { required: true, message: "璇烽�夋嫨鏈汉鎰忔効", trigger: "blur" }
+ ],
+ registerAddresss: [
+ { required: true, message: "璇疯緭鍏ョ幇鎵�鍦ㄥ湴", trigger: "blur" }
],
familyrelations: [
{ required: true, message: "璇烽�夋嫨浜插睘涓庢崘鐚�呭叧绯�", trigger: "blur" }
@@ -3049,12 +3131,15 @@
// 鐩戝惉 procureddata 鐨勫彉鍖栵紝鏁版嵁鏇存柊鍚庨噸鏂版帓搴�
procureddata: {
handler(newVal) {
+ if (this.procureddata[0].organgettime) {
+ this.organgettimetrue = true;
+ }
if (this.isSorting) {
return;
}
this.customOrganSort();
- },
- deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
+ }
+ // deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
},
allocateddata: {
handler(newVal) {
@@ -3062,12 +3147,17 @@
return;
}
this.allocateddataSort();
- },
- deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
+ }
+ // deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
}
},
methods: {
+ loadRowData(row, treeNode, resolve) {
+ // 鍙湁褰撹灞曞紑鎴栭渶瑕佹椂鎵嶅畬鏁存覆鏌撳唴閮ㄧ粍浠�
+ this.$set(row, "loaded", true);
+ resolve();
+ },
// 鑾峰彇涓昏〃鍙婇檮灞炴暟鎹�
Getbasicinformation() {
// 宸︿晶娴佺▼鏁版嵁
@@ -3155,7 +3245,9 @@
if (response.code == 200 && response.rows[0]) {
this.affirmform = response.rows[0];
if (this.affirmform.organdecision) {
- this.organdecision = this.affirmform.organdecision.split(",");
+ this.organdecision = this.affirmform.organdecision
+ .split(",")
+ .flatMap(item => (item === "鍙岃偩鑴�" ? ["宸﹁偩", "鍙宠偩"] : item));
}
if (this.affirmform.kinship) {
this.kinship = this.affirmform.kinship.split(",");
@@ -3334,6 +3426,8 @@
this.$refs["form"].validate(valid => {
console.log("鎻愪氦鐨勬暟鎹滑锛�", this.form);
if (valid) {
+ console.log(112);
+
this.form.birthday = this.$moment(this.form.birthday).format(
"YYYY-MM-DD HH:mm:ss"
);
@@ -3420,6 +3514,8 @@
}
});
}
+ } else {
+ this.$modal.msgError("鍓嶉儴娼滃湪鎹愮尞琛ㄥ崟淇℃伅鏈夌己婕忚鎺掓煡鍚庨噸鏂颁繚瀛�");
}
});
},
@@ -3666,6 +3762,7 @@
// 1. 鍔犻攣锛岄樆姝㈢洃鍚櫒鎵ц
this.isSorting = true;
+ this.loading = true;
// 鑷畾涔夋帓搴忓嚱鏁�
this.procureddata.sort((a, b) => {
const indexA = this.organOrder.indexOf(a.organname);
@@ -3692,6 +3789,7 @@
this.procureddata = [...this.procureddata];
this.$nextTick(() => {
this.isSorting = false;
+ this.loading = false;
});
},
allocateddataSort() {
--
Gitblit v1.9.3