diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 1144fe4..f98c762 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -3563,6 +3563,7 @@ export default { this.scheduleData.seqNo = seqNo; this.currentRollOps.seqNo = seqNo; this.operatorData = operatorData; + this.getMultiLanguageList()//刷新按钮 //清空当前的页面列表参数 this.sfdcTimeList = []; this.sfdcToolList = []; @@ -4136,7 +4137,6 @@ export default { created() { // this.factoryList() // this.getLanguageList() - this.getMultiLanguageList()//刷新按钮 } } diff --git a/src/views/modules/yieldReport/com_split_order_finish_roll.vue b/src/views/modules/yieldReport/com_split_order_finish_roll.vue index a884eba..42e776c 100644 --- a/src/views/modules/yieldReport/com_split_order_finish_roll.vue +++ b/src/views/modules/yieldReport/com_split_order_finish_roll.vue @@ -7,7 +7,7 @@ - + - - 列表 + 对语言设置 - 刷新 + {{buttons.refreshButton}} - 结束卷 + {{buttons.finishRoll}} - 关闭 + {{buttons.closeButton}}
- 卷数量统计 + {{labels.rollQtySum}} 是否报告产量 + v-model="pageData.reportedFlag">{{labels.whetherReport}} - + - + - + - +
- 人员排程班次信息 - + {{labels.operatorScheduleInfo}} + - + - + - + -
- 卷生产时间统计 +
+ {{labels.rollTimeSum}} - + - + - + - + @@ -100,13 +99,13 @@ - + - + - + @@ -114,13 +113,13 @@ - + - + - + @@ -128,25 +127,25 @@
+ style="margin-left: 325px; margin-top: -143px; width: 575px;"> - 产量报告 + {{ labels.produceReport }} - + - + - + - + - + @@ -154,19 +153,19 @@ - + - + - + - + - + @@ -174,10 +173,10 @@ - + - + @@ -187,7 +186,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/com_split_order_report.vue b/src/views/modules/yieldReport/com_split_order_report.vue index cfe4792..3ab9f3b 100644 --- a/src/views/modules/yieldReport/com_split_order_report.vue +++ b/src/views/modules/yieldReport/com_split_order_report.vue @@ -7,54 +7,54 @@ label-width="80px"> - + - + - + - + - + - + - + - + - + - + - + 仅显示当前卷信息 + v-model="scheduleData.currentRollFlag">{{labels.onlyCurrentRoll}}
- 卷操作 + {{labels.rollButtons}} {{ this.currentRollOps.rollNo }} @@ -63,39 +63,39 @@ - 创建新卷 + {{ buttons.newRollButton }} - 切换卷 + {{buttons.switchRoll}} - 创建分卷 + {{buttons.separateRoll}} - 结束卷 + {{ buttons.finishRoll }} - 合并卷 + {{ buttons.mergeRoll }} - 结单 + {{ buttons.finishSchedule }} @@ -103,10 +103,10 @@
- 列表信息 + {{labels.listDesc}} - + - + + :label=labels.toolListOperation> - + + :label=labels.materialListOperation> - + - + - + + :label=labels.rollListOperation> @@ -361,64 +361,68 @@
- 生产调机 + {{labels.produceButtons}} - 刷新 + {{ buttons.refreshButton }} - 切换用户 + {{ buttons.switchOperator }} - 开始调机 + {{ buttons.startTuning }} - 开始生产 + {{ buttons.startProduce }}
- 不良 + {{labels.defectButtons}} - 报告不良 + {{ buttons.reportDefect }} + + 对语言设置 + +
- 扫描 + {{labels.scanButtons}} - 刀模板 + {{ buttons.toolButton }} - 材料 + {{ buttons.materialButton }} @@ -427,12 +431,12 @@
- 停机 + {{labels.downTimeButtons}} - 报告其他停机 + {{ buttons.downTime }} @@ -440,7 +444,7 @@
- 其它操作 + {{ buttons.otherOperation }} @@ -453,21 +457,21 @@
- 产量报告 + {{ buttons.preReport }} - 删除卷 + {{ buttons.deleteRoll }} - 未生产下机拆卷 + {{ buttons.notProduce }}
其她操作 + slot="reference">{{labels.otherButtons}}
@@ -622,11 +626,27 @@ import comCuttingMaterial from "./com_cutting_material"/*材料下料*/ import comProduceDown from "./com_produce_down";/*停机组件*/ import comFinishSchedule from "./com_finish_schedule";/*结束派工单组件*/ import notOverFinishRoll from "./not_over_finish_roll";/*生产过程的停机组件*/ + +import { + searchSysLanguagePackList, + searchSysLanguageParam, + searchFunctionButtonList, + saveButtonList, + searchSysLanguage, + searchLanguageListByLanguageCode, + saveSysLanguageOne, + searchPageLanguageData, + removerLanguage, + saveSysLanguageList +} from "@/api/sysLanguage.js"; + +var functionId = 'C10000032'; + export default { - name: "com_produce_report_normal", data() { return { titleCon: '', + showDefault: false, popoverFlag: false, showNotOverFlag: false, showOperatorFlag: false, @@ -2787,6 +2807,406 @@ export default { otherFlag: true, }, dataListLoading: false, + buttons: { + newRollButton: '创建新卷', + switchRoll: '切换卷', + separateRoll: '创建分卷', + finishRoll: '结束卷', + mergeRoll: '合并卷', + finishSchedule: '结单', + refreshButton: '刷新', + switchOperator: '切换用户', + startTuning: '开始调机', + startProduce: '开始生产', + reportDefect: '报告不良', + toolButton: '刀模板', + materialButton: '材料', + downTime: '报告其他停机', + otherOperation: '其他操作', + preReport: '产量报告', + deleteRoll: '删除卷', + notProduce: '未生产下机拆卷', + }, + buttonList: [ + { + functionId: functionId, + languageValue: '创建新卷', + objectId: 'newRollButton', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '切换卷', + objectId: 'switchRoll', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '创建分卷', + objectId: 'separateRoll', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '结束卷', + objectId: 'finishRoll', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '合并卷', + objectId: 'mergeRoll', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '结单', + objectId: 'finishSchedule', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '刷新', + objectId: 'refreshButton', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '切换用户', + objectId: 'switchOperator', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '开始调机', + objectId: 'startTuning', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '开始生产', + objectId: 'startProduce', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '报告不良', + objectId: 'reportDefect', + objectType: 'button', + tableId: '*' + },{ + functionId: functionId, + languageValue: '刀模板', + objectId: 'toolButton', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '材料', + objectId: 'materialButton', + objectType: 'button', + tableId: '*' + },{ + functionId: functionId, + languageValue: '报告其他停机', + objectId: 'downTime', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '其他操作', + objectId: 'otherOperation', + objectType: 'button', + tableId: '*' + },{ + functionId: functionId, + languageValue: '产量报告', + objectId: 'preReport', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '删除卷', + objectId: 'deleteRoll', + objectType: 'button', + tableId: '*' + },{ + functionId: functionId, + languageValue: '未生产下机拆卷', + objectId: 'notProduce', + objectType: 'button', + tableId: '*' + } + ], + labels: { + titleCon: '机台工作台', + orderNo: '订单号', + partNo: '物料编码', + partDesc: '物料名称/规则', + seqNo: '派工单号', + needDate: '要求完工日期', + planStartDate: '刷新', + lotSize: '原始派工单需求数量', + scheduledDate: ' 排产日期', + shiftNo: '班次', + preItemNo: '前道工序', + nextItemNo: ' 后道工序', + onlyCurrentRoll: '仅显示当前卷信息', + rollButtons: '卷操作', + listDesc: '列表信息', + timeList: '时间', + toolList: '刀模板记录', + materialList: '材料', + rollopsList: '生产卷操作信息', + defectList: '不良记录', + rollList: '机器下机卷', + produceButtons: '生产调机', + defectButtons: '不良', + scanButtons: '扫描', + downTimeButtons: '停机', + otherButtons: '其他操作', + toolListReplace: '刀模替换', + toolListFinish: '结束使用', + materialListReplace: '换料', + materialListCutting: '下料', + materialListFinish: '结束生产', + rollListDelete: '删除卷', + toolListOperation: '操作', + materialListOperation: '操作', + rollListOperation: '操作', + }, + 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: '列表信息', + objectId: 'listDesc', + objectType: 'label', + tableId: '*' + },{ + functionId: functionId, + languageValue: '时间', + objectId: 'timeList', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '刀模板记录', + objectId: 'toolList', + objectType: 'label', + tableId: '*' + },{ + functionId: functionId, + languageValue: '材料', + objectId: 'materialList', + 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: 'produceButtons', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '不良', + objectId: 'defectButtons', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '扫描', + objectId: 'scanButtons', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '停机', + objectId: 'downTimeButtons', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '其他操作', + objectId: 'otherButtons', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '刀模替换', + objectId: 'toolListReplace', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '结束使用', + objectId: 'toolListFinish', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '不良', + objectId: 'defectButtons', + 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: '*' + }, { + functionId: functionId, + languageValue: '删除卷', + objectId: 'rollListDelete', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '操作', + objectId: 'toolListOperation', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '操作', + objectId: 'materialListOperation', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '操作', + objectId: 'rollListOperation', + 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' + }, + } }, components: { @@ -3081,7 +3501,7 @@ export default { this.scheduleData.resourceDesc = data.row.resourceDesc; this.scheduleData.preItemNo = data.row.preItemNo; //设置弹窗的标题 - this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' ' + this.titleCon = this.labels.titleCon + ' - ' + data.row.itemDesc + ' ' + data.row.resourceDesc + ' (' + this.operatorData.operatorName + ')'; }) //刷新页面的卷信息 @@ -3181,7 +3601,7 @@ export default { this.operatorData = JSON.parse(JSON.stringify(operatorData)); //切换当前账户的信息 //设置弹窗的标题 - this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + '' + this.titleCon = this.labels.titleCon+' - ' + this.scheduleData.workCenterDesc + '' + this.scheduleData.resourceDesc + ' (' + this.operatorData.operatorName + ')'; //刷新菜单 }, @@ -3196,7 +3616,7 @@ export default { this.operatorData.operatorName = ''; this.operatorData.showFlag = false; //刷新标题 - this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ' ' + this.titleCon = this.labels.titleCon + ' - ' + this.scheduleData.workCenterDesc + ' ' + this.scheduleData.resourceDesc + ' (' + this.operatorData.operatorName + ')'; }, @@ -3566,10 +3986,43 @@ export default { }); }, + // 保存 默认配置 列 + 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/com_split_order_switch_roll.vue b/src/views/modules/yieldReport/com_split_order_switch_roll.vue index e52d1f1..4b99ea0 100644 --- a/src/views/modules/yieldReport/com_split_order_switch_roll.vue +++ b/src/views/modules/yieldReport/com_split_order_switch_roll.vue @@ -7,15 +7,16 @@ - +
- 确 定 - 关闭 + {{ buttons.confirmButton }} + {{ buttons.closeButton }} + 对语言设置 @@ -30,12 +31,28 @@ import comExceptionReason from "./com_exception_reason";//异常远远 import { checkSplitScheduleSwitchRoll,/*校验是否可以切换卷*/ splitScheduleSwitchRoll,/*执行切换卷的操作*/ -} from '@/api/yieldReport/com_switch_roll.js' +} from '@/api/yieldReport/com_switch_roll.js'; + +import { + searchSysLanguagePackList, + searchSysLanguageParam, + searchFunctionButtonList, + saveButtonList, + searchSysLanguage, + searchLanguageListByLanguageCode, + saveSysLanguageOne, + searchPageLanguageData, + removerLanguage, + saveSysLanguageList +} from "@/api/sysLanguage.js"; + +var functionId = 'C10000033'; + export default { - name: "com_merge_roll", data() { return { titleCon: '切换卷', + showDefault: false, scheduleData: { site: this.$store.state.user.site, username: this.$store.state.user.name, @@ -79,6 +96,56 @@ export default { seqNo: '', showFlag: false }, + buttons: { + confirmButton: '确定', + closeButton: '关闭', + }, + buttonList: [ + { + functionId: functionId, + languageValue: '确定', + objectId: 'confirmButton', + objectType: 'button', + tableId: '*' + }, { + functionId: functionId, + languageValue: '关闭', + objectId: 'closeButton', + objectType: 'button', + tableId: '*' + }, + ], + queryButton: { + functionId: functionId, + table_id: '*', + languageCode: this.$i18n.locale, + objectType: 'button' + }, + labels: { + componentTitle: '切换卷', + sfdcRoll: '卷号:', + }, + labelsList: [ + { + functionId: functionId, + languageValue: '切换卷', + objectId: 'componentTitle', + objectType: 'label', + tableId: '*' + }, { + functionId: functionId, + languageValue: '卷号:', + objectId: 'sfdcRoll', + objectType: 'label', + tableId: '*' + }, + ], + queryLabel: { + functionId: functionId, + table_id: '*', + languageCode: this.$i18n.locale, + objectType: 'label' + }, } }, components: { @@ -101,6 +168,9 @@ export default { this.$nextTick(() => { this.$refs.newRollNo.focus(); }); + + //重置标题 + this.titleCon = this.labels.titleCon; }, /*关闭modal*/ @@ -161,10 +231,43 @@ export default { } }) }, + + // 保存 默认配置 列 + 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();//刷新多语言的信息 } }