From 7352927ebbabedaacc28e4972187e06236ac19ab Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Mon, 21 Apr 2025 17:48:47 +0800 Subject: [PATCH] 2025-04-21 --- .../projectInfo/com_project_puotation.vue | 22 +-- .../projectInfo/com_project_sample.vue | 38 ++--- .../com_project_technicalSpecification.vue | 44 +++--- .../project/projectInfo/com_project_test.vue | 38 ++--- .../com_project_toolApplyCation.vue | 139 +++++++++++------- .../project/projectPart/projectPartQuote.vue | 8 +- 6 files changed, 164 insertions(+), 125 deletions(-) diff --git a/src/views/modules/project/projectInfo/com_project_puotation.vue b/src/views/modules/project/projectInfo/com_project_puotation.vue index 4ce1708..8c02272 100644 --- a/src/views/modules/project/projectInfo/com_project_puotation.vue +++ b/src/views/modules/project/projectInfo/com_project_puotation.vue @@ -149,10 +149,10 @@ serialNumber: '102001Table1TestPartNo', tableId: '102001Table1', tableName: '询价信息表', - columnProp: 'testPartNo', + columnProp: 'plmPartNo', headerAlign: 'center', - align: 'center', - columnLabel: '物料编码', + align: 'left', + columnLabel: 'PLM物料编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -164,38 +164,38 @@ { userId: this.$store.state.user.name, functionId: 102001, - serialNumber: '102001Table1PartName', + serialNumber: '102001Table1FinalPartNo', tableId: '102001Table1', tableName: '询价信息表', - columnProp: 'partName', + columnProp: 'finalPartNo', headerAlign: 'center', align: 'left', - columnLabel: '物料描述', + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 80 }, { userId: this.$store.state.user.name, functionId: 102001, - serialNumber: '102001Table1FinalPartNo', + serialNumber: '102001Table1PartName', tableId: '102001Table1', tableName: '询价信息表', - columnProp: 'finalPartNo', + columnProp: 'partName', headerAlign: 'center', align: 'left', - columnLabel: 'IFS料号', + columnLabel: '物料描述', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name, diff --git a/src/views/modules/project/projectInfo/com_project_sample.vue b/src/views/modules/project/projectInfo/com_project_sample.vue index 86a3732..685d961 100644 --- a/src/views/modules/project/projectInfo/com_project_sample.vue +++ b/src/views/modules/project/projectInfo/com_project_sample.vue @@ -165,10 +165,10 @@ serialNumber: '103001Table1TestPartNo', tableId: '103001Table1', tableName: '打样信息表', - columnProp: 'testPartNo', + columnProp: 'plmPartNo', headerAlign: 'center', - align: 'center', - columnLabel: '物料编码', + align: 'left', + columnLabel: 'PLM物料编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -179,39 +179,39 @@ }, { userId: this.$store.state.user.name, - functionId: 103001, - serialNumber: '103001Table1PartName', - tableId: '103001Table1', - tableName: '打样信息表', - columnProp: 'partName', + functionId: 102001, + serialNumber: '102001Table1FinalPartNo', + tableId: '102001Table1', + tableName: '询价信息表', + columnProp: 'finalPartNo', headerAlign: 'center', - align: 'center', - columnLabel: '物料名称', + align: 'left', + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 80 }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1FinalPartNo', - tableId: '102001Table1', - tableName: '询价信息表', - columnProp: 'finalPartNo', + functionId: 103001, + serialNumber: '103001Table1PartName', + tableId: '103001Table1', + tableName: '打样信息表', + columnProp: 'partName', headerAlign: 'center', - align: 'left', - columnLabel: 'IFS料号', + align: 'center', + columnLabel: '物料名称', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name, diff --git a/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue b/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue index d8cf1bc..28736af 100644 --- a/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue +++ b/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue @@ -173,16 +173,17 @@ status: true, fixed: '', columnWidth: 80 - },{ + }, + { userId: this.$store.state.user.name, functionId: 101002001, serialNumber: '101002001Table9TestPartNo', tableId: "101002001Table9", tableName: "技术参数卡列表", - columnProp: "testPartNo", + columnProp: "plmPartNo", headerAlign: "center", align: "left", - columnLabel: "物料编码", + columnLabel: "PLM物料编码", columnHidden: false, columnImage: false, columnSortable: false, @@ -190,23 +191,6 @@ status: true, fixed: '', columnWidth: 80 - },{ - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table9PartName', - tableId: "101002001Table9", - tableName: "技术参数卡列表", - columnProp: "partDesc", - headerAlign: "center", - align: "left", - columnLabel: "物料名称", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 }, { userId: this.$store.state.user.name, @@ -217,7 +201,7 @@ columnProp: 'finalPartNo', headerAlign: 'center', align: 'left', - columnLabel: 'IFS料号', + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -226,6 +210,24 @@ fixed: '', columnWidth: 80 }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table9PartName', + tableId: "101002001Table9", + tableName: "技术参数卡列表", + columnProp: "partDesc", + headerAlign: "center", + align: "left", + columnLabel: "物料名称", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, { userId: this.$store.state.user.name, functionId: 102001, diff --git a/src/views/modules/project/projectInfo/com_project_test.vue b/src/views/modules/project/projectInfo/com_project_test.vue index b50d6b5..9556214 100644 --- a/src/views/modules/project/projectInfo/com_project_test.vue +++ b/src/views/modules/project/projectInfo/com_project_test.vue @@ -129,10 +129,10 @@ export default { serialNumber: '103001Table1TestPartNo', tableId: '103001Table1', tableName: '测试信息表', - columnProp: 'testPartNo', + columnProp: 'plmPartNo', headerAlign: 'center', - align: 'center', - columnLabel: '物料编码', + align: 'left', + columnLabel: 'PLM物料编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -143,39 +143,39 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 103001, - serialNumber: '103001Table1PartName', - tableId: '103001Table1', - tableName: '测试信息表', - columnProp: 'partName', + functionId: 102001, + serialNumber: '102001Table1FinalPartNo', + tableId: '102001Table1', + tableName: '询价信息表', + columnProp: 'finalPartNo', headerAlign: 'center', - align: 'center', - columnLabel: '物料名称', + align: 'left', + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 80 }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1FinalPartNo', - tableId: '102001Table1', - tableName: '询价信息表', - columnProp: 'finalPartNo', + functionId: 103001, + serialNumber: '103001Table1PartName', + tableId: '103001Table1', + tableName: '测试信息表', + columnProp: 'partName', headerAlign: 'center', - align: 'left', - columnLabel: 'IFS料号', + align: 'center', + columnLabel: '物料名称', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name, diff --git a/src/views/modules/project/projectInfo/com_project_toolApplyCation.vue b/src/views/modules/project/projectInfo/com_project_toolApplyCation.vue index 25b5766..11bb1f5 100644 --- a/src/views/modules/project/projectInfo/com_project_toolApplyCation.vue +++ b/src/views/modules/project/projectInfo/com_project_toolApplyCation.vue @@ -195,73 +195,74 @@ { userId: this.$store.state.user.name, functionId: 101002001, - serialNumber: '101002001Table10Remark', + serialNumber: '101002001Table10QuotationNo', tableId: '101002001Table10', tableName: '工具申请明细', - columnProp: 'remark', + columnProp: 'plmPartNo', headerAlign: 'center', - align: 'center', - columnLabel: '备注', + align: 'left', + columnLabel: 'PLM物料编码', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 200 + columnWidth: 80 }, { userId: this.$store.state.user.name, functionId: 101002001, - serialNumber: '101002001Table10NodeId', - tableId: "101002001Table10", - tableName: "技术参数卡列表", - columnProp: "nodeId", - headerAlign: "center", - align: "left", - columnLabel: "当前节点", + serialNumber: '101002001Table10QuotationNo', + tableId: '101002001Table10', + tableName: '工具申请明细', + columnProp: 'ifsPartNo', + headerAlign: 'center', + align: 'left', + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 70 + columnWidth: 80 }, { userId: this.$store.state.user.name, functionId: 101002001, - serialNumber: '101002001Table10NodeName', - tableId: "101002001Table10", - tableName: "技术参数卡列表", - columnProp: "nodeName", - headerAlign: "center", - align: "left", - columnLabel: "节点名称", + serialNumber: '101002001Table10QuotationNo', + tableId: '101002001Table10', + tableName: '工具申请明细', + columnProp: 'partDesc', + headerAlign: 'center', + align: 'left', + columnLabel: '物料描述', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 150 - },{ + columnWidth: 160 + }, + { userId: this.$store.state.user.name, functionId: 101002001, - serialNumber: '101002001Table10SP', - tableId: "101002001Table10", - tableName: "技术参数卡列表", - columnProp: "sp", - headerAlign: "center", - align: "left", - columnLabel: "当前审批人", + serialNumber: '101002001Table10QuotationNo', + tableId: '101002001Table10', + tableName: '工具申请明细', + columnProp: 'orderRef3', + headerAlign: 'center', + align: 'center', + columnLabel: '工艺路线版本', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 70 }, { userId: this.$store.state.user.name, @@ -269,10 +270,10 @@ serialNumber: '101002001Table10QuotationNo', tableId: '101002001Table10', tableName: '工具申请明细', - columnProp: 'orderRef2', + columnProp: 'orderRef5', headerAlign: 'center', align: 'center', - columnLabel: '物料编码', + columnLabel: '替代编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -280,16 +281,16 @@ status: true, fixed: '', columnWidth: 70 - }, { + },{ userId: this.$store.state.user.name, functionId: 101002001, serialNumber: '101002001Table10QuotationNo', tableId: '101002001Table10', tableName: '工具申请明细', - columnProp: 'orderRef3', + columnProp: 'operationNo', headerAlign: 'center', align: 'center', - columnLabel: '工艺路线版本', + columnLabel: '工序号', columnHidden: false, columnImage: false, columnSortable: false, @@ -297,17 +298,16 @@ status: true, fixed: '', columnWidth: 70 - }, - { + },{ userId: this.$store.state.user.name, functionId: 101002001, serialNumber: '101002001Table10QuotationNo', tableId: '101002001Table10', tableName: '工具申请明细', - columnProp: 'orderRef5', + columnProp: 'operationName', headerAlign: 'center', align: 'center', - columnLabel: '替代编码', + columnLabel: '工序', columnHidden: false, columnImage: false, columnSortable: false, @@ -315,16 +315,17 @@ status: true, fixed: '', columnWidth: 70 - },{ + }, + { userId: this.$store.state.user.name, functionId: 101002001, - serialNumber: '101002001Table10QuotationNo', - tableId: '101002001Table10', - tableName: '工具申请明细', - columnProp: 'operationNo', - headerAlign: 'center', - align: 'center', - columnLabel: '工序号', + serialNumber: '101002001Table10NodeId', + tableId: "101002001Table10", + tableName: "技术参数卡列表", + columnProp: "nodeId", + headerAlign: "center", + align: "left", + columnLabel: "当前节点", columnHidden: false, columnImage: false, columnSortable: false, @@ -332,23 +333,59 @@ status: true, fixed: '', columnWidth: 70 + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table10NodeName', + tableId: "101002001Table10", + tableName: "技术参数卡列表", + columnProp: "nodeName", + headerAlign: "center", + align: "left", + columnLabel: "节点名称", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150 },{ userId: this.$store.state.user.name, functionId: 101002001, - serialNumber: '101002001Table10QuotationNo', + serialNumber: '101002001Table10SP', + tableId: "101002001Table10", + tableName: "技术参数卡列表", + columnProp: "sp", + headerAlign: "center", + align: "left", + columnLabel: "当前审批人", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table10Remark', tableId: '101002001Table10', tableName: '工具申请明细', - columnProp: 'operationName', + columnProp: 'remark', headerAlign: 'center', align: 'center', - columnLabel: '工序', + columnLabel: '备注', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 70 + columnWidth: 200 }, ], // 导出 start diff --git a/src/views/modules/project/projectPart/projectPartQuote.vue b/src/views/modules/project/projectPart/projectPartQuote.vue index dc6096b..e7b5402 100644 --- a/src/views/modules/project/projectPart/projectPartQuote.vue +++ b/src/views/modules/project/projectPart/projectPartQuote.vue @@ -68,10 +68,10 @@ export default { serialNumber: '101002002Table2PartNo', tableId: '101002002Table2', tableName: '报价详情信息表', - columnProp: 'partNo', + columnProp: 'plmPartNo', headerAlign: 'center', align: 'left', - columnLabel: '物料编码', + columnLabel: 'PLM物料编码', columnHidden: false, columnImage: false, columnSortable: false, @@ -86,10 +86,10 @@ export default { serialNumber: '101002002Table2PLMPartNo', tableId: '101002002Table2', tableName: '报价详情信息表', - columnProp: 'plmPartNo', + columnProp: 'ifsPartNo', headerAlign: 'center', align: 'left', - columnLabel: 'PLM 物料编码', + columnLabel: 'IFS物料编码', columnHidden: false, columnImage: false, columnSortable: false,