From 73a77a02195912712c7168bd78cb3857df5094a8 Mon Sep 17 00:00:00 2001
From: chengxiangling <291105840@qq.com>
Date: 星期二, 13 五月 2025 09:23:55 +0800
Subject: [PATCH] 提交修改查询条件区域样式
---
.env.development | 2
src/views/mainPlan/sheetMetalSupplyGap/index.vue | 8
src/utils/i18n/locales/plan/index.js | 2
src/views/mainPlan/plateProcessStat/index.vue | 76 ++++++------
src/views/partPlan/index.vue | 50 ++++---
src/views/mainPlan/platePlan/index.vue | 164 ++++++++++++++------------
src/views/mainPlan/gasPiping/index.vue | 10
7 files changed, 167 insertions(+), 145 deletions(-)
diff --git a/.env.development b/.env.development
index f0b6c1e..605a602 100644
--- a/.env.development
+++ b/.env.development
@@ -10,4 +10,4 @@
# 閰嶅悎鍚庣鏈嶅姟
# VITE_APP_LOCAL = 'int'
# VITE_APP_LOCAL = 'zhl'
-VITE_APP_LOCAL = 'sfd'
\ No newline at end of file
+VITE_APP_LOCAL = 'hjy'
\ No newline at end of file
diff --git a/src/utils/i18n/locales/plan/index.js b/src/utils/i18n/locales/plan/index.js
index db364b7..58035bd 100644
--- a/src/utils/i18n/locales/plan/index.js
+++ b/src/utils/i18n/locales/plan/index.js
@@ -229,7 +229,7 @@
selectMonth: "Select Month",
statistical: "Statistical method",
selectDateRange: "Select interval",
- requireTraceID: "Requirement traceability ID",
+ requireTraceID: "Require track ID",
itemNumber: "Item number",
},
upload: {
diff --git a/src/views/mainPlan/gasPiping/index.vue b/src/views/mainPlan/gasPiping/index.vue
index f051f78..4f5d3dd 100644
--- a/src/views/mainPlan/gasPiping/index.vue
+++ b/src/views/mainPlan/gasPiping/index.vue
@@ -5,12 +5,11 @@
ref="queryRef"
:inline="true"
v-show="showSearch"
- :label-width="locale === 'zh' ? '90px' : '140px'"
label-position="left"
>
<el-row :gutter="20">
<el-col :span="locale === 'zh' ? 12 : 12">
- <el-form-item :label="$t('plan.query.daterangePlanStartDay')">
+ <el-form-item :label-width="locale === 'zh' ? '90px' : '140px'" :label="$t('plan.query.daterangePlanStartDay')">
<el-date-picker
:style="{ width: locale === 'zh' ? '220px' : '240px' }"
v-model="daterangePlanStartDay"
@@ -23,7 +22,7 @@
</el-form-item>
</el-col>
<el-col :span="locale === 'zh' ? 12 : 12">
- <el-form-item :label="$t('plan.query.daterangePlanEndDay')">
+ <el-form-item :label-width="locale === 'zh' ? '90px' : '140px'" :label="$t('plan.query.daterangePlanEndDay')">
<el-date-picker
:style="{ width: locale === 'zh' ? '220px' : '240px' }"
v-model="daterangePlanEndDay"
@@ -36,9 +35,10 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row :gutter="20">
<el-col :span="locale === 'zh' ? 12 : 12">
<el-form-item
+ :label-width="locale === 'zh' ? '90px' : '140px'"
:label="$t('plan.query.documentNumber')"
prop="documentNumber"
>
@@ -52,7 +52,7 @@
</el-form-item>
</el-col>
<el-col :span="locale === 'zh' ? 12 : 12">
- <el-form-item :label="$t('plan.query.customer')" prop="customer">
+ <el-form-item :label-width="locale === 'zh' ? '90px' : '140px'" :label="$t('plan.query.customer')" prop="customer">
<el-input
:style="{ width: locale === 'zh' ? '220px' : '240px' }"
v-model="queryParams.customer"
diff --git a/src/views/mainPlan/platePlan/index.vue b/src/views/mainPlan/platePlan/index.vue
index 74d6cf9..5547dba 100644
--- a/src/views/mainPlan/platePlan/index.vue
+++ b/src/views/mainPlan/platePlan/index.vue
@@ -1,79 +1,90 @@
<template>
<div class="app-container">
- <el-row :gutter="10" class="mb8">
- <el-form
- :model="queryParams"
- ref="queryRef"
- :inline="true"
- v-show="showSearch"
- :label-width="locale === 'zh' ? '90px' : '180px'"
- label-position="left"
- >
- <!-- <el-row :gutter="20">
- <el-col :span="6"> -->
- <el-form-item :label="$t('plan.query.daterangePlanStartDay')">
- <el-date-picker
- style="width: 240px"
- v-model="daterangePlanStartDay"
- value-format="YYYY-MM-DD"
- type="daterange"
- range-separator="-"
- :start-placeholder="$t('plan.placeholder.startDate')"
- :end-placeholder="$t('plan.placeholder.endDate')"
- ></el-date-picker>
- </el-form-item>
- <!-- </el-col>
- <el-col :span="6"> -->
- <el-form-item :label="$t('plan.query.daterangePlanEndDay')">
- <el-date-picker
- style="width: 240px"
- v-model="daterangePlanEndDay"
- value-format="YYYY-MM-DD"
- type="daterange"
- range-separator="-"
- :start-placeholder="$t('plan.placeholder.startDate')"
- :end-placeholder="$t('plan.placeholder.endDate')"
- ></el-date-picker>
- </el-form-item>
- <!-- </el-col>
- <el-col :span="6"> -->
- <el-form-item
- :label="$t('plan.query.documentNumber')"
- prop="documentNumber"
- >
- <el-input
- style="width: 240px"
- v-model="queryParams.documentNumber"
- :placeholder="$t('plan.placeholder.documentNumber')"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <!-- </el-col>
- <el-col :span="6"> -->
- <el-form-item :label="$t('plan.query.customer')" prop="customer">
- <el-input
- style="width: 240px"
- v-model="queryParams.customer"
- :placeholder="$t('plan.placeholder.customer')"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <!-- </el-col>
- <el-col :span="24" style="text-align: right;"> -->
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">{{
- $t("common.common.query")
- }}</el-button>
- <el-button icon="Refresh" @click="resetQuery">{{
- $t("common.common.reset")
- }}</el-button>
- </el-form-item>
- <!-- </el-col> -->
- <!-- </el-row> -->
- </el-form>
- </el-row>
+ <!-- <el-row :gutter="10" class="mb8"> -->
+ <el-form
+ :model="queryParams"
+ ref="queryRef"
+ :inline="true"
+ v-show="showSearch"
+ :label-width="locale === 'zh' ? '90px' : '180px'"
+ label-position="left"
+ >
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item
+ :label-width="locale === 'zh' ? '90px' : '140px'"
+ :label="$t('plan.query.daterangePlanStartDay')"
+ >
+ <el-date-picker
+ :style="{ width: locale === 'zh' ? '220px' : '240px' }"
+ v-model="daterangePlanStartDay"
+ value-format="YYYY-MM-DD"
+ type="daterange"
+ range-separator="-"
+ :start-placeholder="$t('plan.placeholder.startDate')"
+ :end-placeholder="$t('plan.placeholder.endDate')"
+ ></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item
+ :label-width="locale === 'zh' ? '90px' : '140px'"
+ :label="$t('plan.query.daterangePlanEndDay')"
+ >
+ <el-date-picker
+ :style="{ width: locale === 'zh' ? '220px' : '240px' }"
+ v-model="daterangePlanEndDay"
+ value-format="YYYY-MM-DD"
+ type="daterange"
+ range-separator="-"
+ :start-placeholder="$t('plan.placeholder.startDate')"
+ :end-placeholder="$t('plan.placeholder.endDate')"
+ ></el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item
+ :label-width="locale === 'zh' ? '90px' : '140px'"
+ :label="$t('plan.query.documentNumber')"
+ prop="documentNumber"
+ >
+ <el-input
+ :style="{ width: locale === 'zh' ? '220px' : '240px' }"
+ v-model="queryParams.documentNumber"
+ :placeholder="$t('plan.placeholder.documentNumber')"
+ clearable
+ @keyup.enter="handleQuery"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item :label="$t('plan.query.customer')" prop="customer">
+ <el-input
+ :style="{ width: locale === 'zh' ? '220px' : '240px' }"
+ v-model="queryParams.customer"
+ :placeholder="$t('plan.placeholder.customer')"
+ clearable
+ @keyup.enter="handleQuery"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24" style="text-align: right">
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">{{
+ $t("common.common.query")
+ }}</el-button>
+ <el-button icon="Refresh" @click="resetQuery">{{
+ $t("common.common.reset")
+ }}</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <!-- </el-row> -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -900,10 +911,11 @@
response.msg +
"</div>",
t("plan.upload.errorResult"),
- { dangerouslyUseHTMLString: true,
+ {
+ dangerouslyUseHTMLString: true,
confirmButtonText: t("plan.btns.confirm"),
cancelButtonText: t("plan.btns.cancel"),
- }
+ }
);
}
proxy.$refs["uploadRef"].handleRemove(file);
diff --git a/src/views/mainPlan/plateProcessStat/index.vue b/src/views/mainPlan/plateProcessStat/index.vue
index d2a01b7..63dff3b 100644
--- a/src/views/mainPlan/plateProcessStat/index.vue
+++ b/src/views/mainPlan/plateProcessStat/index.vue
@@ -1,41 +1,40 @@
<template>
<div class="app-container">
- <el-row :gutter="10" class="mb8">
- <!-- <el-col> -->
- <el-form
- :model="queryParams"
- ref="queryRef"
- :inline="true"
- v-show="showSearch"
- :label-width="locale === 'zh' ? '60px' : '150px'"
- label-position="left"
- >
- <!-- <el-row :gutter="20">
- <el-col :span="12"> -->
- <el-form-item :label="$t('plan.query.workOrderNo')" prop="num">
- <el-input
- style="width: 370px"
- v-model="queryParams.workOrderNo"
- :placeholder="$t('plan.placeholder.planWorkOderNO')"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <!-- </el-col>
- <el-col :span="12" style="text-align: right;"> -->
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">{{
- $t("common.common.query")
- }}</el-button>
- <el-button icon="Refresh" @click="resetQuery">{{
- $t("common.common.reset")
- }}</el-button>
- </el-form-item>
- <!-- </el-col>
- </el-row> -->
- </el-form>
- <!-- </el-col> -->
- </el-row>
+ <!-- <el-col> -->
+ <el-form
+ :model="queryParams"
+ ref="queryRef"
+ :inline="true"
+ v-show="showSearch"
+ :label-width="locale === 'zh' ? '60px' : '150px'"
+ label-position="left"
+ >
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item :label="$t('plan.query.workOrderNo')" prop="num">
+ <el-input
+ :style="{ width: locale === 'zh' ? '200px' : '250px' }"
+ v-model="queryParams.workOrderNo"
+ :placeholder="`${$t('common.common.placeholder')}${$t(
+ 'plan.query.workOrderNo'
+ )}`"
+ clearable
+ @keyup.enter="handleQuery"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" style="text-align: right">
+ <el-form-item class="column-with-margin">
+ <el-button type="primary" icon="Search" @click="handleQuery">{{
+ $t("common.common.query")
+ }}</el-button>
+ <el-button icon="Refresh" @click="resetQuery">{{
+ $t("common.common.reset")
+ }}</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -210,7 +209,7 @@
type: "html",
},
{
- title: t("plan.table.OrderCompletionDate"),
+ title: t("plan.table.OrderCompletionDate"),
field: "orderPlanEndDay",
width: 200,
format: "YYYY-MM-DD HH:mm:ss",
@@ -387,6 +386,9 @@
getList();
</script>
<style lang="scss" scoped>
+.column-with-margin {
+ margin-right: 0px;
+}
::v-deep(.mytable-style.vxe-table .vxe-body--row.row-green) {
background-color: #187;
color: #fff;
diff --git a/src/views/mainPlan/sheetMetalSupplyGap/index.vue b/src/views/mainPlan/sheetMetalSupplyGap/index.vue
index bbd0c0e..7a5e4f8 100644
--- a/src/views/mainPlan/sheetMetalSupplyGap/index.vue
+++ b/src/views/mainPlan/sheetMetalSupplyGap/index.vue
@@ -11,21 +11,21 @@
<el-row type="flex" justify="left">
<el-col :span="locale === 'zh' ?6 :9">
<el-form-item
- :label-width="locale === 'zh' ? '90px' : '200px'"
+ :label-width="locale === 'zh' ? '90px' : '130px'"
:label="$t('plan.query.requireTraceID')"
prop="requireTrackId"
>
<el-input
- :style="{ width: locale === 'zh' ? '140px' : '200px' }"
+ :style="{ width: locale === 'zh' ? '140px' : '230px' }"
v-model="queryParams.requireTrackId"
- :placeholder="`${$t('plan.placeholder.requireTraceID')}`"
+ :placeholder="`${$t('common.common.placeholder')}${$t('plan.query.requireTraceID')}`"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="locale === 'zh' ? 8 : 9">
- <el-form-item :label-width="locale === 'zh' ? '48px' : '200px'" :label="$t('plan.query.itemNumber')" prop="bomLineCode">
+ <el-form-item :label-width="locale === 'zh' ? '48px' : '100px'" :label="$t('plan.query.itemNumber')" prop="bomLineCode">
<el-input
:style="{ width: locale === 'zh' ? '140px' : '210px' }"
v-model="queryParams.bomLineCode"
diff --git a/src/views/partPlan/index.vue b/src/views/partPlan/index.vue
index 60b09a8..d208ab2 100644
--- a/src/views/partPlan/index.vue
+++ b/src/views/partPlan/index.vue
@@ -5,15 +5,14 @@
ref="queryRef"
:inline="true"
v-show="showSearch"
- :label-width="locale === 'zh' ? '90px' : '180px'"
label-position="left"
>
- <el-row :gutter="10" class="mb8">
- <!-- <el-col
- :span="6"> -->
- <el-form-item :label="$t('plan.query.daterangePlanStartDay')">
+ <el-row :gutter="20" class="mb8">
+ <el-col
+ :span="12">
+ <el-form-item :label-width="locale === 'zh' ? '90px' : '140px'" :label="$t('plan.query.daterangePlanStartDay')">
<el-date-picker
- style="width: 240px"
+ :style="{ width: locale === 'zh' ? '220px' : '240px' }"
v-model="daterangePlanStartDay"
value-format="YYYY-MM-DD"
type="daterange"
@@ -22,11 +21,11 @@
:end-placeholder="$t('plan.placeholder.endDate')"
></el-date-picker>
</el-form-item>
- <!-- </el-col>
- <el-col :span="6"> -->
- <el-form-item :label="$t('plan.query.daterangePlanEndDay')">
+ </el-col>
+ <el-col :span="12">
+ <el-form-item :label-width="locale === 'zh' ? '90px' : '140px'" :label="$t('plan.query.daterangePlanEndDay')">
<el-date-picker
- style="width: 240px"
+ :style="{ width: locale === 'zh' ? '220px' : '240px' }"
v-model="daterangePlanEndDay"
value-format="YYYY-MM-DD"
type="daterange"
@@ -35,14 +34,18 @@
:end-placeholder="$t('plan.placeholder.endDate')"
></el-date-picker>
</el-form-item>
- <!-- </el-col>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
<el-col
- :span="6"> -->
+ :span="12">
<el-form-item
+ :label-width="locale === 'zh' ? '90px' : '140px'"
:label="$t('plan.query.documentNumber')"
prop="documentNumber"
>
<el-input
+ :style="{ width: locale === 'zh' ? '220px' : '240px' }"
v-model="queryParams.documentNumber"
:placeholder="$t('plan.placeholder.documentNumber')"
clearable
@@ -50,23 +53,25 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
- <!-- </el-col>
+ </el-col>
<el-col
- :span="6"> -->
- <el-form-item :label="$t('plan.query.customer')" prop="customer">
+ :span="12">
+ <el-form-item :label-width="locale === 'zh' ? '90px' : '140px'" :label="$t('plan.query.customer')" prop="customer">
<el-input
- style="width: 240px"
+ :style="{ width: locale === 'zh' ? '220px' : '240px' }"
v-model="queryParams.customer"
:placeholder="$t('plan.placeholder.customer')"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
- <!-- </el-col>
+ </el-col>
+ </el-row>
+ <el-row>
<el-col
:span="24"
- style="text-align: right;"> -->
- <el-form-item>
+ style="text-align: right;">
+ <el-form-item class="column-with-margin">
<el-button type="primary" icon="Search" @click="handleQuery">{{
$t("common.common.query")
}}</el-button>
@@ -74,8 +79,8 @@
$t("common.common.reset")
}}</el-button>
</el-form-item>
- <!-- </el-col>
- -->
+ </el-col>
+
</el-row>
</el-form>
@@ -875,6 +880,9 @@
getList();
</script>
<style lang="css" scoped>
+.column-with-margin {
+ margin-right: 0px;
+}
h4 {
font-weight: bold;
}
--
Gitblit v1.9.3