diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js index 408fe5a..0a183bb 100644 --- a/src/api/mes/reportWork.js +++ b/src/api/mes/reportWork.js @@ -273,3 +273,16 @@ export function getPutInOrderList(workorderCode) { data: data }); } + +// 获取最新物料列表 +export function getNewPrepareData(workorderCode) { + const data = { + workorderCode + } + return request({ + url: '/mes/reportWork/getNewPrepareData', + method: 'post', + data: data + }); +} + diff --git a/src/api/mes/reportWorkConsume.js b/src/api/mes/reportWorkConsume.js index 97d685d..e9d3b3b 100644 --- a/src/api/mes/reportWorkConsume.js +++ b/src/api/mes/reportWorkConsume.js @@ -60,6 +60,16 @@ export function getConsumeList(query) { params: query }); } + +// 2.0查询各级报工损耗列表 +export function getAllLevelConsumeList(query) { + return request({ + url: '/mes/reportWorkConsume/getAllLevelConsumeList', + method: 'get', + params: query + }); +} + // 提交报工物料损耗详细列表 export function submitConsumePS(data) { return request({ @@ -85,3 +95,5 @@ export function getBomList(query) { params: query }); } + + diff --git a/src/api/quality/qcMarket.js b/src/api/quality/qcMarket.js new file mode 100644 index 0000000..8f09759 --- /dev/null +++ b/src/api/quality/qcMarket.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询市场不良检验任务列表 +export function listQcMarket(query) { + return request({ + url: '/quality/qcMarket/list', + method: 'get', + params: query + }); +} + +// 查询市场不良检验任务详细 +export function getQcMarket(recordId) { + return request({ + url: '/quality/qcMarket/' + recordId, + method: 'get' + }); +} + +// 新增市场不良检验任务 +export function addQcMarket(data) { + return request({ + url: '/quality/qcMarket', + method: 'post', + data: data + }); +} + +// 修改市场不良检验任务 +export function updateQcMarket(data) { + return request({ + url: '/quality/qcMarket', + method: 'put', + data: data + }); +} + +// 删除市场不良检验任务 +export function delQcMarket(recordId) { + return request({ + url: '/quality/qcMarket/' + recordId, + method: 'delete' + }); +} diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 572bad5..ddb217e 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -61,7 +61,7 @@ - + - - - + + + 新增物料 + @@ -522,26 +527,17 @@ - - - - - - - - - - + - - - - + + - +
@@ -661,6 +643,11 @@ ref="itemSelectEquip" @onSelected="onSelectEquip" > + + { - this.pOrderTableList = response; - this.openReportSAP = true; - this.titleReport = "SAP收货"; - }); + this.queryParams.workorderCode = sr.workorderCode; + // this.SAPCD=sr.workorderCodeSap; + //查询母工单报工记录列表 + this.queryParams.parentOrder = '0'; + getReportSAPList(this.queryParams).then(response => { + this.pOrderTableList = response; + this.openReportSAP = true; + this.titleReport = "SAP收货"; + }); - // let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3) - // let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象 - // let requestBody = JSON.stringify(params)// 将参数对象转换为JSON字符串 - // getCKList(requestBody).then(response => { - // this.warehouseList = response; - // }); - let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3) - let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象 - //let paramsJSON = JSON.stringify(params); // 将对象转换为JSON字符串 - console.log(factoryCode) - getCKList(params).then(response => { - this.warehouseList = response.data - }); + // let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3) + // let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象 + // let requestBody = JSON.stringify(params)// 将参数对象转换为JSON字符串 + // getCKList(requestBody).then(response => { + // this.warehouseList = response; + // }); + let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3) + let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象 + //let paramsJSON = JSON.stringify(params); // 将对象转换为JSON字符串 + console.log(factoryCode) + getCKList(params).then(response => { + this.warehouseList = response.data + }); - }, + }, /** 修改按钮操作 */ handleUpdate(row) { this.reset(); @@ -1264,46 +1254,46 @@ export default { this.getList(); }); }, - submitReportSAP() { - this.reportRows = this.pReportRows.concat(this.sReportRows) - console.log(this.reportRows) - if ( this.reportRows==0) { - this.$modal.msgError(`请选择数据`); - return false; - } - this.reportRows.forEach(row => { - this.$set(row, 'whCode', this.selectedWarehouse); - }); - console.log("仓库－－－"+this.selectedWarehouse) - const reportRowsJson = JSON.stringify(this.reportRows); // 将this.reportRows转换为JSON字符串 - this.loading = true; - submitReportPSSAP(reportRowsJson).then(response => { - this.$modal.msgSuccess("操作成功"); - this.loading = false; - this.openReportSAP = false; - this.getList(); - }); - }, + submitReportSAP() { + this.reportRows = this.pReportRows.concat(this.sReportRows) + console.log(this.reportRows) + if ( this.reportRows==0) { + this.$modal.msgError(`请选择数据`); + return false; + } + this.reportRows.forEach(row => { + this.$set(row, 'whCode', this.selectedWarehouse); + }); + console.log("仓库－－－"+this.selectedWarehouse) + const reportRowsJson = JSON.stringify(this.reportRows); // 将this.reportRows转换为JSON字符串 + this.loading = true; + submitReportPSSAP(reportRowsJson).then(response => { + this.$modal.msgSuccess("操作成功"); + this.loading = false; + this.openReportSAP = false; + this.getList(); + }); + }, /** 报工损耗按钮操作 */ handleConsumeHz(row) { this.reset(); - let sr = this.selectRow[0]; + let sr = row; + if(sr.workorderCode==undefined){ + sr = this.selectRow[0] + } + + if(sr.uploadStatus =='1'){ + this.optType = 'view' + }else{ + this.optType = '' + } + this.queryParams.workorderCode = sr.workorderCode; //查询母工单报工记录列表 - this.queryParams.parentOrder = '0'; - getConsumeList(this.queryParams).then(response => { - this.pConsumeTableList = response; + getAllLevelConsumeList(this.queryParams).then(response => { + this.libConsumeTabs= response; this.openConsume = true; this.titleConsume = "工单报工物料损耗详情"; - }); - - //查询子工单报工记录列表 - this.queryParams.parentOrder = sr.workorderCode; - getConsumeList(this.queryParams).then(response => { - this.sConsumeTableList = response; - this.openConsume = true; - this.titleConsume = "工单报工物料损耗详情"; - this.queryParams.workorderCode = ''; }); @@ -1313,12 +1303,7 @@ export default { getBomList(this.queryParams).then(response => { this.pBomTableList = this.handleTree(response, 'materialCode', 'pMaterialCode') }); - //查询子工单BOM记录列表 - //this.queryParams.parentOrder = sr.workorderCode; - //getBomList(this.queryParams).then(response => { - // this.sBomTableList = response; - // this.queryParams.workorderCode = ''; - //}); + }, // 多选框选中数据 pConsumeSelection(selection) { @@ -1436,6 +1421,25 @@ export default { this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格 this.newWorkerLoading = false // 设置加载状态为false，表示加载完成 }) + }, + //物料损耗表格--删除 + deleteBomRow(index, rows) { + rows.splice(index, 1); + }, + //物料损耗表格--新增 + addConsumeTableRow(consumeList){ + + if(consumeList.length==0){ + this.$modal.msgError(`上位机尚未填写损耗，不允许提前新增`); + return + } + + this.$refs.itemSelectNewPrepare.showFlag = true; + this.$refs.itemSelectNewPrepare.init(consumeList[0].workorderCode); + }, + //物料损耗表格--新增确认 + onSelectNewPrepare(obj) { + console.log(obj) } } }; diff --git a/src/views/mes/reportWork/selectNewPrepare.vue b/src/views/mes/reportWork/selectNewPrepare.vue new file mode 100644 index 0000000..e1f8703 --- /dev/null +++ b/src/views/mes/reportWork/selectNewPrepare.vue @@ -0,0 +1,80 @@ + + diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue index 97c5355..1404249 100644 --- a/src/views/quality/qcInventory/index.vue +++ b/src/views/quality/qcInventory/index.vue @@ -162,16 +162,6 @@ - - - - - -