From ccb00a17b9119200b8c8d29a177bcc129dd4c982 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 19 三月 2026 17:43:13 +0800
Subject: [PATCH] Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG
---
src/views/consumablesLogistics/receiptManagement/Record.vue | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/views/consumablesLogistics/receiptManagement/Record.vue b/src/views/consumablesLogistics/receiptManagement/Record.vue
index 84bda74..6161e67 100644
--- a/src/views/consumablesLogistics/receiptManagement/Record.vue
+++ b/src/views/consumablesLogistics/receiptManagement/Record.vue
@@ -15,16 +15,16 @@
style="width: 240px"
placeholder="璇疯緭鍏�"
clearable/>
- <span class="search_title ml10">鏉ユ簮锛�</span>
- <el-select v-model="searchForm.recordType"
- style="width: 240px"
- placeholder="璇烽�夋嫨"
- clearable>
- <el-option v-for="item in stockRecordTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"/>
- </el-select>
+<!-- <span class="search_title ml10">鏉ユ簮锛�</span>-->
+<!-- <el-select v-model="searchForm.recordType"-->
+<!-- style="width: 240px"-->
+<!-- placeholder="璇烽�夋嫨"-->
+<!-- clearable>-->
+<!-- <el-option v-for="item in stockRecordTypeOptions"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
<el-button type="primary"
@click="handleQuery"
style="margin-left: 10px">鎼滅储
@@ -92,13 +92,13 @@
<el-table-column label="鍏ュ簱浜�"
prop="createBy"
show-overflow-tooltip/>
- <el-table-column label="鏉ユ簮"
+ <!-- <el-table-column label="鏉ユ簮"
prop="recordType"
show-overflow-tooltip>
<template #default="scope">
{{ getRecordType(scope.row.recordType) }}
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="杩囩鏃ユ湡"
prop="weighingDate"
v-if="type === '0'"
@@ -117,12 +117,14 @@
</template>
</el-table-column>
</el-table>
- <pagination v-show="total > 0"
- :total="total"
- layout="total, sizes, prev, pager, next, jumper"
- :page="page.current"
- :limit="page.size"
- @pagination="pageProductChange"/>
+ <div style="margin-top: 12px; display: flex; justify-content: flex-end;">
+ <pagination v-show="total > 0"
+ :total="total"
+ layout="total, sizes, prev, pager, next, jumper"
+ :page="page.current"
+ :limit="page.size"
+ @pagination="pageProductChange"/>
+ </div>
</div>
</div>
</template>
@@ -161,7 +163,7 @@
const stockRecordTypeOptions = ref([]);
const page = reactive({
current: 1,
- size: 100,
+ size: 10,
});
const total = ref(0);
--
Gitblit v1.9.3