From d449c8c24939d4ab40e2e063dbdbf08a01e6ef0f Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 25 Jul 2025 17:01:41 +0800 Subject: [PATCH] 2025-07-25 --- .../technicalSpecificationList.vue | 207 ++++++------------ src/views/modules/test/requestForTest.vue | 47 ++-- 2 files changed, 96 insertions(+), 158 deletions(-) diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 12df23d..3c206b6 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -678,70 +678,34 @@ fixed: '', columnWidth: 80 }, - // { - // userId: this.$store.state.user.name, - // functionId: 103002, - // serialNumber: '103002Table1ProofingNo', - // tableId: "103002Table1", - // tableName: "技术参数卡列表", - // columnProp: "proofingNo", - // headerAlign: "center", - // align: "center", - // columnLabel: "打样单号", - // columnHidden: false, - // columnImage: false, - // columnSortable: false, - // sortLv: 0, - // status: true, - // fixed: '', - // columnWidth: 100 - // }, { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1Status', + serialNumber: '103002Table1FinalPartNo', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "statusDesc", + columnProp: "finalPartNo", headerAlign: "center", align: "left", - columnLabel: "状态", + columnLabel: "IFS物料编码", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, - // { - // userId: this.$store.state.user.name, - // functionId: 103002, - // serialNumber: '103002Table1NodeId', - // tableId: "103002Table1", - // tableName: "技术参数卡列表", - // columnProp: "nodeId", - // headerAlign: "center", - // align: "left", - // columnLabel: "当前节点", - // columnHidden: false, - // columnImage: false, - // columnSortable: false, - // sortLv: 0, - // status: true, - // fixed: '', - // columnWidth: 70 - // }, { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1NodeName', + serialNumber: '103002Table1PartName', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "nodeName", + columnProp: "partDesc", headerAlign: "center", align: "left", - columnLabel: "节点名称", + columnLabel: "物料名称", columnHidden: false, columnImage: false, columnSortable: false, @@ -749,52 +713,53 @@ status: true, fixed: '', columnWidth: 150 - },{ + }, + { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1SP', + serialNumber: '103002Table1LabelLength', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "sp", + columnProp: "labelLength", headerAlign: "center", - align: "left", - columnLabel: "当前审批人", + align: "right", + columnLabel: "标签长度", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1TestPartNo', + serialNumber: '103002Table1LabelWidth', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "testPartNo", + columnProp: "labelWidth", headerAlign: "center", - align: "center", - columnLabel: "PLM物料编码", + align: "right", + columnLabel: "标签宽度", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 140 + columnWidth: 100 }, { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1FinalPartNo', + serialNumber: '103002Table1Radius', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "finalPartNo", + columnProp: "radius", headerAlign: "center", - align: "center", - columnLabel: "IFS物料编码", + align: "right", + columnLabel: "圆角", columnHidden: false, columnImage: false, columnSortable: false, @@ -803,110 +768,78 @@ fixed: '', columnWidth: 100 }, - // { - // userId: this.$store.state.user.name, - // functionId: 103002, - // serialNumber: '103002Table1TestPartNo', - // tableId: "103002Table1", - // tableName: "技术参数卡列表", - // columnProp: "projectId", - // headerAlign: "center", - // align: "center", - // columnLabel: "项目号", - // columnHidden: false, - // columnImage: false, - // columnSortable: false, - // sortLv: 0, - // status: true, - // fixed: '', - // columnWidth: 100 - // },{ - // userId: this.$store.state.user.name, - // functionId: 103002, - // serialNumber: '103002Table1TestPartNo', - // tableId: "103002Table1", - // tableName: "技术参数卡列表", - // columnProp: "buNo", - // headerAlign: "center", - // align: "center", - // columnLabel: "BU", - // columnHidden: false, - // columnImage: false, - // columnSortable: false, - // sortLv: 0, - // status: true, - // fixed: '', - // columnWidth: 80 - // },{ - // userId: this.$store.state.user.name, - // functionId: 103002, - // serialNumber: '103002Table1TestPartNo', - // tableId: "103002Table1", - // tableName: "技术参数卡列表", - // columnProp: "buDesc", - // headerAlign: "center", - // align: "left", - // columnLabel: "BU名称", - // columnHidden: false, - // columnImage: false, - // columnSortable: false, - // sortLv: 0, - // status: true, - // fixed: '', - // columnWidth: 80 - // }, - { + { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1PartName', + serialNumber: '103002Table1Stage', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "partDesc", + columnProp: "stage", headerAlign: "center", align: "left", - columnLabel: "物料名称", + columnLabel: "生产状态", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 150 - },{ + columnWidth: 110 + }, + { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1ECNFlag', + serialNumber: '103002Table1Status', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "ecnFlag", + columnProp: "statusDesc", headerAlign: "center", - align: "center", - columnLabel: "ECN变更", + align: "left", + columnLabel: "状态", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 65 - },{ + columnWidth: 80 + }, + { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1EcnNo', + serialNumber: '103002Table1NodeName', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "ecnNo", + columnProp: "nodeName", headerAlign: "center", - align: "center", - columnLabel: "ECN单据号", + align: "left", + columnLabel: "节点名称", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 150 },{ + userId: this.$store.state.user.name, + functionId: 103002, + serialNumber: '103002Table1SP', + tableId: "103002Table1", + 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: 103002, serialNumber: '103002Table1CreateDate', @@ -923,7 +856,8 @@ status: true, fixed: '', columnWidth: 120 - },{ + }, + { userId: this.$store.state.user.name, functionId: 103002, serialNumber: '103002Table1CreateBy', @@ -940,7 +874,8 @@ status: true, fixed: '', columnWidth: 80 - },{ + }, + { userId: this.$store.state.user.name, functionId: 103002, serialNumber: '103002Table1UpdateDate', @@ -957,7 +892,8 @@ status: true, fixed: '', columnWidth: 120 - },{ + }, + { userId: this.$store.state.user.name, functionId: 103002, serialNumber: '103002Table1UpdateBy', @@ -974,23 +910,24 @@ status: true, fixed: '', columnWidth: 80 - },{ + }, + { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1ecnAddress', + serialNumber: '103002Table1TestPartNo', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "ecnAddress", + columnProp: "testPartNo", headerAlign: "center", align: "left", - columnLabel: "ECN文档链接", + columnLabel: "PLM物料编码", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 200 + columnWidth: 140 }, ], fileColumnList: [ diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index fb3bc93..bd6181e 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -359,13 +359,13 @@ - + + v-model="modalData.technicalConsiderations" :rows="6" resize='none' show-word-limit> @@ -373,13 +373,17 @@
下一步 - - - - - - - + + + - + - + - - - - + @@ -663,7 +664,7 @@ - + - + - + - + - + - - + + -
+
刷新 保存 取消