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/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/api/quality/qcGoal.js b/src/api/quality/qcGoal.js new file mode 100644 index 0000000..672a328 --- /dev/null +++ b/src/api/quality/qcGoal.js @@ -0,0 +1,61 @@ +import request from '@/utils/request' + +// 查询质量目标列表 +export function listQcGoal(query) { + return request({ + url: '/quality/qcGoal/list', + method: 'get', + params: query + }); +} + +// 查询质量目标详细 +export function getQcGoal(id) { + return request({ + url: '/quality/qcGoal/' + id, + method: 'get' + }); +} + +// 查询二级节点 +export function getChildrenList(parentId) { + return request({ + url: '/quality/qcGoal/getChildrenList/' + parentId, + method: 'get' + }); +} + + + +// 新增质量目标 +export function addQcGoal(data) { + return request({ + url: '/quality/qcGoal', + method: 'post', + data: data + }); +} + +// 修改质量目标 +export function updateQcGoal(data) { + return request({ + url: '/quality/qcGoal', + method: 'put', + data: data + }); +} + +// 删除质量目标 +export function delQcGoal(id) { + return request({ + url: '/quality/qcGoal/' + id, + method: 'delete' + }); +} + +export function getGenerate(id) { + return request({ + url: '/quality/qcGoal/generate/' + id, + method: 'get', + }); +} \ No newline at end of file diff --git a/src/api/quality/qcGoalDistribute.js b/src/api/quality/qcGoalDistribute.js new file mode 100644 index 0000000..77cde6b --- /dev/null +++ b/src/api/quality/qcGoalDistribute.js @@ -0,0 +1,80 @@ +import request from '@/utils/request' + +// 查询质量目标分配列表 +export function listQcGoalDistribute(query) { + return request({ + url: '/quality/qcGoalDistribute/list', + method: 'get', + params: query + }); +} + +// 查询质量目标分配详细 +export function getQcGoalDistribute(id) { + return request({ + url: '/quality/qcGoalDistribute/' + id, + method: 'get' + }); +} + +// 修改质量目标分配 +export function updateQcGoalDistribute(data) { + return request({ + url: '/quality/qcGoalDistribute', + method: 'put', + data: data + }); +} + +// 删除质量目标分配 +export function delQcGoalDistribute(id) { + return request({ + url: '/quality/qcGoalDistribute/' + id, + method: 'delete' + }); +} + +// 查询用户物料未关联列表 +export function getLeftList(query) { + return request({ + url: '/quality/qcGoalDistribute/getLeftList', + method: 'get', + params: query + }); +} + +// 查询用户物料已关联列表 +export function getRightList(query) { + return request({ + url: '/quality/qcGoalDistribute/getRightList', + method: 'get', + params: query + }); +} + +export function addSupplier(data) { + return request({ + url: '/quality/qcGoalDistribute', + method: 'post', + data: data + }); +} + +// 查询用户物料未关联列表 +export function getProductLeftList(query) { + return request({ + url: '/quality/qcGoalDistribute/getProductLeftList', + method: 'get', + params: query + }); +} + +// 查询用户物料已关联列表 +export function getProductRightList(query) { + return request({ + url: '/quality/qcGoalDistribute/getProductRightList', + method: 'get', + 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/assets/images/packagingline/bg- border1.png b/src/assets/images/packagingline/bg- border1.png new file mode 100644 index 0000000..f44d97c Binary files /dev/null and b/src/assets/images/packagingline/bg- border1.png differ diff --git a/src/assets/images/packagingline/bg-body.png b/src/assets/images/packagingline/bg-body.png new file mode 100644 index 0000000..539ec7d Binary files /dev/null and b/src/assets/images/packagingline/bg-body.png differ diff --git a/src/assets/images/packagingline/bg-border1.png b/src/assets/images/packagingline/bg-border1.png new file mode 100644 index 0000000..889e7e4 Binary files /dev/null and b/src/assets/images/packagingline/bg-border1.png differ diff --git a/src/assets/images/packagingline/bg-border2(1).png b/src/assets/images/packagingline/bg-border2(1).png new file mode 100644 index 0000000..c7ba8d7 Binary files /dev/null and b/src/assets/images/packagingline/bg-border2(1).png differ diff --git a/src/assets/images/packagingline/bg-border2(2).png b/src/assets/images/packagingline/bg-border2(2).png new file mode 100644 index 0000000..c7ba8d7 Binary files /dev/null and b/src/assets/images/packagingline/bg-border2(2).png differ diff --git a/src/assets/images/packagingline/bg-border2.png b/src/assets/images/packagingline/bg-border2.png new file mode 100644 index 0000000..a7ef2cc Binary files /dev/null and b/src/assets/images/packagingline/bg-border2.png differ diff --git a/src/assets/images/packagingline/bg-border3.png b/src/assets/images/packagingline/bg-border3.png new file mode 100644 index 0000000..34b987d Binary files /dev/null and b/src/assets/images/packagingline/bg-border3.png differ diff --git a/src/assets/images/packagingline/bg-head.png b/src/assets/images/packagingline/bg-head.png new file mode 100644 index 0000000..2cb71bf Binary files /dev/null and b/src/assets/images/packagingline/bg-head.png differ diff --git a/src/assets/images/packagingline/bg-num.png b/src/assets/images/packagingline/bg-num.png new file mode 100644 index 0000000..12d8d50 Binary files /dev/null and b/src/assets/images/packagingline/bg-num.png differ diff --git a/src/assets/images/packagingline/bg-title.png b/src/assets/images/packagingline/bg-title.png new file mode 100644 index 0000000..e06181d Binary files /dev/null and b/src/assets/images/packagingline/bg-title.png differ diff --git a/src/assets/images/packagingline/bg-title1.png b/src/assets/images/packagingline/bg-title1.png new file mode 100644 index 0000000..cf2a899 Binary files /dev/null and b/src/assets/images/packagingline/bg-title1.png differ diff --git a/src/assets/images/packagingline/bg-title3(1).png b/src/assets/images/packagingline/bg-title3(1).png new file mode 100644 index 0000000..0556768 Binary files /dev/null and b/src/assets/images/packagingline/bg-title3(1).png differ diff --git a/src/assets/images/packagingline/bg-title3(2).png b/src/assets/images/packagingline/bg-title3(2).png new file mode 100644 index 0000000..0556768 Binary files /dev/null and b/src/assets/images/packagingline/bg-title3(2).png differ diff --git a/src/assets/images/packagingline/bg-title3(3).png b/src/assets/images/packagingline/bg-title3(3).png new file mode 100644 index 0000000..0556768 Binary files /dev/null and b/src/assets/images/packagingline/bg-title3(3).png differ diff --git a/src/assets/images/packagingline/bg-title3.png b/src/assets/images/packagingline/bg-title3.png new file mode 100644 index 0000000..0556768 Binary files /dev/null and b/src/assets/images/packagingline/bg-title3.png differ diff --git a/src/assets/images/packagingline/bg-title5.png b/src/assets/images/packagingline/bg-title5.png new file mode 100644 index 0000000..7fc7eff Binary files /dev/null and b/src/assets/images/packagingline/bg-title5.png differ diff --git a/src/assets/images/packagingline/bg-yichang1.png b/src/assets/images/packagingline/bg-yichang1.png new file mode 100644 index 0000000..3fecca8 Binary files /dev/null and b/src/assets/images/packagingline/bg-yichang1.png differ diff --git a/src/assets/images/packagingline/bg-yichang2.png b/src/assets/images/packagingline/bg-yichang2.png new file mode 100644 index 0000000..52f9f4a Binary files /dev/null and b/src/assets/images/packagingline/bg-yichang2.png differ diff --git a/src/assets/images/packagingline/bg-yichang3.png b/src/assets/images/packagingline/bg-yichang3.png new file mode 100644 index 0000000..dd595ce Binary files /dev/null and b/src/assets/images/packagingline/bg-yichang3.png differ diff --git a/src/assets/images/packagingline/icon-title4.png b/src/assets/images/packagingline/icon-title4.png new file mode 100644 index 0000000..ac8c35e Binary files /dev/null and b/src/assets/images/packagingline/icon-title4.png differ diff --git a/src/assets/images/packagingline/logo.png b/src/assets/images/packagingline/logo.png new file mode 100644 index 0000000..dcdccaa Binary files /dev/null and b/src/assets/images/packagingline/logo.png differ diff --git a/src/assets/images/packagingline/标题2.png b/src/assets/images/packagingline/标题2.png new file mode 100644 index 0000000..f8fce0b Binary files /dev/null and b/src/assets/images/packagingline/标题2.png differ diff --git a/src/assets/images/packagingline/矩形备份 30(1).png b/src/assets/images/packagingline/矩形备份 30(1).png new file mode 100644 index 0000000..1dcef25 Binary files /dev/null and b/src/assets/images/packagingline/矩形备份 30(1).png differ diff --git a/src/assets/images/packagingline/矩形备份 30(2).png b/src/assets/images/packagingline/矩形备份 30(2).png new file mode 100644 index 0000000..253dcc6 Binary files /dev/null and b/src/assets/images/packagingline/矩形备份 30(2).png differ diff --git a/src/assets/images/packagingline/矩形备份 30(3).png b/src/assets/images/packagingline/矩形备份 30(3).png new file mode 100644 index 0000000..253dcc6 Binary files /dev/null and b/src/assets/images/packagingline/矩形备份 30(3).png differ diff --git a/src/assets/images/packagingline/矩形备份 30(4).png b/src/assets/images/packagingline/矩形备份 30(4).png new file mode 100644 index 0000000..1dcef25 Binary files /dev/null and b/src/assets/images/packagingline/矩形备份 30(4).png differ diff --git a/src/assets/images/packagingline/矩形备份 30(5).png b/src/assets/images/packagingline/矩形备份 30(5).png new file mode 100644 index 0000000..253dcc6 Binary files /dev/null and b/src/assets/images/packagingline/矩形备份 30(5).png differ diff --git a/src/assets/images/packagingline/矩形备份 30(6).png b/src/assets/images/packagingline/矩形备份 30(6).png new file mode 100644 index 0000000..db9dab7 Binary files /dev/null and b/src/assets/images/packagingline/矩形备份 30(6).png differ diff --git a/src/assets/images/packagingline/矩形备份 30(7).png b/src/assets/images/packagingline/矩形备份 30(7).png new file mode 100644 index 0000000..db9dab7 Binary files /dev/null and b/src/assets/images/packagingline/矩形备份 30(7).png differ diff --git a/src/assets/images/packagingline/矩形备份 30(8).png b/src/assets/images/packagingline/矩形备份 30(8).png new file mode 100644 index 0000000..db9dab7 Binary files /dev/null and b/src/assets/images/packagingline/矩形备份 30(8).png differ diff --git a/src/assets/images/packagingline/矩形备份 30(9).png b/src/assets/images/packagingline/矩形备份 30(9).png new file mode 100644 index 0000000..db9dab7 Binary files /dev/null and b/src/assets/images/packagingline/矩形备份 30(9).png differ diff --git a/src/assets/images/packagingline/矩形备份 30.png b/src/assets/images/packagingline/矩形备份 30.png new file mode 100644 index 0000000..253dcc6 Binary files /dev/null and b/src/assets/images/packagingline/矩形备份 30.png differ diff --git a/src/assets/images/packagingline/编组 12备份 19(1).png b/src/assets/images/packagingline/编组 12备份 19(1).png new file mode 100644 index 0000000..0efae6b Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19(1).png differ diff --git a/src/assets/images/packagingline/编组 12备份 19(10).png b/src/assets/images/packagingline/编组 12备份 19(10).png new file mode 100644 index 0000000..5d644a5 Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19(10).png differ diff --git a/src/assets/images/packagingline/编组 12备份 19(11).png b/src/assets/images/packagingline/编组 12备份 19(11).png new file mode 100644 index 0000000..74c18b2 Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19(11).png differ diff --git a/src/assets/images/packagingline/编组 12备份 19(2).png b/src/assets/images/packagingline/编组 12备份 19(2).png new file mode 100644 index 0000000..224a231 Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19(2).png differ diff --git a/src/assets/images/packagingline/编组 12备份 19(3).png b/src/assets/images/packagingline/编组 12备份 19(3).png new file mode 100644 index 0000000..34b9823 Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19(3).png differ diff --git a/src/assets/images/packagingline/编组 12备份 19(4).png b/src/assets/images/packagingline/编组 12备份 19(4).png new file mode 100644 index 0000000..f016d21 Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19(4).png differ diff --git a/src/assets/images/packagingline/编组 12备份 19(5).png b/src/assets/images/packagingline/编组 12备份 19(5).png new file mode 100644 index 0000000..dcb866a Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19(5).png differ diff --git a/src/assets/images/packagingline/编组 12备份 19(6).png b/src/assets/images/packagingline/编组 12备份 19(6).png new file mode 100644 index 0000000..b1e9800 Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19(6).png differ diff --git a/src/assets/images/packagingline/编组 12备份 19(7).png b/src/assets/images/packagingline/编组 12备份 19(7).png new file mode 100644 index 0000000..a6a3931 Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19(7).png differ diff --git a/src/assets/images/packagingline/编组 12备份 19(8).png b/src/assets/images/packagingline/编组 12备份 19(8).png new file mode 100644 index 0000000..a33a680 Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19(8).png differ diff --git a/src/assets/images/packagingline/编组 12备份 19(9).png b/src/assets/images/packagingline/编组 12备份 19(9).png new file mode 100644 index 0000000..98485c2 Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19(9).png differ diff --git a/src/assets/images/packagingline/编组 12备份 19.png b/src/assets/images/packagingline/编组 12备份 19.png new file mode 100644 index 0000000..4e14214 Binary files /dev/null and b/src/assets/images/packagingline/编组 12备份 19.png differ diff --git a/src/assets/images/packagingline/编组 8(1).png b/src/assets/images/packagingline/编组 8(1).png new file mode 100644 index 0000000..12d8d50 Binary files /dev/null and b/src/assets/images/packagingline/编组 8(1).png differ diff --git a/src/assets/images/packagingline/编组 8(2).png b/src/assets/images/packagingline/编组 8(2).png new file mode 100644 index 0000000..12d8d50 Binary files /dev/null and b/src/assets/images/packagingline/编组 8(2).png differ diff --git a/src/assets/images/packagingline/编组 8(3).png b/src/assets/images/packagingline/编组 8(3).png new file mode 100644 index 0000000..12d8d50 Binary files /dev/null and b/src/assets/images/packagingline/编组 8(3).png differ diff --git a/src/assets/images/packagingline/编组 8(4).png b/src/assets/images/packagingline/编组 8(4).png new file mode 100644 index 0000000..12d8d50 Binary files /dev/null and b/src/assets/images/packagingline/编组 8(4).png differ diff --git a/src/assets/images/packagingline/编组 8(5).png b/src/assets/images/packagingline/编组 8(5).png new file mode 100644 index 0000000..12d8d50 Binary files /dev/null and b/src/assets/images/packagingline/编组 8(5).png differ diff --git a/src/assets/images/packagingline/编组 8(6).png b/src/assets/images/packagingline/编组 8(6).png new file mode 100644 index 0000000..12d8d50 Binary files /dev/null and b/src/assets/images/packagingline/编组 8(6).png differ diff --git a/src/assets/images/packagingline/编组 8(7).png b/src/assets/images/packagingline/编组 8(7).png new file mode 100644 index 0000000..12d8d50 Binary files /dev/null and b/src/assets/images/packagingline/编组 8(7).png differ diff --git a/src/assets/images/packagingline/编组 8(8).png b/src/assets/images/packagingline/编组 8(8).png new file mode 100644 index 0000000..12d8d50 Binary files /dev/null and b/src/assets/images/packagingline/编组 8(8).png differ diff --git a/src/assets/images/packagingline/编组 8(9).png b/src/assets/images/packagingline/编组 8(9).png new file mode 100644 index 0000000..12d8d50 Binary files /dev/null and b/src/assets/images/packagingline/编组 8(9).png differ diff --git a/src/assets/images/packagingline/编组 8.png b/src/assets/images/packagingline/编组 8.png new file mode 100644 index 0000000..12d8d50 Binary files /dev/null and b/src/assets/images/packagingline/编组 8.png differ diff --git a/src/assets/images/packagingline/路径.png b/src/assets/images/packagingline/路径.png new file mode 100644 index 0000000..598cf10 Binary files /dev/null and b/src/assets/images/packagingline/路径.png differ diff --git a/src/router/index.js b/src/router/index.js index 100e5e0..770ec7c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -132,6 +132,12 @@ export const constantRoutes = [ component: () => import("@/views/kanban/finishproduct/index"), hidden: true, }, + // 包装线产线生产看板 + { + path: "/kanban/Packagingline", + component: () => import("@/views/kanban/Packagingline/index"), + hidden: true, + }, ] diff --git a/src/views/kanban/Packagingline/index.vue b/src/views/kanban/Packagingline/index.vue new file mode 100644 index 0000000..511ff85 --- /dev/null +++ b/src/views/kanban/Packagingline/index.vue @@ -0,0 +1,1491 @@ + + + + diff --git a/src/views/kanban/equipment/index.vue b/src/views/kanban/equipment/index.vue index 065cc38..cf28d45 100644 --- a/src/views/kanban/equipment/index.vue +++ b/src/views/kanban/equipment/index.vue @@ -216,7 +216,7 @@ 排名 设备名称 设备编码 - 设备OEE + MTTR @@ -230,7 +230,7 @@ {{ index + 1 }} {{ n.equipmentName }} {{ n.equipmentCode }} - {{ n.rapairQuantity != null ? n.rapairQuantity + '%' : '--' }} + {{ n.rapairQuantity != null ? n.rapairQuantity + 'h' : '--' }} @@ -306,6 +306,8 @@ export default { }; }, created() { + this.getdictlist() + }, destroyed() { clearInterval(this.time1); @@ -316,7 +318,7 @@ export default { //console.log('zhuanhuahou',this.dateRangeone) this.selectFactorylist(); - this.getdictlist() + this.gettime(); }, methods: { @@ -391,10 +393,10 @@ export default { } }); if (item.failureRate) { - item.failureRate = item.failureRate.toFix(2) + item.failureRate = parseFloat(item.failureRate).toFixed(2) } if (item.utilizationRatio) { - item.utilizationRatio = item.utilizationRatio.toFix(2) + item.utilizationRatio = parseFloat(item.utilizationRatio).toFixed(2) } }); } diff --git a/src/views/kanban/exception/cards.vue b/src/views/kanban/exception/cards.vue index 0c5b569..61a134e 100644 --- a/src/views/kanban/exception/cards.vue +++ b/src/views/kanban/exception/cards.vue @@ -1,10 +1,10 @@ @@ -105,6 +150,7 @@ export default { return { cards: [], cardss: [], + cardsss: [], } }, methods: { @@ -144,6 +190,9 @@ export default { this.cardss = new Array(8).fill(0).map((foo, i) => ({ title: '烘房' + (i + 9), })); + this.cardsss = new Array(8).fill(0).map((foo, i) => ({ + title: '烘房' + (i + 9), + })); }, @@ -158,10 +207,10 @@ export default { diff --git a/src/views/kanban/finishproduct/BottomRightechart1.vue b/src/views/kanban/finishproduct/BottomRightechart1.vue new file mode 100644 index 0000000..dc9372e --- /dev/null +++ b/src/views/kanban/finishproduct/BottomRightechart1.vue @@ -0,0 +1,384 @@ + + + + + diff --git a/src/views/kanban/finishproduct/TopLeftCmp.vue b/src/views/kanban/finishproduct/TopLeftCmp.vue index 03fa163..fe95913 100644 --- a/src/views/kanban/finishproduct/TopLeftCmp.vue +++ b/src/views/kanban/finishproduct/TopLeftCmp.vue @@ -29,7 +29,10 @@ export default { name: 'TopLeftCmp', props: { - data: [] + data: { + type: Array, + default: () => [] + } }, data() { return { diff --git a/src/views/kanban/finishproduct/index.vue b/src/views/kanban/finishproduct/index.vue index 8715499..352a5e7 100644 --- a/src/views/kanban/finishproduct/index.vue +++ b/src/views/kanban/finishproduct/index.vue @@ -9,11 +9,7 @@
- +
@@ -26,17 +22,25 @@
- +
- +
-
- +
+ + +
@@ -45,7 +49,7 @@ diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index 3758ed9..53f9ee2 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -60,7 +60,7 @@
- 今日已检数量 + 今日已抽检数量
@@ -70,7 +70,7 @@
- 今日异常数量 + 今日不良数量
@@ -92,7 +92,7 @@
- 本月异常数量 + 本月不良数量
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 572bad5..0f7ae3e 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -61,7 +61,7 @@ - + - + @@ -506,15 +507,23 @@ - - - + + + + + - + @@ -522,26 +531,18 @@ - - - - - - - - - - + - + + - +
@@ -661,6 +648,11 @@ ref="itemSelectEquip" @onSelected="onSelectEquip" > + +
- - +
@@ -734,17 +726,18 @@ import { listReportWork, getReportWork, delReportWork, addReportWork, getWorkcen getReportSAPList,submitReportPS,submitReportPSSAP,getCKList, getPutInOrderList } from "@/api/mes/reportWork"; -import { getConsumeList,submitConsumePS,submitReportInfo,getBomList} from "@/api/mes/reportWorkConsume"; +import { getConsumeList,submitConsumePS,submitReportInfo,getBomList,getAllLevelConsumeList} from "@/api/mes/reportWorkConsume"; import ReportWorkConsume from "./reportWorkConsume.vue"; import ItemSelectUser from "./selectUser.vue"; import ItemSelectWorkOrder from "./selectWorkOrder.vue"; +import ItemSelectNewPrepare from "./selectNewPrepare.vue"; import ItemSelectEquip from "./selectEquip.vue"; import moment from 'moment'; import { getlistCK } from '@/api/wms/outorder' export default { name: "ReportWork", dicts: ['report_type','report_sap_status'], - components: {ReportWorkConsume,ItemSelectUser,ItemSelectWorkOrder,ItemSelectEquip}, + components: {ReportWorkConsume,ItemSelectUser,ItemSelectWorkOrder,ItemSelectEquip,ItemSelectNewPrepare}, data() { return { optType: undefined, @@ -765,6 +758,7 @@ export default { // 报工报表表格数据 reportWorkList: [], libTabs:[], + libConsumeTabs:[], pOrderTableList: [], sOrderTableList: [], pConsumeTableList: [], @@ -774,7 +768,7 @@ export default { activeName0: 'first', activeName: 'pOrder', activeNameR: 'order1', - activeName2: 'pConsume', + activeNameC: 'consume1', selectedWarehouse:'0004', warehouseList: [], // SAPCD:"", @@ -1050,6 +1044,7 @@ export default { }; this.resetForm("form"); this.libTabs = []; + this.libConsumeTabs = []; this.pOrderTableList = []; this.sOrderTableList = []; this.pReportRows = []; @@ -1087,42 +1082,42 @@ export default { this.title = "添加报工记录"; this.optType = "add"; }, - handleAddSAP(row) { - this.reset(); - let sr = this.selectRow[0]; + handleAddSAP(row) { + this.reset(); + let sr = this.selectRow[0]; - if(sr.uploadStatus =='1'){ - this.optType = 'view' - }else{ - this.optType = '' - } + if(sr.uploadStatus =='1'){ + this.optType = 'view' + }else{ + this.optType = '' + } - 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收货"; - }); + 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 +1259,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,22 +1308,17 @@ 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) { - 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(`请选择数据`); @@ -1436,6 +1426,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) } } }; @@ -1445,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/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/mes/unitprice/index.vue b/src/views/mes/unitprice/index.vue index b2076df..e205dec 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/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue index 445148b..8ebcaae 100644 --- a/src/views/quality/incomeReport/index.vue +++ b/src/views/quality/incomeReport/index.vue @@ -88,6 +88,7 @@ +