From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/userAction.vue | 107 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 92 insertions(+), 15 deletions(-)
diff --git a/admin/src/views/business/userAction.vue b/admin/src/views/business/userAction.vue
index 108984f..bc51338 100644
--- a/admin/src/views/business/userAction.vue
+++ b/admin/src/views/business/userAction.vue
@@ -2,11 +2,52 @@
<TableLayout :permissions="['business:useraction:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="绫诲瀷" prop="type">
- <el-input v-model="searchForm.type" placeholder="璇疯緭鍏ョ被鍨�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鎿嶄綔浜哄悕绉�" prop="createName">
+ <el-input v-model="searchForm.createName" placeholder="璇疯緭鍏ユ搷浣滀汉鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鎿嶄綔鍓嶇姸鎬�" prop="beforeStatus">
- <el-input v-model="searchForm.beforeStatus" placeholder="璇疯緭鍏ユ搷浣滃墠鐘舵��" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鎿嶄綔瀵硅薄" prop="memberName">
+ <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ユ搷浣滃璞�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鎵�灞炵粍缁�" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ユ墍灞炵粍缁�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="浜哄憳绫诲瀷" prop="memberType">
+ <el-select v-model="searchForm.memberType" placeholder="璇烽�夋嫨">
+ <el-option label="鍔冲姟璁垮" :value="0"></el-option>
+ <el-option label="鏅�氳瀹�" :value="1"></el-option>
+ <el-option label="鍐呴儴浜哄憳" :value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎵嬫満鍙�" prop="mobile">
+ <el-input v-model="searchForm.mobile" placeholder="璇疯緭鍏ユ墜鏈哄彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+<!-- <el-form-item label="鍘嗗彶璐﹀彿鐘舵��" prop="beforeStatus">
+ <el-select v-model="searchForm.beforeStatus" 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-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-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -16,18 +57,49 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="type" label="绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎" min-width="100px"></el-table-column>
- <el-table-column prop="beforeStatus" label="鎿嶄綔鍓嶇姸鎬� 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎" min-width="100px"></el-table-column>
+ <el-table-column prop="createName" label="鎿嶄綔浜哄憳"></el-table-column>
+ <el-table-column prop="memberName" label="鎿嶄綔瀵硅薄"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞炵粍缁�">
+ <template slot-scope="{row}">
+ <span v-if="row.memberType === '1'">{{row.visitCompanyName}}</span>
+ <span v-else>{{row.companyName}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="浜哄憳绫诲瀷">
+ <template slot-scope="{row}">
+ <span v-if="row.memberType === '0'">鍔冲姟璁垮</span>
+ <span v-if="row.memberType === '1'">鏅�氳瀹�</span>
+ <span v-if="row.memberType === '2'">鍐呴儴浜哄憳</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="mobile" label="鎵嬫満鍙�"></el-table-column>
+<!-- <el-table-column label="鍘嗗彶鐘舵��">
+ <template slot-scope="{row}">
+ <span v-if="row.beforeStatus === 0">瑙ｅ喕</span>
+ <span v-else-if="row.beforeStatus === 1">鍐荤粨</span>
+ <span v-else-if="row.beforeStatus === 2">鎷夐粦</span>
+ <span v-else-if="row.beforeStatus === 3">鎭㈠</span>
+ <span v-else-if="row.beforeStatus === 4">璁句负鎷滆浜�</span>
+ <span v-else-if="row.beforeStatus === 5">鍙栨秷鎷滆浜�</span>
+ <span v-else-if="row.beforeStatus === 6">璁句负楂樼骇瀹℃壒浜�</span>
+ <span v-else-if="row.beforeStatus === 7">鍙栨秷楂樼骇瀹℃壒浜�</span>
+ <span v-else-if="row.beforeStatus === 8">鎵嬪姩绂诲満</span>
+ <span v-else-if="row.beforeStatus === 9">鍒犻櫎</span>
+ <span v-else>姝ｅ父</span>
+ </template>
+ </el-table-column>-->
+ <el-table-column prop="typeName" label="鎿嶄綔绫诲瀷" />
+ <el-table-column prop="remark" label="鎿嶄綔鍐呭" width="350"/>
+ <el-table-column prop="createDate" label="鎿嶄綔鏃堕棿"></el-table-column>
</el-table>
<pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
>
</pagination>
</template>
@@ -46,8 +118,13 @@
return {
// 鎼滅储
searchForm: {
- type: '',
- beforeStatus: ''
+ createName: '',
+ memberName: '',
+ companyName: '',
+ memberType: '',
+ mobile: '',
+ beforeStatus: '',
+ type: ''
}
}
},
--
Gitblit v1.9.3