推送

pages/NursingNew/component/index.vue

@@ -471,7 +471,6 @@
 	}
 	const getmenu = () => {
 		queryPadPageList().then((res => {
-			console.log(res.result)
 			leftMenuArray.value = res.result.records;
 			filteredMenu(0).forEach((element : any, index : number) => {
 				if (element.nuId === uni.getStorageSync('NUall').nuId) {
@@ -490,7 +489,7 @@
 		}
 		queryWorkCareList(data).then((res : any) => {
 			// console.log("看看图",res.result.records[0])
-			indexmessage.value = res.result.records[0]
+			indexmessage.value = res.result.records[0]; 
 			// console.log("看看图",'https://www.focusnu.com/media/upFiles/'+indexmessage.value.previewFile)
 		})
 	}

pages/NursingNew/index.vue

@@ -53,7 +53,6 @@
 			uni.setStorageSync("Packagelist", res.result)
 		})
 		getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{
-			console.log(res.result)
 			listarr.value = res.result;
 		})
 	})
@@ -128,33 +127,36 @@
 		// 
 	 
 	}
-	const arrlist = ref([])
+	const arrlist = ref([
+		{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png' ,type:'hldy'}
+	])
 	const swip = ()=>{
 		let nuName = uni.getStorageSync('nuName')
 		queryPadPageList({'pageNo':-1,'nuName':nuName}).then((res => {
+			console.log(res.result.records)
 			let arr = res.result.records[0].permissionList;
-			console.log(arr)
+			arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png' ,type:'hldy'}];
-			arrlist.value = [];
 			let tbr = [];
-			arr.forEach((v,i)=>{
+			if(arr){
-				let obj = listarr.value.find(item=>
+				arr.forEach((v,i)=>{
-					item.menuCode == v.menuCode
+					let obj = listarr.value.find(item=>
-				);
+						item.menuCode == v.menuCode
-				if(obj){
+					);
-					tbr.push(v)
+					if(obj){
-				}
+						tbr.push(v);
-			})
+					}
-			tbr.forEach(item=>{
+				})
-				let obj = tabbrarr.value.find(r=>
+				tbr.forEach(item=>{
-					r.type == item.menuCode
+					let obj = tabbrarr.value.find(r=>
-				);
+						r.type == item.menuCode
-				if(obj){
+					);
-					arrlist.value.push(obj);
+					if(obj){
-					console.log(arrlist.value)
+						arrlist.value.push(obj);
-				}
+						console.log(arrlist.value)
-			})
+					}
-			let sy = { name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png' ,type:'hldy'}
+				}) 
-			arrlist.value.unshift(sy);
+			}
+			
 			let back =[
 				{ name: '物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png' ,type:'wl'},
 				{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png' ,type:'back'}

pages/Warehouse/finish.vue

@@ -1325,6 +1325,14 @@
 			}
 		}
 	)
+	onMounted(()=>{
+		firstgetqueryCgdList();
+		getSelectList();
+		transition.value = false;
+		setTimeout(() => {
+			transition.value = true;
+		}, 50)
+	})
 	const transition = ref(false)
 	const opencgr = ref(false);
 	const opengys = ref(false);

pages/Warehouse/index/component/index.vue

@@ -224,15 +224,15 @@
 	const openleft = ref(false)
 
 	const menutarget = ref(0)
-
+	const emit = defineEmits(['swip'])
 	const clickmenu = (index : number) => {
 		menutarget.value = index
 		let data = filteredMenu(2)[index]
-		console.log("!!!!", data)
 		uni.setStorageSync('nuId', data.nuId);
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
 		uni.setStorageSync('NUall', data);
+		emit('swip')
 	}
 	const tagarray = ["市医保", "半失能", "正常计费"]
 
@@ -372,6 +372,10 @@
 		setInterval(updateTime, 1000);
 		photoplay.value = true;
 		getmenu()
+		transition.value = false;
+		setTimeout(() => {
+			transition.value = true;
+		}, 50)
 	})
 	const filteredMenu = (index : number) => {
 		return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
@@ -381,7 +385,8 @@
 			leftMenuArray.value = res.result.records;
 			filteredMenu(2).forEach((element : any, index : number) => {
 				if (element.nuId === uni.getStorageSync('NUall').nuId) {
-					menutarget.value = index
+					menutarget.value = index;
+					clickmenu(index)
 				}
 			})
 		}))

pages/Warehouse/index/index.vue

@@ -2,16 +2,16 @@
 	<view>
 		<view class="flex">
 			<view class="left">
-				<leftcontent :list="tabbrarr" @navurl="navurl"></leftcontent>
+				<leftcontent :list="arrlist" @navurl="navurl"></leftcontent>
 			</view>
 			<view class="boxrt">
-				<index     :isShow="menuop==0" v-if="!ckindex" />
+				<index     :isShow="menuop == 0" v-if="menuop == 0" @swip="swip"/>
-				<material  :isShow="menuop == 1" v-if="ckindex == 1"></material>
+				<material  :isShow="menuop == 1" v-if="menuop == 1"></material>
-				<picking   :isShow="menuop == 2" v-if="ckindex == 2"></picking>
+				<picking   :isShow="menuop == 2" v-if="menuop == 2"></picking>
-				<finish    :isShow="menuop == 3" v-if="ckindex == 3"></finish>
+				<finish    :isShow="menuop == 3" v-if="menuop == 3"></finish>
-				<outbound  :isShow="menuop == 4" v-if="ckindex == 4"></outbound>
+				<outbound  :isShow="menuop == 4" v-if="menuop == 4"></outbound>
-				<retstock  :isShow="menuop == 5" v-if="ckindex == 5"></retstock>
+				<retstock  :isShow="menuop == 5" v-if="menuop == 5"></retstock>
-				<inventory :isShow="menuop == 6" v-if="ckindex == 6"></inventory>
+				<inventory :isShow="menuop == 6" v-if="menuop == 6"></inventory>
 			</view>
 		</view>
 	</view>
@@ -20,6 +20,7 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue';
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
+	import { queryPadPageList ,getPermissionList} from '@/pages/watch/api/lunpan.js'
 	import leftcontent from "@/pages/NursingNew/component/leftcontent/leftcontent.vue"
 	import material from "@/pages/procurement/material.vue";
 	import index from "./component/index.vue"
@@ -32,38 +33,94 @@
 	import retstock from "@/pages/procurement/retstock.vue";
 
 	const tabbrarr = ref([
-		{ name: '首页', url: '/static/shouye/ck/h0.png', urls: '/static/shouye/ck/h1.png' },
+		{ name: '采购', url: '/static/shouye/ck/c0.png', urls: '/static/shouye/ck/c1.png'  ,type:'kf_cg'},
-		{ name: '采购', url: '/static/shouye/ck/c0.png', urls: '/static/shouye/ck/c1.png' },
+		{ name: '拣货', url: '/static/shouye/ck/j0.png', urls: '/static/shouye/ck/j1.png'  ,type:'kf_jh'},
-		{ name: '拣货', url: '/static/shouye/ck/j0.png', urls: '/static/shouye/ck/j1.png' },
+		{ name: '完结', url: '/static/shouye/ck/w0.png', urls: '/static/shouye/ck/w1.png'  ,type:'kf_wj'},
-		{ name: '完结', url: '/static/shouye/ck/w0.png', urls: '/static/shouye/ck/w1.png' },
+		{ name: '请领', url: '/static/shouye/ck/q0.png', urls: '/static/shouye/ck/q1.png'  ,type:'kf_ql'},
-		{ name: '请领', url: '/static/shouye/ck/q0.png', urls: '/static/shouye/ck/q1.png' },
+		{ name: '退货', url: '/static/shouye/ck/t0.png', urls: '/static/shouye/ck/t1.png'  ,type:'kf_th'},
-		{ name: '退货', url: '/static/shouye/ck/t0.png', urls: '/static/shouye/ck/t1.png' },
+		{ name: '盘点', url: '/static/shouye/ck/p0.png', urls: '/static/shouye/ck/p1.png'  ,type:'kf_pd'},
-		{ name: '盘点', url: '/static/shouye/ck/p0.png', urls: '/static/shouye/ck/p1.png' },
-		{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png' },
 	])
-
+	const menuop = ref(0)
-	const menuop = ref(-1)
 	// onMounted(() => {
 	// 	// 处理响应式
 	// 	navurl(0)
 	// })
-	onShow(()=>{
+	// onShow(()=>{
-		navurl(ckindex.value)
+	// 	navurl(0,arrlist[0])
-	})
+	// })
-	const ckindex = ref(0)
+	const navurl = (e : number,v:any) => {
-	const navurl = (e : number) => {
 		// 最后一个直接返回
-		if (e === tabbrarr.value.length - 1) {
+		console.log(v)
-			uni.navigateBack()
-			return
-		}
-		ckindex.value = e;
-		// 这个是为了触发渐变动画
 		menuop.value = -1
-		setTimeout(() => {
+		setTimeout(()=>{
-			menuop.value = e
+			switch (v.type){
-		}, 50)
+				case 'sy':
-
+				menuop.value = 0
+					break;
+				case 'kf_cg':
+				menuop.value = 1
+					break;
+				case 'kf_jh':
+				menuop.value = 2
+					break;
+				case 'kf_wj':
+				menuop.value = 3
+					break;
+				case 'kf_ql':
+				menuop.value = 4
+					break;
+				case 'kf_th':
+				menuop.value = 5
+					break;
+				case 'kf_pd':
+				menuop.value = 6
+					break;
+				case 'back':
+				uni.navigateBack()
+					break;
+				
+				default:
+					break;
+			}
+		},10)
+	}
+	const arrlist = ref([
+		{ name: '首页', url: '/static/shouye/ck/h0.png', urls: '/static/shouye/ck/h1.png' ,type:'sy'}
+	])
+	const listarr = ref([])
+	const swip = ()=>{
+		getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{
+			listarr.value = res.result;
+		})
+		let nuName = uni.getStorageSync('nuName')
+		queryPadPageList({'pageNo':-1,'nuName':nuName}).then((res => {
+			let arr = res.result.records[0].permissionList;
+			arrlist.value = [{ name: '首页', url: '/static/shouye/ck/h0.png', urls: '/static/shouye/ck/h1.png' ,type:'sy'}];
+			let tbr = [];
+			if(arr){
+				arr.forEach((v,i)=>{
+					let obj = listarr.value.find(item=>
+						item.menuCode == v.menuCode
+					);
+					if(obj){
+						tbr.push(v)
+					}
+				})
+				tbr.forEach(item=>{
+					let obj = tabbrarr.value.find(r=>
+						r.type == item.menuCode
+					);
+					if(obj){
+						arrlist.value.push(obj);
+					}
+				}) 
+			}
+			
+			let back =[
+				{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png'  ,type:'back'},
+			]
+			arrlist.value.push(...back);
+		}))
 	}
 </script>
 

pages/Warehouse/picking.vue

@@ -1075,6 +1075,14 @@
 			}
 		}
 	)
+	onMounted(()=>{
+		firstgetqueryCgdList();
+		getSelectList();
+		transition.value = false;
+		setTimeout(() => {
+			transition.value = true;
+		}, 50)
+	})
 	const transition = ref(false)
 	const open = ref(0);
 	const typechange = ref(0);

pages/procurement/inventory.vue

@@ -275,12 +275,19 @@
 		},
 	});
 	const transition = ref(false);
+	onMounted(() => {
+		 chongzhi()
+		 getSelectList();
+		transition.value = false;
+		setTimeout(() => {
+			transition.value = true;
+		}, 50)
+	})
 	watch(
 		() => props.isShow,
 		(newVal, oldVal) => {
 			if (!oldVal && newVal) {
-				chongzhi()
+				
-				 getSelectList();
 			}  
 		}
 	)

pages/procurement/material.vue

@@ -186,23 +186,42 @@
 			type: Boolean
 		},
 	});
+	onMounted(()=>{
+		form.pageNo = 1;
+		warn.pageNo = 1;
+		Material.value = [];
+		InvoicingList.value = [];
+		moredex.value = 0;
+		shoppcar();
+		getWaringMaterial()
+		nextTick(() => {
+			chongzhi()
+		})
+		setTimeout(()=>{
+			timeout.value = true
+		},500)
+		transition.value = false;
+		setTimeout(() => {
+			transition.value = true;
+		}, 50)
+	})
 	watch(
 		() => props.isShow,
 		(newVal, oldVal) => {
 			if (!oldVal && newVal) {
-				 form.pageNo = 1;
+				form.pageNo = 1;
-				 warn.pageNo = 1;
+				warn.pageNo = 1;
-				 Material.value = [];
+				Material.value = [];
-				 InvoicingList.value = [];
+				InvoicingList.value = [];
-				 moredex.value = 0;
+				moredex.value = 0;
-				 shoppcar();
+				shoppcar();
-				 getWaringMaterial()
+				getWaringMaterial()
-				 nextTick(() => {
+				nextTick(() => {
-				 	chongzhi()
+					chongzhi()
-				 })
+				})
-				 setTimeout(()=>{
+				setTimeout(()=>{
-				 	timeout.value = true
+					timeout.value = true
-				 },500)
+				},500)
 				 transition.value = false;
 				 setTimeout(() => {
 				 	transition.value = true;

pages/procurement/outbound.vue

@@ -281,6 +281,10 @@
 	)
 	onMounted(() => {
 		firstgetqueryCgdList();
+		transition.value = false;
+		setTimeout(() => {
+			transition.value = true;
+		}, 50)
 	})
 	const lanjie = ref(false);
 
@@ -374,9 +378,7 @@
 			alltotal.value = res.result.total
 			if (res.result.records.length) {
 				rightdonghua.value = false;
-
 				queryQldWlInfo({ qldNo: res.result.records[0].qldNo }).then((element : any) => {
-					console.log(element.result)
 					rightarray.value = []
 					rightarray.value.push(...element.result)
 					rightdonghua.value = true;
@@ -641,6 +643,7 @@
 		// padding: 2vw;
 		padding-left: 1vw;
 		padding-top: 1.5vh;
+		width: 90vw;
 	}
 
 	.right-container-tem {

pages/procurement/retstock.vue

@@ -194,6 +194,7 @@
 			}
 		}
 	)
+	 
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const opendata = ref(false);
 	const form = reactive({
@@ -210,6 +211,10 @@
 	const carnum = ref(0)
 	onMounted(() => {
 		thlist()
+		transition.value = false;
+		setTimeout(() => {
+			transition.value = true;
+		}, 50)
 	})
 	onShow(() => {
 		ritbot();

unpackage/dist/dev/.nvue/pages/camera.js

@@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };

unpackage/dist/dev/.nvue/pages/fullcamera.js

@@ -578,7 +578,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };