diff --git a/src/api/plan/workorder.js b/src/api/plan/workorder.js index 0c9508d..5dae5ff 100644 --- a/src/api/plan/workorder.js +++ b/src/api/plan/workorder.js @@ -24,6 +24,15 @@ export function subChangeWorkOrder(data){ }) } +// 提交修改工单接口 +export function subChangeWorkOrderPro(data){ + return request({ + url:'/plan/pro/workorder/subChangeWorkOrderPro', + method:'post', + data:data + }) + } + // 通过子工单查询父工单对应的批次list export function getWorkBatchList(data){ return request({ @@ -117,4 +126,4 @@ export function subChangeWorkOrderM(data){ method:'post', data:data }) - } \ No newline at end of file + } diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index ddb217e..d6bb0cb 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -206,7 +206,7 @@ :value="scope.row.uploadStatus" /> - + @@ -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); // }); //} - + } };