diff --git a/README.md b/README.md index f7b1e0a..f00b800 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # 注意事项 + 原生APP云打包使用自有证书 -+ 证书别名：testalias \ No newline at end of file ++ 证书别名：testalias ++ 接口线上地址：https://apifox.com/apidoc/shared-a365d40f-4236-45de-972d-58ce2435c7b4/api-145311043 \ No newline at end of file diff --git a/common/style/layout.css b/common/style/layout.css index 613b6ef..f426132 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -1,10 +1,9 @@ page { - background-color: #f6f6f6 !important; + background-color: #f2f5fa !important; min-height: 100% !important; height: 100% !important; } uni-page-body { - background-color: #f6f6f6 !important; min-height: 100% !important; height: 100% !important; } @@ -44,6 +43,19 @@ uni-button:after { color: #ff6a00; border: 1rpx solid #ff6a00; } +.icon_choosed { + position: absolute; + bottom: 0; + right: 0; + padding: 4rpx 10rpx; + line-height: 20rpx; + font-size: 20rpx; + color: #fff; + border: 1rpx solid #ff6a00; + background-color: #ff6a00; + border-top-left-radius: 10rpx; + border-bottom-right-radius: 10rpx; +} .icon_back { font-size: 52rpx; line-height: 52rpx; @@ -86,17 +98,36 @@ uni-button:after { line-height: 48rpx; } .cancel_icon::before { - content: "\e6dc"; + content: "\e6db"; } .cancel_icon { display: block; - width: 100rpx; - height: 100rpx; - font-size: 50rpx; - color: #fff; - line-height: 100rpx; + width: 60rpx; + height: 60rpx; + font-size: 40rpx; + color: #000; + line-height: 60rpx; text-align: center; - background-color: #E9B451; + border: 1px solid #999; + border-radius: 50%; + transform: rotate(-90deg); +} +.icon_start_point { + width: 46rpx; + height: 46rpx; + font-size: 26rpx; + line-height: 46rpx; + background-color: #ff6a00; + color: #fff; + border-radius: 50%; +} +.icon_vdash_line { + width: 46rpx; + height: 26rpx; + font-size: 26rpx; + line-height: 26rpx; + text-align: center; + color: #ff6a00; } /** 内容 */ @@ -105,17 +136,22 @@ uni-button:after { height: 100%; } .zd_content { + position: relative; + top: calc(var(--status-bar-height) + 72rpx); width: 100%; height: auto; - padding: 92rpx 15rpx 82rpx 14rpx; + padding: 20rpx 14rpx 140rpx 14rpx; + /* background: linear-gradient(to bottom, #ff6400 0%, #fee4d7 30%, #f6f6f6 100%) */ + background-color: #f6f6f6; } .zd_wrapper { width: 100%; height: auto; background-color: #fff; border-radius: 24rpx; - padding: 14rpx; + padding: 22rpx 14rpx; margin-bottom: 20rpx; + box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1); } .filter_item { display: flex; @@ -262,26 +298,98 @@ uni-button:after { width: 100%; z-index: 200; background-color: #fff; - padding-top: 10rpx; + padding-top: 20rpx; + box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7); +} +.submit-bar_new { + display: flex; + justify-content: space-between; + align-items: center; + position: fixed; + bottom: 0; + left: 0; + width: 100%; + z-index: 200; + background-color: #fff; + padding: 14rpx; box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7); } .submit-button { - font-size: 30rpx; - line-height: 62rpx; + font-size: 34rpx; + line-height: 88rpx; color: #ff6a00; text-align: center; letter-spacing: 1rpx; padding: 0 22rpx; background-color: #fff; border: 1px solid #ff6a00; - margin: 0 40rpx 10rpx 0; - border-radius: 30rpx; + margin: 0 40rpx 20rpx 0; + border-radius: 10rpx; +} +.submit-button_new { + /* width: 35%; */ + font-size: 34rpx; + line-height: 88rpx; + color: #fff; + text-align: center; + letter-spacing: 1rpx; + padding: 0; + background-color: #ff6a00; + border-radius: 10rpx; +} +.submit-more { + width: 20%; + font-size: 34rpx; + line-height: 34rpx; + padding: 27rpx 10rpx; + color: #000; + text-align: center; + background-color: #fff } .btn-disabled, .submit-button[disabled] { background-color: #c9c9c9; border: 1px solid #c9c9c9; color: #fff; } +.more_btns_wraper { + position: fixed; + bottom: 0; + left: 0; + width: 100%; + z-index: 201; + padding: 0 20rpx 20rpx; + transition: all .3s; +} +.more-button { + font-size: 34rpx; + line-height: 88rpx; + color: #ff6a00; + text-align: center; + border-radius: 0; + background-color: transparent; +} +.more_btns_items .btn-disabled, .more_btns_items .submit-button_new[disabled] { + color: #c9c9c9; + border: none; +} +.more-button:last-child { + border-bottom: none; +} +.more_btns_cancle { + margin-top: 20rpx; + width: 100%; + font-size: 34rpx; + line-height: 88rpx; + color: #000; + text-align: center; + background-color: #fff; + border-radius: 20rpx; +} +.more_btns_items{ + width: 100%; + border-radius: 20rpx; + background-color: #fff; +} /** 下拉框 */ .uni-select__selector { @@ -331,11 +439,25 @@ uni-button:after { max-width: 300px; margin: 40rpx auto 0; display: flex; - justify-content: space-between; + justify-content: center; align-items: center; } .msg_btn { + width: 45%; border-radius: 10rpx; + margin: 0; + font-size: 34rpx; + line-height: 78rpx; + color: #fff; + text-align: center; + background-color: #ff6a00; + border-radius: 44rpx; + box-shadow: 0 8rpx 18rpx 0 rgba(0,0,0,.2); +} +.msg_btn_cancle { + background-color: #fff; + color: #000; + margin-right: 20rpx; } .msg_btn:disabled { background-color: #c9c9c9; @@ -356,4 +478,42 @@ uni-button:after { .layout-t tr.checked td .sin_input { color: #8a8a8a; border: 1px solid #ffffff; +} + +.flow_wrapper { + width: 100%; + background-color: #fff; + border-radius: 24rpx; + padding: 22rpx 20rpx; + margin-bottom: 20rpx; + box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1); +} +.font-size-1 { + font-size: 30rpx; + line-height: 54rpx; + color: #ff6a00; +} +.font-size-2 { + font-size: 30rpx; + line-height: 54rpx; + color: #000; +} +.flow_start_item { + position: relative; + background-color: #f3f3f3; + border: 1rpx solid #f3f3f3; + border-radius: 10rpx; +} +.flow_start_item_checked { + position: relative; + background-color: #fff; + border: 1rpx solid #ff6a00; +} +.flow_icon_item_1 { + width: 46rpx; + height: 56rpx; +} +.flow_icon_item_2 { + width: 46rpx; + height: 26rpx; } \ No newline at end of file diff --git a/common/style/reset.css b/common/style/reset.css index 8355389..710f35a 100644 --- a/common/style/reset.css +++ b/common/style/reset.css @@ -40,4 +40,100 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re overflow: hidden; text-overflow: ellipsis; white-space: nowrap; +} +.flexstart { + align-items: flex-start !important; +} +.jcflexstart { + justify-content: flex-start !important; +} + +.zd-row { + display: flex; + justify-content: space-between; + align-items: center; +} +.zd-col-24 { + width: 100%; +} +.zd-col-23 { + width: 95.83333% +} +.zd-col-22 { + width: 91.66667% +} +.zd-col-21 { + width: 87.5% +} +.zd-col-20 { + width: 83.33333% +} +.zd-col-19 { + width: 79.16667% +} +.zd-col-18 { + width: 75% +} +.zd-col-17 { + width: 70.83333% +} +.zd-col-16 { + width: 66.66667% +} +.zd-col-15 { + width: 62.5% +} +.zd-col-14 { + width: 58.33333% +} +.zd-col-13 { + width: 54.16667% +} +.zd-col-12 { + width: 50%; +} +.zd-col-11 { + width: 45.83333% +} +.zd-col-10 { + width: 41.66667% +} +.zd-col-9 { + width: 37.5% +} +.zd-col-8 { + width: 33.33333% +} +.zd-col-7 { + width: 29.16667% +} +.zd-col-6 { + width: 25% +} +.zd-col-5 { + width: 20.83333% +} +.zd-col-4 { + width: 16.66667% +} +.zd-col-3 { + width: 12.5% +} +.zd-col-2 { + width: 8.33333% +} +.zd-col-1 { + width: 4.16667% +} +.mgb10 { + margin-bottom: 10rpx; +} +.pdl20 { + padding-left: 20rpx; +} +.pdr20 { + padding-right: 20rpx; +} +.pdr10 { + padding-right: 10rpx; } \ No newline at end of file diff --git a/components/NavBar.vue b/components/NavBar.vue index a03af93..f9403e8 100644 --- a/components/NavBar.vue +++ b/components/NavBar.vue @@ -53,10 +53,11 @@ .header _fj() position fixed - _wh(100%, 72rpx) + _wh(100%, calc(var(--status-bar-height) + 72rpx)) + // background: linear-gradient(to bottom, #ff6800 0%, #ff6400 100%) background-color $red z-index 200 - padding 0 20rpx + padding var(--status-bar-height) 20rpx 0 .page_name _font(32rpx, 32rpx, #fff,700,center) diff --git a/pages.json b/pages.json index 1ebae9a..d7c10fd 100644 --- a/pages.json +++ b/pages.json @@ -24,236 +24,54 @@ "navigationStyle": "custom" } } - ,{ - "path" : "pages/ProductManage/SboProdProgress", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": true, - "onReachBottomDistance": 50 - } - } - ,{ - "path" : "pages/ProductManage/SboProcess", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": true, - "onReachBottomDistance": 50 - } - } - ,{ - "path" : "pages/ProductManage/BakeProcess", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/ProductManage/ManmadeBake", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/ProductManage/PointManage", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/ProductManage/EmptyPipeInStore", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/ProductManage/EmptyPipeOutStore", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/ProductManage/ZjCasing", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": true, - "onReachBottomDistance": 50 - } - } - ,{ - "path" : "pages/ProductManage/ZjDelivery", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/ProductManage/ZjInStore", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/ProductManage/ZjOutStore", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/SemifinishedInStore", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": true, - "onReachBottomDistance": 50 - } - } - ,{ - "path" : "pages/WarehouseManage/SemifinishedOutStore", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/ReturngoodsInStore", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/ScrapInStore", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/InStoreConfirm", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/InStoreSplit", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/ProdDelivery", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/ProdDeliveryConfirm", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/ProdDeliveryDtl", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/XuniDelivery", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/XuniDeliveryConfirm", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/EmptyInStore", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/EmptyOutStore", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/CheckList", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/CheckDtl", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/Details", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/WarehouseManage/ErrorOutUnlock", - "style": { - "navigationStyle": "custom" - } - } - ,{ - "path" : "pages/ProductManage/EmptyPipeOutStore", + ,{ + "path" : "pages/manage/man-group-disk", "style" : { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/ProductManage/ZjInStore", + + } + ,{ + "path" : "pages/manage/in-storage", "style" : { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/WarehouseManage/CustomerLabelPrint", + + } + ,{ + "path" : "pages/manage/out-storage", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/manage/task-flow", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/manage/search-mater", + "style" : + { + "navigationStyle": "custom" + } + + }, + { + "path" : "pages/manage/search-mater-1", "style" : { "navigationStyle": "custom" } - } - ,{ - "path" : "pages/ProductManage/SlittingFeeding", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": true, - "onReachBottomDistance": 50 - } - }, - { - "path": "pages/DispatchManage/TaskManage", - "style" : - { - "navigationStyle": "custom" - } - }, - { - "path": "pages/DispatchManage/RGVStatus", - "style" : - { - "navigationStyle": "custom" - } - }, - { - "path": "pages/WarehouseManage/LabelBind", - "style" : - { - "navigationStyle": "custom" - } - } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf index b68f8e9..25aa4c6 100644 Binary files a/static/iconfont/iconfont.ttf and b/static/iconfont/iconfont.ttf differ diff --git a/static/iconfont/iconfont.woff b/static/iconfont/iconfont.woff index 655b9ec..84280a4 100644 Binary files a/static/iconfont/iconfont.woff and b/static/iconfont/iconfont.woff differ diff --git a/static/iconfont/iconfont.woff2 b/static/iconfont/iconfont.woff2 index c634af4..9f5269c 100644 Binary files a/static/iconfont/iconfont.woff2 and b/static/iconfont/iconfont.woff2 differ diff --git a/static/image/menu/RF01.png b/static/image/menu/RF01.png index 4de6e93..af989ff 100644 Binary files a/static/image/menu/RF01.png and b/static/image/menu/RF01.png differ diff --git a/static/image/menu/RF02.png b/static/image/menu/RF02.png index 450da60..6417a79 100644 Binary files a/static/image/menu/RF02.png and b/static/image/menu/RF02.png differ diff --git a/static/image/menu/RF03.png b/static/image/menu/RF03.png index 44fa467..7e9ddd2 100644 Binary files a/static/image/menu/RF03.png and b/static/image/menu/RF03.png differ diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png index d2b969b..78cca87 100644 Binary files a/static/image/menu/RF04.png and b/static/image/menu/RF04.png differ diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png deleted file mode 100644 index 775f2e8..0000000 Binary files a/static/image/menu/RF05.png and /dev/null differ diff --git a/static/image/menu/RF06.png b/static/image/menu/RF06.png deleted file mode 100644 index af989ff..0000000 Binary files a/static/image/menu/RF06.png and /dev/null differ diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png deleted file mode 100644 index 796026f..0000000 Binary files a/static/image/menu/RF07.png and /dev/null differ diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png deleted file mode 100644 index 30c871f..0000000 Binary files a/static/image/menu/RF08.png and /dev/null differ diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png deleted file mode 100644 index 972a492..0000000 Binary files a/static/image/menu/RF09.png and /dev/null differ diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png deleted file mode 100644 index 15c177a..0000000 Binary files a/static/image/menu/RF10.png and /dev/null differ diff --git a/utils/getData2.js b/utils/getData2.js index 90bb9f2..f01efe8 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -28,528 +28,225 @@ export const handRequest = () => request({ data: {} }) -// 菜单 -export const authority = () => { - let res = { - sonTree: [ - {menu_id: '1', path: 'RF01', name: '生产管理', sonTree: [ - {menu_id: '1', name: '生箔生产进度', path: '/pages/ProductManage/SboProdProgress'}, - {menu_id: '2', name: '生箔工序', path: '/pages/ProductManage/SboProcess'}, - {menu_id: '3', name: '烘烤工序', path: '/pages/ProductManage/BakeProcess'}, - {menu_id: '4', name: '人工烘烤', path: '/pages/ProductManage/ManmadeBake'} - ]}, - {menu_id: '2', path: 'RF02', name: '半成品管理', sonTree: [ - {menu_id: '1', name: '半成品入库', path: '/pages/WarehouseManage/SemifinishedInStore'}, - {menu_id: '2', name: '半成品出库', path: '/pages/WarehouseManage/SemifinishedOutStore'}, - ]}, - {menu_id: '3', path: 'RF03', name: '分切管理', sonTree: [ - {menu_id: '1', name: '分切上料', path: '/pages/ProductManage/SlittingFeeding'}, - {menu_id: '2', name: '空轴套管', path: '/pages/ProductManage/ZjCasing'}, - {menu_id: '3', name: '空轴配送', path: '/pages/ProductManage/ZjDelivery'}, - {menu_id: '4', name: '空轴进站', path: '/pages/ProductManage/ZjInStore'}, - {menu_id: '5', name: '子卷出站', path: '/pages/ProductManage/ZjOutStore'}, - ]}, - {menu_id: '4', path: 'RF04', name: '点位管理', sonTree: [ - {menu_id: '1', name: '点位管理', path: '/pages/ProductManage/PointManage'}, - {menu_id: '2', name: '异常出库解锁', path: '/pages/WarehouseManage/ErrorOutUnlock'} - ]}, - {menu_id: '5', path: 'RF05', name: '纸管/FRP管管理', sonTree: [ - {menu_id: '1', name: '空管入库', path: '/pages/ProductManage/EmptyPipeInStore'}, - {menu_id: '2', name: '空管出库', path: '/pages/ProductManage/EmptyPipeOutStore'}, - ]}, - {menu_id: '6', path: 'RF06', name: '成品管理', sonTree: [ - {menu_id: '1', name: '生产入库', path: '/pages/WarehouseManage/InStoreConfirm'}, - {menu_id: '2', name: '退货入库', path: '/pages/WarehouseManage/ReturngoodsInStore'}, - {menu_id: '3', name: '报废入库', path: '/pages/WarehouseManage/ScrapInStore'}, - {menu_id: '4', name: '拆分入库', path: '/pages/WarehouseManage/InStoreSplit'}, - {menu_id: '5', name: '生产区发货', path: '/pages/WarehouseManage/ProdDelivery'}, - {menu_id: '6', name: '虚拟区发货', path: '/pages/WarehouseManage/XuniDelivery'}, - {menu_id: '7', name: '贴标捆扎', path: '/pages/WarehouseManage/LabelBind'} - ]}, - {menu_id: '7', path: 'RF07', name: '在库管理', sonTree: [ - {menu_id: '1', name: '盘点管理', path: '/pages/WarehouseManage/CheckList'}, - ]}, - {menu_id: '8', path: 'RF08', name: '载具管理', sonTree: [ - {menu_id: '1', name: '空载具入库', path: '/pages/WarehouseManage/EmptyInStore'}, - {menu_id: '2', name: '空载具出库', path: '/pages/WarehouseManage/EmptyOutStore'}, - ]}, - {menu_id: '9', path: 'RF09', name: '打印管理', sonTree: [ - {menu_id: '1', name: '客户标签打印', path: '/pages/WarehouseManage/CustomerLabelPrint'}, - ]}, - {menu_id: '10', path: 'RF10', name: '调度管理', sonTree: [ - {menu_id: '1', name: '任务管理', path: '/pages/DispatchManage/TaskManage'}, - {menu_id: '2', name: 'RGV状态查询', path: '/pages/DispatchManage/RGVStatus'} - ]} - ] - } - return res -} /** - * 空管入库 + * 任务流转 */ -// 1.1生产区域下拉框查询 -export const queryProductArea = () => request({ - url:'api/pda/raw/queryProductArea', +// 1.1查询起点及其对应的终点 +export const queryAllPoints = () => request({ + url:'api/pda/queryAllPoints', data: {} }) -// export const queryProductArea = () => { -// let res = { -// data: [{value: '01', text: 'a'}, {value: '02', text: 'b'}] -// } +// export const queryAllPoints = () => { +// let res = [ +// { +// "point_code": "28", +// "point_name": "石例约么", +// "end_points": [ +// { +// "point_code": "61", +// "point_name": "比非强" +// } +// ] +// }, +// { +// "point_code": "29", +// "point_name": "石例约么1", +// "end_points": [ +// { +// "point_code": "12", +// "point_name": "比非强" +// }, +// { +// "point_code": "13", +// "point_name": "比非强" +// } +// ] +// } +// ] // return res // } -// 1.2空纸管库设备物料初始化查询 -export const queryMaterialInfo1 = (code, mcode, area, option) => request({ - url:'api/pda/empty/queryMaterialInfo', +// 1.2生成任务 +export const createP2pTask = (code, mcode) => request({ + url:'api/pda/createP2pTask', data: { - point_code: code, - material_code: mcode, - product_area: area, - option: option - } -}) -// 1.3入库确认 -// export const emptyConfirm = (jo, qty, code, option) => request({ -// url:'api/pda/empty/confirm', -// data: { -// raw_jo: jo, -// qty: qty, -// material_code: code, -// option: option -// } -// }) - -/** - * 空轴套管 - */ -// 1.1分切计划初始化查询 -export const queryMaterialInfo2 = (code, area, device, name, page, size) => request({ - url:'api/pda/casing/queryMaterialInfo', - data: { - point_code: code, - product_area: area, - device_code: device, - container_name: name, - page: page, - size: size - } -}) -// 1.2套轴确认 -export const casingConfirm = (row, qzz, code) => request({ - url:'api/pda/casing/confirm', - data: { - cut_rows: row, - qzzno: qzz, - point_code: code - } -}) -//1.3设备下拉框 -export const queryDeviceByarea = (area) => request({ - url:'api/pda/casing/queryDeviceByarea', - data: { - product_area: area - } -}) -// export const queryDeviceByarea = () => { -// let res = { -// data: [{value: '01', text: 'a'}, {value: '02', text: 'bc'}] -// } -// return res -// } -// 1.4拔轴确认 -export const casingOutConfirm = (qzz, code) => request({ - url:'api/pda/casing/outConfirm', - data: { - qzzno: qzz, - point_code: code - } -}) -// 1.5穿轴确认 -export const casingWearConfirm = (qzz, code) => request({ - url:'api/pda/casing/wearConfirm', - data: { - qzzno: qzz, - point_code: code + point_code1: code, + point_code2: mcode } }) /** - * 空轴配送 - */ -// 1.1分切计划初始化查询 -export const queryMaterialInfo3 = (code, qzz, area, device) => request({ - url:'api/pda/shipping/queryMaterialInfo', - data: { - vehicle_code: code, - qzzno: qzz, - product_area: area, - device_code: device - } -}) -// 1.2呼叫载具 -export const needVehicle = (code) => request({ - url:'api/pda/shipping/needVehicle', - data: { - cut_jo: code - } -}) - -// 1.3配送确认 -export const shippingConfirm = (rows, code, vcode) => request({ - url:'api/pda/shipping/confirm', - data: { - cut_rows: rows, - point_code: code, - vehicle_code: vcode - } -}) -// 1.4载具送回 -export const returnVehicle = (code, vcode) => request({ - url:'api/pda/shipping/returnVehicle', - data: { - point_code: code, - vehicle_code: vcode - } -}) -// 1.5配送校验 -export const shippingCheck = (code, qzzno) => request({ - url:'api/pda/shipping/check', - data: { - vehicle_code: code, - qzzno: qzzno - } -}) -// 1.6载具横移 -export const acrossVehicle = (code) => request({ - url:'api/pda/shipping/acrossVehicle', - data: { - point_code: code - } -}) - -/** - * 空轴进站 - */ -// 1.1分切计划初始化查询 -export const queryMaterialInfo5 = (code, area) => request({ - url:'api/pda/in/queryMaterialInfo', - data: { - device_code: code, - product_area: area - } -}) -// 1.2子卷入站 -export const inConfirm = (code, rows) => request({ - url:'api/pda/in/confirm', - data: { - point_code: code, - cut_rows: rows - } -}) -// 1.3点位查询 -export const devicePointQuery = (code) => request({ - url:'api/pda/in/devicePointQuery', - data: { - device_code: code - } -}) -// export const devicePointQuery = () => { -// let res = { -// data: [{value: '01', text: 'a'}, {value: '02', text: 'bc'}] -// } -// return res -// } - -/** - * 子卷出站 - */ -// 1.1分切计划初始化查询 -export const queryMaterialInfo4 = (code, area) => request({ - url:'api/pda/out/queryMaterialInfo', - data: { - device_code: code, - product_area: area - - } -}) -// 1.2子卷出站 -export const outConfirm = (code, rows, is) => request({ - url:'api/pda/out/confirm', - data: { - point_code: code, - cut_rows: rows, - is_last: is - } -}) -// 1.3缓存点位查询 -export const conveyPointQuery = (area) => request({ - url:'api/pda/in/conveyPointQuery', - data: { - product_area: area - } -}) -// 1.4出站配送 -export const conveyConfirm = (code) => request({ - url:'api/pda/in/conveyConfirm', - data: { - point_code: code - } -}) -// 1.5废箔下卷 -export const disuseConfirm = (code) => request({ - url:'api/pda/out/disuseConfirm', - data: { - point_code: code - } -}) - -/** - * 半成品入库 - */ -// 1.1半成品入库初始化查询 -export const coolIOQuery = (name, page, size) => request({ - url:'api/pda/coolIn/coolIOQuery', - data: { - container_name: name, - page: page, - size: size - } -}) -// 1.2确认入库 -export const confirmInstor = (raw_jo, code, is_bake) => request({ - url:'api/pda/coolIn/confirmInstor', - data: { - raw_jo: raw_jo, - point_code: code, - is_bake: is_bake - } -}) -// 1.3状态下拉框查询 -export const statusList = () => request({ - url:'api/pda/coolIn/statusList', - data: {} -}) - -/** - * 半成品出库 - */ -// 1.1半成品出库初始化查询 -export const outcoolIOQuery = (name, area, code) => request({ - url:'api/pda/coolOut/coolIOQuery', - data: { - container_name: name, - product_area: area - } -}) -// 1.2确认出库 -export const outconfirmInstor = (raw_jo, code, is_bake) => request({ - url:'api/pda/coolOut/confirmInstor', - data: { - raw_jo: raw_jo, - point_code: code - } -}) - -/** - * 报废入库 - */ -// 1.1入库初始化查询 -export const boxQuery = (no, option, code) => request({ - url:'api/pda/st/boxQuery', - data: { - box_no: no, - option: option - } -}) -// 1.2确认入库 -export const stConfirm = (box_jo, code, option, is, mcode, no, sid) => request({ - url:'api/pda/st/confirm', - data: { - box_jo: box_jo, - point_code: code, - option: option, - is_virtual: is, - material_code: mcode, - box_no: no, - sect_id: sid - } -}) - -/** - * 生产入库 - */ -// 1.3补码 -export const stPrint = (box_jo) => request({ - url:'api/pda/st/print', - data: { - box_jo: box_jo - } -}) -// 库区 -export const getStorSect = () => request({ - url:'api/sectattr/getStorSect', - data: {} -}) - -/** - * 客户标签打印 - */ -// 1.1木箱信息查询 -export const customerInfo = (box_no) => request({ - url:'api/pda/print/customerInfo', - data: { - box_no: box_no - } -}) -// 1.1木箱打印 -export const customerPrint = (box_no, ptype) => request({ - url:'api/pda/print/customerPrint', - data: { - box_no: box_no, - print_type: ptype - } -}) -// 1.3打印机类型 -export const virtualprintType = (url) => request1({ - url: `${url}/` + 'api/pda/virtual/printType', - data: {} -}) - -/** - * 分切上料 - */ -// 1.1分切计划初始化查询 -export const feedingQueryMaterialInfo = (area, dcode, sname, page, size) => request({ - url:'api/pda/feeding/queryMaterialInfo', - data: { - product_area: area, - device_code: dcode, - source_container_name: sname, - page: page, - size: size - } -}) -// 1.2呼叫 -export const feedingConfirm = (row) => request({ - url:'api/pda/feeding/confirm', - data: { - cut_rows: row - } -}) -// 1.3扫码起点带出母卷 -export const feedingQueryPoint = (code) => request({ - url:'api/pda/feeding/queryPoint', - data: { - point_code: code - } -}) -// 1.4人工呼叫 -export const feedingHandleConfirm = (code, cn, ncode) => request({ - url:'api/pda/feeding/handleConfirm', - data: { - point_code: code, - container_name: cn, - next_point_code: ncode - } -}) -// 1.5空轴送回 -export const feedingVehicleReturn = (code) => request({ - url:'api/pda/feeding/vehicleReturn', - data: { - point_code: code - } -}) - -/** - * 任务管理 - */ -//1.1任务查询 -export const taskTaskQuery = (search) => request({ -url:'api/pda/task/taskQuery', -data: { - search: search -} -}) -//1.2重新下发 -export const againLssued = (row) => request({ -url:'api/pda/task/againLssued', -data: { - task_rows: row -} -}) -//1.3强制完成 -export const taskConfirm = (row) => request({ -url:'api/pda/task/confirm', -data: { - task_rows: row -} -}) -/** - * 贴标捆扎 - */ -// 1.1贴标 -export const mendCode = (no, weight) => request({ -url:'api/pda/st/mendCode', -data: { - box_no: no, - weight: weight -} -}) -//1.2捆扎 -export const stBale = (no, code) => request({ -url:'api/pda/st/bale', -data: { - box_no: no, - point_code: code -} -}) - -/** - * 空管出入库 - */ -// 1.1查询纸管库设备下拉框 -export const queryDeviceList = (area) => request({ -url:'api/pda/paper/queryDeviceList', -data: { - product_area: area -} -}) -// 1.2查询纸管物料下拉框 -export const queryPaperMaterial = (code) => request({ -url:'api/pda/paper/queryPaperMaterial', -data: { - material_code: code -} -}) -// 1.3查询纸管物料 -export const taskQuerydevice = (jarr) => request({ -url:'api/wms/task/querydevice', -data: jarr -}) -// 1.4入库设置/出库确认 -export const emptyConfirm = (qty, mater, code, option) => request({ -url:'api/pda/paper/PaperDeviceOperate', -data: { - qty: qty, - material_code: mater, - device_code: code, - option: option -} -}) -// 1.5查询纸管库信息 -export const queryPaperTubeInfo = (area) => request({ -url:'api/pda/paper/queryPaperTubeInfo', -data: { - product_area: area -} -}) - -/** - * RGV状态 + * 原材料库入库 */ // 1.1查询 -export const rgvStatusQuery = () => request({ - url:'api/pda/task/rgvStatusQuery', +export const queryPoints = (type) => request({ + url:'api/pda/queryPoints', + data: { + type: type + } +}) +// export const queryPoints = () => { +// let res = [ +// { +// "point_code": "60", +// "point_name": "同更情决" +// }, +// { +// "point_code": "61", +// "point_name": "倒垃圾了" +// } +// ] +// return res +// } +// 1.2呼叫空托 +export const callEmptyVehicle = (code) => request({ + url:'api/pda/callEmptyVehicle', + data: { + point_code: code + } +}) +//1.3满托入库 +export const fullVehicleIn = (code) => request({ + url:'api/pda/fullVehicleIn', + data: { + point_code: code + } +}) + +/** + * 原材料库出库 + */ +// 1.1物料查询 +export const queryLinkMaterial = (id) => request({ + url:'api/pda/queryLinkMaterial', + data: { + material_id: id + } +}) +// export const queryLinkMaterial = () => { +// let res = [ +// { +// "point_code": "78", +// "point_name": "片百人共", +// "vehicle_code": "52", +// "material_id": "89", +// "material_code": "85", +// "material_name": "战干者许", +// "pcsn": "ullamco Ut", +// "material_qty": "100" +// } +// ] +// return res +// } +// 1.2满托出库 +export const fullVehicleOut = (code1, code2) => request({ + url:'api/pda/fullVehicleOut', + data: { + point_code1: code1, + point_code2: code2 + } +}) +//1.3余料回库 +export const vehicleGoBack = (code, vcode, num) => request({ + url:'api/pda/vehicleGoBack', + data: { + point_code: code, + vehicle_code: vcode, + residue_num: num + } +}) +// 1.4满托出库确认 +export const fullVehicleOutConfirm = (code, vcode, num) => request({ + url:'api/pda/fullVehicleOutConfirm', + data: { + point_code: code, + vehicle_code: vcode, + residue_num: num + } +}) + +/** + * 人工组盘 + */ +// 1.1获取载具类型 +export const getVehicleType = () => request({ + url:'api/pda/group/getVehicleType', data: {} +}) +// export const getVehicleType = () => { +// let res = [ +// { +// "value": "LZ", +// "text": "料盅" +// }, +// { +// "value": "GTP", +// "text": "钢托盘" +// }, +// { +// "value": "1", +// "text": "木托盘" +// } +// ] +// return res +// } +// 1.2获取物料信息 +export const queryMaterial = () => request({ + url:'api/pda/queryMaterial', + data: {} +}) +// export const queryMaterial = () => { +// let res = [ +// { +// "material_id": "19", +// "material_code": "24", +// "material_name": "从非酸地次属例" +// }, +// { +// "material_id": "9", +// "material_code": "24", +// "material_name": "从非酸地次属例" +// } +// ] +// return res +// } +//1.3获取组盘中状态的组盘信息 +export const queryVehicleGroup = () => request({ + url:'api/pda/queryVehicleGroup', + data: {} +}) +// export const queryVehicleGroup = () => { +// let res = [ +// { +// "group_id": "30", +// "vehicle_type": "in quis magna veniam", +// "vehicle_code": "91", +// "material_id": "4", +// "material_code": "20", +// "material_name": "张认义关金", +// "point_code": "16" +// } +// ] +// return res +// } +// 开始组盘 +export const groupManual = (vtype, vcode, pcode, mid, mcode, qty, isl) => request({ + url:'api/pda/group/manual', + data: { + vehicle_type: vtype, + vehicle_code: vcode, + point_code: pcode, + material_id: mid, + material_code: mcode, + material_qty: qty, + is_link: isl + } +}) +// 开始配盘 +export const groupLink = (id, vcode) => request({ + url:'api/pda/group/link', + data: { + group_id: id, + vehicle_code: vcode + } }) \ No newline at end of file diff --git a/vuex/modules/data.js b/vuex/modules/data.js new file mode 100644 index 0000000..e2914f9 --- /dev/null +++ b/vuex/modules/data.js @@ -0,0 +1,31 @@ +import * as types from '../types' +const state = { + publicObj: '', + publicArr: '' +} +const getters = { + publicObj: state => state.publicObj, + publicArr: state => state.publicArr +} +const actions = { + setPublicObj ({commit}, res) { + commit(types.PUBLIC_OBJ, res) + }, + setPublicArr ({commit}, res) { + commit(types.PUBLIC_ARR, res) + } +} +const mutations = { + [types.PUBLIC_OBJ] (state, res) { + state.publicObj = res + }, + [types.PUBLIC_ARR] (state, res) { + state.publicArr = res + } +} +export default { + state, + getters, + actions, + mutations +} \ No newline at end of file diff --git a/vuex/store.js b/vuex/store.js index 095161f..f8cd813 100644 --- a/vuex/store.js +++ b/vuex/store.js @@ -2,11 +2,13 @@ import Vue from 'vue' import Vuex from 'vuex' import user from './modules/user' +import data from './modules/data' Vue.use(Vuex) export default new Vuex.Store({ modules: { - user + user, + data } }) diff --git a/vuex/types.js b/vuex/types.js index 4668940..ee8a8f3 100644 --- a/vuex/types.js +++ b/vuex/types.js @@ -6,4 +6,10 @@ export const DEL_LOGIN_NAME = 'DEL_LOGIN_NAME' export const COM_CONFIG = 'COM_CONFIG' export const SAVE_USER_INFO = 'SAVE_USER_INFO' export const DEL_USER_INFO = 'DEL_USER_INFO' -export const SAVE_TOKEN = 'SAVE_TOKEN' \ No newline at end of file +export const SAVE_TOKEN = 'SAVE_TOKEN' + +/** + * data + */ +export const PUBLIC_OBJ = 'PUBLIC_OBJ' +export const PUBLIC_ARR = 'PUBLIC_ARR' \ No newline at end of file