diff --git a/src/api/shopOrder/productionReport.js b/src/api/shopOrder/productionReport.js index 4dd0c2c..c5fb4cf 100644 --- a/src/api/shopOrder/productionReport.js +++ b/src/api/shopOrder/productionReport.js @@ -23,3 +23,6 @@ export const searchProductionLineOutputReport = data => createAPI(`/productionRe // 查询-CQC检验记录 export const searchCQCInspectionRecord = data => createAPI(`/productionReport/searchCQCInspectionRecord`,'post',data) + +// 查询-产线产量报告(分订单) 订单数据 +export const searchReportInOrderNo = data => createAPI(`/productionReport/searchReportInOrderNoData`,'post',data) diff --git a/src/api/shopOrder/shopOrder.js b/src/api/shopOrder/shopOrder.js index 4d97261..cf79d43 100644 --- a/src/api/shopOrder/shopOrder.js +++ b/src/api/shopOrder/shopOrder.js @@ -30,3 +30,11 @@ export const searchProductionDispatchList = data => createAPI(`/shopOrder/search // -------------查询-生产订单-------------- export const searchShopOrder = data => createAPI(`/shopOrder/searchShopOrder`,'post',data) +// -------------生产订单-------------- +export const getShopOrderData = data => createAPI(`/shopOrder/getShopOrderData`,'post',data) + +export const deleteShopOrderData = data => createAPI(`/shopOrder/deleteShopOrderData`,'post',data) + +export const saveShopOrderData = data => createAPI(`/shopOrder/saveShopOrderData`,'post',data) + +export const getShopOrderDetail = data => createAPI(`/shopOrder/getShopOrderDetail`,'post',data) diff --git a/src/views/modules/base/workCenter.vue b/src/views/modules/base/workCenter.vue index cd502ec..f5f6cd9 100644 --- a/src/views/modules/base/workCenter.vue +++ b/src/views/modules/base/workCenter.vue @@ -259,10 +259,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TablePartNo', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "partNo", headerAlign: "center", align: "left", columnLabel: "产品编码", @@ -277,10 +277,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TableRevNo', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "revNo", headerAlign: "center", align: "left", columnLabel: "版本号", @@ -295,10 +295,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TableItemNo', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "itemNo", headerAlign: "center", align: "right", columnLabel: "工序号", @@ -313,10 +313,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TableOperationDesc', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "operationDesc", headerAlign: "center", align: "left", columnLabel: "工序名称", @@ -331,10 +331,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TableMachSetuptime', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "machSetuptime", headerAlign: "center", align: "right", columnLabel: "计划调试时间", @@ -349,10 +349,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TableMachRunFactor', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "machRunFactor", headerAlign: "center", align: "right", columnLabel: "单位产出量", @@ -367,10 +367,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TableFactorUnit', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "factorUnit", headerAlign: "center", align: "left", columnLabel: "产出类型", @@ -385,10 +385,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TableCrewsize', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "crewsize", headerAlign: "center", align: "right", columnLabel: "操作工人数", @@ -403,10 +403,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TableEfficiency', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "efficiency", headerAlign: "center", align: "right", columnLabel: "效率", @@ -421,10 +421,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TableStatus', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "status", headerAlign: "center", align: "left", columnLabel: "状态", @@ -439,10 +439,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TableRoutingType', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "routingType", headerAlign: "center", align: "left", columnLabel: "工序类别", @@ -457,10 +457,10 @@ { userId: this.$store.state.user.name, functionId: 6029, - serialNumber: '6029TableXXX', + serialNumber: '6029TableRemark', tableId: "6029Table", tableName: "加工中心涉及产品表", - columnProp: "XXX", + columnProp: "remark", headerAlign: "center", align: "left", columnLabel: "备注", @@ -844,6 +844,7 @@ this.modelFlag2=false; getWorkCenterDataDetail(this.modelData).then(({data}) => { this.dataList2 = data.rows2; + this.dataList = data.rows1; }) }, getProLineNo(){ diff --git a/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue b/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue index cc8b8b5..05a5c69 100644 --- a/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue +++ b/src/views/modules/shopOrder/productionReport/searchItemToBeProduct.vue @@ -201,7 +201,7 @@ columnProp: "factorUnit", headerAlign: "center", align: "left", - columnLabel: "产出时间", + columnLabel: "产出单位", columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReportInOrderNo.vue b/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReportInOrderNo.vue new file mode 100644 index 0000000..4d8d8f1 --- /dev/null +++ b/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReportInOrderNo.vue @@ -0,0 +1,1427 @@ + + + + + diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue new file mode 100644 index 0000000..9519a1a --- /dev/null +++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue @@ -0,0 +1,1698 @@ + + + + + +