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 | 50 +++++-
src/views/project/donateorgan/index.vue | 30 ++-
src/views/project/organallocation/index0.vue | 34 ++-
src/views/project/donatebaseinfo/index.vue | 141 +++++++++++++++--
src/views/system/medicalevalustion/index.vue | 22 ++
src/views/project/donatefinishcheck/index.vue | 18 +
src/views/project/medicalevaluation/index.vue | 14 +
src/views/project/donateannex/index.vue | 16 +
src/views/project/donatereview/index.vue | 16 +
src/views/project/fundstatistics/index.vue | 16 +
src/views/system/student/index.vue | 18 ++
src/views/project/ethicalReview/index.vue | 14 +
src/views/project/relativesconfirmation/index.vue | 14 +
src/views/project/fund/applyDetail/index.vue | 2
dist-opo.zip | 0
src/views/project/donateorganstatics/index.vue | 16 +
src/views/project/components/fundsummary/index.vue | 2
src/views/project/donatefinish/index.vue | 18 ++
src/views/project/donationwitness/index.vue | 14 +
19 files changed, 384 insertions(+), 71 deletions(-)
diff --git a/dist-opo.zip b/dist-opo.zip
new file mode 100644
index 0000000..4002f98
--- /dev/null
+++ b/dist-opo.zip
Binary files differ
diff --git a/src/views/project/components/fundsummary/index.vue b/src/views/project/components/fundsummary/index.vue
index c92a22e..4911f64 100644
--- a/src/views/project/components/fundsummary/index.vue
+++ b/src/views/project/components/fundsummary/index.vue
@@ -54,8 +54,6 @@
</template>
<script>
-//杩欓噷鍙互瀵煎叆鍏朵粬鏂囦欢锛堟瘮濡傦細缁勪欢锛屽伐鍏穓s锛岀涓夋柟鎻掍欢js锛宩son鏂囦欢锛屽浘鐗囨枃浠剁瓑绛夛級
-//渚嬪锛歩mport 銆婄粍浠跺悕绉般�� from '銆婄粍浠惰矾寰勩��';
import { getDonationCost, exportFundCost } from "@/api/project/financesubject";
export default {
name: "fundsummary",
diff --git a/src/views/project/donateannex/index.vue b/src/views/project/donateannex/index.vue
index ecea083..9a28fff 100644
--- a/src/views/project/donateannex/index.vue
+++ b/src/views/project/donateannex/index.vue
@@ -163,7 +163,21 @@
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="120" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0
+ ? `${scope.row.age}${scope.row.ageunit}`
+ : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鍖荤枟鏈烘瀯"
align="center"
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index c16b502..01e076a 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -217,7 +217,19 @@
/>
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鍖荤枟鏈烘瀯"
align="center"
@@ -457,8 +469,15 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="骞撮緞" prop="age">
- <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
+ <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>
@@ -471,10 +490,19 @@
v-model="form.birthday"
type="date"
style="width: 174px"
- value-format="yyyy-MM-dd HH:mm:ss"
+ @change="calculateAge"
+ value-format="yyyy-MM-dd"
placeholder="閫夋嫨鍑虹敓鏃ユ湡"
>
</el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <!-- <el-form-item label="骞撮緞" prop="age">
+ <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
+ </el-form-item> -->
+ <el-form-item label="骞撮緞" prop="age">
+ <el-input v-model="form.andAge" disabled> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -482,18 +510,6 @@
<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"
@@ -1041,7 +1057,11 @@
sex: null,
idcardtype: null,
idcardno: null,
- age: null,
+ age: null, // 骞撮緞锛堝勾锛�
+ andAge: "",
+ ageunit: "骞�", // 鍗曚綅锛岄�氬父鍥哄畾涓衡�滃勾鈥�
+ age2: null, // 骞撮緞锛堟湀鎴栧ぉ锛�
+ ageunit2: "鏈�", // 鍗曚綅锛屾牴鎹绠楀喅瀹氭槸鈥滄湀鈥濊繕鏄�滃ぉ鈥�
ageunit: null,
birthday: null,
phone: null,
@@ -1144,7 +1164,7 @@
{ required: true, message: "璇锋纭緭鍏ヨ瘉浠跺彿鐮�", trigger: "blur" }
],
sex: [{ required: true, message: "鎬у埆涓嶈兘涓虹┖", trigger: "blur" }],
- age: [{ required: true, message: "璇疯緭鍏ュ勾榫�", trigger: "blur" }],
+ // age: [{ required: true, message: "璇疯緭鍏ュ勾榫�", trigger: "blur" }],
treatmenthospitalno: [
{ required: true, message: "璇烽�夋嫨鍖荤枟鏈烘瀯", trigger: "blur" }
],
@@ -1287,7 +1307,83 @@
this.currentuser = response.data;
});
},
+ calculateAge(birthday) {
+ if (!birthday) {
+ // 娓呯┖骞撮緞瀛楁
+ this.form.age = null;
+ this.form.age2 = null;
+ // this.form.age3 = null;
+ return;
+ }
+ const birthDate = new Date(birthday);
+ const today = new Date();
+
+ // 璁＄畻鎬绘湀浠藉樊寮�
+ let yearDiff = today.getFullYear() - birthDate.getFullYear();
+ let monthDiff = today.getMonth() - birthDate.getMonth();
+ let dayDiff = today.getDate() - birthDate.getDate();
+
+ // 濡傛灉褰撳墠鏃ユ湡鐨勫ぉ鏁板皬浜庡嚭鐢熸棩鏈熺殑澶╂暟锛屽垯鍊熸湀
+ if (dayDiff < 0) {
+ monthDiff--;
+ // 鑾峰彇涓婁釜鏈堢殑鏈�鍚庝竴澶�
+ const lastDayOfMonth = new Date(
+ today.getFullYear(),
+ today.getMonth(),
+ 0
+ ).getDate();
+ dayDiff += lastDayOfMonth;
+ }
+
+ // 濡傛灉鏈堜唤宸负璐燂紝鍒欏�熷勾
+ if (monthDiff < 0) {
+ yearDiff--;
+ monthDiff += 12;
+ }
+
+ // 璧嬪�煎勾閮ㄥ垎
+ this.form.age = yearDiff;
+ this.form.ageunit = "宀�";
+
+ // 璧嬪�兼湀閮ㄥ垎锛堟垨鑰呮偍涔熷彲浠ラ�夋嫨鏄剧ず鍓╀綑鐨勫ぉ鏁帮級
+ this.form.age2 = monthDiff;
+ this.form.ageunit2 = "鏈�";
+
+ // 濡傛灉鎮ㄨ繕鎯虫樉绀哄ぉ鏁�
+ // this.form.age3 = dayDiff;
+ // this.form.ageunit3 = '澶�';
+
+ // 濡傛灉骞撮緞灏忎簬1宀侊紝鍙兘鎮ㄥ笇鏈涚敤鏈堟垨澶╂潵琛ㄧず涓诲勾榫�
+ // 杩欓噷鏄竴涓畝鍗曠殑閫昏緫锛屾偍鍙互鏍规嵁闇�姹傝皟鏁�
+ if (yearDiff === 0) {
+ if (monthDiff === 0) {
+ // 灏忎簬1涓湀锛岀敤澶╄〃绀�
+ this.form.age = dayDiff;
+ this.form.ageunit = "澶�";
+ this.form.age2 = null; // 娓呯┖绗簩瀛楁
+ // this.form.age3 = null;
+ } else {
+ // 灏忎簬1骞达紝鐢ㄦ湀琛ㄧず
+ this.form.age = monthDiff;
+ this.form.ageunit = "鏈�";
+ this.form.age2 = dayDiff; // 绗簩瀛楁鏄剧ず澶�
+ this.form.ageunit2 = "澶�";
+ }
+ }
+
+ 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();
+ this.$forceUpdate(); // 寮哄埗鏇存柊
+ console.log(this.form.andAge);
+ },
LoadReportList() {
listDonatebaseinfo().then(res => {
let list = res.rows;
@@ -1450,7 +1546,8 @@
// 璧嬪�肩粰琛ㄦ牸
this.form.sex = sex;
this.form.birthday = birthday;
- this.form.age = age;
+ this.calculateAge(birthday);
+ // this.form.age = age;
} else {
}
} catch {}
@@ -1927,4 +2024,10 @@
margin: auto !important;
padding-bottom: 0px !important;
}
+::v-deep .el-input.is-disabled .el-input__inner {
+ background-color: #fff;
+ border-color: #dfe4ed;
+ color: #000;
+ cursor: not-allowed;
+}
</style>
diff --git a/src/views/project/donatefinish/index.vue b/src/views/project/donatefinish/index.vue
index fc5c30a..8911505 100644
--- a/src/views/project/donatefinish/index.vue
+++ b/src/views/project/donatefinish/index.vue
@@ -126,7 +126,7 @@
</el-form-item>
</el-col>
-
+
</el-row> -->
</el-form>
@@ -155,7 +155,21 @@
/>
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0
+ ? `${scope.row.age}${scope.row.ageunit}`
+ : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鍖荤枟鏈烘瀯"
align="center"
diff --git a/src/views/project/donatefinishcheck/index.vue b/src/views/project/donatefinishcheck/index.vue
index 797fa34..b33269b 100644
--- a/src/views/project/donatefinishcheck/index.vue
+++ b/src/views/project/donatefinishcheck/index.vue
@@ -139,7 +139,19 @@
/>
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鐜版墍鍦ㄥ湴甯�"
align="center"
@@ -167,7 +179,7 @@
/>
</template>
</el-table-column>
-
+
<el-table-column
label="鎿嶄綔"
align="center"
@@ -489,7 +501,7 @@
</el-dialog>
-
+
</div>
diff --git a/src/views/project/donateorgan/index.vue b/src/views/project/donateorgan/index.vue
index d9bedd0..822b024 100644
--- a/src/views/project/donateorgan/index.vue
+++ b/src/views/project/donateorgan/index.vue
@@ -49,7 +49,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="鑾峰彇鏈烘瀯" prop="gainhospitalname">
-
+
<org-selecter ref="tranHosSelect" :org-type="'4'" v-model="queryParams.gainhospitalname2" />
</el-form-item>
</el-col>
@@ -65,7 +65,7 @@
>
</el-option>
</el-select>
-
+
</el-form-item>
</el-col>
</el-row>
@@ -91,7 +91,7 @@
<el-date-picker style="width: 100%" v-model="queryParams.transplanttime" type="monthrange" range-separator="鑷�"
start-placeholder="寮�濮嬫湀浠�" end-placeholder="缁撴潫鏈堜唤" value-format="yyyy-MM-dd">
</el-date-picker>
-
+
</el-form-item>
</el-col>
@@ -107,8 +107,8 @@
<el-col :span="6">
<el-form-item label="缁勯暱" prop="zuzhang">
<el-input
-
-
+
+
v-model="queryParams.zuzhang"
/>
</el-form-item>
@@ -128,7 +128,7 @@
</el-form-item>
</el-col>
-
+
</el-row> -->
@@ -186,7 +186,19 @@
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鑾峰彇鍓嶆椿妫�"
width="160"
@@ -258,7 +270,7 @@
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_0_1" :value="scope.row.isdgf" />
</template>
- </el-table-column>
+ </el-table-column>
<el-table-column
label="褰曞叆浜�"
width="120"
@@ -622,7 +634,7 @@
this.loading = true;
this.queryParams.params = {};
const queryParams = { ...this.queryParams }
-
+
if (queryParams.organgettime && typeof queryParams.organgettime == 'object' ) {
queryParams.startorgangettime = queryParams.organgettime[0] + ' 00:00:00'
queryParams.endorgangettime = queryParams.organgettime[1] + " 23:59:59"
diff --git a/src/views/project/donateorganstatics/index.vue b/src/views/project/donateorganstatics/index.vue
index a58a2e7..ca1fe68 100644
--- a/src/views/project/donateorganstatics/index.vue
+++ b/src/views/project/donateorganstatics/index.vue
@@ -456,7 +456,21 @@
</template>
</el-table-column>
<el-table-column label="鎬у埆" align="center" prop="sex" />
- <el-table-column label="骞撮緞" align="center" prop="age" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0
+ ? `${scope.row.age}${scope.row.ageunit}`
+ : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory"
align="center"
diff --git a/src/views/project/donatereview/index.vue b/src/views/project/donatereview/index.vue
index 650fea0..9f06523 100644
--- a/src/views/project/donatereview/index.vue
+++ b/src/views/project/donatereview/index.vue
@@ -122,7 +122,7 @@
>
<!-- <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="id" /> -->
<!-- <el-table-column type="selection" width="55" align="center" /> -->
-
+
<el-table-column
label="鎶ュ憡鏃堕棿"
align="center"
@@ -144,7 +144,19 @@
/>
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鐜版墍鍦ㄥ湴甯�"
align="center"
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index ab5ff0e..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"
@@ -2981,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;
diff --git a/src/views/project/donationwitness/index.vue b/src/views/project/donationwitness/index.vue
index a6bbd22..cacd679 100644
--- a/src/views/project/donationwitness/index.vue
+++ b/src/views/project/donationwitness/index.vue
@@ -165,7 +165,19 @@
/>
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鍖荤枟鏈烘瀯"
align="center"
diff --git a/src/views/project/ethicalReview/index.vue b/src/views/project/ethicalReview/index.vue
index aa90495..3eb4d3e 100644
--- a/src/views/project/ethicalReview/index.vue
+++ b/src/views/project/ethicalReview/index.vue
@@ -134,7 +134,19 @@
</template>
</el-table-column>
<el-table-column label="鎹愮尞鑰�" align="center" prop="name" width="120" />
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column label="鎬у埆" align="center" prop="sex" width="100">
<template slot-scope="scope">
<dict-tag
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index a2764f0..4d86eb7 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -763,7 +763,7 @@
>
<el-radio-group v-model="accountfrom" style="margin-bottom: 0">
<el-radio label="1">浠庤处鎴峰簱</el-radio>
- <el-radio label="2"
+ <el-radio disabled label="2"
>鏂板璐︽埛锛堟柊澧炰笓瀹惰处鎴峰悗闇�瑕佸鏍稿惎鐢ㄦ墠鑳戒娇鐢級</el-radio
>
</el-radio-group>
diff --git a/src/views/project/fundstatistics/index.vue b/src/views/project/fundstatistics/index.vue
index 334c2ea..35195cc 100644
--- a/src/views/project/fundstatistics/index.vue
+++ b/src/views/project/fundstatistics/index.vue
@@ -67,7 +67,21 @@
align="center"
prop="name"
/>
- <el-table-column label="骞撮緞" width="120" align="center" prop="age" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0
+ ? `${scope.row.age}${scope.row.ageunit}`
+ : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column label="鎬у埆" width="120" align="center" prop="sex">
<template slot-scope="scope">
<dict-tag
diff --git a/src/views/project/medicalevaluation/index.vue b/src/views/project/medicalevaluation/index.vue
index a126a90..257e87d 100644
--- a/src/views/project/medicalevaluation/index.vue
+++ b/src/views/project/medicalevaluation/index.vue
@@ -150,7 +150,19 @@
/>
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鍖荤枟鏈烘瀯"
diff --git a/src/views/project/organallocation/index0.vue b/src/views/project/organallocation/index0.vue
index f5d681f..7b1d4c8 100644
--- a/src/views/project/organallocation/index0.vue
+++ b/src/views/project/organallocation/index0.vue
@@ -47,7 +47,7 @@
<!-- <el-row>
<el-col :span="6">
<el-form-item label="缁勯暱" prop="zuzhang">
- <el-input
+ <el-input
v-model="queryParams.zuzhang"
/>
</el-form-item>
@@ -82,7 +82,7 @@
<el-table border v-loading="loading" :data="newdonateorganList" @selection-change="handleSelectionChange"
highlight-current-row style="width: 100%">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
- <!-- <el-table-column
+ <!-- <el-table-column
label="鎹愮尞缂栧彿"
width="160"
align="center"
@@ -95,13 +95,25 @@
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_organstate" :value="scope.row.organstate" />
</template>
- </el-table-column>
+ </el-table-column>
<el-table-column label="鍣ㄥ畼鍚嶇О" align="center" prop="organname" width="100" />
<el-table-column label="绯荤粺缂栧彿" align="center" prop="ageunit" width="100" />
- <el-table-column label="鍙椾綋濮撴皬" align="center" prop="name" width="100" />
- <el-table-column label="璇佷欢绫诲瀷" align="center" prop="age" width="100" />
- <el-table-column label="璇佷欢鍙�" align="center" prop="idcardno" width="100" />
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="鍙椾綋濮撴皬" align="center" prop="name" width="100" />
+ <el-table-column label="璇佷欢绫诲瀷" align="center" prop="age" width="100" />
+ <el-table-column label="璇佷欢鍙�" align="center" prop="idcardno" width="100" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column label="鎬у埆" align="center" prop="sex" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
@@ -124,11 +136,11 @@
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleAdd(scope.row)"
v-hasPermi="['project:donateorgan:edit']">鏂板</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleEdit(scope.row)"
- v-hasPermi="['project:donateorgan:remove']">淇敼</el-button>
+ v-hasPermi="['project:donateorgan:remove']">淇敼</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
- v-hasPermi="['project:donateorgan:remove']">鍒犻櫎</el-button>
+ v-hasPermi="['project:donateorgan:remove']">鍒犻櫎</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleRedo(scope.row)"
- v-hasPermi="['project:donateorgan:remove']">閲嶆柊鍒嗛厤</el-button>
+ v-hasPermi="['project:donateorgan:remove']">閲嶆柊鍒嗛厤</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleSave(scope.row)"
v-hasPermi="['project:donateorgan:remove']">淇濆瓨</el-button>
</template>
@@ -577,7 +589,7 @@
});
},
-
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
diff --git a/src/views/project/relativesconfirmation/index.vue b/src/views/project/relativesconfirmation/index.vue
index 848122b..16104e2 100644
--- a/src/views/project/relativesconfirmation/index.vue
+++ b/src/views/project/relativesconfirmation/index.vue
@@ -148,7 +148,19 @@
/>
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鍖荤枟鏈烘瀯"
diff --git a/src/views/system/medicalevalustion/index.vue b/src/views/system/medicalevalustion/index.vue
index efcd565..a6bafe1 100644
--- a/src/views/system/medicalevalustion/index.vue
+++ b/src/views/system/medicalevalustion/index.vue
@@ -105,7 +105,21 @@
<el-table-column label="濮撳悕" align="center" prop="name" />
<el-table-column label="鎬у埆" align="center" prop="sex" />
<el-table-column label="璇佷欢鍙风爜" align="center" prop="idcardno" />
- <el-table-column label="骞撮緞" align="center" prop="age" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0
+ ? `${scope.row.age}${scope.row.ageunit}`
+ : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column label="璁板綍鐘舵��" align="center" prop="recordstate" />
<el-table-column label="娌荤枟鍖婚櫌鍚嶇О" align="center" prop="treatmenthospitalname" />
<el-table-column label="鐤剧梾璇婃柇鍚嶇О" align="center" prop="diagnosisname" />
@@ -134,11 +148,11 @@
@click="handleAdd(scope.row)"
>淇敼</el-button>
<!-- v-hasPermi="['system:medicalevaluation:edit']" -->
-
+
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
@@ -523,4 +537,4 @@
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/student/index.vue b/src/views/system/student/index.vue
index b60c49c..bd94eb2 100644
--- a/src/views/system/student/index.vue
+++ b/src/views/system/student/index.vue
@@ -117,7 +117,21 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="缂栧彿" align="center" prop="studentId" />
<el-table-column label="瀛︾敓鍚嶇О" align="center" prop="studentName" />
- <el-table-column label="骞撮緞" align="center" prop="studentAge" />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0
+ ? `${scope.row.age}${scope.row.ageunit}`
+ : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column label="鐖卞ソ" align="center" prop="studentHobby" />
<el-table-column label="鎬у埆" align="center" prop="studentSex">
<template slot-scope="scope">
@@ -153,7 +167,7 @@
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
--
Gitblit v1.9.3