Browse Source

2026-04-13

过站采集-》机台工作台-》材料清单列表增加行操作【领料记录】
master
fengyuan_yang 5 days ago
parent
commit
aa1a2b0b78
  1. 3
      src/api/yieldReport/produce_report_normal.js
  2. 58
      src/views/modules/yieldReport/com_produce_report_normal.vue

3
src/api/yieldReport/produce_report_normal.js

@ -112,3 +112,6 @@ export const getOrderNotesByOrderNo = data => createAPI('schedule/getOrderNotesB
// 打开材料卷(重新激活已完成的材料) // 打开材料卷(重新激活已完成的材料)
export const openMaterialRoll = data => createAPI('schedule/openMaterialRoll', 'POST', data) export const openMaterialRoll = data => createAPI('schedule/openMaterialRoll', 'POST', data)
// 获取领料记录
export const getMaterialRecordList = data => createAPI('schedule/getMaterialRecordList', 'POST', data)

58
src/views/modules/yieldReport/com_produce_report_normal.vue

@ -441,6 +441,16 @@
border border
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> 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 <el-table-column
v-for="(item,index) in columnBomArray" :key="index" v-for="(item,index) in columnBomArray" :key="index"
:sortable="item.columnSortable" :sortable="item.columnSortable"
@ -873,6 +883,28 @@
</div> </div>
</el-dialog> </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> </div>
</template> </template>
@ -907,6 +939,7 @@ import {
checkProcessInspectionPendingCount, checkProcessInspectionPendingCount,
getOrderNotesByOrderNo, // getOrderNotesByOrderNo, //
openMaterialRoll, // openMaterialRoll, //
getMaterialRecordList, //
updateProductionStatus // / UspUpdateProductionStatus updateProductionStatus // / UspUpdateProductionStatus
} from "@/api/yieldReport/produce_report_normal.js"; } from "@/api/yieldReport/produce_report_normal.js";
import { import {
@ -1011,6 +1044,9 @@ export default {
sopPageIndex: 1, // SOP sopPageIndex: 1, // SOP
sopPageSize: 20, // SOP sopPageSize: 20, // SOP
sopTotalPage: 0, // SOP sopTotalPage: 0, // SOP
showMaterialRecordFlag: false, //
materialRecordList: [], //
materialRecordLoading: false, //
activeTable: 'order_info', activeTable: 'order_info',
orderInfo: { orderInfo: {
technicalNotes: '', 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() { getSfdcRollOpsList() {
getSfdcRollOpsByCon(this.searchData).then(({data}) => { getSfdcRollOpsByCon(this.searchData).then(({data}) => {

Loading…
Cancel
Save