From 049dd638c4de83fd8415c258c29d9ef71fd58141 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 01 七月 2025 17:20:03 +0800
Subject: [PATCH] 1.巡检管理新建逻辑修改
---
src/views/warehouseManagement/index.vue | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 2dfca16..a110ae1 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -1,18 +1,10 @@
<template>
<div class="app-container">
<el-form :inline="true" :model="queryParams" class="search-form">
- <el-form-item label="渚涘簲鍟嗗悕绉�">
+ <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="璇疯緭鍏�"
+ v-model="queryParams.searchAll"
+ placeholder="璇疯緭鍏ュ叧閿瓧"
clearable
:style="{ width: '100%' }"
/>
@@ -39,7 +31,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 +126,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 +209,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 +285,7 @@
totalPriceIncludingTax: '',
priceExcludingTax: '',
totalPriceExcludingTax: '',
- qualityPlan: '',
+ coalPlanId: '',
pId: '',
},
mergeForm: {
@@ -291,20 +297,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 +325,7 @@
]);
// 鏌ヨ鍙傛暟
const queryParams = reactive({
- supplierName: "",
- coal: "",
+ searchAll: "",
})
const columnTitle = ref([])
const supplyList = ref([]);
@@ -455,7 +460,8 @@
}
// 鍚堝苟搴撳瓨鏁版嵁鏂规硶
const mergeRows = (type,row) => {
- coalFieldListOption();
+ getDropdownData()
+ coalPlanListOptions()
mergeVisible.value = true;
operationType.value = type;
if (type === 'edit') {
--
Gitblit v1.9.3