From 23006c64e0d7478ff2e8c723f2bfda3781b65b09 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期五, 18 七月 2025 11:59:20 +0800
Subject: [PATCH] 1、优化配煤计算器 2、优化正是库存数据渲染问题
---
src/views/warehouseManagement/index.vue | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 159f2ea..b7bd8a4 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>
@@ -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([]);
@@ -469,7 +483,9 @@
const mergeRows = (type,row) => {
getDropdownData()
coalPlanListOptions()
- mergeVisible.value = true;
+ if (type === 'edit') {
+ mergeVisible.value = true;
+ }
operationType.value = type;
if (type !== 'merge') {
mergeForm.value = {...row}
@@ -478,6 +494,7 @@
proxy.$modal.msgWarning('璇疯嚦灏戦�夋嫨涓ゆ潯鏁版嵁')
return
}
+ mergeVisible.value = true;
filteredList.value.forEach(item => {
mergeForm.value[item.fields] = ''
})
--
Gitblit v1.9.3