From 81643ba83a0a2c2363d2376195279e1a5162f497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?= <8702040+cai-ling@user.noreply.gitee.com> Date: Mon, 23 Sep 2024 17:09:16 +0800 Subject: [PATCH] =?UTF-8?q?add=E5=91=BC=E5=8F=AB=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.styl | 8 +- pages.json | 8 ++ pages/home/home.vue | 11 ++- pages/manage/call-mater.vue | 164 ++++++++++++++++++++++++++++++++ pages/manage/modify-process.vue | 4 +- static/image/menu/RF04.png | Bin 2595 -> 3065 bytes static/image/menu/RF09.png | Bin 0 -> 3147 bytes utils/getData2.js | 13 +++ utils/mork2.js | 10 ++ 9 files changed, 211 insertions(+), 7 deletions(-) create mode 100644 pages/manage/call-mater.vue create mode 100644 static/image/menu/RF09.png diff --git a/common/style/layout.styl b/common/style/layout.styl index 35fdbfe..a0ce9a2 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -33,6 +33,12 @@ uni-button:after { margin-bottom: 20rpx; box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1); } +.pop_content { + width: 100%; + height: 100%; + overflow-y: auto; + padding: 20rpx 14rpx 140rpx 14rpx; +} .filter_wrapper { position relative left -14rpx @@ -274,7 +280,7 @@ uni-button:after { bottom: 0; left: 0; width: 100%; - z-index: 30; + z-index: 40; background-color: #fff; padding: 14rpx; box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7); diff --git a/pages.json b/pages.json index e672f21..4a7c1a5 100644 --- a/pages.json +++ b/pages.json @@ -82,6 +82,14 @@ } } + ,{ + "path" : "pages/manage/call-mater", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.vue b/pages/home/home.vue index f360ecb..7f20c79 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -33,13 +33,14 @@ userName: '', menuList: [ {title: '物料入库', icon: 'RF03', path: '/pages/manage/mater-in-storage'}, - {title: '笼框补仓', icon: 'RF01', path: '/pages/manage/empty-tray-back'}, + {title: '笼框补仓', icon: 'RF04', path: '/pages/manage/empty-tray-back'}, // {title: '外协区空料架送回', icon: 'RF05', path: '/pages/manage/empty-material-racks-back'}, // {title: '物料转运', icon: 'RF02', path: '/pages/manage/material-transfer'}, - {title: '区域锁定', icon: 'RF06', path: '/pages/manage/area-lock'}, - {title: '路线锁定', icon: 'RF08', path: '/pages/manage/route-lock'}, - {title: '呼叫空框', icon: 'RF04', path: '/pages/manage/fill-tray'}, - {title: '修改订单工序', icon: 'RF07', path: '/pages/manage/modify-process'} + {title: '区域锁定', icon: 'RF08', path: '/pages/manage/area-lock'}, + {title: '路线锁定', icon: 'RF06', path: '/pages/manage/route-lock'}, + {title: '呼叫空框', icon: 'RF01', path: '/pages/manage/fill-tray'}, + {title: '修改订单工序', icon: 'RF07', path: '/pages/manage/modify-process'}, + {title: '呼叫物料', icon: 'RF09', path: '/pages/manage/call-mater'} ], show: false, secM: [] diff --git a/pages/manage/call-mater.vue b/pages/manage/call-mater.vue new file mode 100644 index 0000000..4e6eda4 --- /dev/null +++ b/pages/manage/call-mater.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/pages/manage/modify-process.vue b/pages/manage/modify-process.vue index 2ef7164..c9dc730 100644 --- a/pages/manage/modify-process.vue +++ b/pages/manage/modify-process.vue @@ -87,7 +87,9 @@ }) }, async _fabOrders () { - let res = await fabOrders(this.val1) + let arr = [] + arr.push(this.val1) + let res = await fabOrders(arr) this.dataList = [...res] }, selectChange (val) { diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png index 5f06944058382416a6d8195261c0a69b12f1f47f..af989ff01a77693e8d7a7e6d54e67db8252b6eb4 100644 GIT binary patch delta 2284 zcmVF)=YWF+?yzK}9r^AOjVXZ2}t%MlmrlH!(ypLP13|lOO{X zlc@qP3`Q|AF*h+oMM6PEG?O3$6_fb_8w^GZU00?JE zL_t(|+U#8kY!p=(ep8lG1Vy=wpvWP3AP_t&7*Pne7*LGj85AMhASfV*2dIe`NGZr6 z#UrTTl^{n9hd~g5f{F^%prBO1D+mQ`5kuSc`#ay3W!;(G+0O3lmiH%LcKY6%**D+3 z_rL%D-@jAC@AoS$@t1!zO@Ss_6RkxPt%=q|Ytck&qP1wEHPM=AEt+Uev=&Wtl8UdY z7if^bK-DnJXI5rZ9N=$5l~)`a6?J8m$Nw)Eq${&rj%)DK$961hfzRPUACxyk`CgPQ z#yN9K4dZ~1=hR~R;On4XWvIY$8m{ZF?CYuDp(>Akybn3oU|)abvoxqYLz(?QSf^dJ z7|}NYOMpGV7@!%;TL6=Qy}-LbC#^c1OKo5PupL+n^tS1z%*eZejldT`Um#r*Z7=5o z&jI^^1wcE8=U)XZOq9`97$A3}=LuTo*EH>QrZc9=z0SuxgGm)w)RJz(c_>?8Od6=>_v+CJ&R(ujUfa=U0uNJVEC+6;KCkLM^#WD{JAuK#8QNhvxmfn3BT@hi ziNORr3mAVzvv3(_jP?v|fkpGtm7qa)Ir4v*N%eQ0yr$)B{P=Wup-Dycwpu(T)a z~S>#*r?%dVMl>Fx81J0_Iaa>`Q; z>O`lMB!XzMdD|qxy~@sc=*I2E)q!YnAVvVYfEPU^IFPa+j!*57Ite&QNOfSCx}+ys zMotc0;#nSzX31|EK$|*{vS1agx}27aI5iSdy&&0%?nYZyM$Twu26+-Kfvu`Q%0hbw z=hlA*#w#aPnL5`kP+O#NCZ4 zGmP8i$pHTX(;b0*GHSKRV3OEtVDe-K3AjO?;xABHI7H3TxMF`2-&35&~}{L z*`%`LG0LX?J7B0Xcb&&6`(&1IBB=t)xS)y^kQbz8qLpH*22o45D08>QY0AQGWp1rC zrApdk({?OXkE=wFwpdtJ09hnQ^jCk03kzF;I+-dkK8j#bz{&}vEbMln50ZwK%ZDZl z{2GgP!`&wOqA+EmuMPr##4vKAkz>4mQG|Af*e)Ki=W^bkT)#9-{bgi!S>{ znK9ryly#z_Q(O31j$}z_>=2>-HNZQxCd86x>_Q)E(xS-+w(!_z;r%AmVYz<+_>j~1 zu_#PFD_eLG_4^aD20J{z3GfV^l{bKnG4!D^A66kB-nGfws^ zYzFRCRgaO&HTx+ukx`tEJEOQ}M?Rc=d{|9VC8#7Gqa?2Eq{rARu0MgCrDN;&LA(7i3xl zf)(Q*@1fq%O}xDYI$j zOM)H2lIPJomRN{Um3RC%$j`%6H>T7ugd|5VuPQ?MR+MMiyu5!31XiRBOhwrdn{VGQ@~Ty+n}W}L&t6`2D0ARC>Q%|ubn@Ggb7-=KlM;?p z8L^Km>(s4)NUE7^3`iJO;@3_#X=OvgDpP6|XKprK^`vlEVkO*);0YwqiAbu}=okr) z8^Q7N41)>(EJ1$+yG8iwcn}9U- delta 1810 zcmYL~X*k=77RK#rYepv+ODoncqM0H{jD0Jms!dx<2}x>A)KXHU{%T6ALXsLXxF{_% zp;cSXF< zZfENV&xVLAWfR2I|AB~qAwvxI4>bK3ZvEeB_CI(Dc-!K!DQ;tBd1jhxJH!e^{^J03s z@jwWP^q<-27CSW``|uFIud48*1peE}ubMW*QS+gv6;*Hs3zjLjRAe)CpjuA%I!(&f zgflgP@!iFpxs+o62wlU1pFeyWe%8~r<2x*;nr=<+94D?s&0G3}yA3I)EA!VHXgThI z!X1d+G&VuUNRtvAkf2Bs@xnfl}yK+=tGhU5R z?VThs`bPKyR6K*heUta58139^0diU28>=j9-9P={siItAALELcU z>OF|9MQhMsl$+wA_A4ZZv%fD|9Rs~v4w;KeaUUeF){_fm5TcF2fWyJM$w}wIqBw)~ zq6fAY{F1>zUei{NR7R4`N6V#Z6dqUEmz^+pmrz)b%KS0*^=Z-Q^P+;~T{$*vccfI) zab0_Qikk=!H+R^*lh1=$PX2nyP}!UCC7R7^mSs#F= zm|Lc(;LRS3cSQkSP;njn4-vtfH!WWb>H&+oYxD6Mxmhg{sYO-1xQ% zjPRYf8A4xv(#B8yJ{nt3!u1($!`l~E+uzeIOw~*dDN3 zaAXxS3w1}U&8t)YC}pyh7PVM2Db}q`2+6B=-1$SjI$DZ?TvsA3wM56GruS4l&@Uc> zge?9kJt*92ilNb|u8M-86B{%~P}(PMH^__FuxgQ%46Pv(!CD)TxtJNaK18Po!b&L@ z*Uo(ANXt2?h5p0WXn+=Kbdcn)%^Gp;%vc}T(566uhGdP&3!VZ`T*)xgsD$skUdz;Y zB)#RV9bHwZxcyTz8^jIY0&+>@t#c7qY=rO(1?shcn%ZMZO)_yZ=p@-KDMUBs$36A? zNuTYrNM(>{>(1S**^!RXq*Mm8FBd0!P;M@f9!4ZKI zD@M)vhybe__zKOAlMl*tWmed*I^MtDV7u8{bVk_DVA_H;UUdLKld9LRC56})@?$=4 zal!jH8ZbRK95&NE@?tq|%gCyOwzM2f@$InLM!mkInE%mGT`*34M_3;)1>%BZ1x-@750=t}TU`O_qW0ydmWlU$bfN^a(6#3pu3u5npZ$-@ z(HaOpSU(ZK>p+;!n=AFlxubd1oZn5wQrrfy1B^F8KeU^Dnav{Mqj6_Rt)^nP@plT( z#AgvCI0g%K4I{?}pgwQaGpLzx@2PHOLc{Q4@{0ftgaFo+J# zpOWk@_!ybIt4R3HFek`8Ce?+gi_#Cgu#uE=k27`JFMsMfu;CB#MdnqH6P_3W9^>S< zU{jCCc^GsK#gKBh&n*ni1-Xn6yE@*}e|T6!5_^}hUVa)LvaMD*YRa;5S`5Gp^XqR} z8pKO+``#j-z3*PFbmhcsw(8c;SVcA9CiImX)mgo+sk}zQo+|t0A=CI8i$N{bYZ0#7 zy&o~b{)cRcS1p+s6_bkdhe-f8g3$5YvDC5Tn}RfyddY2dO2{6sQuew|hF^@v(_-o! z+U1|~b7T`M*$s1ZuHD#IOUM&u?qiQ?d$v7sH9Jig9qTXyC;30Iqmj9f88G+@R)W3i zxWF8==Xbb-v&r9_QIMQBFov}?Nx8M%Xtu-2v+kVY^_>fHZLabGWRQ=Y%l6YgZRo$c rpZ4~1{a-XZWd8xghK5|614N}nma;*;eei-Qk^ORUJnK+p7m)Hdgr0U# diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png new file mode 100644 index 0000000000000000000000000000000000000000..b48d6dac9a00f4bbec577d5cfc558a3e8b474257 GIT binary patch literal 3147 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 literal 0 HcmV?d00001 diff --git a/utils/getData2.js b/utils/getData2.js index 73b39e3..63b1f0e 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -78,3 +78,16 @@ export const updateRouteStatus = (type, status) => request({ url:'api/handheld/updateRouteStatus', data: {type: type, status: status} }) +// 呼叫物料 +export const selectOrderByRegion = (code, code1) => request({ + url:'api/fab/selectOrderByRegion?regionCode=' + code + '&deviceCode=' + code1, + method: 'GET' +}) +export const fabMaterial = (code) => request({ + url:'api/fab/material', + data: {vehicle_code: code} +}) +export const callMater = (mater, code, vcode) => request({ + url:'api/fab/callMater', + data: {mater: mater, device_code: code, vehicle_code: vcode} +}) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index 27b9eef..8af7d96 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -25,4 +25,14 @@ export const updateRouteStatus = (data) => { message: 'ok' } return res +} +export const selectOrderByRegion = (code, code1) => { + let res = { + content: [{ vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }] + } + return res +} +export const fabMaterial = (code, code1) => { + let res = [{ vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }, { vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }, { vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }, { vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }] + return res } \ No newline at end of file