Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages.json

@@ -92,6 +92,14 @@
 				"navigationStyle": "custom"
 			}
 
+		},
+		// 大图
+		{
+			"path": "pages/Warehouse/Warehouse",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		
 		},
 		{
 			"path": "pages/NursingNew/index",
@@ -155,13 +163,7 @@
 			}
 
 		},
-		{
-			"path": "pages/Warehouse/Warehouse",
-			"style": {
-				"navigationStyle": "custom"
-			}
-
-		},
+		
 		{
 			"path": "pages/Warehouse/procurement",
 			"style": {

pages/Warehouse/Warehouse.vue

@@ -1,5 +1,11 @@
 <template>
-	<view :class="darkFans?`darkbackgroundContainer`:`backgroundContainer`" v-show="isShow">
+	<view class="all-content">
+		<view class="content-title">
+			<image class="title-imge" src="/static/index/indeximage.png" mode="aspectFill"></image>
+			<view class="title-font">
+				11111
+			</view>
+		</view>
 		<view class="wareaitem">
 			<view class="wareaitem-item">
 				<view class="tp" :class="'itemact'+(index+1)" v-for="(item,index) in animArray" :key='index'
@@ -20,11 +26,12 @@
 					<!-- 采购增加层级高度方便点击 -->
 				</view>
 			</view>
-			<view class="annotation" :class="'annotation'+(i+1)" v-for="(v,i) in ['付款','采购','拣货','完结','护理单元','监控室','请领出库','退货入库']"
-				:key='i' @click.stop="housactive(i)">
+			<view class="annotation" :class="'annotation'+(i+1)"
+				v-for="(v,i) in ['库存盘点','采购','拣货','完结','护理单元','监控室','请领出库','退货入库']" :key='i'
+				@click.stop="housactive(i)">
 				<view> </view>
 				<view class="tp">
-					<text>{{v}}</text>
+					<text style="font-size: 30rpx;">{{v}}</text>
 					<image src="/static/index/warehouse/y2.png" mode="aspectFill" v-if="i==4"></image>
 					<image src="/static/index/warehouse/y1.png" mode="aspectFill" v-if="i!=4"></image>
 				</view>
@@ -34,7 +41,7 @@
 			</view>
 			<view @click="onlyjump(5)" class="zhanwei"></view>
 
-			<view class="operationbtn">
+			<!-- <view class="operationbtn">
 				<view v-for="(v,i) in ['请领出库','退货入库','库存盘点','实时监控']" @tap="onTap(i)"
 					:class="beblue === i ? 'click-box-target' : 'click-box'">
 					<image
@@ -42,7 +49,7 @@
 						mode="aspectFill"></image>
 					{{v}}
 				</view>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -51,79 +58,74 @@
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps } from 'vue';
 	const darkFans = ref(false);
 	const getblue = ref(false);
-	const props = defineProps({
-		isShow: {
-			type: Boolean,
-			required: true,
-		},
-	});
+
 	const housedex = ref(-1);
 	const lastTap = ref(0)
 	const DOUBLE_TAP_DELAY = 300;
 	const setout = ref(null)
 	const housactive = (index : number) => {
 		housedex.value = index;
-			const now = Date.now()
-			if (now - lastTap.value < DOUBLE_TAP_DELAY) {
-				// 双击成立
-				clearTimeout(setout.value)
-				if (index == 0) {
-					navurl.value = 'pages/Warehouse/paymoney'
+		const now = Date.now()
+		if (now - lastTap.value < DOUBLE_TAP_DELAY) {
+			// 双击成立
+			clearTimeout(setout.value)
+			if (index == 0) {
+				navurl.value = 'pages/Warehouse/paymoney'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			if (index == 1) {
+				navurl.value = 'pages/procurement/material'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			if (index == 2) {
+				navurl.value = 'pages/Warehouse/picking'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			if (index == 3) {
+				navurl.value = 'pages/Warehouse/finish'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			if (index === 5) {
+				uni.navigateTo({
+					url: "/pages/watch/full"
+				})
+			}
+			if (index == 6) {
+				navurl.value = 'pages/procurement/outbound?code=0'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			if (index == 7) {
+				navurl.value = 'pages/procurement/outbound?code=1'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			}
+			// 重置，避免多次触发
+			lastTap.value = 0
+		} else {
+			setout.value = setTimeout(() => {
+				console.log("点击哪个了", index)
+				if (index === 5) {
 					uni.navigateTo({
-						url: '/' + navurl.value
+						url: "/pages/watch/full"
 					})
 				}
-				 if (index == 1) {
-				 	navurl.value = 'pages/procurement/material'
-				 	uni.navigateTo({
-				 		url: '/' + navurl.value
-				 	})
-				 }
-				 if (index == 2) {
-				 	navurl.value = 'pages/Warehouse/picking'
-				 	uni.navigateTo({
-				 		url: '/' + navurl.value
-				 	})
-				 }
-				 if (index == 3) {
-				 	navurl.value = 'pages/Warehouse/finish'
-				 	uni.navigateTo({
-				 		url: '/' + navurl.value
-				 	})
-				 }
-				 if (index === 5) {
-				 	uni.navigateTo({
-				 		url: "/pages/watch/full"
-				 	})
-				 }
-				 if (index ==6) {
-				 		navurl.value = 'pages/procurement/outbound?code=0'
-				 		uni.navigateTo({
-				 			url: '/' + navurl.value
-				 		})
-				 }
-				 if (index ==7) {
-				 		navurl.value = 'pages/procurement/outbound?code=1'
-				 		uni.navigateTo({
-				 			url: '/' + navurl.value
-				 		})
-				 }
-				// 重置，避免多次触发
-				lastTap.value = 0
-			} else {
-				setout.value = setTimeout(()=>{
-					console.log("点击哪个了",index)
-					 if (index === 5) {
-					 	uni.navigateTo({
-					 		url: "/pages/watch/full"
-					 	})
-					 }
-					 
-				},DOUBLE_TAP_DELAY)
-				// 记录本次时间，等待下次点击
-				lastTap.value = now
-			}
-		
+
+			}, DOUBLE_TAP_DELAY)
+			// 记录本次时间，等待下次点击
+			lastTap.value = now
+		}
+
 	}
 	onMounted(() => {
 		housedex.value = 1
@@ -132,11 +134,11 @@
 	const onlyjump = (index : number) => {
 		console.log("点击了哪个图标", index)
 		if (index > 5) {
-				navurl.value = 'pages/Warehouse/finish'
-				uni.navigateTo({
-					url: '/' + navurl.value
-				})
-			return 
+			navurl.value = 'pages/Warehouse/finish'
+			uni.navigateTo({
+				url: '/' + navurl.value
+			})
+			return
 		}
 		if (index < 4) {
 			housedex.value = index;
@@ -246,14 +248,21 @@
 </script>
 
 <style lang="less" scoped>
+	.all-content {
+		width: 100%;
+		height: 100%;
+		background: url('/static/index/warehouse/bg.png')no-repeat;
+		background-size: cover cover;
+		position: relative;
+	}
+
 	.wareaitem {
 		width: 100%;
 		height: 100%;
-		position: fixed;
+		position: absolute;
 		top: 0;
 		left: 0;
-		background: url('/static/index/warehouse/bg.png')no-repeat;
-		background-size: cover cover;
+		transform: scale(0.9, 0.8);
 
 		.tp {
 			image {
@@ -294,19 +303,19 @@
 				}
 			}
 
-			.click-box {
-				color: #888d99;
-				background: rgba(255, 255, 255, 0.43);
-			}
+			// .click-box {
+			// 	color: #888d99;
+			// 	background: rgba(255, 255, 255, 0.43);
+			// }
 
-			.click-box-target {
-				background: #FFFFFF;
-				box-shadow: 0px 0px 3vw 0px rgba(12, 102, 209, 0.33) inset;
-				// box-shadow: 0rpx 0rpx 3vw 0rpx rgba(38,137,255,0.44) inset;
-				color: rgba(108, 132, 160, 1) !important;
-				animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-				transform-origin: center center;
-			}
+			// .click-box-target {
+			// 	background: #FFFFFF;
+			// 	box-shadow: 0px 0px 3vw 0px rgba(12, 102, 209, 0.33) inset;
+			// 	// box-shadow: 0rpx 0rpx 3vw 0rpx rgba(38,137,255,0.44) inset;
+			// 	color: rgba(108, 132, 160, 1) !important;
+			// 	animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
+			// 	transform-origin: center center;
+			// }
 
 			.grad-text {
 				background: linear-gradient(90deg, #5b8bb3, #87a1bd);
@@ -344,6 +353,7 @@
 			top: 0;
 			left: -2vw;
 
+
 			.itemact1 {
 				width: 29vw;
 				height: 21vw;
@@ -491,10 +501,12 @@
 			top: 24vw;
 			right: 6vw;
 		}
+
 		.annotation7 {
 			top: 62vh;
 			left: 40vw;
 		}
+
 		.annotation8 {
 			top: 5vh;
 			left: 28vw;
@@ -506,23 +518,24 @@
 			height: 8vw;
 			z-index: 20;
 			position: fixed;
-
+			
 
 			>view {
 				position: relative;
 
 				&:nth-child(2) {
-					width: 6.5vw;
-					height: 3.2vw;
-					z-index: 2;
-					margin: -2rpx auto 0;
+					width: 7.8vw;
+					height: 3.5vw;
 					z-index: 2;
+
+					margin-left: -10rpx;
 					display: flex;
 					align-items: center;
 					justify-content: center;
 					border-radius: 0.8vw 0.8vw 1.5vw 1.5vw;
 					overflow: hidden;
 
+
 					image {
 						position: absolute;
 						top: 0;
@@ -582,4 +595,20 @@
 		width: 13vw;
 		height: 13vw;
 	}
+	.content-title{
+		position: absolute;
+		top: 100rpx;
+		left: 50rpx;
+		display: flex;
+		align-items: center;
+		.title-imge{
+			width: 60rpx;
+			height: 60rpx;
+		}
+		.title-font{
+			margin-left: 10rpx;
+			font-size: 35rpx;
+			font-weight: 600;
+		}
+	}
 </style>

pages/Warehouse/picking.vue

@@ -1590,7 +1590,7 @@
 	}
 	const zuofei = () => {
 		voidedCgdMain({ id: plsbuy.value[lefttarget.value].id }).then((res : any) => {
-			// console.log("res", res)
+			console.log("res", res)
 			if (res.success) {
 				uni.showToast({
 					title: res.message,
@@ -1603,6 +1603,13 @@
 				Object.assign(plzinfo, mobanplzinfo)
 				Object.assign(form, mobanform)
 				firstgetqueryCgdList();
+			}else{
+				uni.showToast({
+					title: res.message,
+					icon: 'none',
+					duration: 2000
+				})
+				badshow.value = false;
 			}
 		})
 	}

pages/watch/index.vue

@@ -710,7 +710,7 @@
 			})
 		} else if (typeNow.value === 2) {
 			uni.navigateTo({
-				url: '/pages/Warehousing/index'
+				url: '/pages/Warehouse/Warehouse'
 			})
 		}
 	}
@@ -763,7 +763,7 @@
 						})
 					} else if (typeNow.value === 2) {
 						uni.navigateTo({
-							url: '/pages/Warehousing/index'
+							url: '/pages/Warehouse/Warehouse'
 						})
 					}