diff --git a/src/App.vue b/src/App.vue index 20db938..ba56e35 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,14 +10,25 @@ export default { data() { return { - query: {} + query: {}, + version: '1.2' } }, created() { - + this.versionReload() }, methods: { - + versionReload(){ + let version = this.version; //版本号（每次上线前需要更新下版本号） + console.log('最新系统版本: ',version) + console.log('当前系统班帮: ',this.version) + let versionLocal = localStorage.getItem('_version_'); + if(version!=versionLocal){ + localStorage.setItem('_version_',version); + this.version=versionLocal; + location.reload(); + } + } } } diff --git a/src/api/yieldReport/com_finish_roll.js b/src/api/yieldReport/com_finish_roll.js index 20f9539..0be7424 100644 --- a/src/api/yieldReport/com_finish_roll.js +++ b/src/api/yieldReport/com_finish_roll.js @@ -42,10 +42,7 @@ export const finishRollWithNoFqc = data => createAPI('schedule/finishRollWithNoF // 校验是否可以修改总良品数 export const getSORoutingPreviousOperationItemNo = data => createAPI('schedule/getSORoutingPreviousOperationItemNo', 'POST', data) - - - - - - - +// 换包装结束卷校验 +export const checkRepackFinishRollWithNoFqc = data => createAPI(`schedule/checkRepackFinishRollWithNoFqc`,'POST',data) +// 换包装结束卷 +export const repackFinishRollWithNoFqc = data => createAPI(`schedule/repackFinishRollWithNoFqc`,'POST',data) diff --git a/src/api/yieldReport/com_finish_schedule.js b/src/api/yieldReport/com_finish_schedule.js index 66a2d61..bddfe84 100644 --- a/src/api/yieldReport/com_finish_schedule.js +++ b/src/api/yieldReport/com_finish_schedule.js @@ -17,3 +17,7 @@ export const checkFinishScheduleWithNoFqc = data => createAPI('schedule/checkFin // 派工单结束操作 export const finishScheduleWithNoFqc = data => createAPI('schedule/finishScheduleWithNoFqc', 'POST', data) + +// 换包装结束工单 +export const repackFinishScheduleWithNoFqc = data => createAPI('schedule/repackFinishScheduleWithNoFqc', 'POST', data) + diff --git a/src/api/yieldReport/produce_order.js b/src/api/yieldReport/produce_order.js index 930f56f..d72a507 100644 --- a/src/api/yieldReport/produce_order.js +++ b/src/api/yieldReport/produce_order.js @@ -30,3 +30,6 @@ export const repairSOFlagProduceOrder = data => createAPI('schedule/repairSOFlag export const workbenchCancelallops = data => createAPI('schedule/workbenchCancelallops', 'POST', data) // 创建重检派工单 export const soscheduleNewReinspectjob = data => createAPI('schedule/soscheduleNewReinspectjob', 'POST', data) + +//获取订单信息 +export const getShopOrder = data => createAPI(`schedule/getShopOrderType`,'POST',data) diff --git a/src/views/modules/yieldReport/com_finish_schedule.vue b/src/views/modules/yieldReport/com_finish_schedule.vue index 19484e7..504f62c 100644 --- a/src/views/modules/yieldReport/com_finish_schedule.vue +++ b/src/views/modules/yieldReport/com_finish_schedule.vue @@ -280,6 +280,7 @@ getSfdcMaterialHistBySeqNo, checkFinishScheduleWithNoFqc, finishScheduleWithNoFqc, + repackFinishScheduleWithNoFqc } from '@/api/yieldReport/com_finish_schedule.js'; export default { @@ -288,6 +289,7 @@ return { titleCon: '', showExceptionFlag: false, + scheduleNo: 0, pageData: { site: this.$store.state.user.site, username: this.$store.state.user.name, @@ -888,7 +890,8 @@ }, methods: { /*初始化页面参数*/ - init(scheduleData, operatorData) { + init(scheduleData, operatorData,scheduleNo) { + this.scheduleNo = scheduleNo?scheduleNo:0 //初始化参数 this.pageData.orderNo = scheduleData.orderNo; this.pageData.itemNo = scheduleData.itemNo; @@ -1090,18 +1093,32 @@ /*结束卷的具体操作*/ finishScheduleOperation() { - //处理信息 - finishScheduleWithNoFqc(this.pageData).then(({data}) => { - //判断操作是否成功 - if (data.code == 500) { - this.$message.error(data.msg); - } else { - //刷新报工的页面 - this.$emit('processFinishScheduleOperation'); - //关闭当前的页面 - this.closeDialog(); - } - }) + if (this.scheduleNo == 0){ + //处理信息 + finishScheduleWithNoFqc(this.pageData).then(({data}) => { + //判断操作是否成功 + if (data.code == 500) { + this.$message.error(data.msg); + } else { + //刷新报工的页面 + this.$emit('processFinishScheduleOperation'); + //关闭当前的页面 + this.closeDialog(); + } + }) + }else if (this.scheduleNo == 4){ + repackFinishScheduleWithNoFqc(this.pageData).then(({data}) => { + //判断操作是否成功 + if (data.code == 500) { + this.$message.error(data.msg); + } else { + //刷新报工的页面 + this.$emit('processFinishScheduleOperation'); + //关闭当前的页面 + this.closeDialog(); + } + }) + } }, /*打开异常原因录入页面*/ diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 8f5bcc8..176f15b 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -2903,7 +2903,10 @@ export default { const { columns, data } = param; const sums = []; columns.forEach((column, index) => { - + if (index === 1) { + sums[index] = "合计: "; + return; + } if (index == 4){ const values = data.map(item => Number(item[column.property])); if (!values.every(value => isNaN(value))) { @@ -2917,7 +2920,7 @@ export default { }, 0); sums[index] ; } - sums[index] = "合计:"+(sums[index]?sums[index]:0) + sums[index] = (sums[index]?sums[index]:0) } }); diff --git a/src/views/modules/yieldReport/otherReport/change_finish_roll.vue b/src/views/modules/yieldReport/otherReport/change_finish_roll.vue new file mode 100644 index 0000000..3f3d424 --- /dev/null +++ b/src/views/modules/yieldReport/otherReport/change_finish_roll.vue @@ -0,0 +1,947 @@ + + + + + diff --git a/src/views/modules/yieldReport/otherReport/change_packaging.vue b/src/views/modules/yieldReport/otherReport/change_packaging.vue index 9800568..2ac1c2a 100644 --- a/src/views/modules/yieldReport/otherReport/change_packaging.vue +++ b/src/views/modules/yieldReport/otherReport/change_packaging.vue @@ -69,7 +69,7 @@ 结束卷 @@ -115,15 +115,38 @@ 列表信息 - + + + + + + + + + @@ -291,32 +334,13 @@ 切换用户 - - - 开始生产 + + + 结单 - - -
- - 未生产下机拆卷 - -
- 其它操作 - - - + @@ -339,10 +363,10 @@ - - + { - + if (index === 1) { + sums[index] = "合计: "; + return; + } if (index == 4){ const values = data.map(item => Number(item[column.property])); if (!values.every(value => isNaN(value))) { @@ -2807,7 +2834,7 @@ export default { }, 0); sums[index] ; } - sums[index]+= sums[index]?sums[index]:0 + sums[index] = sums[index]?sums[index]:0 } }); @@ -3040,6 +3067,7 @@ export default { } else if (this.activeTable == 'sfdc_roll') { this.getSfdcRollList(); } + }, init(seqNo, operatorData) { @@ -3056,7 +3084,7 @@ export default { this.harmful.defectCode = '' this.harmful.defectDesc = '' //设置table页签 - this.activeTable = 'sfdc_time'; + this.activeTable = 'sfdc_material'; //刷新当前派工单的信息 this.refreshPageData(); }, @@ -3244,7 +3272,7 @@ export default { //打开切换用户的页面 this.$nextTick(() => { this.showSwitchFlag = true; - this.$refs.otherSwitchRoll.init(this.scheduleData, this.operatorData) + this.$refs.changeFinishRoll.init(this.scheduleData, this.operatorData) }); }, @@ -3316,7 +3344,7 @@ export default { //打开结束卷的页面 this.$nextTick(() => { this.showFinishFlag = true; - this.$refs.comFinishRoll.init(this.scheduleData, this.operatorData) + this.$refs.changeFinishRoll.init(this.scheduleData, this.operatorData) }); }, @@ -3451,7 +3479,8 @@ export default { //打开操作员切换功能 this.showFinishScheduleFlag = true; this.$nextTick(() => { - this.$refs.comFinishSchedule.init(this.scheduleData, this.operatorData); + // 第三个换包装结单参数 + this.$refs.comFinishSchedule.init(this.scheduleData, this.operatorData,4); }); }, 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 e78a877..fb1d767 100644 --- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue +++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue @@ -2814,7 +2814,10 @@ export default { const { columns, data } = param; const sums = []; columns.forEach((column, index) => { - + if (index === 1) { + sums[index] = "合计: "; + return; + } if (index == 4){ const values = data.map(item => Number(item[column.property])); if (!values.every(value => isNaN(value))) { @@ -2828,7 +2831,7 @@ export default { }, 0); sums[index] ; } - sums[index] = "合计:"+(sums[index]?sums[index]:0) + sums[index] = (sums[index]?sums[index]:0) } }); diff --git a/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue b/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue index 2a8740c..27b3778 100644 --- a/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue +++ b/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue @@ -2815,7 +2815,10 @@ export default { const { columns, data } = param; const sums = []; columns.forEach((column, index) => { - + if (index === 1) { + sums[index] = "合计: "; + return; + } if (index == 4){ const values = data.map(item => Number(item[column.property])); if (!values.every(value => isNaN(value))) { @@ -2829,7 +2832,7 @@ export default { }, 0); sums[index] ; } - sums[index] = "合计:"+(sums[index]?sums[index]:0) + sums[index] =(sums[index]?sums[index]:0) } }); return sums; @@ -2887,7 +2890,7 @@ export default { if (val === 89 ){ strVal = this.harmful.defectCode; } - this.$refs.baseList.init(val, val) + this.$refs.baseList.init(val, strVal) }) }, // 批量直接送检 diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index f1c4701..5b9434b 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -80,7 +80,6 @@ - 主菜单 @@ -183,7 +182,7 @@ - + @@ -201,7 +200,8 @@ import { costRollUpProduceOrder, manualProduceOrder, repairSOFlagProduceOrder, - workbenchCancelallops + workbenchCancelallops, + getShopOrder } from '@/api/yieldReport/produce_order.js'; /*引入组件*/ @@ -218,7 +218,7 @@ export default { data() { return { height: 800, - menuShow:false, + menuShow: false, showOperatorFlag: false, showReportFlag: false, fqcShowReportFlag: false, @@ -1088,17 +1088,17 @@ export default { username: this.$store.state.user.name, searchFlag: true } - currentRow = getProduceScheduleList(searchOrder).then(({data}) => { + getProduceScheduleList(searchOrder).then(({data}) => { //设置查询数据 currentRow = data.rows[0]; - if (currentRow == null){ + if (currentRow == null) { return; } this.menuButton.canceledAllPrdButton = false this.menuButton.createRecheckButton = false // 判断是否具有该页面权限 let menList = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]').filter(item => item.path == 'shopOrder-shopOrder/shopOrder') - if (menList.length>0){ + if (menList.length > 0) { this.menuButton.prdButton = false } // 关闭按钮 @@ -1136,13 +1136,13 @@ export default { // 暂停 if (currentRow.closedFlag == 'N' && currentRow.parkFlag == 'N') { this.menuButton.pauseButton = false - }else { + } else { this.menuButton.pauseButton = true } // 重开 if (currentRow.closedFlag == 'N' && currentRow.parkFlag == 'Y') { this.menuButton.openReverseButton = false - }else { + } else { this.menuButton.openReverseButton = true } // 生产排料 @@ -1247,7 +1247,7 @@ export default { } else { this.menuButton.canceledRepairSOFlagButton = true } - this.menuShow=true + this.menuShow = true }); } }, @@ -1669,18 +1669,19 @@ export default { this.fqcSplitRollModal(); } if (val == 4) { - //切换到fqc分卷组件 + //切换到换包装 this.changePackaging(); + } }, //切换员工modal switchOperatorModal(val) { - //首先判断是否选择好派工单 if (JSON.stringify(this.currentRow) == '{}') { this.$message.error('请先选择派工单!'); return false; } + if (val == 0) { let data = { site: this.currentRow.site, @@ -1714,12 +1715,30 @@ export default { }) } }) - } else { - //打开操作员切换功能 - this.showOperatorFlag = true; - this.$nextTick(() => { - this.$refs.comSwitchOperator.init(val); - }); + }else{ + if (val == 4){ + getShopOrder(this.currentRow).then(({data}) =>{ + if (data.code == 0){ + if (data.orderType == 'P'){ + //打开操作员切换功能 + this.showOperatorFlag = true; + this.$nextTick(() => { + this.$refs.comSwitchOperator.init(val); + }); + }else { + this.$alert('该订单不是特殊订单，不能采用该功能！', '提示', { + confirmButtonText: '确定'}) + } + } + }) + }else { + //打开操作员切换功能 + this.showOperatorFlag = true; + this.$nextTick(() => { + this.$refs.comSwitchOperator.init(val); + }); + } + } },