From 6dfb5e44a7072d78ca6c04d21b7ed8ad126b874f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 01 七月 2025 14:05:44 +0800
Subject: [PATCH] 1.巡检管理频次选择逻辑修改
---
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 2dfca16..7fd5435 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -39,7 +39,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>
@@ -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"
@@ -217,6 +217,20 @@
</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>
<el-divider></el-divider>
<el-row>
<el-col :span="12" v-for="item in filteredList" :key="item.id">
@@ -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