diff --git a/src/api/kanban/finishproduct.js b/src/api/kanban/finishproduct.js new file mode 100644 index 0000000..b7f9cf4 --- /dev/null +++ b/src/api/kanban/finishproduct.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 获取工厂下拉列表 +export function finishProductBoard(data) { + return request({ + url: '/mes/mesborad/finishProductBoard', + method: 'post', + data: data + }); +} diff --git a/src/api/mes/childprocess.js b/src/api/mes/childprocess.js new file mode 100644 index 0000000..1a2a6df --- /dev/null +++ b/src/api/mes/childprocess.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +// 查询unitprice列表 +export function listChildprocess(query) { + return request({ + url: '/mes/childprocess/list', + method: 'get', + params: query + }); +} +// 查询全部列表 +export function listChildprocessall(query) { + return request({ + url: '/mes/childprocess/listall', + method: 'get', + params: query + }); +} +// 查询unitprice详细 +export function getChildprocess(childprocessId) { + return request({ + url: '/mes/childprocess/' + childprocessId, + method: 'get' + }); +} + +// 新增unitprice +export function addChildprocess(data) { + return request({ + url: '/mes/childprocess', + method: 'post', + data: data + }); +} + +// 修改unitprice +export function updateChildprocesse(data) { + return request({ + url: '/mes/childprocess', + method: 'put', + data: data + }); +} + +// 删除unitprice +export function delChildprocesse(childprocessId) { + return request({ + url: '/mes/childprocess/' + childprocessId, + method: 'delete' + }); +} diff --git a/src/api/mes/unitPrice.js b/src/api/mes/unitPrice.js new file mode 100644 index 0000000..f39eeee --- /dev/null +++ b/src/api/mes/unitPrice.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询unitPrice列表 +export function listUnitPrice(query) { + return request({ + url: '/mes/unitPrice/list', + method: 'get', + params: query + }); +} + +// 查询unitPrice详细 +export function getUnitPrice(picId) { + return request({ + url: '/mes/unitPrice/' + picId, + method: 'get' + }); +} + +// 新增unitPrice +export function addUnitPrice(data) { + return request({ + url: '/mes/unitPrice', + method: 'post', + data: data + }); +} + +// 修改unitPrice +export function updateUnitPrice(data) { + return request({ + url: '/mes/unitPrice', + method: 'put', + data: data + }); +} + +// 删除unitPrice +export function delUnitPrice(picId) { + return request({ + url: '/mes/unitPrice/' + picId, + method: 'delete' + }); +} diff --git a/src/api/wms/product.js b/src/api/wms/product.js index 7bd9b87..968edb2 100644 --- a/src/api/wms/product.js +++ b/src/api/wms/product.js @@ -8,7 +8,14 @@ export function listProduct(query) { params: query }); } - +// 查询物料信息列表 +export function listProductall(query) { + return request({ + url: '/wms/product/listall', + method: 'get', + params: query + }); +} // 查询物料信息详细 export function getProduct(productId) { return request({ diff --git a/src/assets/images/bg-finishproduct.png b/src/assets/images/bg-finishproduct.png new file mode 100644 index 0000000..dbcebae Binary files /dev/null and b/src/assets/images/bg-finishproduct.png differ diff --git a/src/router/index.js b/src/router/index.js index 1524fe6..79f5273 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -127,7 +127,12 @@ export const constantRoutes = [ component: () => import("@/views/kanban/quality/circle"), hidden: true, }, - + { + path: "/kanban/finishproduct", + component: () => import("@/views/kanban/finishproduct/index"), + hidden: true, + }, + ] // 动态路由，基于用户权限动态去加载 diff --git a/src/views/kanban/exception/carousel.vue b/src/views/kanban/exception/carousel.vue index 28324ee..7276a43 100644 --- a/src/views/kanban/exception/carousel.vue +++ b/src/views/kanban/exception/carousel.vue @@ -1,10 +1,12 @@ - - diff --git a/src/views/kanban/exception/index.vue b/src/views/kanban/exception/index.vue index a3bffd6..169d572 100644 --- a/src/views/kanban/exception/index.vue +++ b/src/views/kanban/exception/index.vue @@ -1,36 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -88,7 +206,6 @@ export default { box-shadow: 0 0 3px blue; display: flex; flex-direction: column; - overflow: auto; } .main-content { @@ -100,7 +217,7 @@ export default { .block-left-right-content { flex: 1; display: flex; - margin-top: 10px; + margin-top: 20px; } .block-top-bottom-content { @@ -108,7 +225,7 @@ export default { display: flex; flex-direction: column; box-sizing: border-box; - padding-left: 0px; + padding-left: 20px; } .block-top-content { @@ -118,18 +235,5 @@ export default { box-sizing: border-box; padding-bottom: 20px; } - .time { - font-size: 30px; - font-weight: 400; - color: #ffffff; - line-height: 71px; - - - position: fixed; - top: 0; - z-index: 9999;; - padding: 10px; - width: 100%; - } } diff --git a/src/views/kanban/finishproduct/BottomRightTable1.vue b/src/views/kanban/finishproduct/BottomRightTable1.vue new file mode 100644 index 0000000..d96ac3d --- /dev/null +++ b/src/views/kanban/finishproduct/BottomRightTable1.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/src/views/kanban/finishproduct/TopLeftCmp.vue b/src/views/kanban/finishproduct/TopLeftCmp.vue new file mode 100644 index 0000000..03fa163 --- /dev/null +++ b/src/views/kanban/finishproduct/TopLeftCmp.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/src/views/kanban/finishproduct/TopMiddleCmp.vue b/src/views/kanban/finishproduct/TopMiddleCmp.vue new file mode 100644 index 0000000..3941989 --- /dev/null +++ b/src/views/kanban/finishproduct/TopMiddleCmp.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/views/kanban/finishproduct/TopRightCmp.vue b/src/views/kanban/finishproduct/TopRightCmp.vue new file mode 100644 index 0000000..3864818 --- /dev/null +++ b/src/views/kanban/finishproduct/TopRightCmp.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/views/kanban/finishproduct/index.vue b/src/views/kanban/finishproduct/index.vue new file mode 100644 index 0000000..9ae42c8 --- /dev/null +++ b/src/views/kanban/finishproduct/index.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/src/views/mes/unitprice/index.vue b/src/views/mes/unitprice/index.vue new file mode 100644 index 0000000..dba26fb --- /dev/null +++ b/src/views/mes/unitprice/index.vue @@ -0,0 +1,621 @@ + + + diff --git a/src/views/technology/childprocess/index.vue b/src/views/technology/childprocess/index.vue new file mode 100644 index 0000000..c1cc21a --- /dev/null +++ b/src/views/technology/childprocess/index.vue @@ -0,0 +1,486 @@ + + +