From ace847c89da4a0a772aa513b4343d8fc54a0adc9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 十月 2025 17:49:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/userAction.vue | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/business/userAction.vue b/admin/src/views/business/userAction.vue
index bc51338..cdfa2aa 100644
--- a/admin/src/views/business/userAction.vue
+++ b/admin/src/views/business/userAction.vue
@@ -36,18 +36,25 @@
</el-select>
</el-form-item>-->
<el-form-item label="鎿嶄綔绫诲瀷" prop="type">
- <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
- <el-option label="瑙ｅ喕" :value="0"></el-option>
- <el-option label="鍐荤粨" :value="1"></el-option>
- <el-option label="鎷夐粦" :value="2"></el-option>
- <el-option label="鎭㈠" :value="3"></el-option>
- <el-option label="璁句负鎷滆浜�" :value="4"></el-option>
- <el-option label="鍙栨秷鎷滆浜�" :value="5"></el-option>
- <el-option label="璁句负楂樼骇瀹℃壒浜�" :value="6"></el-option>
- <el-option label="鍙栨秷楂樼骇瀹℃壒浜�" :value="7"></el-option>
- <el-option label="鎵嬪姩绂诲満" :value="8"></el-option>
- <el-option label="鍒犻櫎" :value="9"></el-option>
- </el-select>
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
+ <el-option label="瑙ｅ喕" :value="0"></el-option>
+ <el-option label="鍐荤粨" :value="1"></el-option>
+ <el-option label="鎷夐粦" :value="2"></el-option>
+ <el-option label="鎭㈠" :value="3"></el-option>
+ <el-option label="璁句负鎷滆浜�" :value="4"></el-option>
+ <el-option label="鍙栨秷鎷滆浜�" :value="5"></el-option>
+ <el-option label="璁句负楂樼骇瀹℃壒浜�" :value="6"></el-option>
+ <el-option label="鍙栨秷楂樼骇瀹℃壒浜�" :value="7"></el-option>
+ <el-option label="鎵嬪姩绂诲満" :value="8"></el-option>
+ <el-option label="鍒犻櫎" :value="9"></el-option>
+ <el-option label="鏇存柊" :value="10"></el-option>
+ <el-option label="鎺堟潈闂ㄧ鏉冮檺" :value="11"></el-option>
+ <el-option label="绂昏亴" :value="12"></el-option>
+ <el-option label="鍦ㄨ亴" :value="13"></el-option>
+ <el-option label="瀵煎叆鍩硅鏈夋晥鏈�" :value="14"></el-option>
+ <el-option label="璁句负涓荤" :value="15"></el-option>
+ <el-option label="鍙栨秷涓荤" :value="16"></el-option>
+ </el-select>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -57,6 +64,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
@@ -123,6 +131,7 @@
companyName: '',
memberType: '',
mobile: '',
+ objType:0,
beforeStatus: '',
type: ''
}
--
Gitblit v1.9.3