From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/memberCard.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/memberCard.vue b/admin/src/views/business/memberCard.vue
index a9a5b53..a7d265c 100644
--- a/admin/src/views/business/memberCard.vue
+++ b/admin/src/views/business/memberCard.vue
@@ -8,8 +8,8 @@
<el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyword">
<el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ憳宸ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鐢ㄦ埛绫诲瀷" prop="type">
- <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
+ <el-form-item label="鐢ㄦ埛绫诲瀷" prop="memberType">
+ <el-select v-model="searchForm.memberType" placeholder="璇烽�夋嫨">
<el-option label="鍔冲姟浜哄憳" :value="0"></el-option>
<el-option label="鍐呴儴鍛樺伐" :value="2"></el-option>
</el-select>
@@ -30,7 +30,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:membercard:create']">
- <li><el-button type="primary" @click="$refs.operaMemberCardWindow.open('鏂板缓鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:membercard:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaMemberCardWindow.open('鏂板缓浜哄憳寮�鍗�')" icon="el-icon-plus" v-permissions="['business:membercard:create']">鏂板缓</el-button></li>
<li><el-button type="primary" @click="batchLossReporting">鎸傚け</el-button></li>
<li><el-button type="primary" @click="batchDecoupling">瑙ｆ寕</el-button></li>
</ul>
@@ -53,8 +53,8 @@
</el-table-column>
<el-table-column label="鐢ㄦ埛绫诲瀷" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.type === 0">鍔冲姟璁垮</span>
- <span v-if="row.type === 2">鍐呴儴浜哄憳</span>
+ <span v-if="row.memberType === 0">鍔冲姟璁垮</span>
+ <span v-if="row.memberType === 2">鍐呴儴浜哄憳</span>
</template>
</el-table-column>
<el-table-column prop="memberName" label="鍛樺伐濮撳悕" min-width="100px"></el-table-column>
@@ -102,7 +102,8 @@
searchForm: {
code: '',
keyword: '',
- status: ''
+ status: '',
+ memberType: ''
}
}
},
--
Gitblit v1.9.3