From c75027743ea7c3ecc2d0885f01d11d2ad78679a3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 14:23:26 +0800
Subject: [PATCH] Merge branch 'yxh' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/organallocation/index0.vue | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/views/project/organallocation/index0.vue b/src/views/project/organallocation/index0.vue
index f5d681f..5805f7e 100644
--- a/src/views/project/organallocation/index0.vue
+++ b/src/views/project/organallocation/index0.vue
@@ -1,6 +1,7 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
+ <el-form
+ class="opo-query-form" :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
<el-row>
<el-col :span="6">
<el-form-item label="鎹愮尞鑰�" prop="name">
@@ -47,7 +48,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 +83,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 +96,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 +137,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>
@@ -186,7 +199,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="鑾峰彇鏃堕棿" prop="organgettime">
- <el-date-picker clearable size="medium" v-model="form.organgettime" type="date" disabled
+ <el-date-picker clearable size="medium" v-model="form.organgettime" type="date" format="yyyy-MM-dd" disabled
value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍣ㄥ畼鑾峰彇鏃堕棿">
</el-date-picker>
</el-form-item>
@@ -236,7 +249,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="绉绘鏃堕棿" prop="transplanttime">
- <el-date-picker clearable size="medium" v-model="form.transplanttime" type="date"
+ <el-date-picker clearable size="medium" v-model="form.transplanttime" type="date" format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨绉绘鏃堕棿" disabled>
</el-date-picker>
</el-form-item>
@@ -577,7 +590,7 @@
});
},
-
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
--
Gitblit v1.9.3