From 99676ee4afd8aa9ca0caedb07b5754831a746465 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 23 十一月 2024 17:42:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/client/clientList.vue | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/client/clientList.vue b/admin/src/views/client/clientList.vue
index c54c0d1..d6c97b7 100644
--- a/admin/src/views/client/clientList.vue
+++ b/admin/src/views/client/clientList.vue
@@ -22,12 +22,26 @@
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="type" label="绫诲瀷 0涓汉 1浼佷笟" min-width="100px"></el-table-column>
+ <el-table-column prop="type" label="瀹㈡埛绫诲瀷" min-width="80px">
+ <template slot-scope="{row}">
+ <span>{{ row.type == '0' ? '涓汉' : '浼佷笟' }}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="name" label="瀹㈡埛鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="memberName" label="鑱旂郴浜�" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="idcardNo" label="韬唤璇佸彿锛堝姞瀵嗭級" min-width="100px"></el-table-column>
+ <el-table-column prop="memberPhone" label="鑱旂郴鐢佃瘽" min-width="100px"></el-table-column>
+ <!-- <el-table-column prop="idcardNo" label="韬唤璇佸彿" min-width="100px"></el-table-column> -->
<el-table-column prop="creditCard" label="缁熶竴淇＄敤浠ｇ爜" min-width="100px"></el-table-column>
+ <el-table-column prop="validity" label="钀ヤ笟鏈熼檺" min-width="100px">
+ <template slot-scope="{row}">
+ <span>{{ row.validity == '2099-12-31' ? '闀挎湡' : row.validity }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="榛樿鍙戠エ绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span>{{ row.fpType == '0' ? '澧炲�肩◣鏅�氬彂绁�' : row.fpType == '1' ? '澧炲�肩◣涓撶敤鍙戠エ' : '-' }}</span>
+ </template>
+ </el-table-column>
<el-table-column v-if="containPermissions(['business:ywcustomer:update', 'business:ywcustomer:delete'])"
label="鎿嶄綔" min-width="120" fixed="right">
<template slot-scope="{row}">
--
Gitblit v1.9.3