From c6d13e58d85fbaaceb49d4c24401b50143050173 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期四, 26 六月 2025 18:01:24 +0800
Subject: [PATCH] 调整 基础管理煤种生产人 更改采购数计算逻辑 处理供应商数据回显问题
---
src/views/warehouseManagement/index.vue | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 49e5824..e26abe1 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -134,8 +134,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"
@@ -163,7 +163,7 @@
</template>
</el-dialog>
<!-- 鍚堝苟鏁版嵁寮规 -->
- <el-dialog title="鍚堝苟搴撳瓨" v-model="mergeVisible" width="800px">
+ <el-dialog :title="operationType.value === 'edit' ? '缂栬緫搴撳瓨' : '鍚堝苟搴撳瓨'" v-model="mergeVisible" width="800px">
<el-form :model="mergeForm" :rules="mergeRules" ref="mergeRef" label-width="100px">
<el-row>
<el-col :span="12">
@@ -214,6 +214,20 @@
<el-col :span="12">
<el-form-item label="鎬讳环(涓嶅惈绋�)" prop="totalPriceExcludingTax">
<el-input v-model="mergeForm.totalPriceExcludingTax" placeholder="璇疯緭鍏ユ�讳环(涓嶅惈绋�)" maxlength="30" />
+ </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>
+ <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>
@@ -279,7 +293,7 @@
totalPriceIncludingTax: '',
priceExcludingTax: '',
totalPriceExcludingTax: '',
- qualityPlan: '',
+ coalPlanId: '',
pId: '',
},
mergeForm: {
@@ -291,20 +305,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" }],
}
})
@@ -455,7 +469,8 @@
}
// 鍚堝苟搴撳瓨鏁版嵁鏂规硶
const mergeRows = (type,row) => {
- coalFieldListOption();
+ getDropdownData()
+ coalPlanListOptions()
mergeVisible.value = true;
operationType.value = type;
if (type === 'edit') {
--
Gitblit v1.9.3