From 63f27f3c60e8c608f6bf9586444fa20f4ef16b42 Mon Sep 17 00:00:00 2001
From: chengxiangling <291105840@qq.com>
Date: 星期三, 14 五月 2025 13:45:59 +0800
Subject: [PATCH] 提交钣金计划大表等;
---
.env.development | 2
dist.zip | 0
src/views/mainPlan/sheetMetalOrderManage/index.vue | 2
src/utils/i18n/locales/plan/index.js | 16 +++-
src/views/mainPlan/platePlanList/index.vue | 45 +++++++++++---
src/views/mainPlan/platePlan/index.vue | 75 +++++++++++++-----------
6 files changed, 87 insertions(+), 53 deletions(-)
diff --git a/.env.development b/.env.development
index 605a602..5541762 100644
--- a/.env.development
+++ b/.env.development
@@ -10,4 +10,4 @@
# 閰嶅悎鍚庣鏈嶅姟
# VITE_APP_LOCAL = 'int'
# VITE_APP_LOCAL = 'zhl'
-VITE_APP_LOCAL = 'hjy'
\ No newline at end of file
+VITE_APP_LOCAL = 'lhj'
\ No newline at end of file
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..fb1e0e1
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/utils/i18n/locales/plan/index.js b/src/utils/i18n/locales/plan/index.js
index f3700a2..ff6685f 100644
--- a/src/utils/i18n/locales/plan/index.js
+++ b/src/utils/i18n/locales/plan/index.js
@@ -89,6 +89,7 @@
uploadErrorParseWeldSeamData: "鐒婄紳宸ュ崟鏁版嵁宸茶В鏋愬け璐�",
},
table: {
+ mainPartCustomer:"涓讳欢瀹㈡埛",
mainPartNumber: "涓讳欢鏂欏彿",
businessType: "涓氬姟绫诲瀷",
documentNumber: "鍗曟嵁鍙�",
@@ -97,10 +98,10 @@
documentStatus: "鍗曟嵁鐘舵��",
updateBy: "瀹℃牳鏃堕棿",
workCenter: "褰撳墠宸ュ簭",
- department: "褰撳墠宸ュ簭璐熻矗浜�",
+ department: "褰撳墠宸ュ簭璐熻矗閮ㄩ棬",
opStatus: "褰撳墠宸ュ簭鐘舵��",
nextOpName: "涓嬩竴宸ュ簭",
- nextProcessDeparment: "涓嬩竴宸ュ簭璐熻矗浜�",
+ nextProcessDeparment: "涓嬩竴宸ュ簭璐熻矗閮ㄩ棬",
itemNumber: "鏂欏彿",
drawingNo: "鍥惧彿",
versionNumber: "鐗堟湰鍙�",
@@ -141,7 +142,7 @@
salesOrder: "閿�鍞鍗曞彿",
salesOrderLine: "閿�鍞鍗曡",
goodProductsQuantity: "鑹搧鏁伴噺",
- processNumber: "宸ュ簭搴忓彿",
+ processNumber: "宸ュ簭鍙�",
factoryCenter: "宸ヤ綔涓績",
dependencyDepartment: "鎵�灞為儴闂�",
planStartDay: "璁″垝寮�宸ユ棩",
@@ -202,6 +203,8 @@
subItemPartNumber: "瀛愪欢鏂欏彿",
mismatchedProductionQuantity: "鏈尮閰嶇敓浜ф暟閲�",
workorderCreationTime: "宸ュ崟鍒涘缓鏃堕棿",
+ workOrderReviewTime:"宸ュ崟瀹℃牳鏃堕棿",
+ workOrderStartTime: "宸ュ崟寮�宸ユ椂闂�",
delayRiskIdentification: "寤惰繜椋庨櫓鏍囪瘑",
startDateOfDemandPlan: "闇�姹傝鍒掑紑宸ユ棩",
requirementPlanCompletionDate: "闇�姹傝鍒掑畬宸ユ棩",
@@ -314,6 +317,7 @@
uploadErrorParseWeldSeamData: "Failed to parse weld work order data",
},
table: {
+ mainPartCustomer: "Main part customer",
mainPartNumber: "Main part number",
businessType: "Business type",
documentNumber: "Document number",
@@ -322,10 +326,10 @@
documentStatus: "Document Status",
updateBy: "Audit time",
workCenter: "Current process",
- department: "Current process leader",
+ department: "Current process deparment",
opStatus: "Current process status",
nextOpName: "Next process",
- nextProcessDeparment: "Next Process Manager",
+ nextProcessDeparment: "Next process deparment",
itemNumber: "Item number",
drawingNo: "Drawing No",
versionNumber: "Version number",
@@ -427,6 +431,8 @@
subItemPartNumber: "Sub Item Part Number",
mismatchedProductionQuantity: "Mismatched Production Quantity",
workorderCreationTime: "Work order creation time",
+ workOrderReviewTime:"Work order review time",
+ workOrderStartTime: "Work order start time",
delayRiskIdentification: "Delay risk identification",
startDateOfDemandPlan: "Start date of demand plan",
requirementPlanCompletionDate: "Requirement plan completion date",
diff --git a/src/views/mainPlan/platePlan/index.vue b/src/views/mainPlan/platePlan/index.vue
index 6150ce4..af2c5f3 100644
--- a/src/views/mainPlan/platePlan/index.vue
+++ b/src/views/mainPlan/platePlan/index.vue
@@ -275,15 +275,9 @@
const { proxy } = getCurrentInstance();
const { t, locale } = useI18n();
const {
- aps_is_suspended,
- aps_document_status,
aps_account,
- aps_business_type,
} = proxy.useDict(
- "aps_is_suspended",
- "aps_document_status",
- "aps_account",
- "aps_business_type"
+ "aps_account"
);
const exampleList = ref([]);
const planList = ref([]);
@@ -541,6 +535,7 @@
width: 60,
align: "center",
slots: { content: "expandContent" },
+ fixed:"left",
},
{ type: "checkbox", width: 60, align: "center" },
{ type: "seq", title: t("plan.table.seq"), width: 60 },
@@ -579,11 +574,11 @@
// field: 'mainPartDrawingNumber',
// width: 150,
// },
- // {
- // title: '瀹㈡埛鍚嶇О',
- // field: 'customer',
- // width: 200,
- // },
+ {
+ title: t('plan.table.customer'),
+ field: 'customer',
+ width: 200,
+ },
{
title: t("plan.table.businessType"),
field: "businessType",
@@ -684,11 +679,21 @@
// field: 'isOutsourcing',
// width: 100,
// },
- // {
- // title: '璐﹀',
- // field: 'account',
- // width: 100,
- // },
+ {
+ title: t('plan.table.account'),
+ field: 'account',
+ width: 100,
+ // formatter: ({ cellValue, row, column }) => {
+ // if (cellValue) {
+ // console.log(cellValue,aps_account.value,"llll")
+ // for (let i = 0; i < aps_account.value.length; i++) {
+ // if (cellValue === aps_account.value[i].value) {
+ // return aps_account.value[i].label;
+ // }
+ // }
+ // }
+ // },
+ },
// {
// title: '涓婇樁鐗╂枡',
// field: 'advancedMaterials',
@@ -726,12 +731,12 @@
// },
];
subGridOptions.value.columns = [
- {
- title: t("plan.table.itemNumber"),
- field: "itemNo",
- width: 150,
- align: "center",
- },
+ // {
+ // title: t("plan.table.itemNumber"),
+ // field: "itemNo",
+ // width: 150,
+ // align: "center",
+ // },
{
title: t("plan.table.workOrderNo"),
field: "workOrderNo",
@@ -780,18 +785,18 @@
// width: 90,
// align:"center",
// },
- {
- title: t("plan.table.standardTime"),
- field: "standardTime",
- width: 90,
- align: "center",
- },
- {
- title: t("plan.table.processOrder"),
- field: "processOrder",
- width: 90,
- align: "center",
- },
+ // {
+ // title: t("plan.table.standardTime"),
+ // field: "standardTime",
+ // width: 90,
+ // align: "center",
+ // },
+ // {
+ // title: t("plan.table.processOrder"),
+ // field: "processOrder",
+ // width: 90,
+ // align: "center",
+ // },
{
title: t("plan.table.integrationDay"),
field: "integrationDay",
diff --git a/src/views/mainPlan/platePlanList/index.vue b/src/views/mainPlan/platePlanList/index.vue
index 67e83c4..af43b52 100644
--- a/src/views/mainPlan/platePlanList/index.vue
+++ b/src/views/mainPlan/platePlanList/index.vue
@@ -164,21 +164,27 @@
columns.value = [
/* { type: 'seq', title: '搴忓彿', width: 60 },*/
{
+ title: t("plan.table.mainPartCustomer"),
+ field: "customer",
+ width: 150,
+ fixed: "left",
+ },
+ {
title: t("plan.table.mainPartNumber"),
field: "mainPartNumber",
- width: 150,
+ width: 120,
fixed: "left",
},
{
title: t("plan.table.businessType"),
field: "businessType",
- width: 120,
+ width: 90,
fixed: "left",
},
{
title: t("plan.table.documentNumber"),
field: "documentNumber",
- width: 160,
+ width: 140,
fixed: "left",
},
{
@@ -190,7 +196,7 @@
{
title: t("plan.table.documentStatus"),
field: "documentStatus",
- width: 100,
+ width: 70,
fixed: "left",
},
{
@@ -253,10 +259,25 @@
type: "html",
},
{
- title: t("plan.table.planworkOrderTime"),
- field: "planworkOrderTime",
+ title: t("plan.table.workorderCreationTime"),
+ field: "orderCreateTime",
width: 200,
},
+ {
+ title: t("plan.table.workOrderReviewTime"),
+ field: "approveOn",
+ width: 200,
+ },
+ {
+ title: t("plan.table.workOrderStartTime"),
+ field: "startWorkDate",
+ width: 200,
+ },
+ // {
+ // title: t("plan.table.planworkOrderTime"),
+ // field: "planworkOrderTime",
+ // width: 200,
+ // },
{
title: t("plan.table.planEndDay"),
field: "planEndDay",
@@ -272,6 +293,7 @@
let listValue = response.data;
dynamicList.value = response.shopNames;
aps_plate_process_statList.value = listValue;
+ console.log(aps_plate_process_statList.value,"aps_plate_process_statList")
total.value = response.total;
loading.value = false;
await nextTick();
@@ -335,17 +357,18 @@
},
},
]);
- newArray.splice(2, 0, {
- title: "鐒婃帴浠堕綈濂楀紑濮嬫椂闂�",
- field: "hanjie_startDate",
- width: 140,
- });
+ // newArray.splice(2, 0, {
+ // title: "鐒婃帴浠堕綈濂楀紑濮嬫椂闂�",
+ // field: "hanjie_startDate",
+ // width: 140,
+ // });
columns.value = [
...columns.value,
...newArray.filter(
(item) => !columns.value.some((col) => col.field === item.field)
),
];
+
// columns.value = columns.value
}
diff --git a/src/views/mainPlan/sheetMetalOrderManage/index.vue b/src/views/mainPlan/sheetMetalOrderManage/index.vue
index 5ff1a2c..34c575a 100644
--- a/src/views/mainPlan/sheetMetalOrderManage/index.vue
+++ b/src/views/mainPlan/sheetMetalOrderManage/index.vue
@@ -852,7 +852,7 @@
loadingSubUpAndDown.value = true;
metalOrderManageUpAndDownList({requireId: row.requireId}).then((res) => {
console.log(res,"metalOrderManageUpAndDownList");
- subUpAndDownList.value = res;
+ subUpAndDownList.value = res.rows;
loadingSubUpAndDown.value = false;
}).catch(() => {
loadingSubUpAndDown.value = false;
--
Gitblit v1.9.3