From 284db2f151b4bf9e3ce8639f44778f5be296cfb6 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Wed, 26 Feb 2025 18:32:05 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E7=A9=BA=E6=9C=A8=E7=AE=B1=E5=87=BA?= =?UTF-8?q?=E5=BA=93=20117?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.styl | 1 + common/style/reset.css | 4 +- manifest.json | 4 +- pages.json | 8 ++ pages/SecondPhase/EmptyBoxOutStore.vue | 162 +++++++++++++++++++++++++ static/image/menu/RF11.png | Bin 1814 -> 1613 bytes static/image/menu/RF14.png | Bin 0 -> 1599 bytes utils/getData3.js | 17 ++- utils/mork2.js | 45 ++----- 9 files changed, 201 insertions(+), 40 deletions(-) create mode 100644 pages/SecondPhase/EmptyBoxOutStore.vue create mode 100644 static/image/menu/RF14.png diff --git a/common/style/layout.styl b/common/style/layout.styl index 2222e82..db7c483 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -511,6 +511,7 @@ uni-button[disabled]:not([type]) { font-weight: 700; color: #ff6a00; margin-top: 30rpx; + word-break: break-all; } .msg_modal { position: fixed; diff --git a/common/style/reset.css b/common/style/reset.css index 0fed431..39d2c45 100644 --- a/common/style/reset.css +++ b/common/style/reset.css @@ -131,8 +131,8 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re width: 4.16667% } .letter-30 { - letter-spacing: 30rpx; - text-indent: 30rpx; + /* letter-spacing: 30rpx; + text-indent: 30rpx; */ } .h-50 { height: 50% !important; diff --git a/manifest.json b/manifest.json index 3b86c0e..4c4d9d0 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "海亮铜箔", "appid" : "__UNI__3A002CD", "description" : "海亮铜箔二期手持系统", - "versionName" : "1.1.6", - "versionCode" : 116, + "versionName" : "1.1.7", + "versionCode" : 117, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 1d30b63..285549e 100644 --- a/pages.json +++ b/pages.json @@ -599,6 +599,14 @@ } } + ,{ + "path" : "pages/SecondPhase/EmptyBoxOutStore", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/SecondPhase/EmptyBoxOutStore.vue b/pages/SecondPhase/EmptyBoxOutStore.vue new file mode 100644 index 0000000..fb97f24 --- /dev/null +++ b/pages/SecondPhase/EmptyBoxOutStore.vue @@ -0,0 +1,162 @@ + + + \ No newline at end of file diff --git a/static/image/menu/RF11.png b/static/image/menu/RF11.png index 450da60d94f3a4f932d0cf2c25f581f68a4ee164..6417a79f0e56715159c4beb35362b8c1c2b30e6b 100644 GIT binary patch delta 888 zcmbQnca~>^50iqklYx=5tAUx5qpPu@p{s?Xk+X@ViLtSfiJObFrG?4l93~lu^aEj%DNaQu%ue;oj>gVpU|`zq>EaktaqG?9^WGwfGHf5d&y7_!R64~s zuj!Tji%IPo+WD0poeCWv1SGDiswln4axLj_aSb}N`Nqm-fyfYn5+0jwmZ}xbu1SU; zzwOz*`OLPfnX~6s-mBgB!@#~g{rllJ*6*!%Wy~#hn_BCtB(P;cXprlIeMizt<~$_ndWxF{MNFmhyYGU3RuEWt$x5yPTU`%2GAK z+ULUD6C#=Gvr}p;-=#M0Yn4%GUH4^@TKo~&)_3mn<%(msRSDMk*v+$O*`urTW%BHA z(rh~7Gh5exnab;Zd7)5=!gs3+Zr0v>4RP(7q3^4C`ek&_zw8MEN^M!dx)w-;);Ecj z7;o*0F_XN{l2!h~|Ab%)lVzh0x7F;b{u+;G<`aW;Zsc4zKEb>6w8@R0+%GK3X4&hT z`DX8|e!kH?a>LEv7r#%C=DDHB6Om_}&~9X;V^ikg{J|-C`=j!=-6vLy?OUGrB$@f! zEI(s*f3f=HaIZ~g#;b6REB$%mPXrcdPPn-+ zbHdDpD{E6SuOkTm|s1^3F#B3_pkZiRP#@seZwztzbq>j nP>?~w4VrvF2`BIUFVzDKf*%@Q=tArp{s?Zv8jcHsjHcjp@ox?nUlrj93~lq%ue7?@i;T^vIyZoQe~?GX|vbL_mNyyLnivuBIm zIOZOkBhnn^nAFYXb$Ol(OJby-lhPF<$E6A_CvJU-k__Y0Rf^hjQjX1XiiZ?Q+?ET<>QmuyJjUZyPgZYtILZv>U&%rXm;xJ_I1BGt)6`DwPBp!THN|? z#WYRcbIs9nl~b1d44*KoCzkGPO z>YVqAtX?Yk$g8GH zi@P6g5VTg7EC0Vq;0yPUK0)omMNd~ZGwixn@t<>FR-xWS1L3{5qAyI`@am+h+m^_Z zqx+&~Z```Y-sNIuOS#4IQ{uPpEIzxjQXr4hq3zBDrHL!I3YVzt;kbR*ZHuc-Z!IUo zi``Xw{H`%BUzW76_w$Rz1;^~)io1R~UVoM+J%jf+#Zn>8p%--^w zo`{sr-052WeKD8D#)@~`vvWTE3V&E|*Y zIjfSSt{hlqRQh{CzpT=WkLePkA5Ld(xybuo@x{ha-us^y%;mF47zTYkO0?W+8{ce@qj16z?=DLrrj?4x@Np1%J_A+dH7WQcdZ#+PD^kDxCr6(H>lfy{p&57B+CH z8bRi|OgB;R2PIQy5EdLdKJ06s4N?!f}b>8 zg&~_&1*gUsBnF3uqHP=UI4UL2XtLyGTNGA!-C8K#jROKZ#gmZRzJqb%ZWTPni-U8( zjlj@Y2%oKjUle6FBtaUMqo5dZtjHood6c~!iFdd;$ z$gv45!CG?c6vIzotuL|Il-PhE><*Bbpg7wu%Btg7J2ZB2-1drE65?Xi3KW%0$v2L* zPF;&^N-P43K?39b&$uUCKtqA!q0E2@9QXNo$aAn|NW6owWr&eE$`JL{`_C14~_j#Yg_A~@^!G^j&>e7 z85-R;_>uccM_hZ|NZo@IWj}RkvRm_i>>aH>y`;9F`@2GUS$FYobtMZL$Z_VPQU~6Z&8w@c_N5KYRO;${;dqd5-a*73%$>0{FLI^8ml_ z=WDkdv1+dPnTUBCznbC`w)#eks#f15dz;YWM+*z$hxXq)dbhmdjr2NO)-w1~Du3J^ zDK2U<@7^QN92{;raQ(8kZDG?pJ7c1rd;1o+ig%${dQRGcUwr;^{qDUqTC>7OR(x4w zZ=TcmHD*_TT9d w3 request({ left_spec: lk, right_spec: rk } -}) \ No newline at end of file +}) +/** + * 空木箱出库（二期空木箱出库） + */ +export const twoQueryBoxIvt = (no) => request({ + url:'api/twoPda/st/queryBoxIvt', + data: { + box_no: no + } +}) +export const twoBoxOut = (data) => request({ + url:'api/twoPda/st/boxOut', + data: { + data: data + } +}) diff --git a/utils/mork2.js b/utils/mork2.js index 42d4a3b..42d1262 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -113,47 +113,15 @@ export const allAuthority = () => { ]}, {menu_id: '8', path: 'RF13', title: '立库库存', sonTree: [ {menu_id: '1', title: '空木箱库存', path: '/pages/SecondPhase/lvt/EmptyBox'} + ]}, + {menu_id: '9', path: 'RF14', title: '空木箱出库', sonTree: [ + {menu_id: '1', title: '空木箱出库', path: '/pages/SecondPhase/EmptyBoxOutStore'} ]} ] } }} return res } -export const authority = () => { - let res = { - code: '1', - result: { - rf_menu0: { - sonTree: [ - {title: '生产管理',sonTree: [{title: '生箔生产进度'},{title: '生箔工序'},{title: '烘烤工序'},{title: '人工烘烤'}]}, - {title: '半成品管理',sonTree: [{title: '半成品入库'},{title: '半成品出库'}]}, - {title: '分切管理',sonTree: [{title: '分切上料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'}]}, - {title: '点位管理',sonTree: [{title: '点位管理'},{title: '异常出库解锁'}]}, - {title: '纸管/FRP管管理', sonTree: [{title: '空管入库'},{title: '空管出库'}]}, - {title: '成品管理',sonTree: [{title: '生产入库'},{title: '退货入库'},{title: '报废入库'},{title: '拆分入库'},{title: '生产区发货'},{title: '虚拟区发货'},{title: '贴标捆扎'}]}, - {title: '在库管理', sonTree: [{title: '盘点管理'}]}, - {title: '载具管理', sonTree: [{title: '空载具入库'},{title: '空载具出库'}]}, - {title: '打印管理', sonTree: [{title: '客户标签打印'}]}, - {title: '调度管理', sonTree: [{title: '任务管理'},{title: 'RGV状态查询'}]} - ] - }, - rf_menu1: { - sonTree: [ - {title: '载具入库',sonTree: [{title: '空载具入库'}]}, - {title: '空木箱入库',sonTree: [{title: '空木箱入库'}]}, - {title: '发货区',sonTree: [{title: '发货区解绑'}]}, - {title: '生产管理',sonTree: [{title: '生箔生产进度'},{title: '生箔工序'},{title: '烘烤工序'},{title: '表处工序'},{title: '人工烘烤'},{title: '子卷质检'}, {title: '子卷装箱'}, {title: '标签打印'}]}, - {title: '分切管理', sonTree: [{title: '分切上料'},{title: '分切下料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'},{title: '穿拔轴初始化'},{title: '纸管绑定'},{title: '分切暂存下料'},{title: '分切暂存清除'},{title: '气胀轴库维护'}, {title: '分切子卷维护'}, {title: '备货区管理'}, {title: 'AGV放行'}, {title: '子卷重量维护'}, {title: '分切上轴'}]}, - {title: '点位管理', sonTree: [{title: '点位管理'},{title: '异常出库解锁'},{title: '人工放行'}]}, - {title: '成品入库', sonTree: [{title: '退货口入库'},{title: '异常口入库'},{title: '木箱称重'}]}, - {title: '立库库存', sonTree: [{title: '空木箱库存'}]} - ] - } - } - } - return res -} - export const twoPdaIvtQuery = (no, code) => { let res = { data: [{bill_code: '1', bill_status: 'ljdjldj'}, {bill_code: '2'}, {bill_code: '3', bill_status: 'ljdjldj'}, {bill_code: '4'}, {bill_code: '5', bill_status: 'ljdjldj'}, {bill_code: '6'}, {bill_code: '7', bill_status: 'ljdjldj'}, {bill_code: '8'}, {bill_code: '9', bill_status: 'ljdjldj'}, {bill_code: '12', confirm_time: '2020-10-20'}] @@ -287,4 +255,11 @@ export const paperQueryPaperMaterial = () => { }] } return res +} +export const twoQueryBoxIvt = (code) => { + let res = { + msg: 'ok', + data: [{box_no: '100010000a' + code}] + } + return res } \ No newline at end of file