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 2dc2b44..2d26dd1 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 0000000..2fb5b43 Binary files /dev/null and b/static/index/requestform/back.png differ diff --git a/static/index/requestform/chongzhi.png b/static/index/requestform/chongzhi.png new file mode 100644 index 0000000..ef0571f Binary files /dev/null and b/static/index/requestform/chongzhi.png differ diff --git a/static/index/requestform/shaixuan.png b/static/index/requestform/shaixuan.png new file mode 100644 index 0000000..1946528 Binary files /dev/null and b/static/index/requestform/shaixuan.png differ diff --git a/static/index/requestform/touxiang.png b/static/index/requestform/touxiang.png new file mode 100644 index 0000000..81a0f6a Binary files /dev/null and b/static/index/requestform/touxiang.png differ diff --git a/unpackage/dist/build/app-plus/manifest.json b/unpackage/dist/build/app-plus/manifest.json index c02933e..c4470ce 100644 --- a/unpackage/dist/build/app-plus/manifest.json +++ b/unpackage/dist/build/app-plus/manifest.json @@ -7,8 +7,8 @@ "id": "__UNI__FB2D473", "name": "护理单元", "version": { - "name": "1.0.009", - "code": 10009 + "name": "1.0.011", + "code": 10011 }, "description": "护理单元", "developer": { diff --git a/unpackage/resources/__UNI__FB2D473/www/manifest.json b/unpackage/resources/__UNI__FB2D473/www/manifest.json index 54df83e..6bbe8f5 100644 --- a/unpackage/resources/__UNI__FB2D473/www/manifest.json +++ b/unpackage/resources/__UNI__FB2D473/www/manifest.json @@ -1 +1 @@ -{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.009","code":10009},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"} \ No newline at end of file +{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.011","code":10011},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"} \ No newline at end of file