From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/userAction.vue | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/admin/src/views/business/userAction.vue b/admin/src/views/business/userAction.vue
index a23c5a9..7e6109a 100644
--- a/admin/src/views/business/userAction.vue
+++ b/admin/src/views/business/userAction.vue
@@ -21,7 +21,7 @@
<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-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>
@@ -34,7 +34,7 @@
<el-option label="鎵嬪姩绂诲満" :value="8"></el-option>
<el-option label="鍒犻櫎" :value="9"></el-option>
</el-select>
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="鎿嶄綔绫诲瀷" prop="type">
<el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
<el-option label="瑙ｅ喕" :value="0"></el-option>
@@ -77,7 +77,7 @@
</template>
</el-table-column>
<el-table-column prop="mobile" label="鎵嬫満鍙�"></el-table-column>
- <el-table-column label="鍘嗗彶鐘舵��">
+<!-- <el-table-column label="鍘嗗彶鐘舵��">
<template slot-scope="{row}">
<span v-if="row.beforeStatus === 0">瑙ｅ喕</span>
<span v-else-if="row.beforeStatus === 1">鍐荤粨</span>
@@ -89,23 +89,11 @@
<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>
+ <span v-else>姝ｅ父</span>
</template>
- </el-table-column>
- <el-table-column label="鎿嶄綔">
- <template slot-scope="{row}">
- <span v-if="row.type === 0">瑙ｅ喕</span>
- <span v-if="row.type === 1">鍐荤粨</span>
- <span v-if="row.type === 2">鎷夐粦</span>
- <span v-if="row.type === 3">鎭㈠</span>
- <span v-if="row.type === 4">璁句负鎷滆浜�</span>
- <span v-if="row.type === 5">鍙栨秷鎷滆浜�</span>
- <span v-if="row.type === 6">璁句负楂樼骇瀹℃壒浜�</span>
- <span v-if="row.type === 7">鍙栨秷楂樼骇瀹℃壒浜�</span>
- <span v-if="row.type === 8">鎵嬪姩绂诲満</span>
- <span v-if="row.type === 9">鍒犻櫎</span>
- </template>
- </el-table-column>
+ </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
--
Gitblit v1.9.3