diff --git a/src/views/common/theme.vue b/src/views/common/theme.vue index ca74603..3b1e1a6 100644 --- a/src/views/common/theme.vue +++ b/src/views/common/theme.vue @@ -13,12 +13,12 @@ dark - - - - - - + + + 开启 + 关闭 + + diff --git a/src/views/modules/schedule/com_schedule_order_expand.vue b/src/views/modules/schedule/com_schedule_order_expand.vue index cb88e75..4469190 100644 --- a/src/views/modules/schedule/com_schedule_order_expand.vue +++ b/src/views/modules/schedule/com_schedule_order_expand.vue @@ -1046,24 +1046,24 @@ export default { status: true, fixed: false }, - { - userId: this.$store.state.user.name, - functionId: 5301, - serialNumber: '5301ScheduleOriSOOrderNo', - tableId: "5301Schedule", - tableName: "排产明细表", - columnProp: "oriSOOrderNo", - headerAlign: "center", - align: "center", - columnLabel: "SAP参考号", - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: false - }, + // { + // userId: this.$store.state.user.name, + // functionId: 5301, + // serialNumber: '5301ScheduleOriSOOrderNo', + // tableId: "5301Schedule", + // tableName: "排产明细表", + // columnProp: "oriSOOrderNo", + // headerAlign: "center", + // align: "center", + // columnLabel: "SAP参考号", + // columnWidth: 80, + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: false + // }, { userId: this.$store.state.user.name, functionId: 5301, diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue index 0c971e3..4f469b9 100644 --- a/src/views/modules/schedule/order_schedule.vue +++ b/src/views/modules/schedule/order_schedule.vue @@ -1065,24 +1065,24 @@ export default { status: true, fixed: '' }, - { - userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303OrderOriSOOrderNo', - tableId: "5303Order", - tableName: "工单表", - columnProp: "oriSOOrderNo", - headerAlign: "center", - align: "center", - columnLabel: "SAP参考号", - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, + // { + // userId: this.$store.state.user.name, + // functionId: 5303, + // serialNumber: '5303OrderOriSOOrderNo', + // tableId: "5303Order", + // tableName: "工单表", + // columnProp: "oriSOOrderNo", + // headerAlign: "center", + // align: "center", + // columnLabel: "SAP参考号", + // columnWidth: 80, + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '' + // }, { userId: this.$store.state.user.name, functionId: 5303, @@ -1101,60 +1101,60 @@ export default { status: true, fixed: '' }, - { - userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303OrderCostRollUpFlag', - tableId: "5303Order", - tableName: "工单表", - columnProp: "costRollUpFlag", - headerAlign: "center", - align: "center", - columnLabel: "已排料", - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303OrderManualFlag', - tableId: "5303Order", - tableName: "工单表", - columnProp: "manualFlag", - headerAlign: "center", - align: "center", - columnLabel: "刀模已发", - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303OrderRepairSOFlag', - tableId: "5303Order", - tableName: "工单表", - columnProp: "repairSOFlag", - headerAlign: "center", - align: "center", - columnLabel: "印版已发", - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, + // { + // userId: this.$store.state.user.name, + // functionId: 5303, + // serialNumber: '5303OrderCostRollUpFlag', + // tableId: "5303Order", + // tableName: "工单表", + // columnProp: "costRollUpFlag", + // headerAlign: "center", + // align: "center", + // columnLabel: "已排料", + // columnWidth: 80, + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '' + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 5303, + // serialNumber: '5303OrderManualFlag', + // tableId: "5303Order", + // tableName: "工单表", + // columnProp: "manualFlag", + // headerAlign: "center", + // align: "center", + // columnLabel: "刀模已发", + // columnWidth: 80, + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '' + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 5303, + // serialNumber: '5303OrderRepairSOFlag', + // tableId: "5303Order", + // tableName: "工单表", + // columnProp: "repairSOFlag", + // headerAlign: "center", + // align: "center", + // columnLabel: "印版已发", + // columnWidth: 80, + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '' + // }, ], columnOrderScheduleArray: [ { @@ -1805,24 +1805,24 @@ export default { status: true, fixed: '' }, - { - userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303ScheduleOriSOOrderNo', - tableId: "5303Schedule", - tableName: "排产明细表", - columnProp: "oriSOOrderNo", - headerAlign: "center", - align: "center", - columnLabel: "SAP参考号", - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, + // { + // userId: this.$store.state.user.name, + // functionId: 5303, + // serialNumber: '5303ScheduleOriSOOrderNo', + // tableId: "5303Schedule", + // tableName: "排产明细表", + // columnProp: "oriSOOrderNo", + // headerAlign: "center", + // align: "center", + // columnLabel: "SAP参考号", + // columnWidth: 80, + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '' + // }, { userId: this.$store.state.user.name, functionId: 5303, @@ -1950,7 +1950,7 @@ export default { userColumnList: [], buttons: { menuButton: '菜单', - refreshButton: '刷新', + refreshButton: '查询', moveUp: '上移', moveDown: '下移', insertWaitOrder: '插入等待订单', @@ -2111,7 +2111,7 @@ export default { scheduledDate: '排产日期:', onlyViewPreItemScheduled: '仅查看前道工序已排产的工序', siteNo: '工厂编号:', - resourceId: '机台编号:', + resourceId: '排产机台:', workCenterNo: '加工中心编码:', recordDiagram: '记录示意图', closedAndQtyReached: '已关闭,已达数量', @@ -2412,6 +2412,10 @@ export default { /*刷新页面table*/ refreshPageTables() { + if(this.pageData.resourceId==null||this.pageData.resourceId==''){ + this.$message.warning('请先选择排产机台!') + return false; + } this.getResourceShiftData(); this.getShopOrderList(); this.getOrderScheduleList(); diff --git a/src/views/modules/schedule/order_schedule_expand.vue b/src/views/modules/schedule/order_schedule_expand.vue index 0ec7940..2f7f167 100644 --- a/src/views/modules/schedule/order_schedule_expand.vue +++ b/src/views/modules/schedule/order_schedule_expand.vue @@ -980,24 +980,24 @@ export default { status: true, fixed: false }, - { - userId: this.$store.state.user.name, - functionId: 5301, - serialNumber: '5301OrderOriSOOrderNo', - tableId: "5301Order", - tableName: "工单表", - columnProp: "oriSOOrderNo", - headerAlign: "center", - align: "center", - columnLabel: "SAP参考号", - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: false - }, + // { + // userId: this.$store.state.user.name, + // functionId: 5301, + // serialNumber: '5301OrderOriSOOrderNo', + // tableId: "5301Order", + // tableName: "工单表", + // columnProp: "oriSOOrderNo", + // headerAlign: "center", + // align: "center", + // columnLabel: "SAP参考号", + // columnWidth: 80, + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: false + // }, { userId: this.$store.state.user.name, functionId: 5301, @@ -1016,60 +1016,60 @@ export default { status: true, fixed: false }, - { - userId: this.$store.state.user.name, - functionId: 5301, - serialNumber: '5301OrderCostRollUpFlag', - tableId: "5301Order", - tableName: "工单表", - columnProp: "costRollUpFlag", - headerAlign: "center", - align: "center", - columnLabel: "已排料", - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: false - }, - { - userId: this.$store.state.user.name, - functionId: 5301, - serialNumber: '5301OrderManualFlag', - tableId: "5301Order", - tableName: "工单表", - columnProp: "manualFlag", - headerAlign: "center", - align: "center", - columnLabel: "刀模已发", - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: false - }, - { - userId: this.$store.state.user.name, - functionId: 5301, - serialNumber: '5301OrderRepairSOFlag', - tableId: "5301Order", - tableName: "工单表", - columnProp: "repairSOFlag", - headerAlign: "center", - align: "center", - columnLabel: "印版已发", - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: false - }, + // { + // userId: this.$store.state.user.name, + // functionId: 5301, + // serialNumber: '5301OrderCostRollUpFlag', + // tableId: "5301Order", + // tableName: "工单表", + // columnProp: "costRollUpFlag", + // headerAlign: "center", + // align: "center", + // columnLabel: "已排料", + // columnWidth: 80, + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: false + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 5301, + // serialNumber: '5301OrderManualFlag', + // tableId: "5301Order", + // tableName: "工单表", + // columnProp: "manualFlag", + // headerAlign: "center", + // align: "center", + // columnLabel: "刀模已发", + // columnWidth: 80, + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: false + // }, + // { + // userId: this.$store.state.user.name, + // functionId: 5301, + // serialNumber: '5301OrderRepairSOFlag', + // tableId: "5301Order", + // tableName: "工单表", + // columnProp: "repairSOFlag", + // headerAlign: "center", + // align: "center", + // columnLabel: "印版已发", + // columnWidth: 80, + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: false + // }, ], calendarOutList: [], primaryMenuButton: { diff --git a/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue b/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue index b1d21cc..1f8e4b0 100644 --- a/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue +++ b/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue @@ -906,42 +906,42 @@ fixed: '', columnWidth: 80 }, - { - userId: this.$store.state.user.name, - functionId: 6028, - serialNumber: '6028TableCostRollUpFlag', - tableId: "6028Table", - tableName: "查询生产订单表", - columnProp: "costRollUpFlag", - 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: 6028, - serialNumber: '6028TableManualFlag', - tableId: "6028Table", - tableName: "查询生产订单表", - columnProp: "manualFlag", - 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: 6028, + // serialNumber: '6028TableCostRollUpFlag', + // tableId: "6028Table", + // tableName: "查询生产订单表", + // columnProp: "costRollUpFlag", + // 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: 6028, + // serialNumber: '6028TableManualFlag', + // tableId: "6028Table", + // tableName: "查询生产订单表", + // columnProp: "manualFlag", + // 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: 6028, @@ -1032,24 +1032,24 @@ fixed: '', columnWidth: 100 }, - { - userId: this.$store.state.user.name, - functionId: 6028, - serialNumber: '6028TableRepairSOFlag', - tableId: "6028Table", - tableName: "查询生产订单表", - columnProp: "repairSOFlag", - 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: 6028, + // serialNumber: '6028TableRepairSOFlag', + // tableId: "6028Table", + // tableName: "查询生产订单表", + // columnProp: "repairSOFlag", + // 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: 6028, diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue index bbf486b..0f8bc4b 100644 --- a/src/views/modules/shopOrder/shopOrder/shopOrder.vue +++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue @@ -1636,24 +1636,24 @@ export default { fixed: '', columnWidth: 80 }, - { - userId: this.$store.state.user.name, - functionId: 104001001, - serialNumber: '104001001Table3RepairSOFlag', - tableId: "104001001Table3", - tableName: "生产订单数据获取表", - columnProp: "repairSOFlag", - 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: 104001001, + // serialNumber: '104001001Table3RepairSOFlag', + // tableId: "104001001Table3", + // tableName: "生产订单数据获取表", + // columnProp: "repairSOFlag", + // headerAlign: "center", + // align: "left", + // columnLabel: "印版已发", + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 80 + // } ], columnList4: [ { diff --git a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue index ac1c16e..8e4035d 100644 --- a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue +++ b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue @@ -522,12 +522,12 @@ - - - - - - + + + + + + diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 4f93579..838aaf6 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -1,7 +1,7 @@