diff --git a/src/api/production/generateReport.js b/src/api/production/generateReport.js index 7587258..18bbcf0 100644 --- a/src/api/production/generateReport.js +++ b/src/api/production/generateReport.js @@ -64,6 +64,7 @@ export const startRework = data =>createAPI(`/dailyPlan/startRework`,'post',data export const selectRework = data =>createAPI(`/dailyPlan/selectRework`,'post',data) export const saveRework = data =>createAPI(`/dailyPlan/saveRework`,'post',data) export const getRework = data =>createAPI(`/dailyPlan/getRework`,'post',data) +export const getTimeHistListForSfdc = data =>createAPI(`/dailyPlan/getTimeHistListForSfdc`,'post',data) export const getPackagePrintDataList = data =>createAPI('/board/getPackagePrintDataList','get',data) diff --git a/src/api/production/query.js b/src/api/production/query.js index eacd515..b5f1d30 100644 --- a/src/api/production/query.js +++ b/src/api/production/query.js @@ -7,3 +7,5 @@ export const getHunlianTaskList = data => createAPI(`dailyPlan/getHunlianTaskLis export const getHunlianTaskIssure = data => createAPI(`dailyPlan/getHunlianTaskIssure`, 'post', data); export const liuhuaIssureAndReport= data => createAPI(`dailyPlan/liuhuaIssureAndReport`, 'post', data); export const scheduleAbnormalReport= data => createAPI(`dailyPlan/scheduleAbnormalReport`, 'post', data); + +export const getSfdcTimeHistQuery= data => createAPI(`dailyPlan/getSfdcTimeHistQuery`, 'post', data); diff --git a/src/views/modules/Abnormal/AbnormalFeedBack.vue b/src/views/modules/Abnormal/AbnormalFeedBack.vue index 52e75a7..ffc37be 100644 --- a/src/views/modules/Abnormal/AbnormalFeedBack.vue +++ b/src/views/modules/Abnormal/AbnormalFeedBack.vue @@ -256,6 +256,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -436,6 +500,16 @@ "异常数量": "abnormalQty", "异常情况影响分析": "abnormalInfluence", "异常描述": "abnormalRemark", + "报废状态1": "scrapType1", + "报废原因1": "scrapReason1", + "报废状态2": "scrapType2", + "报废原因2": "scrapReason2", + "报废状态3": "scrapType3", + "报废原因3": "scrapReason3", + "报废状态4": "scrapType4", + "报废原因4": "scrapReason4", + "报废状态5": "scrapType5", + "报废原因5": "scrapReason5", "紧急处理方式": "treatmentTemporary", "临时性措施结论": "temporaryConclusion", "温度": "temperatureTemporary", @@ -499,6 +573,26 @@ abnormalFeedBackData:{ }, + scrapTypeList:[ + {label:'缺料'}, + {label:'气泡'}, + {label:'断裂'}, + {label:'窝气'}, + {label:'粘模'}, + {label:'熟料'}, + {label:'杂质'}, + {label:'烧边'}, + {label:'错位'}, + {label:'脱胶'}, + {label:'表面缺陷'}, + ], + scrapReasonList:[ + {label:'材料问题'}, + {label:'人员操作'}, + {label:'设备问题'}, + {label:'模具问题'}, + {label:'工艺问题'}, + ], columnFileContentArray: [ { columnProp: 'fileName', diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue index 9b169b1..8cfa065 100644 --- a/src/views/modules/production/generateReport.vue +++ b/src/views/modules/production/generateReport.vue @@ -365,7 +365,10 @@ - + + + + @@ -817,6 +820,7 @@ abnormalRemark:'', abnormalInfluence:'', abnormalQty:'', + nextSeqNo:'', }, } }, @@ -1185,13 +1189,14 @@ }, stopScan(){ this.getAllAbnormalItem(); - this.stopData.seqNo='', - this.stopData.shiftNo='', - this.stopData.site='', - this.stopData.resourceDesc='', - this.stopData.orderNo='', - this.stopData.abnormalRemark='', - this.stopData.abnormalCode='', + this.stopData.seqNo=''; + this.stopData.shiftNo=''; + this.stopData.site=''; + this.stopData.resourceDesc=''; + this.stopData.orderNo=''; + this.stopData.abnormalRemark=''; + this.stopData.abnormalCode=''; + this.stopData.nextSeqNo=''; this.stopModalFlag=true; this.fileList = []; this.$nextTick(() => { this.$refs.stop.focus();}) @@ -1455,6 +1460,7 @@ formData.append("abnormalRemark", this.stopData.abnormalRemark); formData.append("abnormalInfluence", this.stopData.abnormalInfluence); formData.append("abnormalQty", this.stopData.abnormalQty); + formData.append("nextSeqNo", this.stopData.nextSeqNo); // let inData={ // username:this.$store.state.user.name, // seqNo:this.scanSeqNo diff --git a/src/views/modules/production/searchSfdc.vue b/src/views/modules/production/searchSfdc.vue index b0d41ec..8bb273a 100644 --- a/src/views/modules/production/searchSfdc.vue +++ b/src/views/modules/production/searchSfdc.vue @@ -93,9 +93,10 @@ header-align="center" fixed="left" align="center" - width="100" + width="140" label="操作"> @@ -117,6 +118,67 @@ + + + + + + + + + + + + + + + + + + + 取消 + + + @@ -125,6 +187,7 @@ import { getSfdcList, printDefectCard, + getTimeHistListForSfdc, } from '@/api/production/generateReport.js' import Chooselist from '@/views/modules/common/Chooselist' import { @@ -695,6 +758,8 @@ // 导出 end height: 200, tableData: [], + detailFlag:false, + detailList: [], searchData: { seqNo:'', orderNo: '', @@ -799,6 +864,12 @@ } }) }, + timeHistModel(row){ + getTimeHistListForSfdc(row).then(({data}) => { + this.detailFlag=true + this.detailList=data.rows + }) + }, tableRowClassName ({row, rowIndex}) { if ( row.csysScrapRate +
+ + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + {{ '导出' }} + + + + + + + + + + + +
+ + + + +