From db6e95062dfb57bcd1fb1cacdbb3cb4372c576b0 Mon Sep 17 00:00:00 2001
From: chengxiangling <291105840@qq.com>
Date: 星期三, 14 五月 2025 17:34:00 +0800
Subject: [PATCH] 钣金页面表格样式;
---
.env.development | 2
dist.zip | 0
src/views/mainPlan/sheetMetalSupplyGap/index.vue | 18 +++---
src/views/mainPlan/plateProcessStat/index.vue | 2
src/views/mainPlan/platePlanList/index.vue | 13 ++--
src/views/mainPlan/platePlan/index.vue | 31 ++++++----
src/views/basicData/calendar/index.vue | 67 +++++++++++-----------
src/views/mainPlan/sheetMetalRedundantReport/index.vue | 17 ++---
8 files changed, 76 insertions(+), 74 deletions(-)
diff --git a/.env.development b/.env.development
index 5541762..605a602 100644
--- a/.env.development
+++ b/.env.development
@@ -10,4 +10,4 @@
# 閰嶅悎鍚庣鏈嶅姟
# VITE_APP_LOCAL = 'int'
# VITE_APP_LOCAL = 'zhl'
-VITE_APP_LOCAL = 'lhj'
\ No newline at end of file
+VITE_APP_LOCAL = 'hjy'
\ No newline at end of file
diff --git a/dist.zip b/dist.zip
index fb1e0e1..8b6f1a4 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/views/basicData/calendar/index.vue b/src/views/basicData/calendar/index.vue
index a0f174e..6f72c18 100644
--- a/src/views/basicData/calendar/index.vue
+++ b/src/views/basicData/calendar/index.vue
@@ -413,7 +413,7 @@
<div class="grey_bg">
<div
class="flex_holidays_set"
- v-for="(item, index) in formHolidays"
+ v-for="(item, index) in formHolidays.holidays"
:key="index"
>
<div class="dis_error_wrap">
@@ -429,7 +429,9 @@
/>
</div>
</div>
- <div class="error_text">璇疯緭鍏ヨ妭鍋囨棩鎻忚堪</div>
+ <div class="error_text" v-if="item.describe == ''">
+ 璇疯緭鍏ヨ妭鍋囨棩鎻忚堪
+ </div>
</div>
<div class="dis_error_wrap">
<div class="flex_item">
@@ -449,7 +451,9 @@
</el-date-picker>
</div>
</div>
- <div class="error_text">璇疯緭鍏ュ紑濮嬫椂闂�</div>
+ <div class="error_text" v-if="item.startdate == ''">
+ 璇疯緭鍏ュ紑濮嬫椂闂�
+ </div>
</div>
<div class="dis_error_wrap">
<div class="flex_item">
@@ -469,7 +473,9 @@
</el-date-picker>
</div>
</div>
- <div class="error_text">璇疯緭鍏ョ粨鏉熸椂闂�</div>
+ <div class="error_text" v-if="item.enddate == ''">
+ 璇疯緭鍏ョ粨鏉熸椂闂�
+ </div>
</div>
<div class="dis_error_wrap">
<div class="flex_item">
@@ -1031,37 +1037,32 @@
// };
// 鎻愪氦鑺傚亣鏃�
function handleSaveHolidaysForm() {
- console.log(holidaysRef.value, "琛ㄥ崟dom");
+ const hasValidDates = formHolidays.value.holidays.some(
+ (item) => item.enddate && item.startdate && item.describe
+ );
+ console.log(hasValidDates, "hasValidDates");
// holidaysRef.value.validate((valid) => {
- // console.log(valid,"valid")
- // if (valid) {
- // proxy.$modal.msgSuccess('submit!');
- // } else {
- // proxy.$modal.msgSuccess('Form is not valid.');
- // return false;
+ // if (!valid) {
+ // proxy.$modal.msgSuccess("蹇呭～椤逛笉鑳戒负绌�");
// }
- // })
- holidaysRef.value.validate((valid) => {
- if (!valid) {
- proxy.$modal.msgSuccess("蹇呭～椤逛笉鑳戒负绌�");
- }
- if (valid) {
- updateCalendar({
- id: form.value.id,
- holidays: formHolidays.value.holidays.map((item) => {
- return {
- startdate: moment(item.startdate).format("YYYY-MM-DD"),
- enddate: moment(item.enddate).format("YYYY-MM-DD"),
- describe: item.describe,
- };
- }),
- }).then((response) => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- });
- }
- });
+ //if (valid) {
+ if (!hasValidDates) {
+ updateCalendar({
+ id: form.value.id,
+ holidays: formHolidays.value.holidays.map((item) => {
+ return {
+ startdate: moment(item.startdate).format("YYYY-MM-DD"),
+ enddate: moment(item.enddate).format("YYYY-MM-DD"),
+ describe: item.describe,
+ };
+ }),
+ }).then((response) => {
+ proxy.$modal.msgSuccess("鏂板鎴愬姛");
+ open.value = false;
+ getList();
+ });
+ }
+ // });
}
/** 鎻愪氦鎸夐挳 */
function submitForm() {
diff --git a/src/views/mainPlan/platePlan/index.vue b/src/views/mainPlan/platePlan/index.vue
index af2c5f3..04ed943 100644
--- a/src/views/mainPlan/platePlan/index.vue
+++ b/src/views/mainPlan/platePlan/index.vue
@@ -567,7 +567,7 @@
{
title: t("plan.table.mainPartNumber"),
field: "mainPartNumber",
- width: 150,
+ width: 160
},
// {
// title: '涓讳欢鍥惧彿',
@@ -577,37 +577,37 @@
{
title: t('plan.table.customer'),
field: 'customer',
- width: 200,
+ width: 160
},
{
title: t("plan.table.businessType"),
field: "businessType",
- width: 100,
+ width: "auto",
},
{
title: t("plan.table.documentNumber"),
field: "documentNumber",
- width: 140,
+ width: "auto",
},
{
title: t("plan.table.requirementType"),
field: "requirementType",
- width: 100,
+ width: "auto",
},
{
title: t("plan.table.documentStatus"),
field: "documentStatus",
- width: 100,
+ width: "auto",
},
{
title: t("plan.table.itemNumber"),
field: "itemNumber",
- width: 100,
+ width: "auto",
},
{
title: t("plan.table.drawingNo"),
field: "drawingNo",
- width: 100,
+ width: 200,
},
// {
// title: '鐗堟湰鍙�',
@@ -617,7 +617,7 @@
{
title: t("plan.table.productionQuantity"),
field: "productionQuantity",
- width: 100,
+ width: "auto",
},
// {
// title: '鑹搧鏁伴噺',
@@ -627,12 +627,12 @@
{
title: t("plan.table.processNumber"),
field: "processNumber",
- width: 100,
+ width: "auto",
},
{
title: t("plan.table.factoryCenter"),
field: "workCenter",
- width: 180,
+ width: "auto",
},
// {
// title: '鎵�灞為儴闂�',
@@ -647,7 +647,7 @@
{
title: t("plan.table.planEndDayDate"),
field: "planEndDay",
- width: 100,
+ width: 160,
},
// {
// title: '澶囨枡鏂欏彿',
@@ -682,7 +682,7 @@
{
title: t('plan.table.account'),
field: 'account',
- width: 100,
+ width: "auto",
// formatter: ({ cellValue, row, column }) => {
// if (cellValue) {
// console.log(cellValue,aps_account.value,"llll")
@@ -1056,3 +1056,8 @@
font-weight: bold;
}
</style>
+<style>
+.vxe-cell{
+ padding:0 20px;
+}
+</style>
diff --git a/src/views/mainPlan/platePlanList/index.vue b/src/views/mainPlan/platePlanList/index.vue
index 0f121dd..be15403 100644
--- a/src/views/mainPlan/platePlanList/index.vue
+++ b/src/views/mainPlan/platePlanList/index.vue
@@ -166,13 +166,13 @@
{
title: t("plan.table.mainPartCustomer"),
field: "customer",
- width: "auto",
+ width: "200",
fixed: "left",
},
{
title: t("plan.table.mainPartNumber"),
field: "mainPartNumber",
- width: "auto",
+ width: "120",
fixed: "left",
},
{
@@ -184,7 +184,7 @@
{
title: t("plan.table.documentNumber"),
field: "documentNumber",
- width: "auto",
+ width: "180",
fixed: "left",
},
{
@@ -207,7 +207,7 @@
{
title: t("plan.table.workCenter"),
field: "workCenter",
- width: "auto",
+ width: "180",
},
{
title: t("plan.table.department"),
@@ -232,7 +232,6 @@
{
title: t("plan.table.itemNumber"),
field: "itemNumber",
- width: "auto",
type: "html",
},
{
@@ -261,12 +260,12 @@
{
title: t("plan.table.workorderCreationTime"),
field: "orderCreateTime",
- width: "auto",
+ width: "160",
},
{
title: t("plan.table.workOrderReviewTime"),
field: "approveOn",
- width: "auto",
+ width: "160",
},
{
title: t("plan.table.workOrderStartTime"),
diff --git a/src/views/mainPlan/plateProcessStat/index.vue b/src/views/mainPlan/plateProcessStat/index.vue
index 13fd74c..ead9f03 100644
--- a/src/views/mainPlan/plateProcessStat/index.vue
+++ b/src/views/mainPlan/plateProcessStat/index.vue
@@ -165,7 +165,7 @@
{
title: t("plan.table.workOrderNo"),
field: "workOrderNo",
- width: "auto",
+ width: "180"
},
{
title: t("plan.table.processName"),
diff --git a/src/views/mainPlan/sheetMetalRedundantReport/index.vue b/src/views/mainPlan/sheetMetalRedundantReport/index.vue
index d667dca..b5c295a 100644
--- a/src/views/mainPlan/sheetMetalRedundantReport/index.vue
+++ b/src/views/mainPlan/sheetMetalRedundantReport/index.vue
@@ -78,7 +78,6 @@
@changePageNo="changePageNo"
@changePageSize="changePageSize"
@on-checkbox="handleCheckboxChange"
- class="auto-height-grid"
>
</HxlhTable>
</div>
@@ -121,31 +120,29 @@
{
title: t("plan.table.workOrderNo"),
field: "documentNumber",
- width: 150,
align: "center",
},
{
title: t("plan.table.itemNumber"),
field: "itemNumber",
- width: 200,
align: "center",
},
{
title: t("plan.table.productionQuantity"),
field: "productionQuantity",
- width: 200,
+ width: "80",
align: "center",
},
{
title: t("plan.table.mismatchedProductionQuantity"),
field: "unmatchedQuantity",
- width: 200,
+ width: "auto",
align: "center",
},
{
title: t("plan.table.applicableFactories"),
field: "plant",
- width: 200,
+ width: "100",
align: "center",
formatter: ({ cellValue, row, column }) => {
if (cellValue) {
@@ -160,25 +157,25 @@
{
title: t("plan.table.productionBase"),
field: "productionBase",
- width: 200,
+ width: "100",
align: "center",
},
{
title: t("plan.table.planStartDay"),
field: "planStartDay",
- width: 200,
+ width: "120",
align: "center",
},
{
title: t("plan.table.planEndDayDate"),
field: "planEndDay",
- width: 200,
+ width: "120",
align: "center",
},
{
title: t("plan.table.workorderCreationTime"),
field: "orderCreateTime",
- width: 200,
+ width: "150",
align: "center",
},
];
diff --git a/src/views/mainPlan/sheetMetalSupplyGap/index.vue b/src/views/mainPlan/sheetMetalSupplyGap/index.vue
index b5603a6..81960a4 100644
--- a/src/views/mainPlan/sheetMetalSupplyGap/index.vue
+++ b/src/views/mainPlan/sheetMetalSupplyGap/index.vue
@@ -127,19 +127,19 @@
{
title: t("plan.table.requireID"),
field: "id",
- width: 150,
+ width: "180",
align: "center",
},
{
title: t("plan.table.requireTraceID"),
field: "requireTrackId",
- width: 200,
+ width: "180",
align: "center",
},
{
title: t("plan.table.itemNumber"),
field: "bomLineCode",
- width: 200,
+ width: "auto",
align: "center",
},
// {
@@ -163,31 +163,31 @@
{
title: t("plan.table.unmatchedDemandQuantity"),
field: "unmatchedDemandAmount",
- width: 200,
+ width: "auto",
align: "center",
},
{
title: t("plan.table.planStartDay"),
field: "startDate",
- width: 200,
+ width: 162,
align: "center",
},
{
title: t("plan.table.planEndDayDate"),
field: "completeDate",
- width: 200,
+ width: 162,
align: "center",
},
{
title: t("plan.table.requirementDate"),
field: "demandDate",
- width: 200,
+ width: 162,
align: "center",
},
{
title: t("plan.table.applicableFactories"),
field: "orgCode",
- width: 200,
+ width: "auto",
align: "center",
formatter: ({ cellValue, row, column }) => {
if (cellValue) {
@@ -202,7 +202,7 @@
{
title: t("plan.table.productionBase"),
field: "productionBase",
- width: 200,
+ width: "auto",
align: "center",
},
];
--
Gitblit v1.9.3