diff --git a/src/api/yieldReport/com_separate_roll.js b/src/api/yieldReport/com_separate_roll.js index 4fe927b..80d54a3 100644 --- a/src/api/yieldReport/com_separate_roll.js +++ b/src/api/yieldReport/com_separate_roll.js @@ -5,3 +5,10 @@ export const checkCreateSplitSfdcRoll = data => createAPI('schedule/checkCreateS // 执行创建分卷的操作 export const createSplitSfdcRoll = data => createAPI('schedule/createSplitSfdcRoll', 'POST', data) + + +// 校验fqc创建分卷的操作 +export const otherCheckCreateSplitSfdcRoll = data => createAPI('schedule/otherCheckCreateSplitSfdcRoll', 'POST', data) + +// 执行fqc创建分卷的操作 +export const otherCreateSplitSfdcRoll = data => createAPI('schedule/otherCreateSplitSfdcRoll', 'POST', data) diff --git a/src/api/yieldReport/com_switch_roll.js b/src/api/yieldReport/com_switch_roll.js index 23227f6..79a30b8 100644 --- a/src/api/yieldReport/com_switch_roll.js +++ b/src/api/yieldReport/com_switch_roll.js @@ -5,3 +5,11 @@ export const checkSwitchSfdcRoll = data => createAPI('schedule/checkSwitchSfdcRo // 执行切换卷的操作 export const switchSfdcRoll = data => createAPI('schedule/switchSfdcRoll', 'POST', data) + + +// 其它报工校验切换卷的操作 +export const otherCheckSwitchSfdcRoll = data => createAPI('schedule/otherCheckSwitchSfdcRoll', 'POST', data) + +// 其它报工执行切换卷的操作 +export const otherSwitchSfdcRoll = data => createAPI('schedule/otherSwitchSfdcRoll', 'POST', data) + diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js index a5639c8..fa9052b 100644 --- a/src/api/yieldReport/produce_report_normal.js +++ b/src/api/yieldReport/produce_report_normal.js @@ -55,7 +55,22 @@ export const processFinishTool = data => createAPI('schedule/processFinishTool', //执行材料结束使用 且未剩余的方法 export const finishMaterialWithNoRemainder = data => createAPI('schedule/processFinishMaterialWithNoRemainder', 'POST', data) - +/*-------------------------------------------------------sxm 其它报工业务--------------------------------------------------------*/ +//保存当前卷不良记录 +export const saveSfdcDefect = data => createAPI('schedule/saveSfdcDefect', 'POST', data) +// 校验卷记录 +export const checkSfdcDefect = data => createAPI('schedule/checkSfdcDefect', 'POST', data) +// 批量保存不良信息 +export const saveSfdcDefectList = data => createAPI('schedule/saveSfdcDefectList','POST',data) +// 获取所有不良信息列表 +export const inspectiondefectcode = data => createAPI('inspectiondefectcode/searchDefectList','POST',data) +// 批量送检卷列表 +export const searchFqcSfdcRolls = data => createAPI('schedule/searchFqcSfdcRolls','POST',data) +// getScheduleDateShif +export const getScheduleDateShift = data => createAPI('schedule/getScheduleDateShift','POST',data) + +// 批量送检 +export const workbenchPostinspection = data => createAPI('schedule/workbenchPostinspection','POST',data) diff --git a/src/views/modules/common/Chooselist.vue b/src/views/modules/common/Chooselist.vue index 8cb5895..1177714 100644 --- a/src/views/modules/common/Chooselist.vue +++ b/src/views/modules/common/Chooselist.vue @@ -1,6 +1,6 @@ @@ -136,6 +141,7 @@ import { 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";/*结束派工的组件*/ export default { data() { @@ -143,6 +149,7 @@ export default { height: 800, showOperatorFlag: false, showReportFlag: false, + fqcShowReportFlag:false, showFinishScheduleFlag:false, searchData: { site: this.$store.state.user.site, @@ -952,6 +959,7 @@ export default { comSwitchOperator,/*切换用户的组件*/ comProduceReportNormal,/*报工页面的组件*/ comFinishSchedule,/*结束派工单的组件*/ + fqcProduceReportNormal, /*fqc报工*/ }, mounted() { this.$nextTick(() => { @@ -959,7 +967,44 @@ export default { }) }, methods: { + // FQC 报工 + fqcReport(){ + //首先判断是否选择好派工单 + if (JSON.stringify(this.currentRow) == '{}') { + this.$message.error('请先选择派工单!'); + return false; + } + //打开操作员切换功能 + this.showOperatorFlag = true; + this.$nextTick(() => { + this.$refs.comSwitchOperator.init(1); + }); + }, + fqcReportModal(){ + //首先判断是否选择好派工单 + if (JSON.stringify(this.currentRow) == '{}') { + this.$message.error('请先选择派工单!'); + return false; + } + //打开操作员切换功能 + this.fqcShowReportFlag = true; + this.$nextTick(() => { + this.$refs.fqcProduceReportNormal.init(this.currentRow.seqNo, this.operatorData); + }); + }, + // FQC 分卷 + fqcSplitRoll(){ + + }, + // 返工重捡 + reworkInspect(){ + + }, + // 换包装 + changePackaging(){ + + }, /*查询派工单*/ getProduceScheduleList() { //开始真的查询; @@ -983,15 +1028,30 @@ export default { initOperatorData(operatorData){ this.showOperatorFlag = false; this.operatorData = JSON.parse(JSON.stringify(operatorData)); - //切换到报工组件 - this.switchProduceReportModal(); + if (operatorData.reportType == 0){ + //切换到报工组件 + this.switchProduceReportModal(); + } + + if (operatorData.reportType == 1){ + //切换到fqc报工组件 + this.fqcReportModal(); + } + }, - notInitOperatorData(){ + notInitOperatorData(val){ //关闭切换用户模态框 this.showOperatorFlag = false; - //切换到报工组件 - this.switchProduceReportModal(); + if (val == 0){ + //切换到报工组件 + this.switchProduceReportModal(); + } + if (val == 1){ + // FQC 报工 + this.fqcReportModal() + } + }, //切换员工modal @@ -1004,7 +1064,7 @@ export default { //打开操作员切换功能 this.showOperatorFlag = true; this.$nextTick(() => { - this.$refs.comSwitchOperator.init(); + this.$refs.comSwitchOperator.init(0); }); },