|
|
@ -91,10 +91,11 @@ |
|
|
prop="" |
|
|
prop="" |
|
|
header-align="center" |
|
|
header-align="center" |
|
|
align="center" |
|
|
align="center" |
|
|
min-width="50" |
|
|
|
|
|
|
|
|
min-width="100" |
|
|
label="操作"> |
|
|
label="操作"> |
|
|
<template slot-scope="scope" class="foo_container"> |
|
|
<template slot-scope="scope" class="foo_container"> |
|
|
<a type="text" size="small" @click="initReportModal(scope.row)">报告</a> |
|
|
|
|
|
|
|
|
<a type="text" size="small" @click="initReportModal(scope.row)">报工</a> |
|
|
|
|
|
<a type="text" size="small" @click="SOPModal2(scope.row)">查看SOP</a> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
<el-table-column |
|
|
<el-table-column |
|
|
@ -266,6 +267,14 @@ |
|
|
</el-date-picker> |
|
|
</el-date-picker> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
|
|
|
<el-form :inline="true" label-position="top"> |
|
|
|
|
|
<el-form-item label="本工序报工数"> |
|
|
|
|
|
<el-input style="width: 130px;" :disabled="setUp.disabled" v-model="qty1"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item label="上工序报工数"> |
|
|
|
|
|
<el-input style="width: 130px;" :disabled="setUp.disabled" v-model="qty2"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-form> |
|
|
<el-form :inline="true" label-position="top"> |
|
|
<el-form :inline="true" label-position="top"> |
|
|
<el-form-item label="报告数量"> |
|
|
<el-form-item label="报告数量"> |
|
|
<el-input type="number" oninput="value=value.replace(/[^\d]/g,'')" class="input_left" style="width: 178px;" v-model="saveHeaderData.qtyReported"></el-input> |
|
|
<el-input type="number" oninput="value=value.replace(/[^\d]/g,'')" class="input_left" style="width: 178px;" v-model="saveHeaderData.qtyReported"></el-input> |
|
|
@ -376,7 +385,8 @@ |
|
|
<script> |
|
|
<script> |
|
|
import { |
|
|
import { |
|
|
getSOScheduleRoutingData |
|
|
getSOScheduleRoutingData |
|
|
, saveGenerateReportForSchedule |
|
|
|
|
|
|
|
|
, saveGenerateReportForSchedule, |
|
|
|
|
|
searchReportedQty |
|
|
} from '@/api/production/generateReport.js' |
|
|
} from '@/api/production/generateReport.js' |
|
|
import Chooselist from '@/views/modules/common/Chooselist' |
|
|
import Chooselist from '@/views/modules/common/Chooselist' |
|
|
import { |
|
|
import { |
|
|
@ -423,6 +433,8 @@ |
|
|
scheduleType:'', |
|
|
scheduleType:'', |
|
|
userId:'', |
|
|
userId:'', |
|
|
}, |
|
|
}, |
|
|
|
|
|
qty1:'', |
|
|
|
|
|
qty2:'', |
|
|
sopFlag:false, |
|
|
sopFlag:false, |
|
|
site: this.$store.state.user.site, |
|
|
site: this.$store.state.user.site, |
|
|
operatorType: 0, |
|
|
operatorType: 0, |
|
|
@ -613,6 +625,10 @@ |
|
|
this.saveHeaderData.userId=this.$store.state.user.name |
|
|
this.saveHeaderData.userId=this.$store.state.user.name |
|
|
this.saveHeaderData.planFinishTime = 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.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00') |
|
|
this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00') |
|
|
|
|
|
searchReportedQty(this.saveHeaderData).then(({data}) => { |
|
|
|
|
|
this.qty1 = data.row.qtyReported; |
|
|
|
|
|
this.qty2 =data.row.lastApproveQty; |
|
|
|
|
|
}) |
|
|
}, |
|
|
}, |
|
|
closeDialog () { |
|
|
closeDialog () { |
|
|
Object.assign(this.$data.saveHeaderData, this.$options.data.call(this).saveHeaderData) |
|
|
Object.assign(this.$data.saveHeaderData, this.$options.data.call(this).saveHeaderData) |
|
|
@ -651,6 +667,15 @@ |
|
|
this.getPhoto(); |
|
|
this.getPhoto(); |
|
|
this.sopFlag=true; |
|
|
this.sopFlag=true; |
|
|
}, |
|
|
}, |
|
|
|
|
|
SOPModal2(row){ |
|
|
|
|
|
this.sopData.partNo = row.partNo; |
|
|
|
|
|
this.sopData.site= row.site; |
|
|
|
|
|
this.partDescription= row.partDesc; |
|
|
|
|
|
// var div1=document.getElementById("padPhoto"); |
|
|
|
|
|
// div1.style.cssText= "height:"+this.height2+"px;"; |
|
|
|
|
|
this.getPhoto(); |
|
|
|
|
|
this.sopFlag=true; |
|
|
|
|
|
}, |
|
|
getPhoto(){ |
|
|
getPhoto(){ |
|
|
getPhotoAddressData(this.sopData).then(({data}) => { |
|
|
getPhotoAddressData(this.sopData).then(({data}) => { |
|
|
this.photoDatas = data.rows; |
|
|
this.photoDatas = data.rows; |
|
|
|
