From e875ccb607bc37c9515217277aafb3d4204c6d14 Mon Sep 17 00:00:00 2001
From: chengxiangling <291105840@qq.com>
Date: 星期五, 16 五月 2025 15:23:56 +0800
Subject: [PATCH] 提交计划运行和基础数据的搜索条件
---
src/views/mainPlan/pipeProduceStatics/index.vue | 106 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 80 insertions(+), 26 deletions(-)
diff --git a/src/views/mainPlan/pipeProduceStatics/index.vue b/src/views/mainPlan/pipeProduceStatics/index.vue
index 1e9835d..5884192 100644
--- a/src/views/mainPlan/pipeProduceStatics/index.vue
+++ b/src/views/mainPlan/pipeProduceStatics/index.vue
@@ -15,6 +15,7 @@
v-model="queryParams.searchType"
placeholder="Select"
@change="handleChangeSelectType"
+
>
<el-option
v-for="item in options"
@@ -26,7 +27,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item :label="$t('plan.query.selectDateRange')" :style="{ width: '100%' }">
+ <el-form-item
+ :label="
+ !dayCom
+ ? $t('plan.query.selectDateRange')
+ : $t('plan.query.selectDateMonth')
+ "
+ :style="{ width: '100%' }"
+ >
<div v-if="!dayCom">
<el-date-picker
v-model="queryParams.monthRange"
@@ -45,7 +53,27 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="8" style="text-align: right">
+ <el-col :span="8" v-if="dayCom">
+ <el-form-item
+ :label="$t('basic.table.applicableFactories')"
+ prop="plant"
+ :style="{ width: '100%' }"
+ >
+ <el-select
+ clearable
+ v-model="queryParams.applicableFactory"
+ :placeholder="$t('basic.table.applicableFactories')"
+ >
+ <el-option
+ v-for="item in aps_factory"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="6" style="text-align:right;">
<el-form-item class="column-with-margin">
<el-button type="primary" icon="Search" @click="handleQuery">{{
$t("common.common.query")
@@ -54,7 +82,7 @@
$t("common.common.reset")
}}</el-button>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -79,7 +107,11 @@
>{{ $t("common.common.update") }}</el-button
>
</el-col>
- <right-toolbar @queryTable="handleQuery" :search="false"></right-toolbar>
+ <right-toolbar
+ v-model:showSearch="showSearch"
+ @queryTable="handleQuery"
+ @resetTable="resetQuery"
+ ></right-toolbar>
</el-row>
<!-- <div class="box_container"> -->
<!-- <div class="title_text">绠¤矾瑙勫垝浜ц兘璐熻浇缁熻</div> -->
@@ -242,26 +274,43 @@
}
// headersOne.push(t("plan.table.dateYearMonth"));
// headersTwo.push(t("plan.table.processName"));
- colList.push({
- field: "dateCol",
- title: t("plan.table.dateYearMonth"),
- fixed: "left",
- children: [
- {
- field: `resourceName`,
- title: t("plan.table.processName"),
- width: 250,
- type: "html",
- },
- {
- field: `resourceGroupName`,
- title: t("plan.table.applicableFactories"),
- width: 250,
- type: "html",
- },
- ],
- width: 160,
- });
+ if (!dayCom.value) {
+ colList.push({
+ field: "dateCol",
+ title: t("plan.table.dateYearMonth"),
+ fixed: "left",
+ children: [
+ {
+ field: `resourceName`,
+ title: t("plan.table.processName"),
+ width: 250,
+ type: "html",
+ },
+ {
+ field: `resourceGroupName`,
+ title: t("plan.table.applicableFactories"),
+ width: 250,
+ type: "html",
+ },
+ ],
+ width: 160,
+ });
+ }else{
+ colList.push({
+ field: "dateCol",
+ title: t("plan.table.dateYearMonth"),
+ fixed: "left",
+ children: [
+ {
+ field: `resourceName`,
+ title: t("plan.table.processName"),
+ width: 250,
+ type: "html",
+ }
+ ],
+ width: 160,
+ });
+ }
response.data.planTitle.forEach((item) => {
colKey++;
colList.push({
@@ -314,8 +363,13 @@
// item[`resourceName`] = flag
// ? `<div class='el-badge'><sup class="el-badge__content is-fixed is-dot"></sup>${key}</div>`
// : key;
- item[`resourceName`] = key.split("_")[0];
- item[`resourceGroupName`] = formatTypeLabelPlant([key.split("_")[1]]);
+ if (!dayCom.value) {
+ const lastIndex = key.lastIndexOf('_');
+ item[`resourceName`] = key.slice(0, lastIndex);
+ item[`resourceGroupName`] = formatTypeLabelPlant([key.slice(lastIndex + 1)]);
+ }else{
+ item[`resourceName`] = key
+ }
}
dataList.push(item);
});
--
Gitblit v1.9.3