|
|
|
@ -441,6 +441,16 @@ |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
fixed="left" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="100" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a class="customer-a" @click="showMaterialRecordDialog(scope.row)">领料记录</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in columnBomArray" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
@ -873,6 +883,28 @@ |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 领料记录弹出框 --> |
|
|
|
<el-dialog title="领料记录" :visible.sync="showMaterialRecordFlag" width="70%" top="5vh"> |
|
|
|
<el-table |
|
|
|
:data="materialRecordList" |
|
|
|
border |
|
|
|
v-loading="materialRecordLoading" |
|
|
|
height="400" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column prop="transactionId" header-align="center" align="left" label="变动单号" min-width="120"></el-table-column> |
|
|
|
<el-table-column prop="documentType" header-align="center" align="left" label="变动类型" min-width="100"></el-table-column> |
|
|
|
<el-table-column prop="documentNo" header-align="center" align="left" label="通知单号" min-width="120"></el-table-column> |
|
|
|
<el-table-column prop="rollNo" header-align="center" align="left" label="标签条码" min-width="150"></el-table-column> |
|
|
|
<el-table-column prop="rollQty" header-align="center" align="right" label="标签数量" min-width="100"></el-table-column> |
|
|
|
<el-table-column prop="batchNo" header-align="center" align="center" label="领料批次" min-width="120"></el-table-column> |
|
|
|
<el-table-column prop="transactionBy" header-align="center" align="center" label="操作人" min-width="100"></el-table-column> |
|
|
|
<el-table-column prop="transactionDate" header-align="center" align="center" label="操作时间" min-width="150"></el-table-column> |
|
|
|
</el-table> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<el-button @click="showMaterialRecordFlag = false">关闭</el-button> |
|
|
|
</span> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
</template> |
|
|
|
@ -907,6 +939,7 @@ import { |
|
|
|
checkProcessInspectionPendingCount, |
|
|
|
getOrderNotesByOrderNo, // 新增 |
|
|
|
openMaterialRoll, // 打开材料卷 |
|
|
|
getMaterialRecordList, // 获取领料记录 |
|
|
|
updateProductionStatus // 暂停生产/继续生产(调用 UspUpdateProductionStatus) |
|
|
|
} from "@/api/yieldReport/produce_report_normal.js"; |
|
|
|
import { |
|
|
|
@ -1011,6 +1044,9 @@ export default { |
|
|
|
sopPageIndex: 1, // SOP预览分页当前页 |
|
|
|
sopPageSize: 20, // SOP预览分页大小 |
|
|
|
sopTotalPage: 0, // SOP预览总页数 |
|
|
|
showMaterialRecordFlag: false, // 领料记录弹出框显示状态 |
|
|
|
materialRecordList: [], // 领料记录列表数据 |
|
|
|
materialRecordLoading: false, // 领料记录加载状态 |
|
|
|
activeTable: 'order_info', |
|
|
|
orderInfo: { |
|
|
|
technicalNotes: '', |
|
|
|
@ -4332,6 +4368,28 @@ export default { |
|
|
|
// 用户取消操作 |
|
|
|
}) |
|
|
|
}, |
|
|
|
// 显示领料记录弹出框 |
|
|
|
showMaterialRecordDialog(row) { |
|
|
|
this.showMaterialRecordFlag = true; |
|
|
|
this.materialRecordLoading = true; |
|
|
|
this.materialRecordList = []; |
|
|
|
let params = { |
|
|
|
site: this.scheduleData.site, |
|
|
|
orderNo: this.scheduleData.orderNo, |
|
|
|
partNo: row.componentPartNo || row.partNo |
|
|
|
}; |
|
|
|
getMaterialRecordList(params).then(({data}) => { |
|
|
|
this.materialRecordLoading = false; |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.materialRecordList = data.rows || []; |
|
|
|
} else { |
|
|
|
this.$message.error(data.msg || '获取领料记录失败'); |
|
|
|
} |
|
|
|
}).catch(() => { |
|
|
|
this.materialRecordLoading = false; |
|
|
|
this.$message.error('获取领料记录失败'); |
|
|
|
}); |
|
|
|
}, |
|
|
|
//刷新派工单 的下机卷的记录 |
|
|
|
getSfdcRollOpsList() { |
|
|
|
getSfdcRollOpsByCon(this.searchData).then(({data}) => { |
|
|
|
|