From fd5504eef7c2f2b3969374d5944d32225adde788 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 3 Feb 2025 15:17:41 +0800 Subject: [PATCH] =?UTF-8?q?2025-02-03=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/changeManagement/changeRecord.vue | 88 +++++++++++-------- src/views/modules/part/partInformation.vue | 54 ++++++------ .../processManagement/processBindingInfo.vue | 2 +- .../sellForQuotation/customerInfo.vue | 2 +- 4 files changed, 78 insertions(+), 68 deletions(-) diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index b1bd7b2..23f0b85 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -1898,81 +1898,91 @@ userId: this.$store.state.user.name, functionId: 108002, serialNumber: '108002Table3FileName', - tableId: '108002Table3', - tableName: '变更单文件信息表', + tableId: '108002Table2', + tableName: '文件信息表', columnProp: 'fileName', headerAlign: 'center', - align: 'left', + align: 'center', columnLabel: '文件名称', columnHidden: false, columnImage: false, + columnSortable: false, + sortLv: 0, status: true, fixed: '', - columnWidth: 120 - }, - { - userId: this.$store.state.user.name, - functionId: 108002, - serialNumber: '108002Table3FileType', - tableId: '108002Table3', - tableName: '变更单文件信息表', - columnProp: 'fileType', - headerAlign: 'center', - align: 'left', - columnLabel: '文件类型', - columnHidden: false, - columnImage: false, - status: true, - fixed: '', - columnWidth: 80 + columnWidth: 140 }, { userId: this.$store.state.user.name, functionId: 108002, - serialNumber: '108002Table3Url', - tableId: '108002Table3', - tableName: '变更单文件信息表', - columnProp: 'url', + serialNumber: '108002Table3FileRemark', + tableId: '108002Table2', + tableName: '文件信息表', + columnProp: 'fileRemark', headerAlign: 'center', - align: 'left', - columnLabel: '文件地址', + align: 'center', + columnLabel: '备注', columnHidden: false, columnImage: false, + columnSortable: false, + sortLv: 0, status: true, fixed: '', - columnWidth: 180 + columnWidth: 240 }, + // { + // userId: this.$store.state.user.name, + // functionId: 108002, + // serialNumber: '108002Table2OrderRef3', + // tableId: '108002Table2', + // tableName: '文件信息表', + // columnProp: 'orderRef3', + // headerAlign: 'center', + // align: 'center', + // columnLabel: '文件描述', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, { userId: this.$store.state.user.name, functionId: 108002, - serialNumber: '108002Table3CreateBy', - tableId: '108002Table3', - tableName: '变更单文件信息表', - columnProp: 'createBy', + serialNumber: '108002Table3CreateDate', + tableId: '108002Table2', + tableName: '文件信息表', + columnProp: 'createDate', headerAlign: 'center', align: 'center', - columnLabel: '创建人', + columnLabel: '上传时间', columnHidden: false, columnImage: false, + columnSortable: false, + sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 140 }, { userId: this.$store.state.user.name, functionId: 108002, - serialNumber: '108002Table3CreateDate', - tableId: '108002Table3', - tableName: '变更单文件信息表', - columnProp: 'createDate', + serialNumber: '108002Table3CreatedBy', + tableId: '108002Table2', + tableName: '文件信息表', + columnProp: 'createBy', headerAlign: 'center', align: 'center', - columnLabel: '创建时间', + columnLabel: '上传人', columnHidden: false, columnImage: false, + columnSortable: false, + sortLv: 0, status: true, fixed: '', - columnWidth: 150 + columnWidth: 140 }, ], columnChooseDataList: [ diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index 514a11d..aac6470 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -8,13 +8,13 @@ - - - + + + - - + + @@ -1956,22 +1956,22 @@ fixed: '', columnWidth: 100 }, - { - userId: this.$store.state.user.name, - functionId: 104001, - serialNumber: '104001Table1Spec', - tableId: '104001Table1', - tableName: '物料信息表', - columnProp: 'spec', - headerAlign: 'center', - align: 'left', - columnLabel: '规格型号', - columnHidden: false, - columnImage: false, - status: true, - fixed: '', - columnWidth: 120 - }, + // { + // userId: this.$store.state.user.name, + // functionId: 104001, + // serialNumber: '104001Table1Spec', + // tableId: '104001Table1', + // tableName: '物料信息表', + // columnProp: 'spec', + // headerAlign: 'center', + // align: 'left', + // columnLabel: '规格型号', + // columnHidden: false, + // columnImage: false, + // status: true, + // fixed: '', + // columnWidth: 120 + // }, { userId: this.$store.state.user.name, functionId: 104001, @@ -2469,10 +2469,10 @@ { userId: this.$store.state.user.name, functionId: 104001, - serialNumber: '104001Table3Active', + serialNumber: '104001Table3ActiveDesc', tableId: '104001Table3', tableName: '物料代理商表', - columnProp: 'active', + columnProp: 'activeDesc', headerAlign: 'center', align: 'center', columnLabel: '是否在用', @@ -2590,10 +2590,10 @@ { userId: this.$store.state.user.name, functionId: 104001, - serialNumber: '104001Table5Active', + serialNumber: '104001Table5ActiveDesc', tableId: '104001Table5', tableName: '物料制造商表', - columnProp: 'active', + columnProp: 'activeDesc', headerAlign: 'center', align: 'center', columnLabel: '是否在用', @@ -2749,10 +2749,10 @@ { userId: this.$store.state.user.name, functionId: 104001, - serialNumber: '104001Table7Active', + serialNumber: '104001Table7ActiveDesc', tableId: '104001Table7', tableName: '物料库位表', - columnProp: 'active', + columnProp: 'activeDesc', headerAlign: 'center', align: 'center', columnLabel: '是否在用', diff --git a/src/views/modules/processManagement/processBindingInfo.vue b/src/views/modules/processManagement/processBindingInfo.vue index f1a5d31..31bbe05 100644 --- a/src/views/modules/processManagement/processBindingInfo.vue +++ b/src/views/modules/processManagement/processBindingInfo.vue @@ -250,7 +250,7 @@ - +