From 73b45134e69af1026c98141a33169b9c0ab787dc Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Tue, 30 Dec 2025 08:42:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/public/reset.vue                    |  2 +-
 .../pleasetake/component/requestform.vue      |  4 +-
 .../pleasetake/component/returnorder.vue      |  2 +-
 pages/Warehouse/finish.vue                    | 46 ++++++++------
 pages/Warehouse/index/index.vue               | 32 +++++-----
 pages/Warehouse/picking.vue                   | 45 +++++++++-----
 pages/login/login.vue                         |  3 +-
 pages/procurement/common/pddsub.vue           |  2 +-
 pages/procurement/components/Inventory.vue    |  6 +-
 pages/procurement/components/addall.vue       |  7 +--
 pages/procurement/components/calculator.vue   |  4 +-
 pages/procurement/components/carditem.vue     |  8 +--
 pages/procurement/components/cgdclass.vue     |  2 +-
 .../procurement/components/classification.vue |  4 +-
 pages/procurement/components/details.vue      |  4 +-
 .../components/inboundoutbound.vue            |  2 +-
 pages/procurement/inventory.vue               | 20 +++++-
 pages/procurement/material.vue                |  4 +-
 pages/procurement/materialcar.vue             |  2 -
 pages/procurement/outbound.vue                | 62 ++++++++++---------
 pages/procurement/retstock.vue                | 23 ++++++-
 request/index.js                              |  4 +-
 unpackage/dist/dev/.nvue/pages/camera.js      |  2 +-
 unpackage/dist/dev/.nvue/pages/fullcamera.js  |  2 +-
 24 files changed, 173 insertions(+), 119 deletions(-)

diff --git a/component/public/reset.vue b/component/public/reset.vue
index b3354a8..6a6fca6 100644
--- a/component/public/reset.vue
+++ b/component/public/reset.vue
@@ -106,7 +106,7 @@
 			if (res.success) {
 				uni.showToast({
 					title: res.message,
-					icon: 'none', // 无图标，表示普通文本
+					icon: 'success', // 无图标，表示普通文本
 					duration: 2000
 				})
 				// uni.clearStorageSync();
diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index 6e95b5f..0ba580f 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -475,7 +475,7 @@
 				if (res.success) {
 					uni.showToast({
 						title: res.result.message,
-						icon: 'none', // 'none' 表示不带图标
+						icon: 'success', // 'none' 表示不带图标
 						duration: 3000
 					})
 				} else {
@@ -514,7 +514,7 @@
 				if (res.success) {
 					uni.showToast({
 						title: res.result.message,
-						icon: 'none', // 'none' 表示不带图标
+						icon: 'success', // 'none' 表示不带图标
 						duration: 3000
 					})
 				} else {
diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
index 56c4c69..1e6e9d5 100644
--- a/pages/NursingNew/component/pleasetake/component/returnorder.vue
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -412,7 +412,7 @@
 			setTimeout(() => {
 				uni.showToast({
 					title: res.success ? res.result.message : res.message,
-					icon: 'none', // 'none' 表示不带图标
+					icon:res.success ?'success': 'none', // 'none' 表示不带图标
 					duration: 3000
 				})
 			}, 300)
diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue
index 454d097..d811815 100644
--- a/pages/Warehouse/finish.vue
+++ b/pages/Warehouse/finish.vue
@@ -1,12 +1,13 @@
 <template>
-	<view class="contain" v-if="isShow">
-		<view
-			v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata"
-			class="mengban" :style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
+	<view class="contain guodu"  :style="!transition?'opacity: 0':'opacity: 1'" style="transition: opacity 1s ease;">
+		<view v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata" class="mengban"
+			:style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
 			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]">
 		</view>
 		<!-- 没数据了，遮罩 -->
-		<nomessageimge cont="暂无数据" :show="nomessageshow" />
+		<view class="mengban" style="background: #fff;width:100vw;right:0;left: 0;top: -5vh;height: 110vh;" v-if="nomessageshow">
+			<defaultr cont="暂无数据" style="z-index: 999;"></defaultr>
+		</view>
 		<!-- 给模糊搜索用的 -->
 		<view v-show="filteredCgrListsecond.length&&gysvalue" class="mengban" style="background: transparent;"
 			@click="closefilteredCgrListsecond">
@@ -400,7 +401,7 @@
 					</view>
 				</view>
 				<view class="noarray" v-if="!suixingdanarr.length">
-				
+
 					<image class="noarray-img" src="/static/index/warehouse/procurement/picking/noarray.png"
 						mode="aspectFill" />
 					<view class="noarray-font">
@@ -1084,13 +1085,13 @@
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, onUnmounted , watch} from 'vue';
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, onUnmounted, watch } from 'vue';
 	import { editIzNew, queryPickingRecordList, queryJhzpList, addSxd, querySxdList, queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload, editPrice, pickingInfo } from './api/lunpan.js'
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import calendar from '@/component/public/calendar.vue'
 	import nomessageimge from '@/pages/procurement/components/nomessage.vue';
 	import tanchuang from '@/pages/procurement/components/tanchuang.vue';
-
+	import defaultr from '@/pages/procurement/components/default.vue';
 	const open = ref(0);
 	const typechange = ref(0);
 	const stringjh = ref("")
@@ -1313,11 +1314,18 @@
 		() => props.isShow,
 		(newVal, oldVal) => {
 			if (!oldVal && newVal) {
-				 firstgetqueryCgdList();
-				 getSelectList();
-			}  
+				firstgetqueryCgdList();
+				getSelectList();
+				transition.value = false;
+				setTimeout(() => {
+					transition.value = true;
+				}, 50)
+			} else {
+				transition.value = false;
+			}
 		}
 	)
+	const transition = ref(false)
 	const opencgr = ref(false);
 	const opengys = ref(false);
 
@@ -1391,12 +1399,12 @@
 		lookshuliang()
 	}
 	const lookshuliang = () => {
-		
+
 		let data = {
 			...plzinfo,
-			pageNo : 1
+			pageNo: 1
 		}
-		
+
 		queryCgdList(data).then((res : any) => {
 			alltotal.value = res.result.total
 		})
@@ -2041,12 +2049,12 @@
 	.contain {
 		background-color: rgb(239, 240, 244);
 		width: 90vw;
-		height:calc(100vh - 5vh);
-		padding:1vh 2vw 0 0;
+		height: calc(100vh - 5vh);
+		padding: 1vh 2vw 0 0;
 		display: flex;
 
 		.contain-left {
-			height:calc(100vh - 3vw);
+			height: calc(100vh - 3vw);
 			width: 30vw;
 			position: relative;
 			z-index: 99;
@@ -2557,7 +2565,7 @@
 
 					.middle-Y-father {
 						display: flex;
-						
+
 						.middle-one {
 							min-width: 325rpx;
 							height: 450rpx;
@@ -2613,7 +2621,7 @@
 		background-color: #fff;
 		width: 60%;
 		top: 0;
-		right:0;
+		right: 0;
 	}
 
 	.wuliao-title {
diff --git a/pages/Warehouse/index/index.vue b/pages/Warehouse/index/index.vue
index 132703f..8161416 100644
--- a/pages/Warehouse/index/index.vue
+++ b/pages/Warehouse/index/index.vue
@@ -5,13 +5,13 @@
 				<leftcontent :list="tabbrarr" @navurl="navurl"></leftcontent>
 			</view>
 			<view class="boxrt">
-				<index :isShow="menuop" v-if="!ckindex" />
-				<material :isShow="ckindex == 1"></material>
-				<picking :isShow="ckindex == 2"></picking>
-				<finish :isShow="ckindex == 3"></finish>
-				<outbound v-if="ckindex == 4"></outbound>
-				<retstock v-if="ckindex == 5"></retstock>
-				<inventory :isShow="ckindex == 6"></inventory>
+				<index     :isShow="menuop==0" v-if="!ckindex" />
+				<material  :isShow="menuop == 1" v-if="ckindex == 1"></material>
+				<picking   :isShow="menuop == 2" v-if="ckindex == 2"></picking>
+				<finish    :isShow="menuop == 3" v-if="ckindex == 3"></finish>
+				<outbound  :isShow="menuop == 4" v-if="ckindex == 4"></outbound>
+				<retstock  :isShow="menuop == 5" v-if="ckindex == 5"></retstock>
+				<inventory :isShow="menuop == 6" v-if="ckindex == 6"></inventory>
 			</view>
 		</view>
 	</view>
@@ -19,6 +19,7 @@
 
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue';
+	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import leftcontent from "@/pages/NursingNew/component/leftcontent/leftcontent.vue"
 	import material from "@/pages/procurement/material.vue";
 	import index from "./component/index.vue"
@@ -41,12 +42,15 @@
 		{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png' },
 	])
 
-	const menuop = ref(false)
-	onMounted(() => {
-		// 处理响应式
-		navurl(0)
+	const menuop = ref(-1)
+	// onMounted(() => {
+	// 	// 处理响应式
+	// 	navurl(0)
+	// })
+	onShow(()=>{
+		navurl(ckindex.value)
 	})
-	const ckindex = ref(-1)
+	const ckindex = ref(0)
 	const navurl = (e : number) => {
 		// 最后一个直接返回
 		if (e === tabbrarr.value.length - 1) {
@@ -55,9 +59,9 @@
 		}
 		ckindex.value = e;
 		// 这个是为了触发渐变动画
-		menuop.value = false
+		menuop.value = -1
 		setTimeout(() => {
-			menuop.value = true
+			menuop.value = e
 		}, 50)
 
 	}
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 93aeac0..cfb0280 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -1,12 +1,12 @@
 <template>
-	<view class="contain" v-if="isShow">
+	<view class="contain guodu"  :style="!transition?'opacity: 0':'opacity: 1'" style="transition: opacity 1s ease;">
 		<view v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata" class="mengban"
 			:style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
 			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]">
 		</view>
 		<!-- 没数据了，遮罩 -->
 		<!-- <nomessageimge cont="暂无数据" :show="nomessageshow" style="width: 92vw;right: 0;height: 100vw;top: 0;position: fixed;"/> -->
-		<view class="mengban" style="background: #fff;width: 91.8vw;right:0;left: 8.2vw;" v-if="nomessageshow" >
+		<view class="mengban" style="background: #fff;width:100vw;right:0;left: 0;top: -5vh;height: 110vh;" v-if="nomessageshow">
 			<defaultr cont="暂无数据" style="z-index: 999;"></defaultr>
 		</view>
 		<!-- 给模糊搜索用的 -->
@@ -1044,17 +1044,17 @@
 		<tanchuang :show="badshow" font="确定要作废这个采购单吗" @back="badshow=false;" @right="zuofei"> </tanchuang>
 		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del()"> </tanchuang>
 		<tanchuang :show="open==2" font="是否销账此物料？" @back="open = 0" @right="sctp(1)"> </tanchuang>
-		<errorshow :show="openerror" :font="errmsg" @close="openerror=false"  />
+		<errorshow :show="openerror" :font="errmsg" @close="openerror=false" />
 	</view>
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, onUnmounted,watch } from 'vue';
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, onUnmounted, watch } from 'vue';
 	import { editIzNew, queryPickingRecordList, queryJhzpList, addSxd, querySxdList, queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload, editPrice, pickingInfo } from './api/lunpan.js'
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import calendar from '@/component/public/calendar.vue'
 	import defaultr from '@/pages/procurement/components/default.vue';
-	
+
 	const props = defineProps({
 		isShow: {
 			type: Boolean
@@ -1066,10 +1066,16 @@
 			if (!oldVal && newVal) {
 				firstgetqueryCgdList();
 				getSelectList();
-			}  
+				transition.value = false;
+				setTimeout(() => {
+					transition.value = true;
+				}, 50)
+			} else {
+				transition.value = false;
+			}
 		}
 	)
-
+	const transition = ref(false)
 	const open = ref(0);
 	const typechange = ref(0);
 	const stringjh = ref("")
@@ -1846,7 +1852,7 @@
 			console.log(`返回`, res)
 			if (res.success) {
 				uni.showToast({
-					icon: res.success?'success':'none',
+					icon: res.success ? 'success' : 'none',
 					title: res.message ? res.message : '操作成功'
 				})
 				plsbuy.value[lefttarget.value].totalPrice = res.result.cgdTotalPrice
@@ -1856,10 +1862,10 @@
 				open.value = 0;
 				form.cgdId = plsbuy.value[lefttarget.value].id;
 				plsbuy.value[lefttarget.value] = res.result.cgdInfo;
-				setTimeout(()=>{
+				setTimeout(() => {
 					queryInvo(middletarget.value)
-				},700)
-			}else{
+				}, 700)
+			} else {
 				errmsg.value = res.message;
 				openerror.value = true;
 			}
@@ -2019,7 +2025,7 @@
 	.contain {
 		background-color: rgb(239, 240, 244);
 		width: 90vw;
-		height:calc(100vh - 3vw);
+		height: calc(100vh - 3vw);
 		padding: 1vh 2vw 0 1vw;
 		display: flex;
 
@@ -2458,7 +2464,7 @@
 
 		.contain-right {
 			z-index: 1;
-			height: 95vh;
+			height: 100vh;
 			width: 62vw;
 			overflow: hidden;
 
@@ -2529,10 +2535,12 @@
 				height: 460rpx;
 				margin-top: 20rpx;
 				margin-left: 5%;
+
 				.middle-Y {
 					width: 92%;
 					height: 100%;
 					margin-right: 3%;
+
 					.middle-Y-father {
 						display: flex;
 
@@ -2587,10 +2595,10 @@
 
 	.white-zhezhao {
 		position: fixed;
-		height: 100%;
+		height: 102vh;
 		background-color: #fff;
-		width: 62%;
-		top: 0;
+		width: 61vw;
+		top:-5vh;
 		right: 0;
 	}
 
@@ -3435,4 +3443,9 @@
 		align-items: center;
 		flex-direction: column;
 	}
+ 	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index fe9737d..4256b7a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -295,11 +295,10 @@
 		form.checkKey = time.value
 		huakuaiOpen.value = false
 		loginApp(form).then(res => {
-			console.log("info", res)
 			if (res.success) {
 				uni.showToast({
 					title: res.message,
-					icon: 'none', // 可选值：'success'、'loading'、'none'
+					icon: 'success', // 可选值：'success'、'loading'、'none'
 					duration: 500   // 持续时间，单位ms
 				})
 				uni.setStorageSync('token', res.result.token);
diff --git a/pages/procurement/common/pddsub.vue b/pages/procurement/common/pddsub.vue
index 83b6156..50cfe40 100644
--- a/pages/procurement/common/pddsub.vue
+++ b/pages/procurement/common/pddsub.vue
@@ -170,7 +170,7 @@
 		width: 100%;
 		height: 3.2vw;
 		margin-top: 0.4vw;
-		padding-right: 2vw;
+		// padding-right: 2vw;
 		display: flex;
 		justify-content: flex-end;
 		view{
diff --git a/pages/procurement/components/Inventory.vue b/pages/procurement/components/Inventory.vue
index d2c45e5..06c4f4b 100644
--- a/pages/procurement/components/Inventory.vue
+++ b/pages/procurement/components/Inventory.vue
@@ -21,7 +21,7 @@
 										<view>{{v.materialName}}</view><text>{{v.materialNo}}</text>
 									</view>
 									<view  style="white-space: nowrap;display: block;">
-										<text> 规格型号: {{v.specificationModel}}</text>
+										<text style="white-space: nowrap;display: block;"> 规格型号: {{v.specificationModel}}</text>
 									</view>
 									<view>
 										<text v-if="v.multiUnitType=='1'">采购单价: ￥{{v.oneUnitPrice?Number(v.oneUnitPrice).toFixed(2):""}} </text>    
@@ -410,8 +410,8 @@
 	box-shadow: 0rpx 0rpx 0.7vw 0rpx rgba(182,186,196,0.29);
 	border-radius: 1.6vw;
 	position: fixed;
-	top: 8vh;
-	left: 24.5vw;
+	top:5vh;
+	right: 24.5vw;
 	z-index: 103;
 	padding: 2vw;
 }
diff --git a/pages/procurement/components/addall.vue b/pages/procurement/components/addall.vue
index a31b94c..47022fc 100644
--- a/pages/procurement/components/addall.vue
+++ b/pages/procurement/components/addall.vue
@@ -45,11 +45,8 @@
 	box-shadow: 0rpx 0rpx 1.3vw 0rpx rgba(163,167,182,0.16);
 	border-radius: 1.6vw;
 	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	margin: auto;
+	right: 28.7vw;
+	bottom: 18vw;
 	padding: 2.8vw;
 	z-index: 120;
 	>view{
diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index 1aabc29..e7ab58f 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -570,8 +570,8 @@
 		overflow: hidden;
 		box-shadow: 0rpx 0rpx 1.6vw 0rpx rgba(136,141,153,0.28);
 		border-radius: 2.2vw;
-		top: 2.5vw;
-		left: 32vw;
+		top: 0vw;
+		right: 32vw;
 		position: fixed;
 		padding:1.5vw 1vw;
 	}
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index dc76f73..add48c5 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -176,13 +176,13 @@
 			grid-template-columns: 1fr 1fr;
 		}
 		.fler {
-			width: 43vw;
+			width: 44vw;
 			height: 15.6vw;
 		}
 	}
 
 	.carditem {
-		width: 43vw;
+		width: 44vw;
 		height: 14.5vw;
 		background: rgba(255, 255, 255, 0.4);
 		border-radius: 1.6vw;
@@ -242,7 +242,7 @@
 		}
 
 		.add {
-			width: 6vw;
+			width: 4.5vw;
 			height: 14.5vw;
 			display: inline-flex;
 			justify-content: center;
@@ -264,7 +264,7 @@
 				align-items: center;
 				position: absolute;
 				top: 0.8vw;
-				right: 0.8vw;
+				right: 0vw;
 			}
 
 			image {
diff --git a/pages/procurement/components/cgdclass.vue b/pages/procurement/components/cgdclass.vue
index 2bb9813..7a5ebb9 100644
--- a/pages/procurement/components/cgdclass.vue
+++ b/pages/procurement/components/cgdclass.vue
@@ -321,7 +321,7 @@
 				min-width: 8vw;
 				height: 3.8vw;
 				background: #EDEDEF;
-				border-radius: 1.6vw;
+				border-radius: 1.9vw;
 				padding: 0 2vw;
 				margin-left: 1vw;
 				border: 1px solid #EDEDEF;
diff --git a/pages/procurement/components/classification.vue b/pages/procurement/components/classification.vue
index 42cb492..f40ffeb 100644
--- a/pages/procurement/components/classification.vue
+++ b/pages/procurement/components/classification.vue
@@ -353,8 +353,8 @@
 		background: rgba(255, 255, 255, 0.98);
 		box-shadow: 0rpx 0rpx 1.3vw 0rpx rgba(163, 167, 182, 0.16);
 		border-radius: 1.6vw;
-		top: 10vh;
-		left: 32vw;
+		top: 7vh;
+		right: 32vw;
 		padding: 2.5vw 2.5vw;
 
 		.btnbotm {
diff --git a/pages/procurement/components/details.vue b/pages/procurement/components/details.vue
index 76dca4c..2e0c35a 100644
--- a/pages/procurement/components/details.vue
+++ b/pages/procurement/components/details.vue
@@ -21,7 +21,7 @@
 										<view>{{v.materialName}}</view><text>{{v.materialNo}}</text>
 									</view>
 									<view>
-										<text> 规格型号: {{v.specificationModel}}</text>
+										<text style="white-space: nowrap;"> 规格型号: {{v.specificationModel}}</text>
 									</view>
 									<view>
 										<text v-if="v.multiUnitType=='1'">采购单价: ￥{{Number(v.oneUnitPrice).toFixed(2)}} </text>    
@@ -414,7 +414,7 @@
 	border-radius: 1.6vw;
 	position: fixed;
 	top: 28vh;
-	left: 24.5vw;
+	right: 24.5vw;
 	z-index: 103;
 	padding: 2vw;
 }
diff --git a/pages/procurement/components/inboundoutbound.vue b/pages/procurement/components/inboundoutbound.vue
index 38bd911..6028e76 100644
--- a/pages/procurement/components/inboundoutbound.vue
+++ b/pages/procurement/components/inboundoutbound.vue
@@ -161,7 +161,7 @@
 		border-radius: 1.6vw;
 		position: fixed;
 		right: 32vw;
-		top: 7vw;
+		top: 5vw;
 		padding: 1.7vw;
 		z-index: 112;
 		.titletop{
diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue
index 5940452..e4b1c38 100644
--- a/pages/procurement/inventory.vue
+++ b/pages/procurement/inventory.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="all-bgc" v-if="isShow">
+	<view class="all-bgc guodu"  :style="!transition?'opacity: 0':'opacity: 1'" style="transition: opacity 1s ease;">
 		<view class="buttons-father">
 			<view class="ipt">
 				<input type="text" v-model="plzinfo.pddInfo" placeholder="盘点单号/盘点人/盘点日期" @confirm="clickconfirm" />
@@ -271,6 +271,7 @@
 			type: Boolean
 		},
 	});
+	const transition = ref(false);
 	watch(
 		() => props.isShow,
 		(newVal, oldVal) => {
@@ -280,7 +281,20 @@
 			}  
 		}
 	)
-
+	watch(
+		() => props.isShow,
+		(newVal, oldVal) => {
+			// 当旧值为false，新值为true时延迟0.2秒调用方法
+			if (!oldVal && newVal) {
+				transition.value = false;
+				setTimeout(() => {
+					transition.value = true;
+				}, 50)
+			} else {
+				transition.value = false;
+			}
+		}
+	)
 	const getSelectList = () => {
 		queryPddStartByList({ nuId: uni.getStorageSync('nuId') }).then((res : any) => {
 			cgrlist.value = res.result;
@@ -1022,7 +1036,7 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				font-size: 30rpx;
+				font-size: 32rpx;
 
 			}
 		}
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 2fc7a0d..f63fa16 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -1,5 +1,5 @@
 <template>
-	<view  v-if="isShow" >
+	<view  class="guodu" :style="!transition?'opacity: 0':'opacity: 1'" style="transition: opacity 1s ease;">
 		<view class="serchs guodu" :style="tx?'':'width:90vw'">
 			<view class="ipt">
 				<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo" @confirm="search" />
@@ -484,7 +484,7 @@
 	}
 </script>
 
-<style scoped lang="less">
+<style scoped lang="less"> 
 	.fiedright {
 		width: 5vw;
 		height: 12vw;
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index 2b49e44..464a970 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -108,7 +108,6 @@
 				item.zk = false;
 				item.scrollleft = 0;
 	 		})
-			console.log(`最上层`,res )
 	 		InvoicingList.value.push(...res.result.records);
 	 		// status.value = (res.result.total == InvoicingList.value.length) ? 'nomore' : 'loadmore';
 	 	})
@@ -281,7 +280,6 @@
 				return
 			}
 			generatedPurchaseViewOrder(caigouarr.value).then(res=>{
-				console.log("11111",caigouarr.value,res)
 				if(res.success){
 					generatedOrder.value = res.result;
 					caigouflag.value = true;
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index df80c46..c0f93c3 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="all-bgc">
+	<view class="all-bgc guodu"  :style="!transition?'opacity: 0':'opacity: 1'" style="transition: opacity 1s ease;">
 		<view class="buttons-father">
 			<view class="ipt">
 				<input type="text" v-model="plzinfo.searchContent" placeholder="请领单号/请领人/请领日期"
@@ -42,8 +42,8 @@
 					</view>
 				</view> -->
 			</view>
-			<view class="mengban" style="background: #fff;width: 91.8vw;right:0;left: 8.2vw;" v-if="nomessageshow" >
-				<defaultr cont="暂无数据" style="z-index: 999;"></defaultr>
+			<view class="mengban" style="background: #fff;width:100vwvw;right:0;left: 0vw;top:-5vw;height: 110vh;" v-if="nomessageshow">
+				<defaultr cont="暂无数据" style="z-index: 999;margin: auto;top: 0;left:35vw;bottom: 0;right: 0;"></defaultr>
 			</view>
 			<!-- <nomessage cont="暂无数据" :show="nomessageshow" />
 			<view class="zhedang" v-if="nomessageshow"></view> -->
@@ -188,7 +188,7 @@
 										:src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'"
 										mode="aspectFill"></image>
 								</view>
-								<view class="left-tages" >
+								<view class="left-tages">
 									{{ item.materialInfo.categoryName}}
 								</view>
 								<view class="left-tages">
@@ -257,33 +257,28 @@
 	import { queryQld, queryQldWlInfo, newtransRead, orderReturn, outbound } from './api/lunpan.js'
 	import nomessage from './components/nomessage.vue'
 	import defaultr from './components/default.vue'
-	// const props = defineProps({
-	// 	isShow: {
-	// 		type: Boolean,
-	// 		required: true,
-	// 	},
-	// });
+	const props = defineProps({
+		isShow: { type: Boolean }
+	});
 	const manyselect = ref(false);
 	const tagsarray = ref(["全部", "待出库", "已出库", "已收货 "])
 	// const nottrue = Array(10).fill(null)
 	// 使用watch监听isShow变化
 	const transition = ref(false);
-	// watch(
-	// 	() => props.isShow,
-	// 	(newVal, oldVal) => {
-	// 		// 当旧值为false，新值为true时延迟0.2秒调用方法
-	// 		if (!oldVal && newVal) {
-	// 			transition.value = false;
-	// 			firstgetqueryCgdList();
-	// 			setTimeout(() => {
-	// 				transition.value = true;
-	// 			}, 50)
-	// 		} else {
-	// 			transition.value = false;
-	// 		}
-
-	// 	}
-	// )
+	watch(
+		() => props.isShow,
+		(newVal, oldVal) => {
+			// 当旧值为false，新值为true时延迟0.2秒调用方法
+			if (!oldVal && newVal) {
+				transition.value = false;
+				setTimeout(() => {
+					transition.value = true;
+				}, 50)
+			} else {
+				transition.value = false;
+			}
+		}
+	)
 	onMounted(() => {
 		firstgetqueryCgdList();
 	})
@@ -369,7 +364,7 @@
 			transition.value = true;
 			// console.log("kankan", plzinfo, res)
 			if (((res.message === "缺少参数") || (!res.result?.total)) && cannomessage.value) {
-				nomessageshow.value = true;
+					nomessageshow.value = true;
 				return
 			}
 
@@ -480,7 +475,7 @@
 	})
 	const badshow = ref(false)
 	const huitui = () => {
-		console.log("????",uni.getStorageSync(`NUall`))
+		console.log("????", uni.getStorageSync(`NUall`))
 		let data = {
 			qldNo: plsbuy.value[lefttarget.value].qldNo,
 			nuId: uni.getStorageSync('nuId'),
@@ -635,6 +630,12 @@
 </script>
 
 <style scoped lang="less">
+	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
+
 	.all-bgc {
 		background-color: rgb(239, 240, 244);
 		// padding: 2vw;
@@ -1108,7 +1109,8 @@
 							align-items: center;
 							justify-content: space-around;
 							padding: 0.5vw 0;
-							.bgimg{
+
+							.bgimg {
 								width: 6.5vw;
 								height: 6vw;
 								margin: 0.3vw auto 0.25vw;
@@ -1118,6 +1120,7 @@
 								justify-content: center;
 								align-items: center;
 								padding: 0.2vw;
+
 								>image {
 									width: 100%;
 									height: 100%;
@@ -1283,6 +1286,7 @@
 		height: 500rpx;
 		background-color: #fff;
 	}
+
 	.mengban {
 		width: 100vw;
 		height: 100vh;
diff --git a/pages/procurement/retstock.vue b/pages/procurement/retstock.vue
index b382f2f..22e3bbe 100644
--- a/pages/procurement/retstock.vue
+++ b/pages/procurement/retstock.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="all-bgc guodu"  :style="!transition?'opacity: 0':'opacity: 1'" style="transition: opacity 1s ease;">
 		<view class="serchs">
 			<view class="leftbtn">
 				<view class="ipt" @click="opendata=true">
@@ -130,7 +130,7 @@
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent } from 'vue';
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent,watch } from 'vue';
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
 	import { thdList, transRead, thdNuMaterialList, addThc, thcList, removeWl, removeAll, submitThd, startServe, finishServe } from './api/lunpan.js'
 
@@ -139,7 +139,24 @@
 	import tanchuang from './components/tanchuang.vue'
 	import submits from './common/submits.vue'
 	import calendar from '@/component/public/calendar.vue'
-
+	const props = defineProps({
+		isShow: { type: Boolean }
+	});
+	const transition = ref(false);
+	watch(
+		() => props.isShow,
+		(newVal, oldVal) => {
+			// 当旧值为false，新值为true时延迟0.2秒调用方法
+			if (!oldVal && newVal) {
+				transition.value = false;
+				setTimeout(() => {
+					transition.value = true;
+				}, 50)
+			} else {
+				transition.value = false;
+			}
+		}
+	)
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const opendata = ref(false);
 	const form = reactive({
diff --git a/request/index.js b/request/index.js
index af36782..faa1c47 100644
--- a/request/index.js
+++ b/request/index.js
@@ -1,6 +1,6 @@
 // 全局请求封装
-// const base_url = 'https://www.focusnu.com/opeapi'
-const base_url = 'http://192.168.2.37:8081/opeapi'
+const base_url = 'https://www.focusnu.com/opeapi'
+// const base_url = 'http://192.168.2.37:8081/opeapi'
 // const base_url = 'http://localhost:8091/opeapi'
 // 请求超出时间
 const timeout = 5000
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 12310ff..04100f2 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/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
 };
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index 3c0ae68..aab70ef 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/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
 };