From 3bd642ad4d805032ae43e1fd23e0c4e6b7dfa9f2 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期六, 12 七月 2025 11:58:41 +0800
Subject: [PATCH] 1、修改采购管理的匹配逻辑 2、修改生产加工新增生产明细的总数居匹配问题 3、修改配煤计算器 4、修改设备管理领用记录的提交问题
---
src/views/warehouseManagement/index.vue | 104 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 40 deletions(-)
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 8b73507..6fd3887 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -1,22 +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.supplierName"
- placeholder="璇疯緭鍏�"
- clearable
- :style="{ width: '100%' }"
- />
- </el-form-item>
- <el-form-item label="鐓ょ">
- <el-input
- v-model="queryParams.coal"
- 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>
@@ -39,7 +42,7 @@
<!-- 鎿嶄綔鎸夐挳鍖� -->
<el-space>
<!-- <el-button type="danger" :icon="Delete">鍒犻櫎</el-button>-->
- <el-button type="info" plain :icon="Download">瀵煎嚭</el-button>
+ <!-- <el-button type="info" plain :icon="Download">瀵煎嚭</el-button> -->
<el-button type="success" plain :icon="Refresh" v-if="activeTab=== 'officialInventory'" @click="mergeRows('merge')">鍚堝苟</el-button>
</el-space>
<div>
@@ -60,19 +63,20 @@
</el-table-column>
<el-table-column prop="registrant" label="鐧昏浜�" width="180"/>
<el-table-column prop="registrationDate" label="鐧昏鏃ユ湡" width="180"/>
- <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="100" align="center">
<template #default="scope">
<el-button link type="primary" size="small" @click="reviewDia(scope.row)" v-if="activeTab !== 'officialInventory'">瀹℃牳</el-button>
- <el-button link type="primary" size="small" @click="mergeRows('edit', scope.row)" v-else>缂栬緫</el-button>
+ <el-button link type="primary" size="small" @click="mergeRows('edit', scope.row)" v-if="activeTab === 'officialInventory'">缂栬緫</el-button>
+ <el-button link type="primary" size="small" @click="mergeRows('view', scope.row)" v-if="activeTab === 'officialInventory'">璇︽儏</el-button>
</template>
</el-table-column>
</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>
@@ -134,8 +138,8 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鐓よ川鏂规" prop="qualityPlan">
- <el-select v-model="form.qualityPlan" placeholder="璇烽�夋嫨" @change="coalPlanByIdList" clearable>
+ <el-form-item label="鐓よ川鏂规" prop="coalPlanId">
+ <el-select v-model="form.coalPlanId" placeholder="璇烽�夋嫨" @change="coalPlanByIdList" clearable>
<el-option
v-for="dict in qualityPlanOption"
:key="dict.id"
@@ -168,14 +172,14 @@
<el-row>
<el-col :span="12">
<el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierId">
- <el-select v-model="mergeForm.supplierId" placeholder="璇烽�夋嫨渚涘簲鍟�">
+ <el-select v-model="mergeForm.supplierId" placeholder="璇烽�夋嫨渚涘簲鍟�" :disabled="operationType === 'view'">
<el-option :label="item.label" v-for="item in supplyList" :key="item.value" :value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鐓ょ" prop="coalId">
- <el-select v-model="mergeForm.coalId" placeholder="璇烽�夋嫨鐓ょ">
+ <el-select v-model="mergeForm.coalId" placeholder="璇烽�夋嫨鐓ょ" :disabled="operationType === 'view'">
<el-option :label="item.label" v-for="item in coalList" :key="item.value" :value="item.value"/>
</el-select>
</el-form-item>
@@ -184,36 +188,50 @@
<el-row>
<el-col :span="12">
<el-form-item label="鍗曚綅" prop="unit">
- <el-input v-model="mergeForm.unit" placeholder="璇疯緭鍏ュ崟浣�" maxlength="30" />
+ <el-input v-model="mergeForm.unit" placeholder="璇疯緭鍏ュ崟浣�" maxlength="30" :disabled="operationType === 'view'"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="搴撳瓨鏁伴噺" prop="inventoryQuantity">
- <el-input v-model="mergeForm.inventoryQuantity" placeholder="璇疯緭鍏ュ簱瀛樻暟閲�" :max="inventoryQuantity" type="number"/>
+ <el-input v-model="mergeForm.inventoryQuantity" placeholder="璇疯緭鍏ュ簱瀛樻暟閲�" :max="inventoryQuantity" type="number" :disabled="operationType === 'view'"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="鍗曚环(鍚◣)" prop="priceIncludingTax">
- <el-input v-model="mergeForm.priceIncludingTax" placeholder="璇疯緭鍏ュ崟浠�(鍚◣)" maxlength="30" />
+ <el-input v-model="mergeForm.priceIncludingTax" placeholder="璇疯緭鍏ュ崟浠�(鍚◣)" maxlength="30" :disabled="operationType === 'view'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎬讳环(鍚◣)" prop="totalPriceIncludingTax">
- <el-input v-model="mergeForm.totalPriceIncludingTax" placeholder="璇疯緭鍏ユ�讳环(鍚◣)" maxlength="30" />
+ <el-input v-model="mergeForm.totalPriceIncludingTax" placeholder="璇疯緭鍏ユ�讳环(鍚◣)" maxlength="30" :disabled="operationType === 'view'" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="鍗曚环(涓嶅惈绋�)" prop="priceExcludingTax">
- <el-input v-model="mergeForm.priceExcludingTax" placeholder="璇疯緭鍏ュ崟浠�(涓嶅惈绋�)" maxlength="30" />
+ <el-input v-model="mergeForm.priceExcludingTax" placeholder="璇疯緭鍏ュ崟浠�(涓嶅惈绋�)" maxlength="30" :disabled="operationType === 'view'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎬讳环(涓嶅惈绋�)" prop="totalPriceExcludingTax">
- <el-input v-model="mergeForm.totalPriceExcludingTax" placeholder="璇疯緭鍏ユ�讳环(涓嶅惈绋�)" maxlength="30" />
+ <el-input v-model="mergeForm.totalPriceExcludingTax" placeholder="璇疯緭鍏ユ�讳环(涓嶅惈绋�)" maxlength="30" :disabled="operationType === 'view'" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鐓よ川鏂规" prop="coalPlanId">
+ <el-select v-model="mergeForm.coalPlanId" placeholder="璇烽�夋嫨" @change="coalPlanByIdList" clearable :disabled="operationType === 'view'">
+ <el-option
+ v-for="dict in qualityPlanOption"
+ :key="dict.id"
+ :label="dict.plan"
+ :value="dict.id"
+ ></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -221,7 +239,7 @@
<el-row>
<el-col :span="12" v-for="item in filteredList" :key="item.id">
<el-form-item :label="item.fieldName">
- <el-input v-model="mergeForm[item.fields]" />
+ <el-input v-model="mergeForm[item.fields]" :disabled="operationType === 'view'" />
</el-form-item>
</el-col>
</el-row>
@@ -279,7 +297,7 @@
totalPriceIncludingTax: '',
priceExcludingTax: '',
totalPriceExcludingTax: '',
- qualityPlan: '',
+ coalPlanId: '',
pId: '',
},
mergeForm: {
@@ -291,20 +309,20 @@
totalPriceIncludingTax: '',
priceExcludingTax: '',
totalPriceExcludingTax: '',
- qualityPlan: '',
+ coalPlanId: '',
pId: '',
},
rules: {
supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }],
coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
- qualityPlan: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ coalPlanId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
},
mergeRules: {
supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }],
coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
- qualityPlan: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ coalPlanId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
}
})
@@ -319,8 +337,8 @@
]);
// 鏌ヨ鍙傛暟
const queryParams = reactive({
- supplierName: "",
- coal: "",
+ registrationDate: "",
+ coal: "",
})
const columnTitle = ref([])
const supplyList = ref([]);
@@ -368,6 +386,12 @@
pageSize.value = 10
getList()
}
+// 鍒嗛〉澶勭悊
+const handlePagination = (val) => {
+ pageNum.value = val.page;
+ pageSize.value = val.limit;
+ getList();
+};
const getList = () => {
tableLoading.value = true;
// 璧嬪�肩叅璐ㄨ〃澶村睍绀哄瓧娈�
@@ -459,7 +483,7 @@
coalPlanListOptions()
mergeVisible.value = true;
operationType.value = type;
- if (type === 'edit') {
+ if (type !== 'merge') {
mergeForm.value = {...row}
} else {
if (selectedRows.value.length < 2) {
--
Gitblit v1.9.3