From 8ac30411bb33e406e0ed5a2b6e2edaf7ab59f11f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 23 十一月 2024 17:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/client/staffList.vue |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/admin/src/views/client/staffList.vue b/admin/src/views/client/staffList.vue
index 05d7c12..3012931 100644
--- a/admin/src/views/client/staffList.vue
+++ b/admin/src/views/client/staffList.vue
@@ -5,6 +5,9 @@
       <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 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']"
@@ -21,10 +24,11 @@
             v-permissions="['business:ywcustomer:delete']">鍒犻櫎</el-button></li>
       </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="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="" label="韬唤" min-width="100px"></el-table-column>
+        <el-table-column prop="" label="鐘舵��" min-width="100px"></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