diff --git a/src/views/modules/scheduleReport/produce_order.vue b/src/views/modules/scheduleReport/produce_order.vue index bc762c5..b563165 100644 --- a/src/views/modules/scheduleReport/produce_order.vue +++ b/src/views/modules/scheduleReport/produce_order.vue @@ -2,168 +2,38 @@
- 菜单 - - + + + + + + + + + + + + + {{ buttons.searchButton }} - - {{ buttons.reportButton }} + + {{ buttons.dieCuttingButton }} - + {{ buttons.fqcReportButton }} - - {{ buttons.reworkInspectReport }} - - - - {{ buttons.repackageReport }} - - - - {{ buttons.fqcSplitRollReport }} - - - - {{ buttons.splitReport }} - -
- - - - - - - 机台编号: - - - - - - - - - - - - - - - - - - {{ labels.showFinishedSeqNo }} - - - - - - - - - {{ labels.primaryMenu }} - - - - {{ labels.shopOrderLabel }} - -
- {{ - labels.closeLabel - }} - - {{ labels.openLabel }} - -
- {{ - labels.pauseLabel - }} - - - {{ labels.reopenLabel }} - -
- - {{ labels.createReCheckSeqNo }} - -
- - {{ labels.cancelAllScheduleOperations }} - -
- - {{ labels.prodIssued }} - - - {{ labels.cancelProdIssued }} - - {{ labels.viewPartStock }} - -
- - {{ labels.toolIssued }} - - - {{ labels.cancelToolIssued }} - -
- - {{ labels.printIssued }} - - - {{ labels.cancelPrintIssued }} - -
- - - {{ buttons.settingTable }} - {{ buttons.defaultTable }} - - {{ buttons.download||'导出' }} - - - @@ -262,7 +89,7 @@ import { workbenchCancelallops, getShopOrder, getScheduleMultiReportSpecialAuth,/* 获取派工单的特殊权限 */ -} from '@/api/yieldReport/produce_order.js' +} from '@/api/scheduleReport/produce_order.js' /* 动态表头 */ import { @@ -275,35 +102,10 @@ import { /* 引入组件 */ import Chooselist from '@/views/modules/common/Chooselist'/* 列表组件 */ -import comSwitchOperator from './com_switch_operator'/* 切换操作员 */ -import comProduceReportNormal from './com_produce_report_normal'/* 报工的组件 */ -import comFinishSchedule from './com_finish_schedule'/* 结束派工的组件 */ -import fqcProduceReportNormal from './otherReport/fqc_produce_report_normal'/* 结束派工的组件 */ -import reworkInspectReport from './otherReport/rework_inspect_report'/* 结束派工的组件 */ -import fqcSplitRollReport from './otherReport/fqc_split_roll_report'/* 结束派工的组件 */ -import changePackaging from './otherReport/change_packaging'/* 结束派工的组件 */ -import createRecheck from './com_create_recheck' -import Com_split_schedule from '../schedule/com_split_schedule' -import comSplitOrderReport from './com_split_order_report' -import comPartStock from '../common/com_part_stock' import column from '@/views/modules/common/column' -/* 展示物料库存的组件 */ -/* 分切报工 */ - -import { - searchSysLanguagePackList, - searchSysLanguageParam, - searchFunctionButtonList, - saveButtonList, - searchSysLanguage, - searchLanguageListByLanguageCode, - saveSysLanguageOne, - searchPageLanguageData, - removerLanguage, - saveSysLanguageList -} from "@/api/sysLanguage.js"; +import comDieCuttingReport from './com_die_cutting_report' /* 模切报工的组件 */ -var functionId = '104003006'; +var functionId = '600001'; export default { data() { @@ -323,639 +125,32 @@ export default { reworkShowReportFlag: false, fqcRollShowReportFlag: false, showFinishScheduleFlag: false, - changePackagingFlag: false, - showPartStockFlag: false, - searchData: { - site: this.$store.state.user.site, - resourceId: '', - orderNo: '', - seqNo: '', - planStartTime1: '', - planStartTime2: '', - closedFlag: 'N', - status: 1, - username: this.$store.state.user.name, - searchFlag: false, - exportFlag: "N", - }, - currentRow: {}, - operatorData: { - site: this.$store.state.user.site, - username: this.$store.state.user.name, - userDisplay: this.$store.state.user.userDisplay, - operatorId: '', - operatorName: '', - status: '', - showFlag: false - }, - produceScheduleList: [], - dataListLoading: false, - columnList: [ - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceMatIssueFlag', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'matIssueFlag', - headerAlign: 'center', - align: 'center', - columnLabel: '已排料', - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceToolIssueFlag', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'toolIssueFlag', - headerAlign: 'center', - align: 'center', - columnLabel: '刀模已发', - columnWidth: 90, - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProducePlateIssueFlag', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'plateIssueFlag', - headerAlign: 'center', - align: 'center', - columnLabel: '印版已发', - columnWidth: 90, - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProducePreResourceInfo', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'preResourceInfo', - headerAlign: 'center', - align: 'left', - columnLabel: '上工序机台信息', - columnWidth: 100, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProducePreQtyFinished', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'preQtyFinished', - headerAlign: 'center', - align: 'right', - columnLabel: '上工序完工数', - columnWidth: 100, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProducePlanStartTime', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'planStartTime', - headerAlign: 'center', - align: 'center', - columnLabel: '计划开工时间', - columnWidth: 125, - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProducePlanFinishTime', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'planFinishTime', - headerAlign: 'center', - align: 'center', - columnLabel: '计划完工时间', - columnWidth: 125, - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceTimeRequired', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'timeRequired', - headerAlign: 'center', - align: 'center', - columnLabel: '需求时间', - columnWidth: 60, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceTimeReported', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'timeReported', - headerAlign: 'center', - align: 'center', - columnLabel: '已报告时间', - columnWidth: 70, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceOrderNo', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'orderNo', - headerAlign: 'center', - align: 'center', - columnLabel: '生产订单号', - columnWidth: 70, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceItemNo', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'itemNo', - headerAlign: 'center', - align: 'center', - columnLabel: '工序号', - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceItemDesc', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'itemDesc', - 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: 5302, - serialNumber: '5302ProduceResourceId', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'resourceId', - headerAlign: 'center', - align: 'center', - columnLabel: '机台', - columnWidth: 60, - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceQtyRequired', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'qtyRequired', - headerAlign: 'center', - align: 'center', - columnLabel: '需求数量', - columnWidth: 60, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceQtyReported', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'qtyReported', - headerAlign: 'center', - align: 'right', - columnLabel: '已报告数量', - columnWidth: 100, - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceNeedDate', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'needDate', - headerAlign: 'center', - align: 'center', - columnLabel: '生产订单要求完工日期', - columnWidth: 170, - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceClosedFlag', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'closedFlag', - headerAlign: 'center', - align: 'center', - columnLabel: '已关闭', - columnWidth: 50, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProducePartNo', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'partNo', - headerAlign: 'center', - align: 'center', - columnLabel: '产品编码', - columnWidth: 110, - columnHidden: false, - columnImage: false, - columnSortable: true, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProducePartDesc', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'partDesc', - headerAlign: 'center', - align: 'center', - columnLabel: '产品名称', - columnWidth: 180, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceSpec', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'spec', - 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: 5302, - serialNumber: '5302ProduceSeqNo', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'seqNo', - 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: 5302, - serialNumber: '5302ProduceQtyApprove', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'qtyApprove', - 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: 5302, - serialNumber: '5302ProduceBarcodeId', - tableId: '5302Produce', - tableName: '条形码', - columnProp: 'barcodeId', - 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: 5302, - serialNumber: '5302ProduceRemark', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'remark', - 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: 5302, - serialNumber: '5302ProduceCrewSize', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'crewSize', - 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: 5302, - serialNumber: '5302ProduceQtyScrapt', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'qtyScrapt', - 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: 5302, - serialNumber: '5302ProduceOutWorkFlag', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'outWorkFlag', - 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: 5302, - serialNumber: '5302ProduceScheduledDate', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'scheduledDate', - 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: 5302, - serialNumber: '5302ProduceScheduledSeqNo', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'scheduledSeqNo', - 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: 5302, - serialNumber: '5302ProduceShiftNo', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'shiftNo', - 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: 5302, - serialNumber: '5302ProduceMachSetupTime', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'machSetupTime', - 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: 5302, - serialNumber: '5302ProduceMachRunFactor', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'machRunFactor', - 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: 5302, - serialNumber: '5302ProduceFactorUnit', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'factorUnit', - headerAlign: 'center', - align: 'center', - columnLabel: '产出单位', - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - }, + changePackagingFlag: false, + showPartStockFlag: false, + searchData: { + site: this.$store.state.user.site, + itemNo: '', + orderNo: '', + status: 1, + username: this.$store.state.user.name, + searchFlag: true, + exportFlag: "N", + }, + currentRow: {}, + produceScheduleList: [], + dataListLoading: false, + columnList: [ { userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceEfficiency', - tableId: '5302Produce', + functionId: functionId, + serialNumber: '600001ProduceOrderNo', + tableId: '600001Produce', tableName: '待生产工单', - columnProp: 'efficiency', + columnProp: 'orderNo', headerAlign: 'center', align: 'center', - columnLabel: '效率', - columnWidth: 80, + columnLabel: '生产订单号', + columnWidth: 120, columnHidden: false, columnImage: false, columnSortable: false, @@ -965,32 +160,32 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceNextItemNo', - tableId: '5302Produce', + functionId: functionId, + serialNumber: '600001ProduceItemNo', + tableId: '600001Produce', tableName: '待生产工单', - columnProp: 'nextItemNo', + columnProp: 'itemNo', headerAlign: 'center', align: 'center', - columnLabel: '下道工序号', + columnLabel: '工序号', columnWidth: 80, columnHidden: false, columnImage: false, - columnSortable: false, + columnSortable: true, sortLv: 0, status: true, fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceNextItemDesc', - tableId: '5302Produce', + functionId: functionId, + serialNumber: '600001ProduceItemDesc', + tableId: '600001Produce', tableName: '待生产工单', - columnProp: 'nextItemDesc', + columnProp: 'itemDesc', headerAlign: 'center', align: 'center', - columnLabel: '下道工序名称', + columnLabel: '工序描述', columnWidth: 80, columnHidden: false, columnImage: false, @@ -1001,15 +196,15 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProducePreItemNo', - tableId: '5302Produce', + functionId: functionId, + serialNumber: '600001ProduceQtyRequired', + tableId: '600001Produce', tableName: '待生产工单', - columnProp: 'preItemNo', + columnProp: 'qtyRequired', headerAlign: 'center', align: 'center', - columnLabel: '前道工序号', - columnWidth: 80, + columnLabel: '需求数量', + columnWidth: 60, columnHidden: false, columnImage: false, columnSortable: false, @@ -1019,51 +214,51 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProducePreItemDesc', - tableId: '5302Produce', + functionId: functionId, + serialNumber: '600001ProduceQtyReported', + tableId: '600001Produce', tableName: '待生产工单', - columnProp: 'preItemDesc', + columnProp: 'qtyReported', headerAlign: 'center', - align: 'center', - columnLabel: '前道工序名称', - columnWidth: 80, + align: 'right', + columnLabel: '已报告数量', + columnWidth: 100, columnHidden: false, columnImage: false, - columnSortable: false, + columnSortable: true, sortLv: 0, status: true, fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceSite', - tableId: '5302Produce', + functionId: functionId, + serialNumber: '600001ProducePartNo', + tableId: '600001Produce', tableName: '待生产工单', - columnProp: 'site', + columnProp: 'partNo', headerAlign: 'center', align: 'center', - columnLabel: '工厂编号', - columnWidth: 80, + columnLabel: '产品编码', + columnWidth: 120, columnHidden: false, columnImage: false, - columnSortable: false, + columnSortable: true, sortLv: 0, status: true, fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceParkFlag', - tableId: '5302Produce', + functionId: functionId, + serialNumber: '600001ProducePartDesc', + tableId: '600001Produce', tableName: '待生产工单', - columnProp: 'parkFlag', + columnProp: 'partDesc', headerAlign: 'center', align: 'center', - columnLabel: '暂停', - columnWidth: 80, + columnLabel: '产品名称', + columnWidth: 180, columnHidden: false, columnImage: false, columnSortable: false, @@ -1073,15 +268,15 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceCustomerName', - tableId: '5302Produce', + functionId: functionId, + serialNumber: '600001ProduceRemark', + tableId: '600001Produce', tableName: '待生产工单', - columnProp: 'customerName', + columnProp: 'remark', headerAlign: 'center', align: 'center', - columnLabel: '客户名称', - columnWidth: 80, + columnLabel: '备注', + columnWidth: 180, columnHidden: false, columnImage: false, columnSortable: false, @@ -1091,15 +286,15 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceCustPartNo', - tableId: '5302Produce', + functionId: functionId, + serialNumber: '600001ProduceScheduledDate', + tableId: '600001Produce', tableName: '待生产工单', - columnProp: 'custPartNo', + columnProp: 'scheduledDate', headerAlign: 'center', align: 'center', - columnLabel: '客户产品料号', - columnWidth: 80, + columnLabel: '排产日期', + columnWidth: 120, columnHidden: false, columnImage: false, columnSortable: false, @@ -1109,14 +304,14 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceQtyRequiredOriginal', - tableId: '5302Produce', + functionId: functionId, + serialNumber: '600001ProduceShiftNo', + tableId: '600001Produce', tableName: '待生产工单', - columnProp: 'qtyRequiredOriginal', + columnProp: 'shiftNo', headerAlign: 'center', align: 'center', - columnLabel: '原始派工单需求数量', + columnLabel: '班次', columnWidth: 80, columnHidden: false, columnImage: false, @@ -1127,15 +322,15 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceClosedBy', - tableId: '5302Produce', + functionId: functionId, + serialNumber: '600001ProduceCustomerName', + tableId: '600001Produce', tableName: '待生产工单', - columnProp: 'closedBy', + columnProp: 'customerName', headerAlign: 'center', align: 'center', - columnLabel: '关闭人', - columnWidth: 80, + columnLabel: '客户名称', + columnWidth: 180, columnHidden: false, columnImage: false, columnSortable: false, @@ -1143,134 +338,23 @@ export default { status: true, fixed: '' }, - { - userId: this.$store.state.user.name, - functionId: 5302, - serialNumber: '5302ProduceClosedDate', - tableId: '5302Produce', - tableName: '待生产工单', - columnProp: 'closedDate', - headerAlign: 'center', - align: 'center', - columnLabel: '关闭日期', - columnWidth: 80, - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '' - } - ], reportButton: { - normalReportButton: true, + dieCuttingButton: true, fqcReportButton: true, - reworkReportButton: true, - packReportButton: true, - fqcSegmentReportButton: true, - slitReportButton: true - }, - menuButton: { - prdButton: true, - openButton: true, - closedButton: true, - pauseButton: true, - openReverseButton: true, - costRollUpFlagButton: true, - canceledCostRollUpFlagButton: false, - manualFlagButton: false, - canceledManualFlagButton: false, - repairSOFlagButton: false, - canceledRepairSOFlagButton: false, - canceledAllPrdButton: false, - createRecheckButton: false, - partStockFlag: true/* 查看物料库存 */ }, queryTable: { userId: this.$store.state.user.name, functionId: this.$route.meta.menuId, - tableId: '5302Produce', + tableId: '600001Produce', languageCode: this.$i18n.locale }, // 用户table 查询参数 - queryTableUser: { - userId: this.$store.state.user.name, - functionId: this.$route.meta.menuId, - tableId: '5302Produce', - status: true, - languageCode: this.$i18n.locale - }, - // 用户table 配置集合 userColumnList: [], buttons: { searchButton: '查询', - reportButton: '报工', + dieCuttingButton: '模切工站', fqcReportButton: 'FQC报工', - reworkInspectReport: '返工重检', - repackageReport: '换包装', - fqcSplitRollReport: 'FQC分卷', - splitReport: '分切报工', - settingTable: '设置列表', - defaultTable: '设置默认配置', - }, - queryButton: { - functionId: functionId, - table_id: '*', - languageCode: this.$i18n.locale, - objectType: 'button' - }, - labels: { - menuLabel: '菜单', - siteNo: '工厂编号:', - resourceId: '机台编号:', - planStartTime: '计划开工时间:', - orderNo: '生产订单号:', - seqNo: '派工单号:', - showFinishedSeqNo: '显示已结束派工单', - shopOrderList: '生产工单列表 ', - primaryMenu: '主菜单', - shopOrderLabel: '生产订单', - closeLabel: '关闭', - openLabel: '打开', - pauseLabel: '暂停', - reopenLabel: '重新开工', - createReCheckSeqNo: '创建重检派工单', - cancelAllScheduleOperations: '取消所有派工单操作', - prodIssued: '生产已排料', - cancelProdIssued: '取消生产已排料', - viewPartStock: '查看物料库存', - toolIssued: '刀模已发', - cancelToolIssued: '取消刀模已发', - printIssued: '印版已发', - cancelPrintIssued: '取消印版已发', - pleaseSelectSchedule: '请先选择派工单!', - confirmLabel: '确定', - cancelLabel: '取消', - sureCloseThisSchedule: '确定要关闭当前派工单吗？', - closeScheduleLabel: '关闭派工单', - sureOpenThisSchedule: '确定要打开当前派工单吗？', - surePauseThisSchedule: '确定要暂停当前派工单吗？？', - sureReopenThisSchedule: '确定要重开当前派工单吗？', - sureCancelScheduleAllOperations: '确定取消所有派工单操作？', - sureThisOrderMaterialIsIssued: '确定该订单的料已排？', - sureCancelThisOrderMaterialIssued: '确定要撤销该订单的排料？', - cancelOrderMaterialIssued: '撤销订单排料', - sureThisOrderToolIsIssued: '确定该订单的刀模已发？', - sureCancelThisOrderToolIssued: '确定要撤销该订单的刀模已发？', - sureThisOrderPrintIsIssued: '确定该订单的印版已发？', - sureCancelThisOrderPrintIssued: '确定要撤销该订单的印版已发？', - thisScheduleCantReport: '当前派工单无法使用报工!', - thisOrderIsNotSplitOrder: '当前工单非分切工单!', - thisScheduleIsNotFqc: '当前派工单非FQC报工派工单!', - thisOrderIsNotSpecialOrder: '该订单不是特殊订单，不能采用该功能！', - operatorCantBeUsed: '操作员信息不可用!', - }, - queryLabel: { - functionId: functionId, - table_id: '*', - languageCode: this.$i18n.locale, - objectType: 'label' }, // 导出 start exportList: [], @@ -1283,592 +367,15 @@ export default { }, components: { Chooselist, /* 选择的组件 */ - Com_split_schedule, - comSwitchOperator, /* 切换用户的组件 */ - comProduceReportNormal, /* 报工页面的组件 */ - comSplitOrderReport, /* 分切报工 */ - comFinishSchedule, /* 结束派工单的组件 */ - fqcProduceReportNormal, /* FQC报工 */ - reworkInspectReport, /* 返工重建 */ - fqcSplitRollReport, /* FQC分卷 */ - createRecheck, /* 创建重检派工单 */ - changePackaging, /* 换包装 */ - comPartStock, /* 展示物料库存的组件 */ - column/* 动态列 */ + column,/* 动态列 */ + comDieCuttingReport, /* 报工页面的组件 */ }, mounted() { this.$nextTick(() => { - this.height = window.innerHeight - 235 + this.height = window.innerHeight - 190 }) }, methods: { - // 控制是否显示功能 - menuButtonFlag() { - this.menuShow = false - if (JSON.stringify(this.currentRow) == '{}') { - this.menuButton.prdButton = true - this.menuButton.openButton = true - this.menuButton.closedButton = true - this.menuButton.pauseButton = true - this.menuButton.costRollUpFlagButton = true - this.menuButton.canceledCostRollUpFlagButton = true - this.menuButton.manualFlagButton = true - this.menuButton.canceledManualFlagButton = true - this.menuButton.repairSOFlagButton = true - this.menuButton.canceledRepairSOFlagButton = true - this.menuButton.canceledAllPrdButton = true - this.menuButton.createRecheckButton = true - } else { - let currentRow = null - // 获取订单信息 - let searchOrder = { - orderNo: this.currentRow.orderNo, - seqNo: this.currentRow.seqNo, - site: this.currentRow.site, - username: this.$store.state.user.name, - searchFlag: true, - exportFlag: 'N', - } - getProduceScheduleList(searchOrder).then(({data}) => { - // 设置查询数据 - currentRow = data.rows[0] - if (currentRow == null) { - return - } - // this.menuButton.canceledAllPrdButton = false - this.menuButton.createRecheckButton = false - this.menuButton.partStockFlag = false - // 判断是否具有该页面权限 - let menList = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]').filter(item => item.path == 'shopOrder-shopOrder/shopOrder') - if (menList.length > 0) { - this.menuButton.prdButton = false - } - let canceledAllPrd = { - userSpecialSecurityNo: 232, - username: this.$store.state.user.name - } - getUserSpecialSecurity(canceledAllPrd).then(({data}) => { - if (data.userSpecialSecurity == 'Y') { - this.menuButton.canceledAllPrdButton = false - } else { - this.menuButton.canceledAllPrdButton = true - } - }) - // 关闭按钮 - if (currentRow.closedFlag == 'N') { - let data = { - userSpecialSecurityNo: 230, - username: this.$store.state.user.name - } - getUserSpecialSecurity(data).then(({data}) => { - if (data.userSpecialSecurity == 'Y') { - this.menuButton.closedButton = false - } else { - this.menuButton.closedButton = true - } - }) - } else { - this.menuButton.closedButton = true - } - // 打开按钮 - if (currentRow.closedFlag == 'Y') { - let data = { - userSpecialSecurityNo: 231, - username: this.$store.state.user.name - } - getUserSpecialSecurity(data).then(({data}) => { - if (data.userSpecialSecurity == 'Y') { - this.menuButton.openButton = false - } else { - this.menuButton.openButton = true - } - }) - } else { - this.menuButton.openButton = true - } - // 暂停 - if (currentRow.closedFlag == 'N' && currentRow.parkFlag == 'N') { - this.menuButton.pauseButton = false - } else { - this.menuButton.pauseButton = true - } - // 重开 - if (currentRow.closedFlag == 'N' && currentRow.parkFlag == 'Y') { - this.menuButton.openReverseButton = false - } else { - this.menuButton.openReverseButton = true - } - // 生产排料 - if (currentRow.matIssueFlag == 'N') { - // 获取特殊权限 - let data = { - userSpecialSecurityNo: 238, - username: this.$store.state.user.name - } - getUserSpecialSecurity(data).then(({data}) => { - if (data.userSpecialSecurity == 'Y') { - this.menuButton.costRollUpFlagButton = false - } else { - this.menuButton.costRollUpFlagButton = true - } - }) - } else { - this.menuButton.costRollUpFlagButton = true - } - // 取消生产排料 - if (currentRow.matIssueFlag == 'Y') { - // 获取特殊权限 - let data = { - userSpecialSecurityNo: 238, - username: this.$store.state.user.name - } - getUserSpecialSecurity(data).then(({data}) => { - if (data.userSpecialSecurity == 'Y') { - this.menuButton.canceledCostRollUpFlagButton = false - } else { - this.menuButton.canceledCostRollUpFlagButton = true - } - }) - } else { - this.menuButton.canceledCostRollUpFlagButton = true - } - // 刀模已发 确认 - if (currentRow.toolIssueFlag == 'N') { - // 获取特殊权限 - let data = { - userSpecialSecurityNo: 258, - username: this.$store.state.user.name - } - getUserSpecialSecurity(data).then(({data}) => { - if (data.userSpecialSecurity == 'Y') { - this.menuButton.manualFlagButton = false - } else { - this.menuButton.manualFlagButton = true - } - }) - } else { - this.menuButton.manualFlagButton = true - } - // 刀模已发 取消 - if (currentRow.toolIssueFlag == 'Y') { - // 获取特殊权限 - let canceledAllPrdData = { - userSpecialSecurityNo: 259, - username: this.$store.state.user.name - } - getUserSpecialSecurity(canceledAllPrdData).then(({data}) => { - if (data.userSpecialSecurity == 'Y') { - this.menuButton.canceledManualFlagButton = false - } else { - this.menuButton.canceledManualFlagButton = true - } - }) - } else { - this.menuButton.canceledManualFlagButton = true - } - // 印版已发 确认 - if (currentRow.plateIssueFlag == 'N') { - // 获取特殊权限 - let data = { - userSpecialSecurityNo: 259, - username: this.$store.state.user.name - } - getUserSpecialSecurity(data).then(({data}) => { - if (data.userSpecialSecurity == 'Y') { - this.menuButton.repairSOFlagButton = false - } else { - this.menuButton.repairSOFlagButton = true - } - }) - } else { - this.menuButton.repairSOFlagButton = true - } - // 印版已发 取消 - if (currentRow.plateIssueFlag == 'Y') { - // 获取特殊权限 - let data = { - userSpecialSecurityNo: 259, - username: this.$store.state.user.name - } - getUserSpecialSecurity(data).then(({data}) => { - if (data.userSpecialSecurity == 'Y') { - this.menuButton.canceledRepairSOFlagButton = false - } else { - this.menuButton.canceledRepairSOFlagButton = true - } - }) - } else { - this.menuButton.canceledRepairSOFlagButton = true - } - this.menuShow = true - }) - } - }, - /* 区分不同的菜单 调用不同的方法 调用不同的方法 */ - handleCommand(val) { - // 区分是哪一个方法调用 - // 页面跳转 - if (val == '0') { - if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error(this.labels.pleaseSelectSchedule) - return false - } - this.$router.push({ - path: '/shopOrder-shopOrder/shopOrder', - query: { - order: this.currentRow.orderNo, - site: this.currentRow.site, - user: this.$store.state.user.name - } - }) - } - - if (val === '查看物料库存') { - // 判断是否选择好了工单 - if (this.currentRow == null || this.currentRow == {}) { - // 重置按钮 - this.menuButton.partStockFlag = true - // 返回错误 - this.$message.error(this.labels.pleaseSelectSchedule) - return false - } - let tempData = {'site': this.currentRow.site, 'orderNo': this.currentRow.orderNo} - // 打开组件 需要的数据 展示需要的数据 - this.$nextTick(() => { - this.showPartStockFlag = true - this.$refs.comPartStock.init(tempData) - }) - } - // 关闭 - if (val == '1') { - // 调用提示的方法 - this.$confirm(this.labels.sureCloseThisSchedule, this.labels.closeScheduleLabel, { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - let data = { - username: this.$store.state.user.name, - itemNo: this.currentRow.itemNo, - site: this.currentRow.site, - orderNo: this.currentRow.orderNo, - seqNo: this.currentRow.seqNo, - closedFlag: 'Y' - } - closeOrOpenProduceOrder(data).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - } else { - this.$message.error(data.msg) - } - }) - }) - } - // 打开 - if (val == '2') { - // 调用提示的方法 - this.$confirm(this.labels.sureOpenThisSchedule, this.labels.closeScheduleLabel, { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - let data = { - username: this.$store.state.user.name, - itemNo: this.currentRow.itemNo, - site: this.currentRow.site, - orderNo: this.currentRow.orderNo, - seqNo: this.currentRow.seqNo, - closedFlag: 'N' - } - closeOrOpenProduceOrder(data).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - } else { - this.$message.error(data.msg) - } - }) - }) - } - // 暂停 - if (val == '3') { - // 调用提示的方法 - this.$confirm(this.labels.surePauseThisSchedule, this.labels.closeScheduleLabel, { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - let data = { - username: this.$store.state.user.name, - itemNo: this.currentRow.itemNo, - site: this.currentRow.site, - orderNo: this.currentRow.orderNo, - seqNo: this.currentRow.seqNo, - parkFlag: 'Y' - } - pauseOrOpenProduceOrder(data).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - } else { - this.$message.error(data.msg) - } - }) - }) - } - // 重开 - if (val == '4') { - // 调用提示的方法 - this.$confirm(this.labels.sureReopenThisSchedule, this.labels.closeScheduleLabel, { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - let data = { - username: this.$store.state.user.name, - itemNo: this.currentRow.itemNo, - site: this.currentRow.site, - orderNo: this.currentRow.orderNo, - seqNo: this.currentRow.seqNo, - parkFlag: 'N' - } - pauseOrOpenProduceOrder(data).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - } else { - this.$message.error(data.msg) - } - }) - }) - } - // 创建重检派工单 - if (val == '5') { - this.$nextTick(() => { - this.$refs.createRecheck.init(this.currentRow) - }) - } - // 取消所有派工单操作 - if (val == '6') { - // 调用提示的方法 - this.$confirm(this.labels.sureCancelScheduleAllOperations, this.labels.shopOrderLabel, { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - let data = { - orderNo: this.currentRow.orderNo, - itemNo: this.currentRow.itemNo, - site: this.currentRow.site, - seqNo: this.currentRow.seqNo, - username: this.searchData.username, - userDisplay: this.searchData.userDisplay - } - workbenchCancelallops(data).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - } else { - this.$message.warning(data.msg) - } - }) - }) - } - // 生产已排料 确认 - if (val == '7') { - // 调用提示的方法 - this.$confirm(this.labels.sureThisOrderMaterialIsIssued, this.labels.prodIssued, { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - let data = { - site: this.currentRow.site, - orderNo: this.currentRow.orderNo, - itemNo: this.currentRow.itemNo, - seqNo: this.currentRow.seqNo, - username: this.$store.state.user.name, - matIssueFlag: 'Y', - orderChangeStatus: '订单已排料' - } - costRollUpProduceOrder(data).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - } else { - this.$message.warning(data.msg) - } - }) - }) - } - // 生产已排料 取消 - if (val == '8') { - // 调用提示的方法 - this.$confirm(this.labels.sureCancelThisOrderMaterialIssued, this.labels.cancelOrderMaterialIssued, { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - let data = { - site: this.currentRow.site, - orderNo: this.currentRow.orderNo, - itemNo: this.currentRow.itemNo, - seqNo: this.currentRow.seqNo, - matIssueFlag: 'N', - orderChangeStatus: '撤销订单排料' - } - costRollUpProduceOrder(data).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - } else { - this.$message.warning(data.msg) - } - }) - }) - } - // 刀模 确认 - if (val == '9') { - this.$confirm(this.labels.sureCancelThisOrderToolIssued, this.labels.toolIssued, { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - let data = { - site: this.currentRow.site, - orderNo: this.currentRow.orderNo, - itemNo: this.currentRow.itemNo, - seqNo: this.currentRow.seqNo, - toolIssueFlag: 'Y', - orderChangeStatus: '订单刀模已发' - } - manualProduceOrder(data).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - } else { - this.$message.warning(data.msg) - } - }) - }) - } - // 刀模 取消 - if (val == '10') { - this.$confirm(this.labels.sureCancelThisOrderToolIssued, this.labels.toolIssued, { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - let data = { - site: this.currentRow.site, - orderNo: this.currentRow.orderNo, - itemNo: this.currentRow.itemNo, - seqNo: this.currentRow.seqNo, - toolIssueFlag: 'N', - orderChangeStatus: '撤销订单刀模已发' - } - manualProduceOrder(data).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - } else { - this.$message.warning(data.msg) - } - }) - }) - } - // 印版已发 - if (val == '11') { - this.$confirm(this.labels.sureThisOrderPrintIsIssued, this.labels.printIssued, { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - let data = { - site: this.currentRow.site, - orderNo: this.currentRow.orderNo, - itemNo: this.currentRow.itemNo, - seqNo: this.currentRow.seqNo, - plateIssueFlag: 'Y', - orderChangeStatus: '订单印版已发' - } - repairSOFlagProduceOrder(data).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - } else { - this.$message.warning(data.msg) - } - }) - }) - } - // 印版已发 取消 - if (val == '12') { - this.$confirm(this.labels.sureCancelThisOrderPrintIssued, this.labels.printIssued, { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - let data = { - site: this.currentRow.site, - orderNo: this.currentRow.orderNo, - itemNo: this.currentRow.itemNo, - seqNo: this.currentRow.seqNo, - plateIssueFlag: 'N', - orderChangeStatus: '订单印版已发' - } - repairSOFlagProduceOrder(data).then(({data}) => { - if (data.code == 0) { - this.$message.success(data.msg) - } else { - this.$message.warning(data.msg) - } - }) - }) - } - }, - // FQC 报工 - fqcReportModal() { - // 首先判断是否选择好派工单 - if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error(this.labels.pleaseSelectSchedule) - return false - } - // 打开操作员切换功能 - this.fqcShowReportFlag = true - this.$nextTick(() => { - this.$refs.fqcProduceReportNormal.init(this.currentRow.seqNo, this.operatorData) - }) - }, - // FQC 分卷 - fqcSplitRollModal() { - if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error(this.labels.pleaseSelectSchedule) - return false - } - // 打开操作员切换功能 - this.fqcRollShowReportFlag = true - this.$nextTick(() => { - this.$refs.fqcSplitRollReport.init(this.currentRow.seqNo, this.operatorData) - }) - }, - // 返工重捡 - reworkInspectModal() { - // 首先判断是否选择好派工单 - if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error(this.labels.pleaseSelectSchedule) - return false - } - // 打开操作员切换功能 - this.reworkShowReportFlag = true - this.$nextTick(() => { - this.$refs.reworkInspectReport.init(this.currentRow.seqNo, this.operatorData) - }) - }, - // 换包装 - changePackaging() { - // 首先判断是否选择好派工单 - if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error(this.labels.pleaseSelectSchedule) - return false - } - // 打开操作员切换功能 - this.changePackagingFlag = true - this.$nextTick(() => { - this.$refs.changePackaging.init(this.currentRow.seqNo, this.operatorData) - }) - }, /* 查询派工单 */ getProduceScheduleList() { // 开始真的查询; @@ -1886,186 +393,26 @@ export default { }, /* 设置选中行的参数 */ setCurrentRow(row, column, event) { - this.currentRow = JSON.parse(JSON.stringify(row)) - }, - - // 设置参数 - initOperatorData(operatorData) { - this.showOperatorFlag = false - this.operatorData = JSON.parse(JSON.stringify(operatorData)) - if (operatorData.reportType == 0) { - // 切换到报工组件 - this.switchProduceReportModal() - } - - if (operatorData.reportType == 1) { - // 切换到fqc报工组件 - this.fqcReportModal() - } - - if (operatorData.reportType == 2) { - // 切换到返工 重检组件 - this.reworkInspectModal() - } - if (operatorData.reportType == 3) { - // 切换到fqc分卷组件 - this.fqcSplitRollModal() - } - if (operatorData.reportType == 4) { - // 换包装 - this.changePackaging() - } - - /* 分切报工 */ - if (operatorData.reportType == 8) { - // 分切报工 - this.showSplitOrderReportModal() - } - }, - - notInitOperatorData(val) { - // 注销用户信息 - this.operatorData.operatorId = '' - this.operatorData.operatorName = '' - // 关闭切换用户模态框 - this.showOperatorFlag = false - if (val == 0) { - // 切换到报工组件 - this.switchProduceReportModal() - } - - if (val == 1) { - // 切换到fqc报工组件 - this.fqcReportModal() - } - - if (val == 2) { - // 切换到返工 重检组件 - this.reworkInspectModal() - } - if (val == 3) { - // 切换到fqc分卷组件 - this.fqcSplitRollModal() - } - if (val == 4) { - // 切换到换包装 - this.changePackaging() - } - - // 分切报工 - if (val == 8) { - // 分切报工 - this.showSplitOrderReportModal() - } - }, - // 切换员工modal - switchOperatorModal(val) { - // 首先判断是否选择好派工单 - if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error(this.labels.pleaseSelectSchedule) - return false - } - //获取下一道工序 - let nextItemNo = this.currentRow.nextItemNo; - - if (val == 0) { - let orderType = this.currentRow.orderType - let workCenterNo = this.currentRow.workCenterNo - if (orderType != 'S' || workCenterNo === 'FQC' || nextItemNo == 0) { - // 验证通过 - this.$message.error(this.labels.thisScheduleCantReport) - return false - } - let data = { - site: this.currentRow.site, - resourceId: this.currentRow.resourceId, - workCenterNo: this.currentRow.workCenterNo, - seqNo: this.currentRow.seqNo, - username: this.$store.state.user.name - } - reportCheck(data).then(({data}) => { - if (data.code == 0) { - // 打开操作员切换功能 - this.showOperatorFlag = true - this.$nextTick(() => { - this.$refs.comSwitchOperator.init(val) - }) - } - if (data.code == 300) { - this.$message.warning(data.msg) - } - if (data.code == 400) { - this.$confirm(`${data.msg}`, '提示', { - confirmButtonText: this.labels.confirmLabel, - cancelButtonText: this.labels.cancelLabel, - type: 'warning' - }).then(() => { - // 打开操作员切换功能 - this.showOperatorFlag = true - this.$nextTick(() => { - this.$refs.comSwitchOperator.init(val) - }) - }) - } - }) - } else if (val == 8) { // 处理 分切工单 - // 判断当前工单是否是分切工单 - let orderType = this.currentRow.orderType - if (orderType === 'D') { - this.showOperatorFlag = true - this.$refs.comSwitchOperator.init(val) - } else { - this.$message.error(this.labels.thisOrderIsNotSplitOrder) - return false - } - } else if (val == 1) { // 处理 FQC - // 判断订单类型和加工中心 - let workCenterNo = this.currentRow.workCenterNo - if (workCenterNo === 'FQC' || nextItemNo == 0) { - this.showOperatorFlag = true - this.$refs.comSwitchOperator.init(val) - } else { - this.$message.error(this.labels.thisScheduleIsNotFqc) - return false - } - } else { - if (val == 4) { - getShopOrder(this.currentRow).then(({data}) => { - if (data.code == 0) { - if (data.data == 'P') { - // 打开操作员切换功能 - this.showOperatorFlag = true - this.$nextTick(() => { - this.$refs.comSwitchOperator.init(val) - }) - } else { - this.$alert(this.labels.thisOrderIsNotSpecialOrder, '提示', { - confirmButtonText: this.labels.confirmLabel - }) - } - } - }) - } else { - // 打开操作员切换功能 - this.showOperatorFlag = true - this.$nextTick(() => { - this.$refs.comSwitchOperator.init(val) - }) - } + this.currentRow = JSON.parse(JSON.stringify(row)); + //区分当前的工序数据 + if(10 === this.currentRow.itemNo){ + this.reportButton.dieCuttingButton = false; + this.reportButton.fqcReportButton = true; + }else if(20 === this.currentRow.itemNo){ + this.reportButton.dieCuttingButton = true; + this.reportButton.fqcReportButton = false; } }, - // 切换报工modal - switchProduceReportModal() { + dieCuttingReportModal() { // 首先判断是否选择好派工单 if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error(this.labels.pleaseSelectSchedule) + this.$message.error('请先选择好工单!') return false } // 打开操作员切换功能 - this.showReportFlag = true this.$nextTick(() => { - this.$refs.comProduceReportNormal.init(this.currentRow.seqNo, this.operatorData) + this.$refs.comDieCuttingReport.init(this.currentRow.seqNo) }) }, @@ -2163,7 +510,7 @@ export default { let queryTable = { userId: this.$store.state.user.name, functionId: this.$route.meta.menuId, - tableId: '5302Produce', + tableId: '600001Produce', languageCode: this.$i18n.locale } this.$nextTick(() => { @@ -2240,39 +587,7 @@ export default { }) }, - //获取按钮的权限数据 - getButtonAuthData() { - let updateFlag = this.isAuth(this.menuId + ":revise"); - let fullControFlag = this.isAuth(this.menuId + ":fullContro"); - let deleteFlag = this.isAuth(this.menuId + ":remove"); - //处理页面的权限数据 - this.authEdit = !updateFlag && !fullControFlag; - this.authAdd = !fullControFlag; - this.authDelete = !deleteFlag; - }, - - //获取多语言的信息 - getMultiLanguageList() { - //首先查询当前按钮的多语言 - searchFunctionButtonList(this.queryButton).then(({data}) => { - if (data && data.code == 0) { - this.buttons = data.data - } else { - // saveButtonList(this.buttonList).then(({data}) => { - // }) - } - }); - //其次查询当前标签的多语言 - searchFunctionButtonList(this.queryLabel).then(({data}) => { - if (data && data.code == 0) { - this.labels = data.data - } else { - // saveButtonList(this.buttonList).then(({data}) => { - // }) - } - }); - }, fields() { let json = "{" this.columnList.forEach((item, index) => { @@ -2318,50 +633,9 @@ export default { this.produceScheduleList = data.rows }) - /* 获取报工的特殊权限 */ - getScheduleMultiReportSpecialAuth(this.searchData).then(({data}) => { - let authMap = data.authMap - // 区分是否打开按钮 - if (authMap.normalReportFlag === 'Y') { - this.reportButton.normalReportButton = false - } else { - this.reportButton.normalReportButton = true - } - if (authMap.fqcReportFlag === 'Y') { - this.reportButton.fqcReportButton = false - } else { - this.reportButton.fqcReportButton = true - } - if (authMap.reworkReportFlag === 'Y') { - this.reportButton.reworkReportButton = false - } else { - this.reportButton.reworkReportButton = true - } - if (authMap.packReportFlag === 'Y') { - this.reportButton.packReportButton = false - } else { - this.reportButton.packReportButton = true - } - if (authMap.fqcSegmentReportFlag === 'Y') { - this.reportButton.fqcSegmentReportButton = false - } else { - this.reportButton.fqcSegmentReportButton = true - } - if (authMap.slitReportFlag === 'Y') { - this.reportButton.slitReportButton = false - } else { - this.reportButton.slitReportButton = true - } - }) - // 获取动态表头的信息 - this.getTableUserColumn() - - - //获取按钮的权限 - this.getButtonAuthData(); - - this.getMultiLanguageList(); //刷新多语言的信息 + // 获取动态表头的信息 + //this.getTableUserColumn() } }