diff --git a/src/views/modules/yieldReport/com_defect_roll.vue b/src/views/modules/yieldReport/com_defect_roll.vue new file mode 100644 index 0000000..91a0264 --- /dev/null +++ b/src/views/modules/yieldReport/com_defect_roll.vue @@ -0,0 +1,336 @@ + + + + + diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue index d669591..995593b 100644 --- a/src/views/modules/yieldReport/com_finish_roll.vue +++ b/src/views/modules/yieldReport/com_finish_roll.vue @@ -1,9 +1,10 @@ @@ -376,14 +434,32 @@ import { } from "@/api/yieldReport/produce_report_normal.js"; /*引入组件*/ import comSwitchOperator from "./com_switch_operator";/*切换操作员*/ +import comSwitchRoll from "./com_switch_roll";/*切换卷操作*/ +import comSeparateRoll from "./com_separate_roll"; import comFinishRoll from "./com_finish_roll";/*结束卷数的组件*/ +import comMergeRoll from "./com_merge_roll";/*合并卷的组件*/ +import comStartTuning from "./com_start_tuning";/*开始调机组件*/ +import comStartProduce from "./com_start_produce";/*开始生产组件*/ +import comDefectRoll from "./com_defect_roll";/*报告不良品卷*/ +import comProduceTool from "./com_produce_tool";/*生产过程的工具组件*/ +import comProduceMaterial from "./com_produce_material";/*生产过程的材料组件*/ +import comProduceDown from "./com_produce_down";/*生产过程的停机组件*/ export default { name: "com_produce_report_normal", data() { return { titleCon:'', showOperatorFlag: false, + showSwitchFlag: false, + showSeparateFlag: false, showFinishFlag: false, + showMergeFlag: false, + showTuningFlag: false, + showProduceFlag: false, + showDefectFlag: false, + showToolFlag: false, + showMaterialFlag: false, + showDownFlag: false, activeTable: 'sfdc_time', sfdcTimeList: [], orderToolList: [], @@ -2569,23 +2645,32 @@ export default { }, buttonTags:{ createRollFlag: true, - switchRollFlag: true, - separatorRollFlag: true, + switchRollFlag: false, + separateRollFlag: false, finishRollFlag: false, - mergeRollFlag: true, - tuningFlag: true, - produceFlag: true, - defectFlag: true, - toolFlag: true, - materialFlag: true, - downTimeFlag: true + mergeRollFlag: false, + tuningFlag: false, + produceFlag: false, + defectFlag: false, + produceToolFlag: false, + materialFlag: false, + downTimeFlag: false }, dataListLoading: false, } }, components: { comSwitchOperator,/*切换用户的组件*/ + comSwitchRoll,/*切换卷操作*/ + comSeparateRoll,/*創建分卷组件*/ comFinishRoll,/*结束卷的组件*/ + comMergeRoll,/*合并卷组件*/ + comStartTuning,/*开始调机组件*/ + comStartProduce,/*开始生产组件*/ + comDefectRoll,/*报告不良品*/ + comProduceTool,/*生产过程的工具组件*/ + comProduceMaterial,/*生产过程的材料组件*/ + comProduceDown,/*生产过程的停机组件*/ }, methods: { // 获取多语言列表 @@ -2703,21 +2788,6 @@ export default { } }, - //切换员工modal - switchOperatorModal() { - //首先判断是否选择好派工单 - if (JSON.stringify(this.currentRow) == '{}') { - this.$message.error('请先选择派工单!'); - return false; - } - //打开操作员切换功能 - this.showOperatorFlag = true; - this.$nextTick(() => { - this.$refs.comSwitchOperator.init(); - }); - }, - - init(seqNo, operatorData) { this.scheduleData.seqNo = seqNo; this.currentRollOps.seqNo = seqNo; @@ -2771,6 +2841,42 @@ export default { + this.scheduleData.resourceDesc + ' （' + this.operatorData.operatorName+ '）'; }, + //切换员工modal + switchOperatorModal() { + //首先判断是否选择好派工单 + if (JSON.stringify(this.currentRow) == '{}') { + this.$message.error('请先选择派工单!'); + return false; + } + //打开操作员切换功能 + this.showOperatorFlag = true; + this.$nextTick(() => { + this.$refs.comSwitchOperator.init(); + }); + }, + + /*切换卷操作*/ + switchRollModal(){ + //1.首先调用菜单判断方式 看看是否可以结束卷 + //checkProduceButton('switchRollFlag'); + //打开切换用户的页面 + this.$nextTick(() => { + this.showSwitchFlag = true; + this.$refs.comSwitchRoll.init(this.scheduleData.seqNo, this.operatorData) + }); + }, + + /*创建分卷的modal调用*/ + separateRollModal(){ + //1.首先调用菜单判断方式 看看是否可以结束卷 + //checkProduceButton('separateRollFlag'); + //打开创建分卷的页面 + this.$nextTick(() => { + this.showSeparateFlag = true; + this.$refs.comSeparateRoll.init(this.scheduleData.seqNo, this.operatorData) + }); + }, + /*结束卷操作*/ finishRollModal(){ //1.首先调用菜单判断方式 看看是否可以结束卷 @@ -2779,10 +2885,90 @@ export default { this.$nextTick(() => { this.showFinishFlag = true; this.$refs.comFinishRoll.init(this.scheduleData.seqNo, this.operatorData) + }); + }, + + /*合并卷modal*/ + mergeRollModal(){ + //1.首先调用菜单判断方式 看看是否可以结束卷 + //checkProduceButton('mergeRollFlag'); + //打开合并卷的页面 + this.$nextTick(() => { + this.showMergeFlag = true; + this.$refs.comMergeRoll.init(this.scheduleData.seqNo, this.operatorData) + // this.$refs.com_finish_roll.init(this.scheduleData.seqNo, this.currentRollOps.rollNo); + }); + }, + + /*开始调机modal*/ + startTuningModal(){ + //1.首先调用菜单判断方式 看看是否可以结束卷 + //checkProduceButton('startTuningFlag'); + //打开开始调机的页面 + this.$nextTick(() => { + this.showTuningFlag = true; + this.$refs.comStartTuning.init(this.scheduleData.seqNo, this.operatorData) + // this.$refs.com_finish_roll.init(this.scheduleData.seqNo, this.currentRollOps.rollNo); + }); + }, + + /*开始调机modal*/ + startProduceModal(){ + //1.首先调用菜单判断方式 看看是否可以结束卷 + //checkProduceButton('startProduceFlag'); + //打开开始生产的页面 + this.$nextTick(() => { + this.showProduceFlag = true; + this.$refs.comStartProduce.init(this.scheduleData.seqNo, this.operatorData) // this.$refs.com_finish_roll.init(this.scheduleData.seqNo, this.currentRollOps.rollNo); }); }, + /*报告不良modal*/ + defectRollModal(){ + //1.首先调用菜单判断方式 看看是否可以结束卷 + //checkProduceButton('defectRollFlag'); + //打开不良卷的页面 + this.$nextTick(() => { + this.showDefectFlag = true; + this.$refs.comDefectRoll.init(this.scheduleData.seqNo, this.operatorData) + }); + }, + + /*生产过程的工具组件*/ + produceToolModal(){ + //1.首先调用菜单判断方式 打开生产过程的工具的页面 + //checkProduceButton('produceToolFlag'); + //打开生产过程的工具的页面 + this.$nextTick(() => { + this.showToolFlag = true; + this.$refs.comProduceTool.init(this.scheduleData.seqNo, this.operatorData) + }); + }, + + /*生产过程的工具组件*/ + produceMaterialModal(){ + //1.首先调用菜单判断方式 打开生产过程的材料的页面 + //checkProduceButton('produceMaterialFlag'); + //打开生产过程的工具的页面 + this.$nextTick(() => { + this.showMaterialFlag = true; + this.$refs.comProduceMaterial.init(this.scheduleData.seqNo, this.operatorData) + }); + }, + + + /*生产过程的停机组件*/ + produceDownModal(){ + //1.首先调用菜单判断方式 打开生产过程的停机的页面 + //checkProduceButton('produceDownFlag'); + //打开生产过程的工具的页面 + this.$nextTick(() => { + this.showDownFlag = true; + this.$refs.comProduceDown.init(this.scheduleData.seqNo, this.operatorData) + }); + }, + }, created() { // this.factoryList() diff --git a/src/views/modules/yieldReport/com_produce_tool.vue b/src/views/modules/yieldReport/com_produce_tool.vue new file mode 100644 index 0000000..fa4f43c --- /dev/null +++ b/src/views/modules/yieldReport/com_produce_tool.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue new file mode 100644 index 0000000..eda48b3 --- /dev/null +++ b/src/views/modules/yieldReport/com_separate_roll.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/src/views/modules/yieldReport/com_start_produce.vue b/src/views/modules/yieldReport/com_start_produce.vue new file mode 100644 index 0000000..11fc6c9 --- /dev/null +++ b/src/views/modules/yieldReport/com_start_produce.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/modules/yieldReport/com_start_tuning.vue b/src/views/modules/yieldReport/com_start_tuning.vue new file mode 100644 index 0000000..f4656ed --- /dev/null +++ b/src/views/modules/yieldReport/com_start_tuning.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/views/modules/yieldReport/com_switch_operator.vue b/src/views/modules/yieldReport/com_switch_operator.vue index 9e4014f..fd9a36c 100644 --- a/src/views/modules/yieldReport/com_switch_operator.vue +++ b/src/views/modules/yieldReport/com_switch_operator.vue @@ -20,7 +20,7 @@ 保存 - 关闭 + 关闭 @@ -48,6 +48,12 @@ export default { } }, methods: { + + /*关闭modal*/ + closeDialog(){ + this.$emit('update:visible', false); + }, + //初始化的 init() { this.visibleFlag = true; diff --git a/src/views/modules/yieldReport/com_switch_roll.vue b/src/views/modules/yieldReport/com_switch_roll.vue new file mode 100644 index 0000000..39693a0 --- /dev/null +++ b/src/views/modules/yieldReport/com_switch_roll.vue @@ -0,0 +1,135 @@ + + + + +