6 changed files with 564 additions and 85 deletions
-
42src/api/yieldReport/com_material_settlement.js
-
4src/api/yieldReport/produce_report_normal.js
-
365src/views/modules/yieldReport/com_material_settlement.vue
-
167src/views/modules/yieldReport/com_produce_report_normal.vue
-
67src/views/modules/yieldReport/com_start_produce.vue
-
4src/views/modules/yieldReport/com_switch_operator.vue
@ -0,0 +1,42 @@ |
|||
import { createAPI } from '@/utils/httpRequest.js' |
|||
|
|||
// 获取当前的卷的报工汇总数据
|
|||
export const getCurrentRollReportedQty = data => createAPI('schedule/getCurrentRollReportedQty', 'POST', data) |
|||
|
|||
// 获取上机卷的时间信息汇总
|
|||
export const countSfdcTimeQty = data => createAPI('schedule/countSfdcTimeQty', 'POST', data) |
|||
|
|||
// 获取派工单的班次信息
|
|||
export const getScheduleShiftData = data => createAPI('schedule/getScheduleShiftData', 'POST', data) |
|||
|
|||
// 获取sfdc表的时间信息汇总
|
|||
export const getSfdcTimeData = data => createAPI('schedule/getSfdcTimeData', 'POST', data) |
|||
|
|||
// 获取当前时间记录信息
|
|||
export const getSfdcTimeMaxAndMinTime = data => createAPI('schedule/getSfdcTimeMaxAndMinTime', 'POST', data) |
|||
|
|||
// 获取当前卷sfdc表的报工数据
|
|||
export const getSfdcReportedData = data => createAPI('schedule/getSfdcReportedData', 'POST', data) |
|||
|
|||
// 获取当前卷的材料记录--在线的
|
|||
export const getSfdcMaterialByRollNo = data => createAPI('schedule/getSfdcMaterialByRollNo', 'POST', data) |
|||
|
|||
// 获取当前派工单的材料记录
|
|||
export const getSfdcMaterialByCon = data => createAPI('schedule/getSfdcMaterialByCon', 'POST', data) |
|||
|
|||
// 获取当前派工单的上机卷记录
|
|||
export const getSfdcRollOpsByCon = data => createAPI('schedule/getSfdcRollOpsByCon', 'POST', data) |
|||
|
|||
// 获取当前派工单的不良卷记录
|
|||
export const getSfdcDefectByCon = data => createAPI('schedule/getSfdcDefectByCon', 'POST', data) |
|||
|
|||
// 获取当前上机卷信息
|
|||
export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', 'POST', data) |
|||
|
|||
|
|||
|
|||
|
|||
|
|||
|
|||
|
|||
|
|||
@ -0,0 +1,365 @@ |
|||
<template> |
|||
<div class="customer-css"> |
|||
<el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners" |
|||
width="925px" style="height: 415px;" class="customer-dialog"> |
|||
<el-form :inline="true" label-position="top" style="height: 265px;" |
|||
label-width="80px"> |
|||
<!-- 菜单信息 --> |
|||
<el-row> |
|||
<el-col :span="3" > |
|||
<el-form-item :label="'当前时间:'"> |
|||
<el-date-picker style="width: 100px;" |
|||
v-model="pageData.reportDate" |
|||
format="yyyy-MM-dd" |
|||
value-format="yyyy-MM-dd" |
|||
placeholder=""> |
|||
</el-date-picker> |
|||
</el-form-item> |
|||
</el-col> |
|||
<el-col :span="3" style="margin-top: 27px;"> |
|||
<el-form-item :label="''"> |
|||
<el-form-item :label="''"> |
|||
<el-time-picker style="width: 80px;" |
|||
v-model="pageData.reportTime" |
|||
format="HH:mm:ss" |
|||
value-format="HH:mm:ss" |
|||
placeholder=""> |
|||
</el-time-picker> |
|||
</el-form-item> |
|||
</el-form-item> |
|||
</el-col> |
|||
<el-col :span="8"> |
|||
<el-form-item class="customer-button"> |
|||
<el-button type="primary" @click="refreshPageData" style="margin-left: 10px; margin-bottom: 5px;"> |
|||
刷新</el-button> |
|||
</el-form-item> |
|||
<el-form-item class="customer-button"> |
|||
<el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;"> |
|||
结束调机</el-button> |
|||
</el-form-item> |
|||
<el-form-item class="customer-button"> |
|||
<el-button type="primary" @click="closeDialog" style="margin-left: 10px; margin-bottom: 5px;"> |
|||
关闭</el-button> |
|||
</el-form-item> |
|||
</el-col> |
|||
</el-row> |
|||
<!-- 主材料 --> |
|||
<el-form> |
|||
<fieldset class="customer-fieldset" style="width: 830px;"> |
|||
<legend>主材料</legend> |
|||
<el-table |
|||
height="180" |
|||
:data="sfdcMaterialList" |
|||
border |
|||
v-loading="dataListLoading" |
|||
style="width: 100%; margin-top: -5px;"> |
|||
<el-table-column |
|||
v-for="(item,index) in columnMaterialArray" :key="index" |
|||
:sortable="item.columnSortable" |
|||
:prop="item.columnProp" |
|||
:header-align="item.headerAlign" |
|||
:show-overflow-tooltip="item.showOverflowTooltip" |
|||
:align="item.align" |
|||
:fixed="item.fixed" |
|||
:width="item.columnWidth" |
|||
:label="item.columnLabel"> |
|||
<template slot-scope="scope"> |
|||
<el-input v-if="item.columnHidden"> {{scope.row[item.columnProp]}}</el-input> |
|||
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" |
|||
style="width: 100px; height: 80px"/></span> |
|||
</template> |
|||
</el-table-column> |
|||
</el-table> |
|||
</fieldset> |
|||
</el-form> |
|||
</el-form> |
|||
|
|||
|
|||
</el-dialog> |
|||
</div> |
|||
</template> |
|||
|
|||
<script> |
|||
import { |
|||
getSfdcMaterialByRollNo, |
|||
} from '@/api/yieldReport/com_material_settlement.js'; |
|||
export default { |
|||
name: "com_finish_roll", |
|||
data() { |
|||
return { |
|||
titleCon: '', |
|||
sfdcTimeList: [], |
|||
scheduleData: { |
|||
site: this.$store.state.user.site, |
|||
userName: this.$store.state.user.name, |
|||
seqNo: '', |
|||
orderNo: '', |
|||
itemNo: 0, |
|||
partNo: '', |
|||
workCenterDesc: '', |
|||
resourceDesc: '', |
|||
rollNo: '', |
|||
partDesc: '', |
|||
planStartTime: '', |
|||
planFinishTime: '', |
|||
qtyRequiredOriginal: 0, |
|||
scheduledDate: '', |
|||
shiftNo: '', |
|||
preItemDesc: '', |
|||
nextItemDesc: '', |
|||
nextItemNo: 0, |
|||
currentRollFlag: false |
|||
}, |
|||
pageData: { |
|||
reportDate: this.dayjs().format('YYYY-MM-DD'), |
|||
reportTime: this.dayjs().format('HH:mm:ss'), |
|||
}, |
|||
operatorData: { |
|||
site: this.$store.state.user.site, |
|||
username: this.$store.state.user.name, |
|||
operatorId: '', |
|||
operatorName: '', |
|||
status: '', |
|||
seqNo: '', |
|||
showFlag: false |
|||
}, |
|||
sfdcMaterialList: [], |
|||
columnMaterialArray: [ |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 5303, |
|||
serialNumber: '5303MaterialReportDate', |
|||
tableId: "5303Material", |
|||
tableName: "派工单材料", |
|||
columnProp: "reportDate", |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: "报告时间", |
|||
columnWidth: 125, |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: false |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 5305, |
|||
serialNumber: '5305MaterialReportedBy', |
|||
tableId: "5305Material", |
|||
tableName: "派工单材料", |
|||
columnProp: "reportedBy", |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: "报告人", |
|||
columnWidth: 60, |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: false |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 5305, |
|||
serialNumber: '5305MaterialRmRollNo', |
|||
tableId: "5305Material", |
|||
tableName: "派工单材料", |
|||
columnProp: "rmRollNo", |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: "材料卷号", |
|||
columnWidth: 100, |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: false |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 5305, |
|||
serialNumber: '5305MaterialPartNo', |
|||
tableId: "5305Material", |
|||
tableName: "派工单材料", |
|||
columnProp: "partNo", |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: "零部件编码", |
|||
columnWidth: 100, |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: false |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 5305, |
|||
serialNumber: '5305MaterialStartDate', |
|||
tableId: "5305Material", |
|||
tableName: "派工单材料", |
|||
columnProp: "startDate", |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: "开始使用时间", |
|||
columnWidth: 125, |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: false |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 5305, |
|||
serialNumber: '5305MaterialTransQty', |
|||
tableId: "5305Material", |
|||
tableName: "派工单材料", |
|||
columnProp: "transQty", |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: "数量", |
|||
columnWidth: 80, |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: false |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 5305, |
|||
serialNumber: '5305MaterialNetIssueQty', |
|||
tableId: "5305Material", |
|||
tableName: "派工单材料", |
|||
columnProp: "netIssueQty", |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: "本卷调机数量", |
|||
columnWidth: 100, |
|||
columnHidden: true, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: false |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 5305, |
|||
serialNumber: '5305MaterialKeyRMFlag', |
|||
tableId: "5305Material", |
|||
tableName: "派工单材料", |
|||
columnProp: "keyRMFlag", |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: "是否主材", |
|||
columnWidth: 80, |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: false |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 5305, |
|||
serialNumber: '5305MaterialSAPBOMItemNo', |
|||
tableId: "5305Material", |
|||
tableName: "派工单材料", |
|||
columnProp: "sAPBOMItemNo", |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: "SAP BOM序号", |
|||
columnWidth: 100, |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: false |
|||
} |
|||
], |
|||
buttonTags:{ |
|||
createNewRollFlag: true, |
|||
switchRollFlag: true, |
|||
separatorRollFlag: true, |
|||
finishRollFlag: true, |
|||
mergeRollFlag: true, |
|||
tuningFlag: true, |
|||
produceFlag: true, |
|||
defectFlag: true, |
|||
toolFlag: true, |
|||
materialFlag: true, |
|||
downTimeFlag: true |
|||
}, |
|||
dataListLoading: false, |
|||
} |
|||
}, |
|||
methods: { |
|||
/*初始化页面参数*/ |
|||
init(scheduleData, operatorData) { |
|||
//初始化参数 |
|||
this.scheduleData = JSON.parse(JSON.stringify(scheduleData)); |
|||
//初始化操作员对象 |
|||
this.operatorData = JSON.parse(JSON.stringify(operatorData)); |
|||
//初始化标题 |
|||
this.titleCon = '卷调机-卷材料结算'; |
|||
//刷新当前派工单的信息 |
|||
this.refreshPageData(); |
|||
}, |
|||
/*关闭modal*/ |
|||
closeDialog(){ |
|||
this.$emit('update:visible', false); |
|||
}, |
|||
|
|||
/*刷新当前的页面参数*/ |
|||
refreshPageData(){ |
|||
//刷新材料的数据 |
|||
this.refreshSfdcMaterialTable(); |
|||
}, |
|||
|
|||
//刷新当前卷的时间数据 |
|||
refreshSfdcMaterialTable(){ |
|||
getSfdcMaterialByRollNo(this.scheduleData).then(({data}) => { |
|||
this.sfdcMaterialList = data.rows; |
|||
}); |
|||
}, |
|||
|
|||
|
|||
}, |
|||
created() { |
|||
// |
|||
} |
|||
} |
|||
|
|||
</script> |
|||
|
|||
<style scoped lang="scss"> |
|||
/*调节页面button和input的上下间距*/ |
|||
.customer-css .customer-button{ |
|||
margin-top: 25px; |
|||
} |
|||
|
|||
/*调节样式*/ |
|||
.customer-item{ |
|||
margin-top: -10px; |
|||
} |
|||
/*fieldset下table的样式*/ |
|||
.customer-fieldset /deep/ .el-table__header th.is-leaf{ |
|||
line-height: 16px; |
|||
} |
|||
|
|||
/deep/ .customer-tab .el-tabs__content{ |
|||
padding: 0px !important; |
|||
} |
|||
|
|||
</style> |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue