From a63ad9135540afc9b0c066ed555e554e0ef3b528 Mon Sep 17 00:00:00 2001 From: Teng <461587751@qq.com> Date: Wed, 26 Nov 2025 13:26:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 +- pages.json | 24 -- pages/NursingNew/component/nurse/index.vue | 10 +- pages/NursingNew/component/requestform.vue | 287 ++++++++++++++++++ pages/NursingNew/index.vue | 33 +- pages/Warehouse/picking.vue | 17 +- static/index/requestform/back.png | Bin 0 -> 656 bytes static/index/requestform/chongzhi.png | Bin 0 -> 817 bytes static/index/requestform/shaixuan.png | Bin 0 -> 848 bytes static/index/requestform/touxiang.png | Bin 0 -> 1100 bytes unpackage/dist/build/app-plus/manifest.json | 4 +- .../__UNI__FB2D473/www/manifest.json | 2 +- 12 files changed, 311 insertions(+), 70 deletions(-) create mode 100644 pages/NursingNew/component/requestform.vue create mode 100644 static/index/requestform/back.png create mode 100644 static/index/requestform/chongzhi.png create mode 100644 static/index/requestform/shaixuan.png create mode 100644 static/index/requestform/touxiang.png diff --git a/manifest.json b/manifest.json index 475bc58..21bd300 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "护理单元", "appid" : "__UNI__FB2D473", "description" : "护理单元", - "versionName" : "1.0.009", - "versionCode" : 10009, + "versionName" : "1.0.011", + "versionCode" : 10011, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index f641412..8b5e7d5 100644 --- a/pages.json +++ b/pages.json @@ -105,20 +105,6 @@ "path": "pages/NursingNew/index", "style": { "navigationStyle": "custom", - "app-plus": { - // "subNVues": [{ - // "id": "monitorSub", - // "path": "pages/smallcarmera", - // "style": { - // "position": "absolute", - // "left": "230px", - // "top": "150px", - // "width": "680px", - // "height": "520px", - // "background": "transparent" - // } - // }] - } } }, @@ -204,16 +190,6 @@ { "path" : "pages/Warehouse/warehome" } - - // { - // "path": "pages/somethingmove/index", - // "style": { - // "navigationStyle": "custom" - // } - - // } - - ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue index 657aa49..030d505 100644 --- a/pages/NursingNew/component/nurse/index.vue +++ b/pages/NursingNew/component/nurse/index.vue @@ -2097,7 +2097,7 @@ directiveName: '' // 默认的 directiveName })) })) - console.log("wtf", res) + // console.log("wtf", res) res.result.serviceList.forEach((res : any) => { timearr.value[res.positioning].children[res.positioningLong] = res; }) @@ -2126,16 +2126,8 @@ } const savePackagelist = ref([]); onMounted(() => { - - // console.log("jiance一下",uni.getStorageSync('serverUrl')) - // uni.setStorageSync('serverUrl', `http://localhost:8091/nursing-unit_101`); - savePackagelist.value = uni.getStorageSync('Packagelist') || [] let res = uni.getStorageSync('saveTree') - - - console.log("saveTree", res) - let goodArray = [] myArray.forEach((element : any) => { element.children.forEach((element1 : any) => { diff --git a/pages/NursingNew/component/requestform.vue b/pages/NursingNew/component/requestform.vue new file mode 100644 index 0000000..fb26031 --- /dev/null +++ b/pages/NursingNew/component/requestform.vue @@ -0,0 +1,287 @@ + + + + + \ No newline at end of file diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue index d63187e..4151e83 100644 --- a/pages/NursingNew/index.vue +++ b/pages/NursingNew/index.vue @@ -57,26 +57,11 @@ + - - - - - - - - - - @@ -85,9 +70,10 @@ import type { Link } from "./index"; import index from "./component/index.vue" import equipment from "./component/equipment.vue" + import requestform from "./component/requestform.vue" import nurse from "./component/nurse/index.vue" import { onShow } from '@dcloudio/uni-app'; - import { getServiceTree,getNcPackagelist } from './component/nurse/api.js' + import { getServiceTree, getNcPackagelist } from './component/nurse/api.js' onMounted(() => { menuIndex.value = -1; @@ -191,6 +177,7 @@ const menuIndex = ref(-1); const menuIndexshow = ref(false); const menuIndexshowsecond = ref(false); + const menuIndexshowfourth = ref(false); const menuIndexshowfifth = ref(false); // 暗黑模式 const darkFans = ref(false); @@ -226,6 +213,7 @@ menuIndex.value = index; menuIndexshow.value = false menuIndexshowsecond.value = false + menuIndexshowfourth.value = false; menuIndexshowfifth.value = false setTimeout(() => { switch (index) { @@ -234,7 +222,8 @@ break; case 1: menuIndexshowsecond.value = true - + case 3: + menuIndexshowfourth.value = true break; case 4: menuIndexshowfifth.value = true; @@ -251,6 +240,7 @@ menuIndex.value = index; menuIndexshow.value = false menuIndexshowsecond.value = false + menuIndexshowfourth.value = false; menuIndexshowfifth.value = false if (index === 5) { uni.navigateBack() @@ -264,6 +254,9 @@ case 1: menuIndexshowsecond.value = true + break; + case 3: + menuIndexshowfourth.value = true break; case 4: menuIndexshowfifth.value = true; @@ -608,7 +601,7 @@ height: 100%; // background-color: blue; - + .left-head { display: flex; @@ -640,7 +633,7 @@ } } - + } .title-time-border-yellow { diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index ce035e0..747a7be 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -543,16 +543,11 @@ style="border-top-left-radius: 20rpx;border-bottom-left-radius: 20rpx;"> - - + - + 采购 @@ -567,9 +562,7 @@ - - + @@ -687,7 +680,7 @@ {{v.status_dictText}} @@ -1433,7 +1426,7 @@ const lefttarget = ref(0); const clickLeftMenu = (index : any,item:any) => { let num = Math.ceil((index + 1)) - leftscrolltop.value = (num - 2) * 186; + leftscrolltop.value = (num - 2) * 180; lefttarget.value = index; form.cgdId = plsbuy.value[index].id form.pageNo = 1 diff --git a/static/index/requestform/back.png b/static/index/requestform/back.png new file mode 100644 index 0000000000000000000000000000000000000000..2fb5b43b10f08a3eb31cd057c585fa03775ca34d GIT binary patch literal 656 zcmV;B0&o3^P)Px%N=ZaPR9HvtmOp3|K^Vo~H+u(4qGBNyVk0QR6@rzO7U@N9=Vk+XWk5`nD}s^; zdLRKoBZ}BtSlsLkDJ&EO8!P`*f`#B8`~wlSu@Mi+?ei8)6V2@|d*&Lq-EY3%n>XLS z9l;1686g}0;UjUsuUDAIgB!wYhd~j5$Ga4!|d+RLffXqAWNU+!%9=MF)~3NzZ+A-|~exj_(x( z=c!*e;i4!ym?TL$Y}*0MJLm4^X;`FYV7zLrC;9_-r4RopB4^_`epIA+R&8dsHyVwj z{qwpAp!+-5pJg@8`#uw%Hqu%j7m;}YAC*$m*4j6D0fXvt!P5rDn3E)10A2<`&?@u+`L~DInM2_@&y~(AerT1m*&u#lEq|s<>Q%dc#)|MW; q!tgRX&6RM&1Po=`|AnBD+WreDNXQ`XQQ2((0000Px%>q$gGR7gwhmd{I7K@`Wo=lPPrq>YQ97E#bbih>}5qO7DKQbJ}%s9Z=tsf9rj zRzjdDgasv0P!JIn-FxPhyOih_t-xCkPsh5ZGUO0V$UlOtC#?Y(=SMsA$ly?oF4 z%sDgjogvK9pjqN#4xG31TIa0^n|+WRAJ7?%^Qlr zzlWK5US!2u>rVid1L$DplZ8T+Qb&pC3NY>ygUsws!1$O_u`y=DNR_Vvd}ro`g+iU) z7}MxF1z;tB#qM8ZtCdpMi0BA_%glUyI^eOGii(P4Sy|ae0Oi)&t9dKdTDxjp)myB! zFJ=NR=p1XU#RVi1iB+EGz5j1urBrhwkw|7TnTzRkdSIsDnwpv=$z-zL_x;w$T|HCS z#CT&&m58JxH`l*}hGtSvL^mVB#+V%d))7&U=XvjDIuWh)GXUG-fZM~H$T2?y=qI8_ zzVCMyI*Gcvx{^#LGZ^a}PqI1}Gaw>|thM(G1sh}BO?F_U;#bVPDayHyiHNhi(IF!H zthINi0o^Sk55uEb?s?vaC&rc4V z;?+v2!$c&^e0@TzT;;7pLql!d-Q7QP(W|SgON)z(n~3OisL5%&kuMOf^*I1%!bBMn zxkW_1MAR=L?nP1(1i?}OYl&#TGrdsTJaQGb<(gz9*aeOp31{@~&9!qGbxk~c00000NkvXXu0mjfz{Ym) literal 0 HcmV?d00001 diff --git a/static/index/requestform/shaixuan.png b/static/index/requestform/shaixuan.png new file mode 100644 index 0000000000000000000000000000000000000000..194652846bed0d8780ed193adb6de487f6870641 GIT binary patch literal 848 zcmV-W1F!svP)Px&3Q0skR7gwhm0yTVaTLeD=Xb}p?1NpFC&>fawG=5yQXZtmGP85fZI%Z`Njy;= zBpQW0_){Jh>qS!5J$H%~p(r5{kqjO@Y@`$^<%yX&=BGQ`?6y1Zwf;PCU#8~wJLmKJ z{?7NDAK@>3^q08!5B_5}KXBE|d=J1v00jVvQJ$a(fQaan@B5pF%T*2D2VhsY={gZT zSJlaJ4xp+Zh^Q67vM_F^h#ag5wu`Ro9wDM_04|Bh>NwEKUS{qC&_P7qzVB}xDaRmJ zGqVFg0HlaWeBbxtz&+19tE%e&oEMQyt=M7PiJ7kgSgxu^gCN)*1Y~X$pQdVMC5H%{a*mMEF!Cz z*|yNd5Io!kTosY_%0eu#<2X}$dwZ=)F!QYPPrd@S|0R>j#io+Tr&6hjiA3T65!u!olvhpwIn(BIbdcKC{YBR<>t1_2$^BiN$m_ng2P~$`*Vb#}_N~L}gc^4Oa3&0XP zw^j9YE|<%9b#*lt3WfJkABCYe5vj(W=Xt8SAHekQPx(21!IgR9Hu~S50VRRTTbCekM(6`V-sIyd*D;Y1PHxEXKtM%D8q$1zjj2C_2n` zVAO>oqA;Lf6~ToFt}4ZqE}WH!f+D(b9NkoLrqfJvUtTg6Y}1;={M}=3Itfjamv>V- zXOXPe}bM8I&-AmB4wY9=*AkchFN_qsqaUz%iCID0c+5-3*GyekM8`CttBci4b zHMu!uGWN;cAg>YOaR7cd|Gjat0sgpNANeSi3Ks`q90jD)=}E75gzkyS<3; zH-L-rxUu4d?@O$*_IU6GGZKdhd=SHo6)CIdlF8(M2giB@2$4T6C0`~&=qQ5kxkpG=)R7}BWLz6(2jt;IS*U~kh~L-_i?^sn#Swx_l^J| z>`$0+{tgFM^r}5inWk~2)i3Ht2ys8N_cs6@9RZC-13NoAsMl-o`TPilLh$=FJ9IC= zkEUrn+!2t?=06Ac8J*z8ViC7)6?$A}W@a!o71p6>`u5CUj;kJ(*|Es0{#MUkDCA~CCcS;tIgDNvABhLz24f0CMG7JIzUxuWF**n z*0h&Nh}>mnIy(qZDwUAW+pWNA$5W*a27?_)wOU1?kcawLn`WTINwX3c|*dH?E!eLl7F=Z+Fq51i!I{dV(O8_%_g(!Rpu)2gCwKV~L z(ln#0${p)jS*xq7$3mg-GQdwCp@ND!aUBfaQ-O9s)tZ)7c!ilS0nq)nI_dq>Q4AxwOU$QTwGLpbYIhIZp*SxNa;NX@KXRH1H`C# zzCwhRS}nNjb}@CFf%S(GNp-%^w*LXLp_F5% SuS-J!0000