diff --git a/src/views/modules/scheduleReport/com_die_cutting_report.vue b/src/views/modules/scheduleReport/com_die_cutting_report.vue index d46b90c..490258e 100644 --- a/src/views/modules/scheduleReport/com_die_cutting_report.vue +++ b/src/views/modules/scheduleReport/com_die_cutting_report.vue @@ -365,6 +365,24 @@ export default { status: true, fixed: false }, + { + userId: this.$store.state.user.name, + functionId: 5303, + serialNumber: '5303RollStatus', + tableId: "5303Roll", + tableName: "下机卷", + columnProp: "status", + headerAlign: "center", + align: "center", + columnLabel: "状态", + columnWidth: 55, + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: false + }, { userId: this.$store.state.user.name, functionId: 5303, diff --git a/src/views/modules/scheduleReport/com_fqc_report.vue b/src/views/modules/scheduleReport/com_fqc_report.vue index 6667b41..7cd3e94 100644 --- a/src/views/modules/scheduleReport/com_fqc_report.vue +++ b/src/views/modules/scheduleReport/com_fqc_report.vue @@ -141,13 +141,31 @@ export default { { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303RollCreatedDate', + serialNumber: '5303RollFqcBy', tableId: "5303Roll", tableName: "下机卷", - columnProp: "createdDate", + columnProp: "fqcBy", headerAlign: "center", align: "center", - columnLabel: "创建时间", + columnLabel: "检验人", + columnWidth: 90, + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: false + }, + { + userId: this.$store.state.user.name, + functionId: 5303, + serialNumber: '5303RollFqcDate', + tableId: "5303Roll", + tableName: "下机卷", + columnProp: "fqcDate", + headerAlign: "center", + align: "center", + columnLabel: "检验时间", columnWidth: 125, columnHidden: false, columnImage: false, @@ -156,6 +174,24 @@ export default { status: true, fixed: false }, + { + userId: this.$store.state.user.name, + functionId: 5303, + serialNumber: '5303RollStatus', + tableId: "5303Roll", + tableName: "下机卷", + columnProp: "status", + headerAlign: "center", + align: "center", + columnLabel: "状态", + columnWidth: 55, + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: false + }, { userId: this.$store.state.user.name, functionId: 5303, @@ -174,6 +210,24 @@ export default { status: true, fixed: false }, + { + userId: this.$store.state.user.name, + functionId: 5303, + serialNumber: '5303RollCreatedDate', + tableId: "5303Roll", + tableName: "下机卷", + columnProp: "createdDate", + headerAlign: "center", + align: "center", + columnLabel: "创建时间", + columnWidth: 125, + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: false + }, { userId: this.$store.state.user.name, functionId: 5303,