From f64155f6ad27c50451bb7d4a15f553bc72ead7de Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期五, 12 九月 2025 14:35:26 +0800
Subject: [PATCH] 年龄计算相关
---
src/views/project/donationdetails/index.vue | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index dca6278..be9cd62 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -278,7 +278,11 @@
</el-col>
<el-col :span="6">
<el-form-item label="骞撮緞" prop="age">
- <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
+ <el-input
+ disabled
+ v-model="form.andAge"
+ placeholder="璇疯緭鍏ュ勾榫�"
+ />
</el-form-item>
</el-col>
<el-col :span="6">
@@ -429,11 +433,18 @@
<el-row>
<el-col :span="6">
<el-form-item label="褰撳墠鍖荤枟鏈烘瀯" prop="occupation">
- <el-input v-model="form.currentMedicalInstitution" placeholder="璇疯緭鍏�" />
+ <el-input
+ v-model="form.currentMedicalInstitution"
+ placeholder="璇疯緭鍏�"
+ />
</el-form-item>
</el-col>
<el-col :span="10">
- <el-form-item label-width="130px" label="褰撳墠鍖荤枟鏈烘瀯绉戝" prop="education">
+ <el-form-item
+ label-width="130px"
+ label="褰撳墠鍖荤枟鏈烘瀯绉戝"
+ prop="education"
+ >
<el-input v-model="form.currentDept" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
@@ -441,11 +452,18 @@
<el-row>
<el-col :span="6">
<el-form-item label="棣栨鍖荤枟鏈烘瀯" prop="occupation">
- <el-input v-model="form.firstMedicalInstitution" placeholder="璇疯緭鍏�" />
+ <el-input
+ v-model="form.firstMedicalInstitution"
+ placeholder="璇疯緭鍏�"
+ />
</el-form-item>
</el-col>
<el-col :span="10">
- <el-form-item label-width="130px" label="棣栨鍖荤枟鏈烘瀯绉戝" prop="education">
+ <el-form-item
+ label-width="130px"
+ label="棣栨鍖荤枟鏈烘瀯绉戝"
+ prop="education"
+ >
<el-input v-model="form.firstDept" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
@@ -1057,7 +1075,10 @@
</el-col>
<el-col :span="6">
<el-form-item label="瀛﹀巻" prop="education">
- <el-select v-model="affirmform.education" placeholder="璇烽�夋嫨瀛﹀巻">
+ <el-select
+ v-model="affirmform.education"
+ placeholder="璇烽�夋嫨瀛﹀巻"
+ >
<el-option
v-for="dict in dict.type.sys_education || []"
:key="dict.value"
@@ -1067,9 +1088,12 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="6">
<el-form-item label="鑱屼笟" prop="occupation">
- <el-select v-model="affirmform.occupation" placeholder="璇烽�夋嫨鑱屼笟">
+ <el-select
+ v-model="affirmform.occupation"
+ placeholder="璇烽�夋嫨鑱屼笟"
+ >
<el-option
v-for="dict in dict.type.sys_occupation || []"
:key="dict.value"
@@ -1081,17 +1105,16 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="浜插睘绫嶈疮" prop="residenceaddresss">
<div>
<li_area_select
v-model="defultAddresss"
ref="residenceaddresss"
></li_area_select>
- <!-- <div>{{defultAddress}}</div> -->
</div>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="鐜颁綇鍦板潃" prop="residenceaddress">
<el-input
@@ -1668,11 +1691,11 @@
align="left"
label="绛惧瓧鏃堕棿"
label-width="120px"
- prop="coorinatorSignTime"
+ prop="coordinatorSignTime"
>
<el-date-picker
clearable
- v-model="witnessform.coorinatorSignTime"
+ v-model="witnessform.coordinatorSignTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"
@@ -1875,7 +1898,7 @@
</template>
</el-table-column> -->
<el-table-column
- label="鍣ㄥ畼绂讳綋鏃堕棿"
+ label="鑾峰彇寮�濮嬫椂闂�"
align="center"
width="200"
prop="organgettime"
@@ -1888,7 +1911,7 @@
v-model="scope.row.organgettime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="璇疯緭鍏ュ櫒瀹樼浣撴椂闂�"
+ placeholder="璇疯緭鍏ヨ幏鍙栧紑濮嬫椂闂�"
>
</el-date-picker>
</template>
@@ -2982,7 +3005,15 @@
// 琛ㄥ崟鏁版嵁
getDonatebaseinfo(this.infoid).then(response => {
this.form = response.data;
- console.log(this.form, "form");
+ this.form.andAge = `${
+ this.form.age && this.form.age !== 0
+ ? `${this.form.age}${this.form.ageunit}`
+ : ""
+ } ${
+ this.form.age2 && this.form.age2 !== 0
+ ? `${this.form.age2}${this.form.ageunit2}`
+ : ""
+ }`.trim();
if (response.data.terminationCase) {
this.showTerminationBtn = response.data.terminationCase;
--
Gitblit v1.9.3