diff --git a/src/views/modules/schedule/com_schedule_order_expand.vue b/src/views/modules/schedule/com_schedule_order_expand.vue index fa8d30f..751d9be 100644 --- a/src/views/modules/schedule/com_schedule_order_expand.vue +++ b/src/views/modules/schedule/com_schedule_order_expand.vue @@ -760,7 +760,7 @@ export default { serialNumber: '5301ScheduleDelayFlag', tableId: "5301Schedule", tableName: "排产明细表", - columnProp: "delayFlag", + columnProp: "laterShipFlag", headerAlign: "center", align: "center", columnLabel: "晚于发货时间", @@ -829,10 +829,10 @@ export default { { userId: this.$store.state.user.name, functionId: 5301, - serialNumber: '5301SchedulePreOpsPlanFinishTime', + serialNumber: '5301ScheduleEarlierItemFlag', tableId: "5301Schedule", tableName: "排产明细表", - columnProp: "preOpsPlanFinishTime", + columnProp: "earlierItemFlag", headerAlign: "center", align: "center", columnLabel: "派工单早于上工序", @@ -925,7 +925,7 @@ export default { columnProp: "delayHours", headerAlign: "center", align: "center", - columnLabel: "晚于发货时间", + columnLabel: "延误小时数", columnWidth: 80, columnHidden: false, columnImage: false, @@ -940,7 +940,7 @@ export default { serialNumber: '5301Schedule', tableId: "5301Schedule", tableName: "排产明细表", - columnProp: "RecordType", + columnProp: "costRollUpFlag", headerAlign: "center", align: "center", columnLabel: "已排料", @@ -958,10 +958,10 @@ export default { serialNumber: '5301Schedule', tableId: "5301Schedule", tableName: "排产明细表", - columnProp: "排产完成时间早于上工序", + columnProp: "finishPreItremFlag", headerAlign: "center", align: "center", - columnLabel: "", + columnLabel: "排产完成时间早于上工序", columnWidth: 80, columnHidden: false, columnImage: false, diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue index 2ae9d65..c0fd273 100644 --- a/src/views/modules/schedule/order_schedule.vue +++ b/src/views/modules/schedule/order_schedule.vue @@ -261,7 +261,7 @@ @current-change="currentSchedulingRow" @row-dblclick="warnCancelScheduleConfirm" v-loading="dataListLoading" - style="margin-top: -20px; width: 100%;"> + style="margin-top: -20px; width: 96%;">