From 54e81529b5644b10ebe9aa56c811c27e27bba59e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 十二月 2025 13:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/inoutRecord.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/business/inoutRecord.vue b/admin/src/views/business/inoutRecord.vue
index c976ee6..61bf082 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">
@@ -68,8 +68,7 @@
@click="exportExcel">瀵煎嚭</el-button>
</li>
</ul>
- <el-table
- :height="tableHeightNew"
+ <el-table :height="tableHeightNew+10"
v-loading="isWorking.search"
:data="tableData.list"
stripe
@@ -84,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>
@@ -141,7 +140,7 @@
export default {
name: 'InoutRecord',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaInoutRecordWindow },
+ components: { TableLayout, Pagination, OperaInoutRecordWindow },
data () {
return {
// 鎼滅储
@@ -163,8 +162,8 @@
{ key: 1, name: '澶栧崗杩愯緭杞﹁締' },
{ key: 2, name: '甯傚叕鍙稿嵏璐ц溅杈�' },
{ key: 3, name: '鍔犲伐鐑熷嵏璐ц溅杈�' },
- { key: 4, name: '瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅' },
- { key: 5, name: '瀹夋嘲鐗╂祦璐ц繍杞﹁締' },
+ { key: 4, name: '鑷湁鍏姟杞�' },
+ { key: 5, name: '鑷湁璐ц繍杞﹁締' },
{ key: 6, name: '鏈煡杞﹁締' }
]
}
--
Gitblit v1.9.3