From 25aace375476ad7f73089cac6bfed606828c5371 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十一月 2024 09:04:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/client/clientList.vue | 157 +++++++---------------------------------------------
1 files changed, 21 insertions(+), 136 deletions(-)
diff --git a/admin/src/views/client/clientList.vue b/admin/src/views/client/clientList.vue
index e5520ef..c54c0d1 100644
--- a/admin/src/views/client/clientList.vue
+++ b/admin/src/views/client/clientList.vue
@@ -2,162 +2,47 @@
<TableLayout :permissions="['business:ywcustomer:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎵�灞炶涓氱紪鐮侊紙鍏宠仈category)" prop="industryId">
- <el-input v-model="searchForm.industryId" placeholder="璇疯緭鍏ユ墍灞炶涓氱紪鐮侊紙鍏宠仈category)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="绫诲瀷 0涓汉 1浼佷笟" prop="type">
- <el-input v-model="searchForm.type" placeholder="璇疯緭鍏ョ被鍨� 0涓汉 1浼佷笟" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="瀹㈡埛" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鎴�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎵嬫満鍙�" prop="phone">
- <el-input v-model="searchForm.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="韬唤璇佸彿锛堝姞瀵嗭級" prop="idcardNo">
- <el-input v-model="searchForm.idcardNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙凤紙鍔犲瘑锛�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璇佷欢鏄剧ず淇℃伅" prop="idcardDecode">
- <el-input v-model="searchForm.idcardDecode" placeholder="璇疯緭鍏ヨ瘉浠舵樉绀轰俊鎭�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="瀹㈡埛缂栫爜" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ鎴风紪鐮�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鐘舵�� 0姝ｅ父 1绂佺敤" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0姝ｅ父 1绂佺敤" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="韬唤 0鑰佹澘 1瓒呯骇绠＄悊鍛�" prop="highCheckor">
- <el-input v-model="searchForm.highCheckor" placeholder="璇疯緭鍏ヨ韩浠� 0鑰佹澘 1瓒呯骇绠＄悊鍛�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏈�杩戠櫥褰曟椂闂�" prop="lastLoginDate">
- <el-date-picker v-model="searchForm.lastLoginDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ渶杩戠櫥褰曟椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鐧诲綍娆℃暟" prop="loginNum">
- <el-input v-model="searchForm.loginNum" placeholder="璇疯緭鍏ョ櫥褰曟鏁�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="绯荤粺鐧诲綍鐢ㄦ埛缂栫爜(鍏宠仈system_user)" prop="userId">
- <el-input v-model="searchForm.userId" placeholder="璇疯緭鍏ョ郴缁熺櫥褰曠敤鎴风紪鐮�(鍏宠仈system_user)" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収" prop="idcardType">
- <el-input v-model="searchForm.idcardType" placeholder="璇疯緭鍏ヨ瘉浠剁被鍨� 0韬唤璇� 1娓境璇佷欢 2鎶ょ収" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="寮�鎴烽摱琛�" prop="accountBank">
- <el-input v-model="searchForm.accountBank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璐﹀彿" prop="accountNo">
- <el-input v-model="searchForm.accountNo" placeholder="璇疯緭鍏ヨ处鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璐︽埛鐢佃瘽" prop="accountPhone">
- <el-input v-model="searchForm.accountPhone" placeholder="璇疯緭鍏ヨ处鎴风數璇�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缁熶竴淇＄敤浠ｇ爜" prop="creditCard">
- <el-input v-model="searchForm.creditCard" placeholder="璇疯緭鍏ョ粺涓�淇＄敤浠ｇ爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="榛樿鍙戠エ绫诲瀷 0澧炲�肩◣鏅�氬彂绁� 1澧炲�肩◣涓撶敤鍙戠エ" prop="fpType">
- <el-input v-model="searchForm.fpType" placeholder="璇疯緭鍏ラ粯璁ゅ彂绁ㄧ被鍨� 0澧炲�肩◣鏅�氬彂绁� 1澧炲�肩◣涓撶敤鍙戠エ" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璐﹀彿娉ㄥ唽鍦板潃" prop="accountAddr">
- <el-input v-model="searchForm.accountAddr" placeholder="璇疯緭鍏ヨ处鍙锋敞鍐屽湴鍧�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="韬唤绫诲瀷0鑰佹澘瓒呯骇绠＄悊鍛�;1=浜轰簨绠＄悊鍛�;2=鍛樺伐" prop="identityType">
- <el-input v-model="searchForm.identityType" placeholder="璇疯緭鍏ヨ韩浠界被鍨�0鑰佹澘瓒呯骇绠＄悊鍛�;1=浜轰簨绠＄悊鍛�;2=鍛樺伐" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="閭" prop="email">
- <el-input v-model="searchForm.email" placeholder="璇疯緭鍏ラ偖绠�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鑱旂郴浜虹紪鐮侊紙鍏宠仈member锛�" prop="memberId">
- <el-input v-model="searchForm.memberId" placeholder="璇疯緭鍏ヨ仈绯讳汉缂栫爜锛堝叧鑱攎ember锛�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鎴峰悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywcustomer:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywcustomer:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button>
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:ywcustomer:create', 'business:ywcustomer:delete']">
- <li><el-button type="primary" @click="$refs.operaYwCustomerWindow.open('鏂板缓杩愮淮瀹㈡埛淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:ywcustomer:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywcustomer:delete']">鍒犻櫎</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaYwCustomerWindow.open('鏂板缓瀹㈡埛')" icon="el-icon-plus"
+ v-permissions="['business:ywcustomer:create']">鏂板缓</el-button></li>
+ <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+ v-permissions="['business:ywcustomer:delete']">鍒犻櫎</el-button></li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <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="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="industryId" label="鎵�灞炶涓氱紪鐮侊紙鍏宠仈category)" min-width="100px"></el-table-column>
<el-table-column prop="type" label="绫诲瀷 0涓汉 1浼佷笟" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="瀹㈡埛" min-width="100px"></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="idcardDecode" label="璇佷欢鏄剧ず淇℃伅" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="瀹㈡埛缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="鐘舵�� 0姝ｅ父 1绂佺敤" min-width="100px"></el-table-column>
- <el-table-column prop="highCheckor" label="韬唤 0鑰佹澘 1瓒呯骇绠＄悊鍛�" min-width="100px"></el-table-column>
- <el-table-column prop="lastLoginDate" label="鏈�杩戠櫥褰曟椂闂�" min-width="100px"></el-table-column>
- <el-table-column prop="loginNum" label="鐧诲綍娆℃暟" min-width="100px"></el-table-column>
- <el-table-column prop="userId" label="绯荤粺鐧诲綍鐢ㄦ埛缂栫爜(鍏宠仈system_user)" min-width="100px"></el-table-column>
- <el-table-column prop="idcardType" label="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収" min-width="100px"></el-table-column>
- <el-table-column prop="accountBank" label="寮�鎴烽摱琛�" min-width="100px"></el-table-column>
- <el-table-column prop="accountNo" label="璐﹀彿" min-width="100px"></el-table-column>
- <el-table-column prop="accountPhone" label="璐︽埛鐢佃瘽" min-width="100px"></el-table-column>
<el-table-column prop="creditCard" label="缁熶竴淇＄敤浠ｇ爜" min-width="100px"></el-table-column>
- <el-table-column prop="fpType" label="榛樿鍙戠エ绫诲瀷 0澧炲�肩◣鏅�氬彂绁� 1澧炲�肩◣涓撶敤鍙戠エ" min-width="100px"></el-table-column>
- <el-table-column prop="accountAddr" label="璐﹀彿娉ㄥ唽鍦板潃" min-width="100px"></el-table-column>
- <el-table-column prop="identityType" label="韬唤绫诲瀷0鑰佹澘瓒呯骇绠＄悊鍛�;1=浜轰簨绠＄悊鍛�;2=鍛樺伐" min-width="100px"></el-table-column>
- <el-table-column prop="email" label="閭" min-width="100px"></el-table-column>
- <el-table-column prop="memberId" label="鑱旂郴浜虹紪鐮侊紙鍏宠仈member锛�" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:ywcustomer:update', 'business:ywcustomer:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
+ <el-table-column v-if="containPermissions(['business:ywcustomer:update', 'business:ywcustomer:delete'])"
+ label="鎿嶄綔" min-width="120" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaYwCustomerWindow.open('缂栬緫杩愮淮瀹㈡埛淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:ywcustomer:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywcustomer:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="$refs.operaYwCustomerWindow.open('缂栬緫瀹㈡埛', row)" icon="el-icon-edit"
+ v-permissions="['business:ywcustomer:update']">缂栬緫</el-button>
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:ywcustomer:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaYwCustomerWindow ref="operaYwCustomerWindow" @success="handlePageChange"/>
+ <OperaYwCustomerWindow ref="operaYwCustomerWindow" @success="handlePageChange" />
</TableLayout>
</template>
@@ -170,7 +55,7 @@
name: 'YwCustomer',
extends: BaseTable,
components: { TableLayout, Pagination, OperaYwCustomerWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -206,7 +91,7 @@
}
}
},
- created () {
+ created() {
this.config({
module: '杩愮淮瀹㈡埛淇℃伅琛�',
api: '/client/ywCustomer',
--
Gitblit v1.9.3