From 75e20ed49063feac161beca13aba24147424d5a7 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期四, 17 九月 2026 18:43:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
talent-card-admin/src/views/FamilyCardView.vue | 42 ++++++++++++++----------------------------
1 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/talent-card-admin/src/views/FamilyCardView.vue b/talent-card-admin/src/views/FamilyCardView.vue
index d702b34..fc2488f 100644
--- a/talent-card-admin/src/views/FamilyCardView.vue
+++ b/talent-card-admin/src/views/FamilyCardView.vue
@@ -72,10 +72,6 @@
return row.relationship || row.relation || '-'
}
-function familyIdCard(row: FamilyCardApplication) {
- return row.idCardNo || row.dependentIdCardNo || '-'
-}
-
async function loadData() {
loading.value = true
try {
@@ -141,18 +137,14 @@
{ title: '状态', value: row => statusText(row) },
] : [
{ title: '申请编号', value: row => row.applicationNo || row.applyNo },
- { title: '持卡人姓名', value: row => row.talentName },
+ { title: '持卡人名称', value: row => row.talentName },
{ title: '持卡人手机号', value: row => row.talentMobile },
- { title: '持卡人身份证号', value: row => row.talentIdCardNo },
- { title: '人才卡号', value: row => row.talentCardNo },
{ title: '卡片等级', value: row => row.cardLevel },
- { title: '家属姓名', value: row => familyName(row) },
+ { title: '家属名称', value: row => familyName(row) },
{ title: '家属手机号', value: row => familyMobile(row) },
- { title: '家属身份证号', value: row => familyIdCard(row) },
- { title: '关系', value: row => relationship(row) },
+ { title: '家属关系', value: row => relationship(row) },
{ title: '申请时间', value: row => registerTime(row) },
{ title: '状态', value: row => statusText(row) },
- { title: '审核备注', value: row => row.auditRemark || '-' },
],
result.records,
)
@@ -178,11 +170,12 @@
</div>
<el-form class="family-card-filter-form" :model="filters" label-width="84px">
- <el-form-item :label="isManagement ? '家属' : '家属信息'">
- <el-input v-model="filters.familyKeyword" :placeholder="isManagement ? '家属姓名、手机号' : '请输入家属姓名、手机号或身份证号'" clearable />
+ <!-- 家属卡申请按原型只保留「持卡人 / 卡片等级 / 状态」三个筛选；家属与时间筛选只在家属卡管理页使用。 -->
+ <el-form-item v-if="isManagement" label="家属">
+ <el-input v-model="filters.familyKeyword" placeholder="家属姓名、手机号" clearable />
</el-form-item>
<el-form-item label="持卡人" :class="{ 'family-card-filter-talent': isManagement }">
- <el-input v-model="filters.talentKeyword" placeholder="持卡人姓名、手机号、身份证号或卡号" clearable />
+ <el-input v-model="filters.talentKeyword" :placeholder="isManagement ? '持卡人姓名、手机号、身份证号或卡号' : '持卡人姓名、手机号、卡号'" clearable />
</el-form-item>
<el-form-item label="卡片等级">
<el-select v-model="filters.cardLevel" placeholder="全部" clearable>
@@ -196,7 +189,7 @@
<el-option v-for="item in statusOptions" :key="item.label" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
- <el-form-item :label="isManagement ? '注册时间' : '申请时间'" :class="{ 'family-card-filter-date': isManagement }">
+ <el-form-item v-if="isManagement" label="注册时间" :class="{ 'family-card-filter-date': isManagement }">
<el-date-picker
v-model="filters.applyTime"
type="daterange"
@@ -250,33 +243,26 @@
table-layout="fixed"
scrollbar-always-on
>
- <el-table-column prop="id" label="编号" width="86" align="center" />
<el-table-column prop="applicationNo" label="申请编号" min-width="160" />
- <el-table-column label="家属姓名" min-width="110">
+ <el-table-column prop="talentName" label="持卡人名称" min-width="110" />
+ <el-table-column prop="talentMobile" label="持卡人手机号" min-width="130" />
+ <el-table-column prop="cardLevel" label="卡片等级" min-width="108" />
+ <el-table-column label="家属名称" min-width="106">
<template #default="{ row }">{{ familyName(row) }}</template>
</el-table-column>
<el-table-column label="家属手机号" min-width="130">
<template #default="{ row }">{{ familyMobile(row) }}</template>
</el-table-column>
- <el-table-column label="家属身份证号" min-width="180">
- <template #default="{ row }">{{ familyIdCard(row) }}</template>
- </el-table-column>
- <el-table-column prop="talentName" label="持卡人姓名" min-width="110" />
- <el-table-column prop="talentMobile" label="持卡人手机号" min-width="130" />
- <el-table-column prop="talentIdCardNo" label="持卡人身份证号" min-width="180" />
- <el-table-column prop="talentCardNo" label="人才卡号" min-width="120" />
- <el-table-column prop="cardLevel" label="卡片等级" min-width="108" />
- <el-table-column label="关系" min-width="90">
+ <el-table-column label="家属关系" min-width="90">
<template #default="{ row }">{{ relationship(row) }}</template>
</el-table-column>
- <el-table-column prop="auditRemark" label="审核备注" min-width="160" show-overflow-tooltip />
<el-table-column label="申请时间" min-width="150">
<template #default="{ row }">{{ registerTime(row) }}</template>
</el-table-column>
<el-table-column label="状态" width="90">
<template #default="{ row }">{{ statusText(row) }}</template>
</el-table-column>
- <el-table-column label="操作" width="180" fixed="right">
+ <el-table-column label="操作" width="90" fixed="right">
<template #default="{ row }">
<el-button link type="primary" @click="viewDetail(row)">查看</el-button>
</template>
--
Gitblit v1.7.1