From ffdd29fb11c93de601ee4b411de5a1ebe22fd5c3 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Sun, 18 Feb 2024 17:58:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +- common/style/layout.css | 194 ++++++++- common/style/reset.css | 96 +++++ components/NavBar.vue | 5 +- pages.json | 258 ++---------- static/iconfont/iconfont.ttf | Bin 3480 -> 3896 bytes static/iconfont/iconfont.woff | Bin 2260 -> 2524 bytes static/iconfont/iconfont.woff2 | Bin 1796 -> 2060 bytes static/image/menu/RF01.png | Bin 2286 -> 3065 bytes static/image/menu/RF02.png | Bin 1814 -> 1613 bytes static/image/menu/RF03.png | Bin 3101 -> 1599 bytes static/image/menu/RF04.png | Bin 2601 -> 2771 bytes static/image/menu/RF05.png | Bin 2249 -> 0 bytes static/image/menu/RF06.png | Bin 3065 -> 0 bytes static/image/menu/RF07.png | Bin 3110 -> 0 bytes static/image/menu/RF08.png | Bin 2390 -> 0 bytes static/image/menu/RF09.png | Bin 3239 -> 0 bytes static/image/menu/RF10.png | Bin 2668 -> 0 bytes utils/getData2.js | 715 ++++++++++----------------------- vuex/modules/data.js | 31 ++ vuex/store.js | 4 +- vuex/types.js | 8 +- 22 files changed, 563 insertions(+), 751 deletions(-) delete mode 100644 static/image/menu/RF05.png delete mode 100644 static/image/menu/RF06.png delete mode 100644 static/image/menu/RF07.png delete mode 100644 static/image/menu/RF08.png delete mode 100644 static/image/menu/RF09.png delete mode 100644 static/image/menu/RF10.png create mode 100644 vuex/modules/data.js 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 b68f8e9004f95975f077aaef535a6d31e7464d60..25aa4c6de004ae489076d71145708854b729e566 100644 GIT binary patch delta 971 zcmZXSUr19?7{I@C&fL}g)6l83p>yh1dFC_Z#RnXaLyy+|m4J&2tT~cH9>ORjfFa zI3pxL%G${TBipgDsr(cG+l2Sob<%c=8nP9%yl1K42=EYCLF2gUFnS3zfbLKUWoXd~ zCTc}UjEXriFBZh6*xs?_^8o+YH^i1=&n^LH5;1H&>OIk^5 zuBfWSd7`yNogTN-;dC(jQQ|&LPS%hL6QR%>@HI8}c;({__9M>L!yc=h^Yeiq_jB&= zRRlZ3n|y&_>h?&ywcl=UI(D|b`}`$e5aalM754{yocn@)j=wWDu}XKb35wUN0~0`F zorRd|JdHo0yZbJY$>U?G?Crm$2bPy#OinKM^*!-wz87~G2_=kZNDC(yhc4S t5F;@`$#^7{PNj$Ccxfn-8kEDsk%91V824o(D3W8TX654$imcxl_yK`G=Cc3* delta 577 zcmY*WJxd%>6g~IN?CkFNkxh&uCIodYEK-IL!giu4SojAtjuYdet`5Xv69T*G0+FDs zg`kBP3&AA>Z7lo~wsDcT#cg7n!W3E0n*qW1ICDSGy=P`lpKU+c7^svdjsaN*FdLSF zXezZn0+`1{ZejVuyWR7}KY&{Ryr?)Iyv_d@8)ffr;$@ME^riEa{uwb;EUlG?>2TgP zAH&P5VUYcp-XMR7aZf2IN79E+toJhRUkOU{PjlZ3KLNkag$vQ@`?b;OF9$#e1>p1M zS$@Qa&?V+3|37^5pzs%ME)$e6E_Ujjb>Y}B17i)3<@t!<)duCLBh;o-ZB+rMfokoS zysq_|uF6*21$-mf_CKffN!@~rImS6&j@3|?bVv7eUmMzNweDpu^vY)L9f_HiZSN!2 zgt{E0IM+j(Dzi*^C+EgU1?@4H-z7e*Xqdoi(xn9Uy>ur*tZ9!v!I{wg1e^}NNWeYN zMgnexUM1jeXfuITfo|}Z)bURa%?mSQw#}vU3OK2!ZZbW-7;(gvlz5VsjAX@^Hq@>= GCk3}x0e&9< diff --git a/static/iconfont/iconfont.woff b/static/iconfont/iconfont.woff index 655b9ec46650b60023ac9ab90232d1a13ef0f8f6..84280a43e9177ed11f9860b793a0848da5ba17f4 100644 GIT binary patch delta 2071 zcmV+y2q006T9 z00L5`+6TvHYk001ul001^7?a{<&Xk}pl z00*o9000~S001Nh-UE(kZFG1500+nb000jF001;J0001NZ)0Hq00-Cr000~S000~c zf()*0VR&#j000N{0000V0000W0UiK+ZeeX@000OS0003%0007K5TiV>aBp*T000S8 z0001p00028#JSp0lL!H4e=)yMU~c%|z`($Khv5oPm=Q%0698`<&rxNgD?<8 z$1#u}MXCs;fdk}Llw2bBph48Bavf-(7;y_S_7+hhZjiN}rJcgNnlXSBfERa>0PY2c zP*15Y>K>=4CwQp8;vyxZXUUokTXyU@a$c%+1%C8_lj$4f^w#$&e{hTXPP0;EIAD*X zrk|0A9bLBh&VN-N@9xvl8zC*0h8zTIBc#g42x+r5r;?66b@{2QLlM<@VzoOM*)YaCS+zvs@!&F*Ao6Lx0yBfFE#rkUB@O!s?tY}3tG z)08GLA-2KBilz#!f0klfMTID~P!azCA4H|LZ&F&phk`ALDfLC4;+yD$6+tPq6hx#T znR;esvl7tVy}$eQ+uuF+oO=#oggkbr%{hc4j7TI#;v_)^2m!6$WcB8-_8$#?Slsd9 zoTa7vi}$;Y5JFM+YwjR7g<5%3%Q2COnwrq@TXkFEx7n~Qf7{}6C1{L8%>Y#aN{%kf zjqYCAcf7JISG3(iGm~?iLkp|UyyMIt^?{poM&}k*U;p6LD{d|~TArR-KJ@h5D*ny! z63+bUoa4-`&O3zgXu}4*hc-|mk|9lM8JCxf9^I%NH0l|9BGro{!J864XBMnqXaulk2hL1T@`bdJ8YL=*vyGB7|w}W zKho=Ft<~&rSaDUv4GV{@F_-{z5b8BuqojRu-@cRUKD5irmCEvSK74N!4g9UG=|Za4 zyPzZleXZc8cc*_Cz5RXi zez)LF4mc^d0I0Kd*VllJcy?%Vawr?eD?@PaFX=n@5(ro#i-4too&bFi^x6cpTxeO` zHOY{?0q?J`g~cPZsKj;EBGl7Z5J{>$_WjEF-j zct(G{f9X4A8Gls}-+$=+Yzqn><*5MA z@)CjoIFp5f8uLU&d$hI&H@$DJ^NjJ=q5ajbL&%f`nTI&Xc@K~%3zRp#pJJ*S(=HHv zC%$bfw2GNfCKF_dJWtM`g>~OHRUCz!)rLlke{);t41?k`aGT?RLtvUh@j2K{t2Nj) zx`aU<2RotTTL>?O?$ZS~{L40n1#16t;Ez5r8WsCkB;xgn5`a8&{LBk8GDx`ALzSoA zc<;^S7_f7S!1GB?78H@=us_wq^FmRSxgL%ai-JstdN^4u;AW?PRS{$^i6jL{Nsa>} zf5IyMQ5B4Fi~AQh zLR+vWK|Z2ypP?6sN~&a$97De<=+H*1ZVh+Ss@Y(*usj6S!M1|Z!Njn3=!smo+6Xzd za8(UC_Ks5WB2_b*7R#8~Y9>?NTgkrEe}1A>8cbjrGD@vIZ|`Z9jD)5o{YiV_z}{*; zozT266~wJKyLa{SN&?f55*m z;BCWHYuFJ4nwIdPdUtpp+BlE|!TS*`f!^%pdGAiJB?vwREUwjJz;#HIG>xef&(Fe89E-M~C9ko|#4zk#;onPYy-x4oMT{QU|`^7C}3b`00AZ- z<^nCn2{pHeRR|%dNCa@4H2#kB85^E-GhB z{u`a>DUzExvHs54Q-U--*Zku1WAG!JQM^kUGPl(9KClitVfQg4CZD~W}o BsQCZ@ delta 1804 zcmV+n2lM#c6VwqDcTYw}00961000Qo01E&B000e`krX|DcuBHjZDDW#00D>q005N$ z00IzD1&l*yYaBp*T000PV z0001I0001iMO}!blL!H4eG1OSKF4W)RT?UB6=!cYu^ z?~xz!5CvimrV3?N$P83;X`-x^G)Zx5gtHArcEHy6B%hvL+ySTn6yhODAia@b^^%%g zFK}_aM63Cx)_*?Pap1^_3%7kgC^J`64wZcK*LPP=x>V_IjWZf#e@Qj|b@jLZPT8Cd zEDv^pyaR{8^B4omlT%=Mat`D%xCC+=Tm$(IZUOQKNU}Ne0001ZoOM*qiyTE1uUB0k z+tb@UyG(b_$8Ps-&$!()lg)fjkI82CE1M07Cd4Ec6b-hJIKhu{S0QAQ6iJy3 z$w@+>Y=G%PXBm18P|6MHEknlz(|}wr?AWF#`-4i*fQnZZS*VnSHI4MH*9rU6JwIm( zT<~!iF2M?TbI|SB7A3>8hYp>+6vME2qSZR_d<@^Ybr-)|e_J*$PDYoFJh!)MgVO#Y z-L4G=(#h?v<{T$?C1b-SJ98!H(5;aOLUduIf&fD+7IHs7JUKn3A0E`A)tSZOpa!V3 zdq38I?VK~ex;pRV@W_yy`!;=-7;~sT@ybM9!#=DRn3d3jf zLHd_Hj!e}4;lOWGB9jqQQdOfVp#kU{FP?vCLkA7#CaCfBn;*P&A`9}O!5J$kIyZ!( zVE@_#e`CBZbY((OM4jt&enQbj4HrlK>ju}A0+I|Q6%++rRkq@-TA1T31u0nnRI7cu zPo)F}Gzn{GmzK_~QK{YkuN1qei$qF{`kXEjU&N@7eL-I83-%aRmc;fMdYPD{O^%Ug zF|Gy%v=?^$%DAlhJ=qzAaq9(s+{#kK&CJ_Le=Dc6y_C~QXU&uo{JS3M%ha5;tn94k zv}b4A2V2f7!^gwMT;4MCZX-PK&VjJu<}Irb8^b4$9BfxhdAn3?9o+mlHj1`gs_mU;fV+!~XFk`IwkiJJMXkeW1ewkUw#~{j0%rt`ETfyxR;yQb@ zlPd4*q*6OO%wVXGJ$43z8>7L_{}2gHfAV{b{zP1|kC27&W(K~4Mu@nT!dP+P#Jom(i zf{?h8K$mV~9oNWVLUQ=R;47R|ar}-9DrqI}&83y?C63{QH-3;(dP3b+B|RCJf6MMI zsm{mcIkIuM`#_aar8!kj?J-mdZ;uQ4oGQ2DsRXWFlj>I)as7I{dUphW1Ljxv3;+NC zc${NkWME(b;v}Dcg7N$|Um3Vr7(n2G2crry&BDM8qBt0sKokJe#0D7vc${NkWME)! z_}{<~!@>XpK$4LG6>tFnM-T#YM|hlLVPIfjAp!#c1DF6Q00000004XdtN{7}r~)(s zUILf`-UB!Q0C=2ZU}Rum;9@9XU}FFQCNPf+Nd5=&82}X00ha&(vl9qJ0cF9_4uUWY z1<+m?Lr3Dj=?|FFG_H!PVQ7%A_kmZ>p@w#e{!3`kBA`P=j{}ZK7--ls`)XWncZ=(r u%cddwQ~Qrq8z(*KSFf+x7nQ}lgpuXZ$>ddIRh}isDqPMNq8}pw8odDbl^r<% diff --git a/static/iconfont/iconfont.woff2 b/static/iconfont/iconfont.woff2 index c634af459efd58bb8d1a94274ea9cd2a783da720..9f5269c89ad554100d8391639da1efd46a0f03f5 100644 GIT binary patch delta 2054 zcmV+h2>JJf4vY{OcTYw#00961000OK01E&B000j-000NQkr*C-QVNd@j4%N<0we=8 z3mgChAO(bH2Z1sh{0t)zCX|y%_7?}4+#ic*9M?6@-g=!HOR!$4MK&Z$a@hH)Z8Fk# zKM$q!`NvKFz9a-qprs;0&8dc(Q`o#pr%HP^x;gBNwo|Ko)wxt=nlB;*0Q9o$-;JM$ zvvzxjEqm{rKX9#oy(Z63jrG_vS^UKIVpGe01o|U6pu;)aBM2E`igNZzv;EKo+g^i% zpI>wJ{-h&TO%uKRyXpI~+rtl2OO_xJ@)}Ll8*w2cp^z)8r#A6#RYQ1aglF^hpc_) zANSdi@wjVb#%_jkAxAvi~vpcLaZi_f+GjLPgB@l9~45Vf-DD|Hs&$tB-8;49HWQ@L5e^ zdbM9r*#}To*gs&iEzd=@lJ{lkf?=6RA9~#?{wGN_OhU` zYgT_o)3Y}!{-?FnL3;IQOH{D@gqr2LDtT3}Xu%Uf4-y*nr(Q+20twWHQr+?NE(3{_ z1w$)G1zu+Yim&$Q<$ZjXk9Y4E>~Dj(e0N-buB|;~N9Fna0sor$R<4`mIeYw!{*Y&Z z-lg+8akkoSI@j>ocU|UR#~v%k9F?>6pSCs7vk2dn4V%ic*O|ww9NI723aM2^2_xN3 zW6zxLR?c6mZ3zo>Nh)gPTZKZG|AYEDC_d2l4KWs`Ut(g0HspT)NzkLY!qwDmseZzLMAu|x zkx@`-{Q0P03s}FOY-N+_NH~h!{RCho^pAZ_G6Xv!g z3dR!@d!X*;W~&F`3hFJ3v)3)juIu0nD0arY`(s7=v}NJPipCmr;p<$-r_bw7(--wN z9uMyh*ERGC#{*rvalCQ8gM*cS%%46c0G4?$#u|>f_fH*K2mJE=4E_f7+rj>-&$B;Q zW&eBG-?LN9U1q-fU3-B~V*A~@<_+B&&G+tf6nGRYx_i&O@p6?Rcq^7}w?vt?Fa2?A zaqt#H&=xG+WY(Ftt^cwA=~2}YQxY9jY!s~$V{vr!p`=_F-X9DIoS@f#r*f$-HE@Q0 za)(E+2!Y2Rhc92Yt{o6~;W8Y1?OU44r+(yGLum@1@-el=&^KGQrf_Ea8+L5ZG$bMKi#%}Fy*F*zH2^tM>RN5FT{{-OFStPA{MSf0~ z(uF}s?5hfZK04Ny(;rYP5ImiFGq{OL+G+x20{|+JI>&AG1GN$W=o;!FSC~Q_+4gLQ z1EyY&scQXiGUfVc)x$4J<5;;zV-<)+@ySYPF%L8d zBL@(H)rcj~;BYJj9v=b?>uF$M9gCH~1783O>wmEdmKDvsveb@ zp$I`_jWf}^OaYTrk3_3=tpjn$Z)F11u3L52xs+GlCNJk@7S7e~#=YF%iBYIDI)jVJ z&Emm%H5Zz)&l<~?CvjRRCar-1Qj5>-UY4;mHlR^|cQg$D9^&lfzOdy8=LToEsy10Z k!6O{tzoAIp&*E~(^b delta 1788 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 L1H?-F@r(Zi^hrna diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png index d2b969bf0ae2f9e84136d31f5490edfcd916f351..78cca87e816815d5f192e7582854cf1327eecdfd 100644 GIT binary patch delta 2051 zcmZ{kdpHvcAIE3as1UVW=aw=SX*0|uc8xcYa(NraOQboA<(5m@j!Q0?Ni&Y?vMKG9 zOQGZvC6Q~hHMw`0$TXrPq1QQ`_rLf2{`oxL-}8OGzvub>@#BMqyQ`gndISrEg{93w z6c$6UfWrwW3<8I=L0VWKkVHJr2F0QPb@Z@SIBN_Xi`noX|DUHE2>)M>)j#EY-N^a- zmi0e*EH>fj-Riy&06-q&gvYqY4A1&d&VfC^k7~@esTpG)`>E_!xy{zs`k@cId<(AX z246|C0y`em$N*x=d*SN{t04-a*2MYt*^Xsqyb0dzz<8E?!U+BI#_$^>!8RWwHSYpQiQ~H$X_<&_5-5 ze^Atx2T%2g?-xMv;#)ZdDV+*WGww|qBXjZ}zRz+uYSA2uQ2l146D@k~Q;sSLSu|n< z6$h7fy|_m&9<8lW$kHEW)Yd7qc*zcHy4;5hnlMFT%BP&JwyYz`l_2^BKutn+ks7fQ zbQsV#XzDsSF5eaRVlaEub!INYZdz(%xU%o{U5#N)WyVWWTV)Nkw&(*Ou^Lbi4cyT# z5(i%=)Xd5q&`UK1$Q;pv?tovXsMpb(W6OWD@iBLL*XbC>2vGtWT`Z%5N)$09+iJaK zYsuFZrTEPZ&`Pk_gf3SCy!mi|DhFEF@jHrZ{v{R*OW-w^5d>K^wt+fv;k3n=f#5^E zPDSXxMW;ElYZqZH@?=E17>)ngkt%olzpm_hk-F1U?nsOz3SbY=lNYscLLj~Y26Yw6 z%dTmjznW0ViDi&wf#D?t)jct=`X0mQ5^bj5nb#9VSDnf2hJ>W6`df&q97;&16nDAS z+BBZ7?(n=n#$Gy_F#lQx&E&NQRL;N3fOrI&eUS1W?hfy=!*Da{5N ztoXC*L~cLw08pK8-sGlMm)+}N=<4bj&ts2a9IoNb(jw$DkHE}(%$!d5A%#`G;9NN| z--<(z)Tyh$@p{x-js1YtUQw3F%=h!8*Ob?x%I{ium<8v}99zdF)_)Qz3ih&QGmaC> zWwc(}ak_R+i)DXqX;0gwyAy(-$sDa|5M`k@rc%<_No`x$HDByHMokz2TA8M@qdK)8 zDEh4x_Yv#*G&YSXIUMBs_5-udvJajwM$kjr8Hyh{pT5M$LvZz4genKesd=eeJZwOH zj|)DXbWeQ$Nmb9Y`oH%PtwpU_1C@Vy?gg`zEH(u-3uL6Gey2HRg$uYP76 zJ#IBgQXEmCf=EEMw!4nndH3n5k^?Da96fygGr&aSD8T|+BAm;umAfrHT@R};7Ksb9 z(=SX5GVY`VKpUQszFn$gS{W@|mlwPfY8xh*d={f&VQa)5e4&0^SX`3Y0~XJ1(7|d< z-fmXYw?HA^JgRsLG?L}ov2ML0VN)3X_k!%N)K9EgUf}PTKY+5oPglO$oNcYpVe_G^ zqllI~2N=#i#t0T7JE6@j#4$OoGe+Tb{)8kIA!Jjt7B#Yd6gO$J84YG5;1EaCfYrTu zQBuq6qEh=RbCrrW9(t}9M}IeC#WV#jzAB04ok*Eg@^&5BAO1{rYzCj+QG7z- z?cv8JZn@p(4Lg2>(aHLDJK?KeuYtD-XgB+6u(gk-Q5fB=`MUR=$Mz#rN625e|)K z#2-uDH1|-pe5>&#eok@1U2M|x3*1iZ1#CpQq;7kFUU*=W_6SD2W-kfbTQKcnRDebs zp7xfE(PLXxsgaYm?<7e_tQM}NO*r)-YyN%Psi`7~A^8fEqR6FO>$c>D|gMc=Tiw;`Lwl$3Ltn!X!zs#fmq?p#k(>@RU2nSe}Rj0O*#^?4K>;CA*p zZ|r2+TyKaF;-|&Wz%|X3?=m>G+!q&EXnfEQ{SO~?u#qvPI&UIhuGv=&*N@6JXYKn$>d0$4DOG%R?)dr= zB{_?yFR~3c_K~oT93GidON{d}jzg|R%xHQI3t<%Zopxv<{|uYS@TAJQf(KFv<9cTJ s?SehnT9rTfC-(f!zt)i_Ch2k@z`~b~*ptzp^#B{=L~y}ZV*L{T3rk_cO#lD@ delta 1880 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 diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png deleted file mode 100644 index 796026f592816f4b7081c16a55b2cbb9411a7626..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3110 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 i&j!YDxbwM}h8Bd8E_1mxPGhM5{{kt& 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