From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/business/userAction.vue |   82 ++++++++++++++++++++---------------------
 1 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/admin/src/views/business/userAction.vue b/admin/src/views/business/userAction.vue
index 29c359f..cdfa2aa 100644
--- a/admin/src/views/business/userAction.vue
+++ b/admin/src/views/business/userAction.vue
@@ -8,8 +8,8 @@
             <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 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="璇烽�夋嫨">
@@ -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="瑙e喕" :value="0"></el-option>
                     <el-option label="鍐荤粨" :value="1"></el-option>
@@ -34,20 +34,27 @@
                     <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="瑙e喕" :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="瑙e喕" :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,13 +64,14 @@
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
             <el-table
+                :height="tableHeightNew"
                 v-loading="isWorking.search"
                 :data="tableData.list"
                 stripe
             >
                 <el-table-column prop="createName" label="鎿嶄綔浜哄憳"></el-table-column>
                 <el-table-column prop="memberName" label="鎿嶄綔瀵硅薄"></el-table-column>
-                <el-table-column prop="companyName" label="鎵�灞炲叕鍙�">
+                <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>
@@ -77,34 +85,23 @@
                     </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">瑙e喕</span>
-                        <span v-if="row.beforeStatus === 1">鍐荤粨</span>
-                        <span v-if="row.beforeStatus === 2">鎷夐粦</span>
-                        <span v-if="row.beforeStatus === 3">鎭㈠</span>
-                        <span v-if="row.beforeStatus === 4">璁句负鎷滆浜�</span>
-                        <span v-if="row.beforeStatus === 5">鍙栨秷鎷滆浜�</span>
-                        <span v-if="row.beforeStatus === 6">璁句负楂樼骇瀹℃壒浜�</span>
-                        <span v-if="row.beforeStatus === 7">鍙栨秷楂樼骇瀹℃壒浜�</span>
-                        <span v-if="row.beforeStatus === 8">鎵嬪姩绂诲満</span>
-                        <span v-if="row.beforeStatus === 8">鍒犻櫎</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>姝e父</span>
                     </template>
-                </el-table-column>
-                <el-table-column label="鎿嶄綔">
-                    <template slot-scope="{row}">
-                        <span v-if="row.type === 0">瑙e喕</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 === 8">鍒犻櫎</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
@@ -134,6 +131,7 @@
           companyName: '',
           memberType: '',
           mobile: '',
+          objType:0,
           beforeStatus: '',
           type: ''
         }

--
Gitblit v1.9.3