|
|
|
@ -384,7 +384,7 @@ |
|
|
|
<el-button type="primary" @click="continueModalFlag = false">取消</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
<el-dialog class="big" @close="closeDialog" :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="报告信息" :visible.sync="setUp.reviewFlag" width="615px"> |
|
|
|
<el-dialog class="big" @close="closeDialog" top="10vh" :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="报告信息" :visible.sync="setUp.reviewFlag" width="615px"> |
|
|
|
<el-form :inline="true" label-position="top"> |
|
|
|
<el-form-item label="派工单号"> |
|
|
|
<el-input style="width: 130px;" :disabled="setUp.disabled" onkeyup="this.value = this.value.toUpperCase()" v-model="saveHeaderData.seqNo"></el-input> |
|
|
|
@ -461,7 +461,7 @@ |
|
|
|
<el-form-item label="不合格/缺失数量" > |
|
|
|
<el-input type="number" class="input_left" style="width: 178px;" v-model="saveHeaderData.qtyUnApprove" @blur="qtyReportedBlur()"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="生产模数" > |
|
|
|
<el-form-item label="生产模数" v-if="false"> |
|
|
|
<el-input type="number" style="width: 178px;" v-model="moQty" @blur="moQtyBlur()"></el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
@ -530,6 +530,18 @@ |
|
|
|
<el-input style="width: 560px;" v-model="saveHeaderData.remark"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
height="150" |
|
|
|
:data="toolHistList" |
|
|
|
border> |
|
|
|
<el-table-column label="工具实例" prop="toolInstanceID"></el-table-column> |
|
|
|
<el-table-column label="工具名称" prop="toolDescription"></el-table-column> |
|
|
|
<el-table-column label="生产模数"> |
|
|
|
<template slot-scope="{row,$index}"> |
|
|
|
<el-input type="number" v-model="row.finishQty"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<el-button @click="SOPModal()" type="primary">查看SOP</el-button> |
|
|
|
<el-button @click="setUp.reviewFlag = false">取消</el-button> |
|
|
|
@ -589,8 +601,8 @@ |
|
|
|
printTransNoLabel, |
|
|
|
} from "@/views/modules/print/print_transNo_label.js" |
|
|
|
import { |
|
|
|
getSOScheduleRoutingData |
|
|
|
, saveGenerateReportForSchedule, |
|
|
|
getSOScheduleRoutingData, |
|
|
|
saveGenerateReportForSchedule, |
|
|
|
searchReportedQty, |
|
|
|
searchSeqNo, |
|
|
|
startSeqNo, |
|
|
|
@ -598,6 +610,7 @@ |
|
|
|
continueWork, |
|
|
|
getTvList, |
|
|
|
getBadCodeList, |
|
|
|
selectSFDCToolHist |
|
|
|
} from '@/api/production/generateReport.js' |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist' |
|
|
|
import { |
|
|
|
@ -614,6 +627,7 @@ |
|
|
|
}, |
|
|
|
data () { |
|
|
|
return { |
|
|
|
toolHistList:[],// 工具 |
|
|
|
cavity:'', |
|
|
|
setUp: { |
|
|
|
reviewFlag: false, |
|
|
|
@ -860,6 +874,18 @@ |
|
|
|
if(this.saveHeaderData.acceptQty==null||this.saveHeaderData.acceptQty==''){ |
|
|
|
this.saveHeaderData.acceptQty=0 |
|
|
|
} |
|
|
|
// 判断生产模数 |
|
|
|
if (this.toolHistList.length > 0){ |
|
|
|
if (!this.toolHistList.some(item => item.finishQty && item.finishQty !== 0)) { |
|
|
|
this.$alert('至少填写一条工具的生产模数！', '错误信息', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return |
|
|
|
} |
|
|
|
this.saveHeaderData.toolingHistDataList = this.toolHistList |
|
|
|
this.saveHeaderData.createBy = this.$store.state.user.name |
|
|
|
} |
|
|
|
|
|
|
|
this.setUp.saveButton=true; |
|
|
|
saveGenerateReportForSchedule(this.saveHeaderData).then(({data}) => { |
|
|
|
this.setUp.saveButton = false |
|
|
|
@ -943,6 +969,7 @@ |
|
|
|
initReportModal (row) { |
|
|
|
this.scanSeqNo=row.seqNo |
|
|
|
this.searchSeqNo() |
|
|
|
this.selectSFDCToolHist(row) |
|
|
|
}, |
|
|
|
closeDialog () { |
|
|
|
Object.assign(this.$data.saveHeaderData, this.$options.data.call(this).saveHeaderData) |
|
|
|
@ -952,6 +979,28 @@ |
|
|
|
this.tableData = data.rows |
|
|
|
}) |
|
|
|
}, |
|
|
|
selectSFDCToolHist(row){ |
|
|
|
let params = { |
|
|
|
site:row.site, |
|
|
|
orderNo:row.orderNo, |
|
|
|
itemNo:row.itemNo, |
|
|
|
seqNo:row.seqNo, |
|
|
|
finishFlag:"N" |
|
|
|
} |
|
|
|
selectSFDCToolHist(params).then(({data})=>{ |
|
|
|
if (data && data.code === 0){ |
|
|
|
this.toolHistList = data.rows |
|
|
|
}else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}).catch((error)=>{ |
|
|
|
this.$alert(error, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
}) |
|
|
|
}, |
|
|
|
createExportData () { |
|
|
|
return this.tableData |
|
|
|
}, |
|
|
|
@ -1163,7 +1212,7 @@ |
|
|
|
this.liLunQty =''; |
|
|
|
this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00') |
|
|
|
this.saveHeaderData.planFinishTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00') |
|
|
|
|
|
|
|
this.selectSFDCToolHist(this.saveHeaderData) |
|
|
|
searchReportedQty(this.saveHeaderData).then(({data}) => { |
|
|
|
if(data.code===0) { |
|
|
|
this.cavity= data.row.cavity |
|
|
|
@ -1426,4 +1475,8 @@ |
|
|
|
font-size: 17px; |
|
|
|
font-weight: bold; |
|
|
|
} |
|
|
|
|
|
|
|
.big /deep/ .el-table .cell{ |
|
|
|
height: auto !important; |
|
|
|
} |
|
|
|
</style> |
