From 1c6a5867e58bdaef384a72217a7defe1817fd6ba Mon Sep 17 00:00:00 2001 From: DOUDOU <877258667@qq.com> Date: Thu, 13 Oct 2022 17:35:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otherReport/change_packaging.vue | 476 ++++++++++++++++-- .../otherReport/fqc_produce_report_normal.vue | 3 +- 2 files changed, 430 insertions(+), 49 deletions(-) diff --git a/src/views/modules/yieldReport/otherReport/change_packaging.vue b/src/views/modules/yieldReport/otherReport/change_packaging.vue index 411c3bd..7327352 100644 --- a/src/views/modules/yieldReport/otherReport/change_packaging.vue +++ b/src/views/modules/yieldReport/otherReport/change_packaging.vue @@ -8,54 +8,54 @@ label-width="80px"> - + - + - + - + - + - + - + - + - + - + - + 仅显示当前卷信息 + v-model="scheduleData.currentRollFlag">{{labels.onlyCurrentRoll}}
- 卷操作 + {{labels.rollButtons}} {{ this.currentRollOps.rollNo }} @@ -64,14 +64,14 @@ - 扫描卷 + {{ buttons.scanRoll }} - 结束卷 + {{ buttons.finishRoll }} @@ -79,15 +79,15 @@
- FQC成品卷操作 + {{labels.fqcSfdcOperation}} - 每卷数量 + {{labels.perRollQty}} - 卷数 + {{labels.rollNums}} @@ -95,16 +95,15 @@ - 创建分卷 + :disabled="buttonTags.createNewRollFlag"> + {{buttons.separateRoll}} - 合并卷 + {{buttons.mergeRoll}} @@ -112,10 +111,10 @@
- 列表信息 + {{labels.listDesc}} - + + :label=labels.materialListOperation> - + - + - 报告日期 + {{labels.reportDate}} - 不良代码 + {{labels.defectCode}} - 不良原因 + {{labels.defectDesc}} - 不良数 + {{labels.defectQty}} @@ -236,14 +235,14 @@ - 保存 + {{buttons.saveButton}} - 批量录入 + {{buttons.batchSaveButton}} @@ -274,7 +273,7 @@ - + + :label=labels.rollListOperation> @@ -321,25 +320,28 @@
- 生产调机 + {{labels.produceTuning}} - 刷新 + {{buttons.refreshButton}} - 切换用户 + {{buttons.switchOperator}} - 结单 + {{buttons.finishSchedule}} + + 对语言设置 +
@@ -510,12 +512,29 @@ import comFinishSchedule from "../com_finish_schedule";/*结束派工单组件*/ import defectList from "./defectList";/*结束派工单组件*/ import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/ import notOverFinishRoll from "../not_over_finish_roll";/*结束派工单组件*/ -import comFinishPartRoll from "../com_finish_part_roll" +import comFinishPartRoll from "../com_finish_part_roll"; + + +import { + searchSysLanguagePackList, + searchSysLanguageParam, + searchFunctionButtonList, + saveButtonList, + searchSysLanguage, + searchLanguageListByLanguageCode, + saveSysLanguageOne, + searchPageLanguageData, + removerLanguage, + saveSysLanguageList +} from "@/api/sysLanguage.js"; + +var functionId = 'C10000024'; /*生产过程的停机组件*/ export default { data() { return { titleCon: '', + showDefault: false, popoverFlag: false, showNotOverFlag:false, showOperatorFlag: false, @@ -2790,7 +2809,337 @@ export default { defectCode: '', defectQty: '', defectDesc: '' - } + }, + buttons: { + scanRoll: '扫描卷', + finishRoll: '结束卷', + separateRoll: '创建分卷', + mergeRoll: '合并卷', + refreshButton: '刷新', + switchOperator: '切换用户', + finishSchedule: '结单', + saveButton: '保存', + batchSaveButton: '批量插入', + }, + buttonList: [ + { + functionId: functionId, + languageValue: '扫描卷', + objectId: 'scanRoll', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '结束卷', + objectId: 'finishRoll', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '创建分卷', + objectId: 'separateRoll', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '合并卷', + objectId: 'mergeRoll', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '刷新', + objectId: 'refreshButton', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '切换用户', + objectId: 'switchOperator', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '结单', + objectId: 'finishSchedule', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '保存', + objectId: 'saveButton', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '批量插入', + objectId: 'batchSaveButton', + objectType: 'button', + tableId: '*' + }, + ], + labels: { + titleCon: '机台工作台', + orderNo: '订单号', + partNo: '物料编码', + partDesc: '物料名称/规则', + seqNo: '派工单号', + needDate: '要求完工日期', + planStartDate: '要求开工日期', + lotSize: '原始派工单需求数量', + scheduledDate: ' 排产日期', + shiftNo: '班次', + preItemNo: '前道工序', + nextItemNo: ' 后道工序', + onlyCurrentRoll: '仅显示当前卷信息', + rollButtons: '卷操作', + fqcSfdcOperation: 'FQC成品卷操作', + perRollQty: '每卷数量', + rollNums: '卷数', + produceTuning: '生产调机', + listDesc: '列表信息', + materialList: '材料', + timeList: '时间', + rollopsList: '生产卷操作信息', + defectList: '不良记录', + rollList: '机器下机卷', + reportDate: '报告日期', + defectCode: '不良代码', + defectDesc: '不良原因', + defectQty: '不良数', + rollListOperation: '操作', + rollListReopen: '重打开', + rollListDelete: '删除卷', + materialListOperation: '操作', + materialListReplace: '换料', + materialListCutting: '下料', + materialListFinish: '结束生产', + }, + labelsList: [ + { + functionId: functionId, + languageValue: '机台工作台', + objectId: 'titleCon', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '订单号', + objectId: 'orderNo', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '物料编码', + objectId: 'partNo', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '物料名称/规则', + objectId: 'partDesc', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '派工单号', + objectId: 'seqNo', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '要求完工日期', + objectId: 'needDate', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '要求开工日期', + objectId: 'planStartDate', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '原始派工单需求数量', + objectId: 'lotSize', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '排产日期', + objectId: 'scheduledDate', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '班次', + objectId: 'shiftNo', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '前道工序', + objectId: 'preItemNo', + objectType: 'label', + tableId: '*' + },{ + functionId: functionId, + languageValue: '后道工序', + objectId: 'nextItemNo', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '仅显示当前卷信息', + objectId: 'onlyCurrentRoll', + objectType: 'label', + tableId: '*' + },{ + functionId: functionId, + languageValue: '卷操作', + objectId: 'rollButtons', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: 'FQC成品卷操作', + objectId: 'fqcSfdcOperation', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '每卷数量', + objectId: 'perRollQty', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '卷数', + objectId: 'rollNums', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '生产调机', + objectId: 'produceTuning', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '列表信息', + objectId: 'listDesc', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '材料', + objectId: 'materialList', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '时间', + objectId: 'timeList', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '生产卷操作信息', + objectId: 'rollopsList', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '不良记录', + objectId: 'defectList', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '机器下机卷', + objectId: 'rollList', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '报告日期', + objectId: 'reportDate', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '不良代码', + objectId: 'defectCode', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '不良原因', + objectId: 'defectDesc', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '不良数量', + objectId: 'defectQty', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '操作', + objectId: 'rollListOperation', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '重打开', + objectId: 'rollListReopen', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '删除卷', + objectId: 'rollListDelete', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '操作', + objectId: 'materialListOperation', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '换料', + objectId: 'materialListReplace', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '下料', + objectId: 'materialListCutting', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '结束生产', + objectId: 'materialListFinish', + objectType: 'label', + tableId: '*' + }, + ], + queryButton: { + functionId: functionId, + table_id: '*', + languageCode: this.$i18n.locale, + objectType: 'button' + }, + queryLabel: { + functionId: functionId, + table_id: '*', + languageCode: this.$i18n.locale, + objectType: 'label' + }, } }, watch: { @@ -3656,12 +4005,45 @@ export default { }, closeDialog(){ Object.assign(this.$data, this.$options.data.call(this)); - } + }, + + // 保存 默认配置 列 + async saveMultiLanguage() { + // 保存页面 button label title 属性 + let buttons = this.buttonList; + let labels = this.labelsList; + await saveButtonList(buttons) + await saveButtonList(labels) + this.getMultiLanguageList() + }, + + getMultiLanguageList() { + //首先查询当前按钮的多语言 + searchFunctionButtonList(this.queryButton).then(({data}) => { + 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/otherReport/fqc_produce_report_normal.vue b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue index cf47dbf..8db72be 100644 --- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue +++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue @@ -95,8 +95,7 @@ + :disabled="buttonTags.separateRollFlag"> {{buttons.separateRoll}}