From aaf943ada13005f2b22d01e3d7080b8740d9aa96 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期二, 15 七月 2025 15:09:49 +0800
Subject: [PATCH] 添加待入库功能及优化配煤计算器

---
 src/views/warehouseManagement/index.vue |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index b91980d..12bfcdc 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -1,14 +1,25 @@
 <template>
   <div class="app-container">
     <el-form :inline="true" :model="queryParams" class="search-form">
-      <el-form-item label="鎼滅储">
-        <el-input
-            v-model="queryParams.searchAll"
-            placeholder="璇疯緭鍏ュ叧閿瓧"
-            clearable
-            :style="{ width: '100%' }"
-        />
-      </el-form-item>
+			<el-form-item label="鐧昏鏃ユ湡">
+				<el-date-picker
+					v-model="queryParams.registrationDate"
+					type="date"
+					value-format="YYYY-MM-DD"
+					format="YYYY-MM-DD"
+					clearable
+					style="width: 100%"
+					placeholder="璇烽�夋嫨鏃ユ湡"
+				/>
+			</el-form-item>
+			<el-form-item label="鐓ょ">
+				<el-input
+					v-model="queryParams.coal"
+					placeholder="璇疯緭鍏ョ叅绉�"
+					clearable
+					:style="{ width: '100%' }"
+				/>
+			</el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleQuery">鏌ヨ</el-button>
         <el-button @click="resetQuery">閲嶇疆</el-button>
@@ -62,10 +73,10 @@
         </el-table>
         <pagination
             v-if="total>0"
-            :page-num="pageNum"
-            :page-size="pageSize"
+            :page="pageNum"
+            :limit="pageSize"
             :total="total"
-            @pagination="handleQuery"
+            @pagination="handlePagination"
             :layout="'total, prev, pager, next, jumper'"
         />
       </div>
@@ -306,12 +317,14 @@
     coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
     unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
     coalPlanId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    supplierId: [{ required: true, message: "璇烽�夋嫨渚涘簲鍟�", trigger: "change" }],
   },
   mergeRules: {
     supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }],
     coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
     unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
     coalPlanId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    supplierId: [{ required: true, message: "璇烽�夋嫨渚涘簲鍟�", trigger: "change" }],
   }
 })
 
@@ -326,7 +339,8 @@
 ]);
 // 鏌ヨ鍙傛暟
 const queryParams = reactive({
-  searchAll: "",
+	registrationDate: "",
+	coal: "",
 })
 const columnTitle = ref([])
 const supplyList = ref([]);
@@ -374,6 +388,12 @@
   pageSize.value = 10
   getList()
 }
+// 鍒嗛〉澶勭悊
+const handlePagination = (val) => {
+	pageNum.value = val.page;
+	pageSize.value = val.limit;
+	getList();
+};
 const getList = () => {
   tableLoading.value = true;
   // 璧嬪�肩叅璐ㄨ〃澶村睍绀哄瓧娈�

--
Gitblit v1.9.3