From 96c0f9325788bb688d347919f7ead3b44586b95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Tue, 22 Oct 2024 08:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E6=98=BE=E7=A4=BA=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ss/suit/component/SuitTable.vue | 12 ++++++++++--
 src/views/system/smUser/index.vue         |  7 +++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/ss/suit/component/SuitTable.vue b/src/views/ss/suit/component/SuitTable.vue
index 70553f3..5f19130 100644
--- a/src/views/ss/suit/component/SuitTable.vue
+++ b/src/views/ss/suit/component/SuitTable.vue
@@ -17,6 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="用户手机" prop="userMobile">
+        <el-input
+          v-model="queryParams.userMobile"
+          placeholder="请输入用户手机号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="套餐名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -50,8 +58,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="套餐ID" align="center" prop="suitId" width="80"/>
       <el-table-column label="套餐名称" align="center" prop="name" width="100"/>
-      <el-table-column label="所属用户" align="center" prop="userName" width="100">
-        <user-link slot-scope="d" :id="d.row.userId" :name="d.row.userName"/>
+      <el-table-column label="所属用户" align="center" prop="mobileOrUserName" width="100">
+        <user-link slot-scope="d" :id="d.row.userId" :name="d.row.mobileOrUserName"/>
       </el-table-column>
       <el-table-column label="收费模式" align="center" prop="feeMode" width="100">
         <dict-tag slot-scope="d" :value="d.row.feeMode" :options="dict.type.suit_fee_mode"/>
diff --git a/src/views/system/smUser/index.vue b/src/views/system/smUser/index.vue
index e410bb5..107fb85 100644
--- a/src/views/system/smUser/index.vue
+++ b/src/views/system/smUser/index.vue
@@ -111,6 +111,9 @@
             <template v-else-if="column.key === 'phonenumber'">
               <user-link :id="d.row.userId" :name="d.row.phonenumber"/>
             </template>
+            <template v-else-if="column.key === 'realOrUserName'">
+              <user-link :id="d.row.userId" :name="d.row.realOrUserName"/>
+            </template>
             <template v-else-if="column.key === 'storeCount'">
               {{d.row.storeCount | defaultValue}} 家
             </template>
@@ -308,8 +311,8 @@ export default {
       span: 12,
       columns: [
         {key: 'userId', visible: false, label: 'ID', align: 'center', minWidth: "80", sortable: true, width: null},
-        {key: 'phonenumber', visible: true, label: '手机', align: 'center', minWidth: null, sortable: true, width: "120"},
-        {key: 'userName', visible: false, label: '名称', align: 'center', minWidth: null, sortable: false, width: null},
+        {key: 'phonenumber', visible: true, label: '手机', align: 'center', minWidth: null, sortable: true, width: null},
+        {key: 'realOrUserName', visible: true, label: '名称', align: 'center', minWidth: null, sortable: false, width: null},
         {key: 'type', visible: true, label: '类型', align: 'center', minWidth: null, sortable: true, width: null},
         {key: 'remark', visible: true, label: '备注', align: 'center', minWidth: null, sortable: false, overflow: true, width: null},
         {key: 'status', visible: true, label: '状态', align: 'center', minWidth: null, sortable: true, width: null},