From 4e3ccfbf0fd155dd77ec2d4ca7126533cad27c67 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 7 Mar 2024 10:37:47 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/reportWork.js | 13 + src/api/mes/reportWorkConsume.js | 12 + src/api/quality/qcMarket.js | 44 ++ src/views/mes/reportWork/index.vue | 222 +++--- src/views/mes/reportWork/selectNewPrepare.vue | 80 ++ src/views/quality/qcInventory/index.vue | 12 +- src/views/quality/qcMarket/index.vue | 701 ++++++++++++++++++ src/views/quality/qcWarehousing/index.vue | 10 - 8 files changed, 964 insertions(+), 130 deletions(-) create mode 100644 src/api/quality/qcMarket.js create mode 100644 src/views/mes/reportWork/selectNewPrepare.vue create mode 100644 src/views/quality/qcMarket/index.vue 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; - this.openConsume = true; - this.titleConsume = "工单报工物料损耗详情"; - }); - - //查询子工单报工记录列表 - this.queryParams.parentOrder = sr.workorderCode; - getConsumeList(this.queryParams).then(response => { - this.sConsumeTableList = response; + getAllLevelConsumeList(this.queryParams).then(response => { + this.libConsumeTabs= 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 @@ - - - - - - - + @@ -462,7 +462,7 @@ - + @@ -506,17 +508,19 @@ - - 新增物料 + + @@ -527,13 +531,14 @@ + @@ -693,7 +698,7 @@
- - +
@@ -1307,13 +1312,13 @@ export default { }, // 多选框选中数据 pConsumeSelection(selection) { - this.pConsumeRows = selection + this.pConsumeRows = this.pConsumeRows.concat(selection) }, sConsumeSelection(selection) { this.sConsumeRows = selection }, submitConsume() { - this.consumeRows = this.pConsumeRows.concat(this.sConsumeRows) + this.consumeRows = this.pConsumeRows; if ( this.consumeRows==0) { this.$modal.msgError(`请选择数据`); @@ -1449,7 +1454,7 @@ export default { margin-bottom: 15px; margin-left: 10px; } -.center-text { +.center-text { text-align: center; } .report-logo { diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index a8ed926..2b7fb71 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -635,7 +635,7 @@ import { downWorkorder, getOrderAndWork,getProSortNo, getWorkBatchList, - subChangeWorkOrder,subChangeWorkOrderM, + subChangeWorkOrderPro,subChangeWorkOrderM, checkWorkOrder } from '@/api/plan/workorder' import moment from 'moment'; @@ -1296,7 +1296,7 @@ export default { materialName: this.splitForm.materialName } - subChangeWorkOrder(data).then(response => { + subChangeWorkOrderPro(data).then(response => { if (response.code == 500) { this.$modal.msgError(response.msg) return @@ -1458,7 +1458,7 @@ export default { getOrderAndWork(this.selectWork).then(response => { this.splitData.push(response.data.workOrder) this.productData.push(response.data.order) - + //订单产品类型 this.splitForm.prodType = this.splitData[0].prodType this.checkType = false @@ -1501,7 +1501,7 @@ export default { // 递归将拆分数量还原 function setAtrr1(order, work) { - + order.quantitySplit = Number(order.quantitySplit) - Number(work.quantitySplit); order.atrr1 = work.quantitySplit; @@ -1723,7 +1723,7 @@ export default { }); }, 222); }, - + // @expand-change="getOpenNextLevel" // 点击展开节点 //getOpenNextLevel(row, column, event) { @@ -1732,7 +1732,7 @@ export default { // return resolve(data); // }); //} - + } }; From 49f0d34556f71247104f85d2fba23c1844aab380 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Tue, 12 Mar 2024 09:55:31 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/unitprice/index.vue | 2 +- src/views/mes/unitpriceReport/index.vue | 70 +++++++++++++++++++++---- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/src/views/mes/unitprice/index.vue b/src/views/mes/unitprice/index.vue index b2076df..a0ae514 100644 --- a/src/views/mes/unitprice/index.vue +++ b/src/views/mes/unitprice/index.vue @@ -83,7 +83,7 @@ icon="el-icon-upload2" size="mini" @click="handleImport" - v-hasPermi="['mes:unitprice:import']" + v-hasPermi="['system:unitprice:import']" >导入 diff --git a/src/views/mes/unitpriceReport/index.vue b/src/views/mes/unitpriceReport/index.vue index ee57cc0..2462ff6 100644 --- a/src/views/mes/unitpriceReport/index.vue +++ b/src/views/mes/unitpriceReport/index.vue @@ -82,13 +82,18 @@ + + + - + - diff --git a/src/views/quality/qcGoal/index.vue b/src/views/quality/qcGoal/index.vue index d7b3bc5..760c6f8 100644 --- a/src/views/quality/qcGoal/index.vue +++ b/src/views/quality/qcGoal/index.vue @@ -282,8 +282,17 @@ 确定 - - + + +
+ 确 定 +
+ @@ -318,7 +327,10 @@ export default { checkTypes: [], genList: [], checked: false, - goalId: null, + belongGoalId: null, + showFlag: false, + mode: null, + disTitle: "", // 弹出层标题 title: "", genTitle: "", @@ -524,20 +536,21 @@ export default { return checkTypeBody ? checkTypeBody.checkName : ''; }, handleSupplier(row) { - this.goalId = row.id; - this.$refs.itemDistribution.model = true; - this.$refs.itemDistribution.getRightListFun(); - this.$refs.itemDistribution.getList(); - this.$refs.itemDistribution.title = "分配供应商"; - this.$refs.itemDistribution.showFlag = true; + this.belongGoalId = row.id; + this.mode = true; + this.disTitle = "分配供应商"; + this.showFlag = true; }, handleProduct(row) { - this.goalId = row.id; - this.$refs.itemDistribution.model = false; - this.$refs.itemDistribution.getRightListFun(); - this.$refs.itemDistribution.getList(); - this.$refs.itemDistribution.title = "分配产品"; - this.$refs.itemDistribution.showFlag = true; + this.belongGoalId = row.id; + this.mode = false; + this.disTitle = "分配产品"; + this.showFlag = true; + }, + closeDistribution() { + this.showFlag = false; + this.$refs.itemDistribution.leftList=[]; + this.$refs.itemDistribution.rightList=[]; }, },