diff --git a/src/views/modules/yieldReport/com_finish_part_roll.vue b/src/views/modules/yieldReport/com_finish_part_roll.vue index 814313d..1561aea 100644 --- a/src/views/modules/yieldReport/com_finish_part_roll.vue +++ b/src/views/modules/yieldReport/com_finish_part_roll.vue @@ -64,7 +64,7 @@ - + diff --git a/src/views/modules/yieldReport/not_over_finish_roll.vue b/src/views/modules/yieldReport/not_over_finish_roll.vue index cac9527..3353510 100644 --- a/src/views/modules/yieldReport/not_over_finish_roll.vue +++ b/src/views/modules/yieldReport/not_over_finish_roll.vue @@ -9,8 +9,8 @@
- 人员排程班次信息 - + {{labels.operatorScheduleInfo}} + - + - + - + - + @@ -38,27 +38,22 @@
- - - 列表 - - - 刷新 + {{buttons.refreshButton}} - 结束卷 + {{buttons.finishRollButton}} - 关闭 + {{buttons.closeButton}} @@ -67,30 +62,30 @@
- 卷数量统计 + {{labels.rollQtySum}} 是否报告产量 + v-model="pageData.reportedFlag">{{labels.whetherReport}} - + - + - + - + - + -
- 卷生产时间统计 +
+ {{labels.rollTimeSum}} - + - + - + - + @@ -123,15 +118,15 @@ - + - + - + @@ -140,15 +135,15 @@ - + - + - + @@ -157,27 +152,27 @@
+ style="margin-left: 325px; margin-top: -143.5px; width: 575px;"> - 产量报告 + {{ labels.produceReport }} - + - + - + - + - + @@ -186,22 +181,22 @@ - + - + - + - + - + @@ -209,10 +204,10 @@ - + - + @@ -222,7 +217,7 @@
- 主材料 + {{labels.primaryMaterial}} { + if (JSON.stringify(data.data) != '{}') { + this.buttons = data.data + } else { + // saveButtonList(this.buttonList).then(({data}) => { + // }) + } + }); + //其次查询当前标签的多语言 + searchFunctionButtonList(this.queryLabel).then(({data}) => { + if (JSON.stringify(data.data) != '{}') { + this.labels = data.data + } else { + // saveButtonList(this.buttonList).then(({data}) => { + // }) + } + }); + }, + }, created() { // this.factoryList() // this.getLanguageList() + this.getMultiLanguageList();//刷新多语言的信息 } } diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 3a2575b..d1bf478 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -230,37 +230,37 @@ import { repairSOFlagProduceOrder, workbenchCancelallops, getShopOrder, - getScheduleMultiReportSpecialAuth,/*获取派工单的特殊权限*/ -} from '@/api/yieldReport/produce_order.js'; + getScheduleMultiReportSpecialAuth,/* 获取派工单的特殊权限 */ +} from '@/api/yieldReport/produce_order.js' -/*动态表头*/ +/* 动态表头 */ import { saveTableDefaultList, getTableDefaultListLanguage, getTableUserListLanguage, removerDefault, removerUser -} from "@/api/table.js"; - -/*引入组件*/ -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";/*结束派工的组件*/ +} from '@/api/table.js' + +/* 引入组件 */ +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 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' +/* 展示物料库存的组件 */ +/* 分切报工 */ export default { - data() { + data () { return { height: 800, menuShow: false, @@ -309,21 +309,21 @@ export default { download: '导出', settingTable: '设置列表', defaultTable: '设置默认配置', - list: "列表", + list: '列表', addList: '批量添加', - settingLanguage: "按控件设置" + settingLanguage: '按控件设置' }, columnList: [ { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceMatIssueFlag', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "matIssueFlag", - headerAlign: "center", - align: "center", - columnLabel: "已排料", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'matIssueFlag', + headerAlign: 'center', + align: 'center', + columnLabel: '已排料', columnWidth: 80, columnHidden: false, columnImage: false, @@ -336,12 +336,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceToolIssueFlag', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "toolIssueFlag", - headerAlign: "center", - align: "center", - columnLabel: "刀模已发", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'toolIssueFlag', + headerAlign: 'center', + align: 'center', + columnLabel: '刀模已发', columnWidth: 90, columnHidden: false, columnImage: false, @@ -354,12 +354,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProducePlateIssueFlag', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "plateIssueFlag", - headerAlign: "center", - align: "center", - columnLabel: "印版已发", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'plateIssueFlag', + headerAlign: 'center', + align: 'center', + columnLabel: '印版已发', columnWidth: 90, columnHidden: false, columnImage: false, @@ -372,12 +372,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProducePreResourceInfo', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "preResourceInfo", - headerAlign: "center", - align: "left", - columnLabel: "上工序机台信息", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'preResourceInfo', + headerAlign: 'center', + align: 'left', + columnLabel: '上工序机台信息', columnWidth: 100, columnHidden: false, columnImage: false, @@ -390,12 +390,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProducePreQtyFinished', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "preQtyFinished", - headerAlign: "center", - align: "right", - columnLabel: "上工序完工数", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'preQtyFinished', + headerAlign: 'center', + align: 'right', + columnLabel: '上工序完工数', columnWidth: 100, columnHidden: false, columnImage: false, @@ -408,12 +408,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProducePlanStartTime', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "planStartTime", - headerAlign: "center", - align: "center", - columnLabel: "计划开工时间", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'planStartTime', + headerAlign: 'center', + align: 'center', + columnLabel: '计划开工时间', columnWidth: 125, columnHidden: false, columnImage: false, @@ -426,12 +426,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProducePlanFinishTime', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "planFinishTime", - headerAlign: "center", - align: "center", - columnLabel: "计划完工时间", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'planFinishTime', + headerAlign: 'center', + align: 'center', + columnLabel: '计划完工时间', columnWidth: 125, columnHidden: false, columnImage: false, @@ -444,12 +444,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceTimeRequired', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "timeRequired", - headerAlign: "center", - align: "center", - columnLabel: "需求时间", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'timeRequired', + headerAlign: 'center', + align: 'center', + columnLabel: '需求时间', columnWidth: 60, columnHidden: false, columnImage: false, @@ -462,12 +462,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceTimeReported', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "timeReported", - headerAlign: "center", - align: "center", - columnLabel: "已报告时间", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'timeReported', + headerAlign: 'center', + align: 'center', + columnLabel: '已报告时间', columnWidth: 70, columnHidden: false, columnImage: false, @@ -480,12 +480,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceOrderNo', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "orderNo", - headerAlign: "center", - align: "center", - columnLabel: "生产订单号", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'orderNo', + headerAlign: 'center', + align: 'center', + columnLabel: '生产订单号', columnWidth: 70, columnHidden: false, columnImage: false, @@ -498,12 +498,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceItemNo', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "itemNo", - headerAlign: "center", - align: "center", - columnLabel: "工序号", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'itemNo', + headerAlign: 'center', + align: 'center', + columnLabel: '工序号', columnWidth: 80, columnHidden: false, columnImage: false, @@ -516,12 +516,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceItemDesc', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "itemDesc", - headerAlign: "center", - align: "center", - columnLabel: "工序描述", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'itemDesc', + headerAlign: 'center', + align: 'center', + columnLabel: '工序描述', columnWidth: 80, columnHidden: false, columnImage: false, @@ -534,12 +534,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceResourceId', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "resourceId", - headerAlign: "center", - align: "center", - columnLabel: "机台", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'resourceId', + headerAlign: 'center', + align: 'center', + columnLabel: '机台', columnWidth: 60, columnHidden: false, columnImage: false, @@ -552,12 +552,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceQtyRequired', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "qtyRequired", - headerAlign: "center", - align: "center", - columnLabel: "需求数量", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'qtyRequired', + headerAlign: 'center', + align: 'center', + columnLabel: '需求数量', columnWidth: 60, columnHidden: false, columnImage: false, @@ -570,12 +570,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceQtyReported', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "qtyReported", - headerAlign: "center", - align: "right", - columnLabel: "已报告数量", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'qtyReported', + headerAlign: 'center', + align: 'right', + columnLabel: '已报告数量', columnWidth: 100, columnHidden: false, columnImage: false, @@ -588,12 +588,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceNeedDate', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "needDate", - headerAlign: "center", - align: "center", - columnLabel: "生产订单要求完工日期", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'needDate', + headerAlign: 'center', + align: 'center', + columnLabel: '生产订单要求完工日期', columnWidth: 170, columnHidden: false, columnImage: false, @@ -606,12 +606,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceClosedFlag', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "closedFlag", - headerAlign: "center", - align: "center", - columnLabel: "已关闭", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'closedFlag', + headerAlign: 'center', + align: 'center', + columnLabel: '已关闭', columnWidth: 50, columnHidden: false, columnImage: false, @@ -624,12 +624,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProducePartNo', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "partNo", - headerAlign: "center", - align: "center", - columnLabel: "产品编码", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'partNo', + headerAlign: 'center', + align: 'center', + columnLabel: '产品编码', columnWidth: 110, columnHidden: false, columnImage: false, @@ -642,12 +642,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProducePartDesc', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "partDesc", - headerAlign: "center", - align: "center", - columnLabel: "产品名称", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'partDesc', + headerAlign: 'center', + align: 'center', + columnLabel: '产品名称', columnWidth: 180, columnHidden: false, columnImage: false, @@ -660,12 +660,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceSpec', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "spec", - headerAlign: "center", - align: "center", - columnLabel: "规格型号", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'spec', + headerAlign: 'center', + align: 'center', + columnLabel: '规格型号', columnWidth: 80, columnHidden: false, columnImage: false, @@ -678,12 +678,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceSeqNo', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "seqNo", - headerAlign: "center", - align: "center", - columnLabel: "次序号", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'seqNo', + headerAlign: 'center', + align: 'center', + columnLabel: '次序号', columnWidth: 80, columnHidden: false, columnImage: false, @@ -696,12 +696,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceQtyApprove', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "qtyApprove", - headerAlign: "center", - align: "center", - columnLabel: "合格数量", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'qtyApprove', + headerAlign: 'center', + align: 'center', + columnLabel: '合格数量', columnWidth: 80, columnHidden: false, columnImage: false, @@ -714,12 +714,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceBarcodeId', - tableId: "5302Produce", - tableName: "条形码", - columnProp: "barcodeId", - headerAlign: "center", - align: "center", - columnLabel: "条形码", + tableId: '5302Produce', + tableName: '条形码', + columnProp: 'barcodeId', + headerAlign: 'center', + align: 'center', + columnLabel: '条形码', columnWidth: 80, columnHidden: false, columnImage: false, @@ -732,12 +732,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceRemark', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "remark", - headerAlign: "center", - align: "center", - columnLabel: "备注", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'remark', + headerAlign: 'center', + align: 'center', + columnLabel: '备注', columnWidth: 80, columnHidden: false, columnImage: false, @@ -750,12 +750,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceCrewSize', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "crewSize", - headerAlign: "center", - align: "center", - columnLabel: "操作工人数", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'crewSize', + headerAlign: 'center', + align: 'center', + columnLabel: '操作工人数', columnWidth: 80, columnHidden: false, columnImage: false, @@ -768,12 +768,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceQtyScrapt', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "qtyScrapt", - headerAlign: "center", - align: "center", - columnLabel: "报废数量", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'qtyScrapt', + headerAlign: 'center', + align: 'center', + columnLabel: '报废数量', columnWidth: 80, columnHidden: false, columnImage: false, @@ -786,12 +786,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceOutWorkFlag', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "outWorkFlag", - headerAlign: "center", - align: "center", - columnLabel: "是否外协", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'outWorkFlag', + headerAlign: 'center', + align: 'center', + columnLabel: '是否外协', columnWidth: 80, columnHidden: false, columnImage: false, @@ -804,12 +804,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceScheduledDate', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "scheduledDate", - headerAlign: "center", - align: "center", - columnLabel: "排产日期", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'scheduledDate', + headerAlign: 'center', + align: 'center', + columnLabel: '排产日期', columnWidth: 80, columnHidden: false, columnImage: false, @@ -822,12 +822,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceScheduledSeqNo', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "scheduledSeqNo", - headerAlign: "center", - align: "center", - columnLabel: "次序号", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'scheduledSeqNo', + headerAlign: 'center', + align: 'center', + columnLabel: '次序号', columnWidth: 80, columnHidden: false, columnImage: false, @@ -840,12 +840,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceShiftNo', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "shiftNo", - headerAlign: "center", - align: "center", - columnLabel: "班次", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'shiftNo', + headerAlign: 'center', + align: 'center', + columnLabel: '班次', columnWidth: 80, columnHidden: false, columnImage: false, @@ -858,12 +858,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceMachSetupTime', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "machSetupTime", - headerAlign: "center", - align: "center", - columnLabel: "调机时间", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'machSetupTime', + headerAlign: 'center', + align: 'center', + columnLabel: '调机时间', columnWidth: 80, columnHidden: false, columnImage: false, @@ -876,12 +876,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceMachRunFactor', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "machRunFactor", - headerAlign: "center", - align: "center", - columnLabel: "单位产出", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'machRunFactor', + headerAlign: 'center', + align: 'center', + columnLabel: '单位产出', columnWidth: 80, columnHidden: false, columnImage: false, @@ -894,12 +894,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceFactorUnit', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "factorUnit", - headerAlign: "center", - align: "center", - columnLabel: "产出单位", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'factorUnit', + headerAlign: 'center', + align: 'center', + columnLabel: '产出单位', columnWidth: 80, columnHidden: false, columnImage: false, @@ -912,12 +912,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceEfficiency', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "efficiency", - headerAlign: "center", - align: "center", - columnLabel: "效率", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'efficiency', + headerAlign: 'center', + align: 'center', + columnLabel: '效率', columnWidth: 80, columnHidden: false, columnImage: false, @@ -930,12 +930,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceNextItemNo', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "nextItemNo", - headerAlign: "center", - align: "center", - columnLabel: "下道工序号", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'nextItemNo', + headerAlign: 'center', + align: 'center', + columnLabel: '下道工序号', columnWidth: 80, columnHidden: false, columnImage: false, @@ -948,12 +948,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceNextItemDesc', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "nextItemDesc", - headerAlign: "center", - align: "center", - columnLabel: "下道工序名称", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'nextItemDesc', + headerAlign: 'center', + align: 'center', + columnLabel: '下道工序名称', columnWidth: 80, columnHidden: false, columnImage: false, @@ -966,12 +966,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProducePreItemNo', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "preItemNo", - headerAlign: "center", - align: "center", - columnLabel: "前道工序号", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'preItemNo', + headerAlign: 'center', + align: 'center', + columnLabel: '前道工序号', columnWidth: 80, columnHidden: false, columnImage: false, @@ -984,12 +984,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProducePreItemDesc', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "preItemDesc", - headerAlign: "center", - align: "center", - columnLabel: "前道工序名称", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'preItemDesc', + headerAlign: 'center', + align: 'center', + columnLabel: '前道工序名称', columnWidth: 80, columnHidden: false, columnImage: false, @@ -1002,12 +1002,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceSite', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "site", - headerAlign: "center", - align: "center", - columnLabel: "工厂编号", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'site', + headerAlign: 'center', + align: 'center', + columnLabel: '工厂编号', columnWidth: 80, columnHidden: false, columnImage: false, @@ -1020,12 +1020,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceParkFlag', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "parkFlag", - headerAlign: "center", - align: "center", - columnLabel: "暂停", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'parkFlag', + headerAlign: 'center', + align: 'center', + columnLabel: '暂停', columnWidth: 80, columnHidden: false, columnImage: false, @@ -1038,12 +1038,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceCustomerName', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "customerName", - headerAlign: "center", - align: "center", - columnLabel: "客户名称", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'customerName', + headerAlign: 'center', + align: 'center', + columnLabel: '客户名称', columnWidth: 80, columnHidden: false, columnImage: false, @@ -1056,12 +1056,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceCustPartNo', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "custPartNo", - headerAlign: "center", - align: "center", - columnLabel: "客户产品料号", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'custPartNo', + headerAlign: 'center', + align: 'center', + columnLabel: '客户产品料号', columnWidth: 80, columnHidden: false, columnImage: false, @@ -1074,12 +1074,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceQtyRequiredOriginal', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "qtyRequiredOriginal", - headerAlign: "center", - align: "center", - columnLabel: "原始派工单需求数量", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'qtyRequiredOriginal', + headerAlign: 'center', + align: 'center', + columnLabel: '原始派工单需求数量', columnWidth: 80, columnHidden: false, columnImage: false, @@ -1092,12 +1092,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceClosedBy', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "closedBy", - headerAlign: "center", - align: "center", - columnLabel: "关闭人", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'closedBy', + headerAlign: 'center', + align: 'center', + columnLabel: '关闭人', columnWidth: 80, columnHidden: false, columnImage: false, @@ -1110,12 +1110,12 @@ export default { userId: this.$store.state.user.name, functionId: 5302, serialNumber: '5302ProduceClosedDate', - tableId: "5302Produce", - tableName: "待生产工单", - columnProp: "closedDate", - headerAlign: "center", - align: "center", - columnLabel: "关闭日期", + tableId: '5302Produce', + tableName: '待生产工单', + columnProp: 'closedDate', + headerAlign: 'center', + align: 'center', + columnLabel: '关闭日期', columnWidth: 80, columnHidden: false, columnImage: false, @@ -1123,7 +1123,7 @@ export default { sortLv: 0, status: true, fixed: '' - }, + } ], reportButton: { @@ -1132,7 +1132,7 @@ export default { reworkReportButton: true, packReportButton: true, fqcSegmentReportButton: true, - slitReportButton: true, + slitReportButton: true }, menuButton: { prdButton: true, @@ -1148,49 +1148,49 @@ export default { canceledRepairSOFlagButton: false, canceledAllPrdButton: false, createRecheckButton: false, - partStockFlag: true,/*查看物料库存*/ + partStockFlag: true/* 查看物料库存 */ }, - queryTable:{ + queryTable: { userId: this.$store.state.user.name, functionId: this.$route.meta.menuId, - tableId: "5302Produce", + tableId: '5302Produce', languageCode: this.$i18n.locale }, // 用户table 查询参数 queryTableUser: { userId: this.$store.state.user.name, functionId: this.$route.meta.menuId, - tableId: "5302Produce", + tableId: '5302Produce', status: true, languageCode: this.$i18n.locale }, // 用户table 配置集合 - userColumnList: [], + userColumnList: [] } }, components: { - Chooselist,/*选择的组件*/ + Chooselist, /* 选择的组件 */ Com_split_schedule, - comSwitchOperator,/*切换用户的组件*/ - comProduceReportNormal,/*报工页面的组件*/ - comSplitOrderReport,/*分切报工*/ - comFinishSchedule,/*结束派工单的组件*/ - fqcProduceReportNormal, /*FQC报工*/ - reworkInspectReport, /*返工重建*/ - fqcSplitRollReport, /*FQC分卷*/ - createRecheck,/*创建重检派工单*/ - changePackaging, /*换包装*/ - comPartStock,/*展示物料库存的组件*/ - column,/*动态列*/ + comSwitchOperator, /* 切换用户的组件 */ + comProduceReportNormal, /* 报工页面的组件 */ + comSplitOrderReport, /* 分切报工 */ + comFinishSchedule, /* 结束派工单的组件 */ + fqcProduceReportNormal, /* FQC报工 */ + reworkInspectReport, /* 返工重建 */ + fqcSplitRollReport, /* FQC分卷 */ + createRecheck, /* 创建重检派工单 */ + changePackaging, /* 换包装 */ + comPartStock, /* 展示物料库存的组件 */ + column/* 动态列 */ }, - mounted() { + mounted () { this.$nextTick(() => { - this.height = window.innerHeight - 235; + this.height = window.innerHeight - 235 }) }, methods: { // 控制是否显示功能 - menuButtonFlag() { + menuButtonFlag () { this.menuShow = false if (JSON.stringify(this.currentRow) == '{}') { this.menuButton.prdButton = true @@ -1216,14 +1216,14 @@ export default { searchFlag: true } getProduceScheduleList(searchOrder).then(({data}) => { - //设置查询数据 - currentRow = data.rows[0]; + // 设置查询数据 + currentRow = data.rows[0] if (currentRow == null) { - return; + return } - //this.menuButton.canceledAllPrdButton = false + // this.menuButton.canceledAllPrdButton = false this.menuButton.createRecheckButton = false - this.menuButton.partStockFlag = false; + this.menuButton.partStockFlag = false // 判断是否具有该页面权限 let menList = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]').filter(item => item.path == 'shopOrder-shopOrder/shopOrder') if (menList.length > 0) { @@ -1231,7 +1231,7 @@ export default { } let canceledAllPrd = { userSpecialSecurityNo: 232, - username: this.$store.state.user.name, + username: this.$store.state.user.name } getUserSpecialSecurity(canceledAllPrd).then(({data}) => { if (data.userSpecialSecurity == 'Y') { @@ -1244,7 +1244,7 @@ export default { if (currentRow.closedFlag == 'N') { let data = { userSpecialSecurityNo: 230, - username: this.$store.state.user.name, + username: this.$store.state.user.name } getUserSpecialSecurity(data).then(({data}) => { if (data.userSpecialSecurity == 'Y') { @@ -1260,7 +1260,7 @@ export default { if (currentRow.closedFlag == 'Y') { let data = { userSpecialSecurityNo: 231, - username: this.$store.state.user.name, + username: this.$store.state.user.name } getUserSpecialSecurity(data).then(({data}) => { if (data.userSpecialSecurity == 'Y') { @@ -1289,7 +1289,7 @@ export default { // 获取特殊权限 let data = { userSpecialSecurityNo: 238, - username: this.$store.state.user.name, + username: this.$store.state.user.name } getUserSpecialSecurity(data).then(({data}) => { if (data.userSpecialSecurity == 'Y') { @@ -1306,7 +1306,7 @@ export default { // 获取特殊权限 let data = { userSpecialSecurityNo: 238, - username: this.$store.state.user.name, + username: this.$store.state.user.name } getUserSpecialSecurity(data).then(({data}) => { if (data.userSpecialSecurity == 'Y') { @@ -1323,7 +1323,7 @@ export default { // 获取特殊权限 let data = { userSpecialSecurityNo: 258, - username: this.$store.state.user.name, + username: this.$store.state.user.name } getUserSpecialSecurity(data).then(({data}) => { if (data.userSpecialSecurity == 'Y') { @@ -1340,7 +1340,7 @@ export default { // 获取特殊权限 let canceledAllPrdData = { userSpecialSecurityNo: 259, - username: this.$store.state.user.name, + username: this.$store.state.user.name } getUserSpecialSecurity(canceledAllPrdData).then(({data}) => { if (data.userSpecialSecurity == 'Y') { @@ -1357,7 +1357,7 @@ export default { // 获取特殊权限 let data = { userSpecialSecurityNo: 259, - username: this.$store.state.user.name, + username: this.$store.state.user.name } getUserSpecialSecurity(data).then(({data}) => { if (data.userSpecialSecurity == 'Y') { @@ -1374,7 +1374,7 @@ export default { // 获取特殊权限 let data = { userSpecialSecurityNo: 259, - username: this.$store.state.user.name, + username: this.$store.state.user.name } getUserSpecialSecurity(data).then(({data}) => { if (data.userSpecialSecurity == 'Y') { @@ -1387,17 +1387,17 @@ export default { this.menuButton.canceledRepairSOFlagButton = true } this.menuShow = true - }); + }) } }, - /*区分不同的菜单 调用不同的方法 调用不同的方法*/ - handleCommand(val) { - //区分是哪一个方法调用 - //页面跳转 - if ('0' == val) { + /* 区分不同的菜单 调用不同的方法 调用不同的方法 */ + handleCommand (val) { + // 区分是哪一个方法调用 + // 页面跳转 + if (val == '0') { if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error('请先选择派工单!'); - return false; + this.$message.error('请先选择派工单!') + return false } this.$router.push({ path: '/shopOrder-shopOrder/shopOrder', @@ -1409,25 +1409,25 @@ export default { }) } - if('查看物料库存' === val){ - //判断是否选择好了工单 - if(this.currentRow == null || this.currentRow == {}){ - //重置按钮 - this.menuButton.partStockFlag = true; - //返回错误 - this.$message.error('请选择派工单!'); - return false; + if (val === '查看物料库存') { + // 判断是否选择好了工单 + if (this.currentRow == null || this.currentRow == {}) { + // 重置按钮 + this.menuButton.partStockFlag = true + // 返回错误 + this.$message.error('请选择派工单!') + return false } - let tempData = {'site': this.currentRow.site, 'orderNo': this.currentRow.orderNo}; - //打开组件 需要的数据 展示需要的数据 + let tempData = {'site': this.currentRow.site, 'orderNo': this.currentRow.orderNo} + // 打开组件 需要的数据 展示需要的数据 this.$nextTick(() => { - this.showPartStockFlag = true; - this.$refs.comPartStock.init(tempData); + this.showPartStockFlag = true + this.$refs.comPartStock.init(tempData) }) } // 关闭 - if ('1' == val) { - //调用提示的方法 + if (val == '1') { + // 调用提示的方法 this.$confirm(`确定要关闭当前派工单吗？`, `关闭派工单`, { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1439,7 +1439,7 @@ export default { site: this.currentRow.site, orderNo: this.currentRow.orderNo, seqNo: this.currentRow.seqNo, - closedFlag: 'Y', + closedFlag: 'Y' } closeOrOpenProduceOrder(data).then(({data}) => { if (data.code == 0) { @@ -1448,11 +1448,11 @@ export default { this.$message.error(data.msg) } }) - }); + }) } // 打开 - if ('2' == val) { - //调用提示的方法 + if (val == '2') { + // 调用提示的方法 this.$confirm(`确定要打开当前派工单吗？`, `关闭派工单`, { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1464,7 +1464,7 @@ export default { site: this.currentRow.site, orderNo: this.currentRow.orderNo, seqNo: this.currentRow.seqNo, - closedFlag: 'N', + closedFlag: 'N' } closeOrOpenProduceOrder(data).then(({data}) => { if (data.code == 0) { @@ -1473,11 +1473,11 @@ export default { this.$message.error(data.msg) } }) - }); + }) } // 暂停 - if ('3' == val) { - //调用提示的方法 + if (val == '3') { + // 调用提示的方法 this.$confirm(`确定要暂停当前派工单吗？`, `关闭派工单`, { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1489,7 +1489,7 @@ export default { site: this.currentRow.site, orderNo: this.currentRow.orderNo, seqNo: this.currentRow.seqNo, - parkFlag: 'Y', + parkFlag: 'Y' } pauseOrOpenProduceOrder(data).then(({data}) => { if (data.code == 0) { @@ -1498,11 +1498,11 @@ export default { this.$message.error(data.msg) } }) - }); + }) } // 重开 - if ('4' == val) { - //调用提示的方法 + if (val == '4') { + // 调用提示的方法 this.$confirm(`确定要重开当前派工单吗？`, `关闭派工单`, { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1514,7 +1514,7 @@ export default { site: this.currentRow.site, orderNo: this.currentRow.orderNo, seqNo: this.currentRow.seqNo, - parkFlag: 'N', + parkFlag: 'N' } pauseOrOpenProduceOrder(data).then(({data}) => { if (data.code == 0) { @@ -1523,17 +1523,17 @@ export default { this.$message.error(data.msg) } }) - }); + }) } // 创建重检派工单 - if ('5' == val) { + if (val == '5') { this.$nextTick(() => { - this.$refs.createRecheck.init(this.currentRow); - }); + this.$refs.createRecheck.init(this.currentRow) + }) } // 取消所有派工单操作 - if ('6' == val) { - //调用提示的方法 + if (val == '6') { + // 调用提示的方法 this.$confirm(` 确定取消所有派工单操作`, `生产订单`, { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1545,7 +1545,7 @@ export default { site: this.currentRow.site, seqNo: this.currentRow.seqNo, username: this.searchData.username, - userDisplay: this.searchData.userDisplay, + userDisplay: this.searchData.userDisplay } workbenchCancelallops(data).then(({data}) => { if (data.code == 0) { @@ -1557,8 +1557,8 @@ export default { }) } // 生产已排料 确认 - if ('7' == val) { - //调用提示的方法 + if (val == '7') { + // 调用提示的方法 this.$confirm(` 确定该订单的料已排`, `生产已排料`, { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1571,7 +1571,7 @@ export default { seqNo: this.currentRow.seqNo, username: this.$store.state.user.name, matIssueFlag: 'Y', - orderChangeStatus: "订单已排料", + orderChangeStatus: '订单已排料' } costRollUpProduceOrder(data).then(({data}) => { if (data.code == 0) { @@ -1580,12 +1580,11 @@ export default { this.$message.warning(data.msg) } }) - }) } // 生产已排料 取消 - if ('8' == val) { - //调用提示的方法 + if (val == '8') { + // 调用提示的方法 this.$confirm(` 确定要撤销该订单的排料？`, `撤销订单排料`, { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1597,7 +1596,7 @@ export default { itemNo: this.currentRow.itemNo, seqNo: this.currentRow.seqNo, matIssueFlag: 'N', - orderChangeStatus: "撤销订单排料", + orderChangeStatus: '撤销订单排料' } costRollUpProduceOrder(data).then(({data}) => { if (data.code == 0) { @@ -1606,11 +1605,10 @@ export default { this.$message.warning(data.msg) } }) - }) } // 刀模 确认 - if ('9' == val) { + if (val == '9') { this.$confirm(` 确定该订单的刀模已发？`, `刀模已发`, { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1622,7 +1620,7 @@ export default { itemNo: this.currentRow.itemNo, seqNo: this.currentRow.seqNo, toolIssueFlag: 'Y', - orderChangeStatus: "订单刀模已发", + orderChangeStatus: '订单刀模已发' } manualProduceOrder(data).then(({data}) => { if (data.code == 0) { @@ -1631,11 +1629,10 @@ export default { this.$message.warning(data.msg) } }) - }) } // 刀模 取消 - if ('10' == val) { + if (val == '10') { this.$confirm(` 确定要撤销该订单的刀模已发？`, `刀模已发`, { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1647,7 +1644,7 @@ export default { itemNo: this.currentRow.itemNo, seqNo: this.currentRow.seqNo, toolIssueFlag: 'N', - orderChangeStatus: "撤销订单刀模已发", + orderChangeStatus: '撤销订单刀模已发' } manualProduceOrder(data).then(({data}) => { if (data.code == 0) { @@ -1656,11 +1653,10 @@ export default { this.$message.warning(data.msg) } }) - }) } // 印版已发 - if ('11' == val) { + if (val == '11') { this.$confirm(` 确定该订单的印版已发？`, `印版已发`, { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1672,7 +1668,7 @@ export default { itemNo: this.currentRow.itemNo, seqNo: this.currentRow.seqNo, plateIssueFlag: 'Y', - orderChangeStatus: "订单印版已发", + orderChangeStatus: '订单印版已发' } repairSOFlagProduceOrder(data).then(({data}) => { if (data.code == 0) { @@ -1681,11 +1677,10 @@ export default { this.$message.warning(data.msg) } }) - }) } // 印版已发 取消 - if ('12' == val) { + if (val == '12') { this.$confirm(` 确定要撤销该订单的印版已发？`, `订单印版`, { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1697,7 +1692,7 @@ export default { itemNo: this.currentRow.itemNo, seqNo: this.currentRow.seqNo, plateIssueFlag: 'N', - orderChangeStatus: "订单印版已发", + orderChangeStatus: '订单印版已发' } repairSOFlagProduceOrder(data).then(({data}) => { if (data.code == 0) { @@ -1706,165 +1701,164 @@ export default { this.$message.warning(data.msg) } }) - }) } }, // FQC 报工 - fqcReportModal() { - //首先判断是否选择好派工单 + fqcReportModal () { + // 首先判断是否选择好派工单 if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error('请先选择派工单!'); - return false; + this.$message.error('请先选择派工单!') + return false } - //打开操作员切换功能 - this.fqcShowReportFlag = true; + // 打开操作员切换功能 + this.fqcShowReportFlag = true this.$nextTick(() => { - this.$refs.fqcProduceReportNormal.init(this.currentRow.seqNo, this.operatorData); - }); + this.$refs.fqcProduceReportNormal.init(this.currentRow.seqNo, this.operatorData) + }) }, // FQC 分卷 - fqcSplitRollModal() { + fqcSplitRollModal () { if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error('请先选择派工单!'); - return false; + this.$message.error('请先选择派工单!') + return false } - //打开操作员切换功能 - this.fqcRollShowReportFlag = true; + // 打开操作员切换功能 + this.fqcRollShowReportFlag = true this.$nextTick(() => { - this.$refs.fqcSplitRollReport.init(this.currentRow.seqNo, this.operatorData); - }); + this.$refs.fqcSplitRollReport.init(this.currentRow.seqNo, this.operatorData) + }) }, // 返工重捡 - reworkInspectModal() { - //首先判断是否选择好派工单 + reworkInspectModal () { + // 首先判断是否选择好派工单 if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error('请先选择派工单!'); - return false; + this.$message.error('请先选择派工单!') + return false } - //打开操作员切换功能 - this.reworkShowReportFlag = true; + // 打开操作员切换功能 + this.reworkShowReportFlag = true this.$nextTick(() => { - this.$refs.reworkInspectReport.init(this.currentRow.seqNo, this.operatorData); - }); + this.$refs.reworkInspectReport.init(this.currentRow.seqNo, this.operatorData) + }) }, // 换包装 - changePackaging() { - //首先判断是否选择好派工单 + changePackaging () { + // 首先判断是否选择好派工单 if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error('请先选择派工单!'); - return false; + this.$message.error('请先选择派工单!') + return false } - //打开操作员切换功能 - this.changePackagingFlag = true; + // 打开操作员切换功能 + this.changePackagingFlag = true this.$nextTick(() => { - this.$refs.changePackaging.init(this.currentRow.seqNo, this.operatorData); - }); + this.$refs.changePackaging.init(this.currentRow.seqNo, this.operatorData) + }) }, - /*查询派工单*/ - getProduceScheduleList() { - //开始真的查询; - this.searchData.searchFlag = true; + /* 查询派工单 */ + getProduceScheduleList () { + // 开始真的查询; + this.searchData.searchFlag = true getProduceScheduleList(this.searchData).then(({data}) => { - //设置查询数据 - this.produceScheduleList = data.rows; + // 设置查询数据 + this.produceScheduleList = data.rows }) }, - /*刷新页面table*/ - refreshPageTables() { + /* 刷新页面table */ + refreshPageTables () { this.currentRow = {} - this.getProduceScheduleList(); + this.getProduceScheduleList() }, - /*设置选中行的参数*/ - setCurrentRow(row, column, event) { - this.currentRow = JSON.parse(JSON.stringify(row)); + /* 设置选中行的参数 */ + setCurrentRow (row, column, event) { + this.currentRow = JSON.parse(JSON.stringify(row)) }, - //设置参数 - initOperatorData(operatorData) { - this.showOperatorFlag = false; - this.operatorData = JSON.parse(JSON.stringify(operatorData)); + // 设置参数 + initOperatorData (operatorData) { + this.showOperatorFlag = false + this.operatorData = JSON.parse(JSON.stringify(operatorData)) if (operatorData.reportType == 0) { - //切换到报工组件 - this.switchProduceReportModal(); + // 切换到报工组件 + this.switchProduceReportModal() } if (operatorData.reportType == 1) { - //切换到fqc报工组件 - this.fqcReportModal(); + // 切换到fqc报工组件 + this.fqcReportModal() } if (operatorData.reportType == 2) { - //切换到返工 重检组件 - this.reworkInspectModal(); + // 切换到返工 重检组件 + this.reworkInspectModal() } if (operatorData.reportType == 3) { - //切换到fqc分卷组件 - this.fqcSplitRollModal(); + // 切换到fqc分卷组件 + this.fqcSplitRollModal() } if (operatorData.reportType == 4) { // 换包装 - this.changePackaging(); + this.changePackaging() } - /*分切报工*/ + /* 分切报工 */ if (operatorData.reportType == 8) { // 分切报工 - this.showSplitOrderReportModal(); + this.showSplitOrderReportModal() } }, - notInitOperatorData(val) { - //注销用户信息 - this.operatorData.operatorId = ''; - this.operatorData.operatorName = ''; - //关闭切换用户模态框 - this.showOperatorFlag = false; + notInitOperatorData (val) { + // 注销用户信息 + this.operatorData.operatorId = '' + this.operatorData.operatorName = '' + // 关闭切换用户模态框 + this.showOperatorFlag = false if (val == 0) { - //切换到报工组件 - this.switchProduceReportModal(); + // 切换到报工组件 + this.switchProduceReportModal() } if (val == 1) { - //切换到fqc报工组件 - this.fqcReportModal(); + // 切换到fqc报工组件 + this.fqcReportModal() } if (val == 2) { - //切换到返工 重检组件 - this.reworkInspectModal(); + // 切换到返工 重检组件 + this.reworkInspectModal() } if (val == 3) { - //切换到fqc分卷组件 - this.fqcSplitRollModal(); + // 切换到fqc分卷组件 + this.fqcSplitRollModal() } if (val == 4) { - //切换到换包装 - this.changePackaging(); + // 切换到换包装 + this.changePackaging() } - //分切报工 + // 分切报工 if (val == 8) { - //分切报工 - this.showSplitOrderReportModal(); + // 分切报工 + this.showSplitOrderReportModal() } }, - //切换员工modal - switchOperatorModal(val) { - //首先判断是否选择好派工单 + // 切换员工modal + switchOperatorModal (val) { + // 首先判断是否选择好派工单 if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error('请先选择派工单!'); - return false; + this.$message.error('请先选择派工单!') + return false } if (val == 0) { - let orderType = this.currentRow.orderType; - let workCenterNo = this.currentRow.workCenterNo; - if(orderType != 'S' || workCenterNo === 'FQC'){ - //验证通过 - this.$message.error('当前派工单无法使用报工!'); - return false; + let orderType = this.currentRow.orderType + let workCenterNo = this.currentRow.workCenterNo + if (orderType != 'S' || workCenterNo === 'FQC') { + // 验证通过 + this.$message.error('当前派工单无法使用报工!') + return false } let data = { site: this.currentRow.site, @@ -1875,11 +1869,11 @@ export default { } reportCheck(data).then(({data}) => { if (data.code == 0) { - //打开操作员切换功能 - this.showOperatorFlag = true; + // 打开操作员切换功能 + this.showOperatorFlag = true this.$nextTick(() => { - this.$refs.comSwitchOperator.init(val); - }); + this.$refs.comSwitchOperator.init(val) + }) } if (data.code == 300) { this.$message.warning(data.msg) @@ -1890,199 +1884,197 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - //打开操作员切换功能 - this.showOperatorFlag = true; + // 打开操作员切换功能 + this.showOperatorFlag = true this.$nextTick(() => { - this.$refs.comSwitchOperator.init(val); - }); + 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('当前工单非分切工单!'); - return false; + } else if (val == 8) { // 处理 分切工单 + // 判断当前工单是否是分切工单 + let orderType = this.currentRow.orderType + if (orderType === 'D') { + this.showOperatorFlag = true + this.$refs.comSwitchOperator.init(val) + } else { + this.$message.error('当前工单非分切工单!') + return false } - }else if(val == 1){//处理 FQC - //判断订单类型和加工中心 - let workCenterNo = this.currentRow.workCenterNo; - if(workCenterNo === 'FQC'){ - this.showOperatorFlag = true; - this.$refs.comSwitchOperator.init(val); - }else{ - this.$message.error('当前派工单非FQC报工派工单!'); - return false; + } else if (val == 1) { // 处理 FQC + // 判断订单类型和加工中心 + let workCenterNo = this.currentRow.workCenterNo + if (workCenterNo === 'FQC') { + this.showOperatorFlag = true + this.$refs.comSwitchOperator.init(val) + } else { + this.$message.error('当前派工单非FQC报工派工单!') + return false } - }else{ - if (val == 4){ - getShopOrder(this.currentRow).then(({data}) =>{ - if (data.code == 0){ - if (data.data == 'P'){ - //打开操作员切换功能 - this.showOperatorFlag = true; + } 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.$refs.comSwitchOperator.init(val) + }) + } else { this.$alert('该订单不是特殊订单，不能采用该功能！', '提示', { confirmButtonText: '确定'}) } } }) - }else { - //打开操作员切换功能 - this.showOperatorFlag = true; + } else { + // 打开操作员切换功能 + this.showOperatorFlag = true this.$nextTick(() => { - this.$refs.comSwitchOperator.init(val); - }); + this.$refs.comSwitchOperator.init(val) + }) } - } }, - //切换报工modal - switchProduceReportModal() { - //首先判断是否选择好派工单 + // 切换报工modal + switchProduceReportModal () { + // 首先判断是否选择好派工单 if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error('请先选择派工单!'); - return false; + this.$message.error('请先选择派工单!') + return false } - //打开操作员切换功能 - this.showReportFlag = true; + // 打开操作员切换功能 + this.showReportFlag = true this.$nextTick(() => { - this.$refs.comProduceReportNormal.init(this.currentRow.seqNo, this.operatorData); - }); + this.$refs.comProduceReportNormal.init(this.currentRow.seqNo, this.operatorData) + }) }, - //打开分切报工的 - showSplitOrderReportModal() { - //首先判断是否选择好派工单 + // 打开分切报工的 + showSplitOrderReportModal () { + // 首先判断是否选择好派工单 if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error('请先选择派工单!'); - return false; + this.$message.error('请先选择派工单!') + return false } this.$nextTick(() => { - //打开分切报工功能 - this.showSplitReportFlag = true; - this.$refs.comSplitOrderReport.init(this.currentRow.seqNo, this.operatorData); - }); + // 打开分切报工功能 + this.showSplitReportFlag = true + this.$refs.comSplitOrderReport.init(this.currentRow.seqNo, this.operatorData) + }) }, - //打开结束派工单的modal - showFinishScheduleModal() { - //首先判断是否选择好派工单 + // 打开结束派工单的modal + showFinishScheduleModal () { + // 首先判断是否选择好派工单 if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error('请先选择派工单!'); - return false; + this.$message.error('请先选择派工单!') + return false } - //打开操作员切换功能 - this.showFinishScheduleFlag = true; + // 打开操作员切换功能 + this.showFinishScheduleFlag = true this.$nextTick(() => { - this.$refs.comFinishSchedule.init(this.currentRow, this.operatorData); - }); + this.$refs.comFinishSchedule.init(this.currentRow, this.operatorData) + }) }, - //结束派工单后刷新页面 - processFinishScheduleOperation() { - //刷新当前页面的数据 - this.refreshPageTables(); + // 结束派工单后刷新页面 + processFinishScheduleOperation () { + // 刷新当前页面的数据 + this.refreshPageTables() }, - //保存操作员的信息 - saveOperatorData() { - //查询操作员信息 + // 保存操作员的信息 + saveOperatorData () { + // 查询操作员信息 getOperatorData(this.operatorData).then(({data}) => { - let operatorData = data.row; - let status = operatorData.status; - this.operatorData.operatorName = data.row.operatorName; - //重置操作员信息状态 - this.operatorData.status = status; - //判断是否验证通过 + let operatorData = data.row + let status = operatorData.status + this.operatorData.operatorName = data.row.operatorName + // 重置操作员信息状态 + this.operatorData.status = status + // 判断是否验证通过 if (status == 'N') { - this.operatorFlag = false; + this.operatorFlag = false } else { - this.operatorFlag = true; + this.operatorFlag = true } if (!this.operatorFlag) { - this.$message.error('操作员信息不可用!'); + this.$message.error('操作员信息不可用!') } }) - //判断是否检查通过--不通过不在继续 + // 判断是否检查通过--不通过不在继续 .then(() => { if (!this.operatorFlag) { - return false; + return false } - //关闭操作员切换功能 - this.operatorData.showFlag = false; - //打开组件 - this.showReportFlag = true; - //打开报工操作页面 + // 关闭操作员切换功能 + this.operatorData.showFlag = false + // 打开组件 + this.showReportFlag = true + // 打开报工操作页面 this.$nextTick(() => { - this.$refs.comProduceReportNormal.init(this.currentRow.seqNo, this.operatorData); - }); + this.$refs.comProduceReportNormal.init(this.currentRow.seqNo, this.operatorData) + }) }) }, - /*列表方法的回调*/ - getBaseData(val){ - if (this.tagNo === 88){ - this.searchData.resourceId = val.ResourceID; + /* 列表方法的回调 */ + getBaseData (val) { + if (this.tagNo === 88) { + this.searchData.resourceId = val.ResourceID } }, // 获取基础数据列表 - getBaseList(val){ + getBaseList (val) { this.tagNo = val this.$nextTick(() => { - let strVal = ""; - if (val === 88){ - strVal = this.searchData.resourceId; + let strVal = '' + if (val === 88) { + strVal = this.searchData.resourceId } - this.$refs.baseList.init(val,strVal, " AND WorkCenterNo <> 'FQC'"); + this.$refs.baseList.init(val, strVal, " AND WorkCenterNo <> 'FQC'") }) }, // 打开页面设置 - userSetting() { - this.visible = true; + userSetting () { + this.visible = true let queryTable = { userId: this.$store.state.user.name, functionId: this.$route.meta.menuId, - tableId: "5302Produce", + tableId: '5302Produce', languageCode: this.$i18n.locale } this.$nextTick(() => { - this.$refs.column.init(queryTable); - }); + this.$refs.column.init(queryTable) + }) }, // 获取 用户保存的 格式列 - getTableUserColumn() { + getTableUserColumn () { getTableUserListLanguage(this.queryTableUser).then(({data}) => { - if ( data && data.code == 0 && data.rows.length > 0) { - //this.columnList = [] + if (data && data.code == 0 && data.rows.length > 0) { + // this.columnList = [] this.columnList = data.rows - } else { + } else { this.getColumnList() } - }) }, // 保存 默认配置 列 - async saveColumnList() { + async saveColumnList () { // 删除所有的该页面下保存的数据 if (this.userColumnList) { - //删除 user自定义的数据 + // 删除 user自定义的数据 await removerUser(this.queryTable) } // 删除默认配置 await removerDefault(this.queryTable) // 保存页面 table属性 - let sumColumnList = this.columnList;//concat(this.columnList1); + let sumColumnList = this.columnList// concat(this.columnList1); sumColumnList = sumColumnList.map(item => { return item = { tableId: item.tableId, @@ -2115,12 +2107,12 @@ export default { tableId: item.tableId } }) - await saveButtonList(buttons)*/ + await saveButtonList(buttons) */ this.getFunctionButtonList() this.getColumnList() }, // 获取 tableDefault 列 - getColumnList() { + getColumnList () { getTableDefaultListLanguage(this.queryTable).then(({data}) => { if (data && data.code == 0) { // this.showDefault = false @@ -2129,55 +2121,54 @@ export default { // this.showDefault = true } }) - }, - + } }, - created() { - //不查询 + created () { + // 不查询 getProduceScheduleList(this.searchData).then(({data}) => { - //设置查询数据 - this.searchData.searchFlag = false; - this.produceScheduleList = data.rows; - }); + // 设置查询数据 + this.searchData.searchFlag = false + 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; + 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.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.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.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.fqcSegmentReportFlag === 'Y') { + this.reportButton.fqcSegmentReportButton = false + } else { + this.reportButton.fqcSegmentReportButton = true } - if(authMap.slitReportFlag === 'Y'){ - this.reportButton.slitReportButton = false; - }else{ - this.reportButton.slitReportButton = true; + if (authMap.slitReportFlag === 'Y') { + this.reportButton.slitReportButton = false + } else { + this.reportButton.slitReportButton = true } - }); - //获取动态表头的信息 - this.getTableUserColumn(); + }) + // 获取动态表头的信息 + this.getTableUserColumn() } }