From 4e598bff548c0e4a89f30e1523bdfb8b59d97741 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 09:59:05 +0800
Subject: [PATCH] tijiao

---
 admin/src/views/business/inoutRecord.vue |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/business/inoutRecord.vue b/admin/src/views/business/inoutRecord.vue
index b89d53d..6371726 100644
--- a/admin/src/views/business/inoutRecord.vue
+++ b/admin/src/views/business/inoutRecord.vue
@@ -20,7 +20,7 @@
             <el-option label="璁垮" value="1"></el-option>
             <el-option label="鍐呴儴浜哄憳" value="2"></el-option>
             <el-option label="鐩稿叧鏂逛汉鍛�" value="4"></el-option>
-            <el-option label="璐ц繍鍙告満" value="5"></el-option>
+<!--            <el-option label="璐ц繍鍙告満" value="5"></el-option>-->
           </el-select>
         </el-form-item>
         <el-form-item label="" prop="memberName">
@@ -83,7 +83,7 @@
             <span  v-if="row.memberType ==1">璁垮</span>
             <span  v-else-if="row.memberType ==2">鍐呴儴浜哄憳</span>
             <span  v-else-if="row.memberType ==4">鐩稿叧鏂逛汉鍛�</span>
-            <span  v-else-if="row.memberType ==5">璐ц繍鍙告満</span>
+<!--            <span  v-else-if="row.memberType ==5">璐ц繍鍙告満</span>-->
             <span  v-else ></span>
           </template>
         </el-table-column>
@@ -162,8 +162,11 @@
         { key: 1, name: '澶栧崗杩愯緭杞﹁締' },
         { key: 2, name: '甯傚叕鍙稿嵏璐ц溅杈�' },
         { key: 3, name: '鍔犲伐鐑熷嵏璐ц溅杈�' },
+<<<<<<< HEAD
         { key: 4, name: '鑷湁鍏姟杞�' },
         { key: 5, name: '鑷湁璐ц繍杞﹁締' },
+=======
+        { key: 4, name: '鐗╂祦鍏姟鐢ㄨ溅'  007)
         { key: 6, name: '鏈煡杞﹁締' }
       ]
     }

--
Gitblit v1.9.3