From 6eed3b2434c7c1552b1b1433a5c85849a3b0d592 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Mon, 17 Mar 2025 16:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plus-ui/src/components/Pagination/index.vue              | 8 +++++++-
 .../views/machinery/component/MachineryDetailTable.vue   | 9 ++++++++-
 .../materials/component/MaterialsInventoryAddDialog.vue  | 6 +++---
 .../materials/component/MaterialsInventoryTable.vue      | 3 ++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/plus-ui/src/components/Pagination/index.vue b/plus-ui/src/components/Pagination/index.vue
index ac02193a..9f96001d 100644
--- a/plus-ui/src/components/Pagination/index.vue
+++ b/plus-ui/src/components/Pagination/index.vue
@@ -3,6 +3,7 @@
     <el-pagination
       v-model:current-page="currentPage"
       v-model:page-size="pageSize"
+      :size="size"
       :background="background"
       :layout="layout"
       :page-sizes="pageSizes"
@@ -38,7 +39,8 @@ const props = defineProps({
   background: propTypes.bool.def(true),
   autoScroll: propTypes.bool.def(true),
   hidden: propTypes.bool.def(false),
-  float: propTypes.string.def('right')
+  float: propTypes.string.def('right'),
+  size: propTypes.any
 });
 
 const emit = defineEmits(['update:page', 'update:limit', 'pagination']);
@@ -58,6 +60,7 @@ const pageSize = computed({
     emit('update:limit', val);
   }
 });
+
 function handleSizeChange(val: number) {
   if (currentPage.value * val > props.total) {
     currentPage.value = 1;
@@ -67,6 +70,7 @@ function handleSizeChange(val: number) {
     scrollTo(0, 800);
   }
 }
+
 function handleCurrentChange(val: number) {
   emit('pagination', { page: val, limit: pageSize.value });
   if (props.autoScroll) {
@@ -78,10 +82,12 @@ function handleCurrentChange(val: number) {
 <style lang="scss" scoped>
 .pagination-container {
   padding: 32px 16px;
+
   .el-pagination {
     float: v-bind(float);
   }
 }
+
 .pagination-container.hidden {
   display: none;
 }
diff --git a/plus-ui/src/views/machinery/component/MachineryDetailTable.vue b/plus-ui/src/views/machinery/component/MachineryDetailTable.vue
index ad6b9150..3cabb2aa 100644
--- a/plus-ui/src/views/machinery/component/MachineryDetailTable.vue
+++ b/plus-ui/src/views/machinery/component/MachineryDetailTable.vue
@@ -31,7 +31,14 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <pagination
+      size="small"
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.current"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
     <el-dialog title="修改机械出入场详情" v-model="dialogRef" width="500px" append-to-body>
       <el-form ref="formRef" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="出入场" prop="type">
diff --git a/plus-ui/src/views/materials/materials/component/MaterialsInventoryAddDialog.vue b/plus-ui/src/views/materials/materials/component/MaterialsInventoryAddDialog.vue
index 8eeac26d..e043c250 100644
--- a/plus-ui/src/views/materials/materials/component/MaterialsInventoryAddDialog.vue
+++ b/plus-ui/src/views/materials/materials/component/MaterialsInventoryAddDialog.vue
@@ -21,9 +21,6 @@
       <el-form-item v-if="form.outPut === '1'" label="领用人" prop="shipper">
         <el-input v-model="form.shipper" placeholder="请输入领用人" />
       </el-form-item>
-      <el-form-item label="材料出入证明" prop="path">
-        <el-input v-model="form.path" type="textarea" placeholder="材料出入证明" />
-      </el-form-item>
       <el-form-item label="处理方式" prop="disposition">
         <el-input v-model="form.disposition" placeholder="请输入处理方式" />
       </el-form-item>
@@ -34,6 +31,9 @@
         <el-date-picker clearable v-model="form.outPutTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择操作时间">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="材料出入证明" prop="path">
+        <file-upload v-model="form.path" :limit="1" :file-size="50" :file-type="['pdf']" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
diff --git a/plus-ui/src/views/materials/materials/component/MaterialsInventoryTable.vue b/plus-ui/src/views/materials/materials/component/MaterialsInventoryTable.vue
index 6a5385e5..b6115a74 100644
--- a/plus-ui/src/views/materials/materials/component/MaterialsInventoryTable.vue
+++ b/plus-ui/src/views/materials/materials/component/MaterialsInventoryTable.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table v-if="materialsInventoryList.length !== 0" :data="materialsInventoryList">
+    <el-table size="small" v-if="materialsInventoryList.length !== 0" :data="materialsInventoryList">
       <el-table-column label="序号" type="index" width="60" align="center" />
       <el-table-column label="出入库" align="center" prop="outPut">
         <template #default="scope">
@@ -27,6 +27,7 @@
     <pagination
       v-show="total > 0"
       :total="total"
+      size="small"
       v-model:page="materialsSearchParams.current"
       v-model:limit="materialsSearchParams.pageSize"
       @pagination="getList"