diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index ea18215..5458c8d 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -103,7 +103,7 @@
 					<scroll-view class="scrol" scroll-y="true">
 						<view v-for="(v,i) in fwzlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk" @click="zldex(i)">
 							<image :src="fwzldex!=i?v.netImmediateFile:v.netPreviewFileSmall" mode="aspectFill"></image>
-							<text>{{v.directiveName}}</text>
+							<text style="white-space: nowrap;width: 100%;text-overflow: ellipsis;overflow: hidden;">{{v.directiveName}}</text>
 						</view>
 						<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;" v-if="fwzlarr.length==0">
 							<image src="/static/index/card/zw.png" mode="aspectFill" style="width:13vw;height: 13vw"></image>
@@ -1736,17 +1736,18 @@
 		height: 4vh;
 		display: flex;
 		justify-content: center;
-
 		.bottom-tags {
 			background-color: #E7F1FF;
 			color: #0084FA;
 			height: 100%;
 			display: flex;
 			align-items: center;
-			padding: 0 0.6vw;
+			padding: 0 0.4vw;
 			border-radius: 0.8vw;
 			font-size: 1.2vw;
 			margin: 0 0.2vw;
+			white-space: nowrap;
+			flex-wrap: nowrap;
 		}
 	}
 
@@ -1997,7 +1998,7 @@
 		}
 		.scrol{
 			width: 110%;
-			height: 30vw;
+			height: 29.5vw;
 			display: flex;
 			flex-wrap: wrap;
 			
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 44bf162..fe88211 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -201,8 +201,10 @@
 			<scroll-view class="top-list" scroll-y>
 				<view class="list-view" :style="menutarget===index?{borderColor:`#8DD6FF`,backgroundColor:`#F7F7F9`}:{}"
 					v-for="(item,index) in filteredMenu(2)" :key="index" @click="clickmenu(index)">
-					<image class="list-img"
-						:src="`/static/index/newindex/leftmenu/ware${item.elderInfo?.name?`blue`:`white`}.png`" />
+					<!-- <image class="list-img"
+						:src="`/static/index/newindex/leftmenu/ware${item.elderInfo?.name?`blue`:`white`}.png`" /> -->
+						<image class="list-img"
+							:src="`/static/index/newindex/leftmenu/wareblue.png`" />
 					<view class="">
 						<view class="first-line">
 							<view style="font-size: 1.2vw;">
@@ -872,6 +874,7 @@
 	const getmenu = () => {
 		queryPadPageList().then((res => {
 			leftMenuArray.value = res.result.records;
+			console.log(leftMenuArray.value )
 			filteredMenu(2).forEach((element : any, index : number) => {
 				if (element.nuId === uni.getStorageSync('NUall').nuId) {
 					menutarget.value = index;
@@ -1141,7 +1144,7 @@
 		left: 50%;
 		transform: translate(-50%, -20%);
 		// 禁止动画阻挡逻辑
-		z-index: -1;
+		z-index: 1;
 	}
 
 	.weight-time {
@@ -1264,6 +1267,7 @@
 		top: 55%;
 		left: 100rpx;
 		transform: translateY(-50%);
+		z-index: 2;
 	}
 
 	.zoom {
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index cb24191..ab7a343 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -223,9 +223,9 @@
 			<view style="display: flex;flex-wrap: wrap;width: 60%;">
 				<view class="moban-photo" v-for="(item,index) in albumlist" :key="index">
 					<view
-						style="width: 1.6vw;height: 1.6vw;z-index: 20;position: absolute; right: 0.1vw;top: 0.1vw;background: rgba(255, 255, 255, 0.7);display: flex;justify-content: center;align-items: center;"
+						style="border-radius: 0.3vw;width: 1.6vw;height: 1.6vw;z-index: 20;position: absolute; right: 0.1vw;top: 0.1vw;background: rgba(255, 255, 255, 0.7);display: flex;justify-content: center;align-items: center;"
 						@click.stop="deldex=index;open=1">
-						<image src="/static/x.png" mode="aspectFill" style="width: 100%;height: 100%;"></image>
+						<image src="/static/index/procurement/del1.png" mode="aspectFill" style="width: 75%;height: 75%;"></image>
 					</view>
 					<image style="width: 100%;height: 100%;" :src="item?item:'/static/zhanwei.png'" mode="aspectFill"
 						@click="previewImage(item,index,albumlist)" />
@@ -738,7 +738,7 @@
 						</view>
 					</view>
 				</scroll-view>
-				<view style="display: flex;justify-content: space-between;">
+				<view style="display: flex;justify-content: space-between;width: 100%;">
 					<view style="display: flex;">
 						<view :class="!typechange? `wuliao-title`:`wuliao-title-no`" @click="typechange = 0">
 							物料详情
@@ -751,19 +751,24 @@
 						</view>
 					</view>
 					<view style="display: flex;margin-top: 10rpx;font-size: 30rpx;">
-						<view :style="outerStyle" @click="opengaijiaclick">
+						<view :style="outerStyle" @click="opengaijiaclick" v-if="showvalue.jianhuobtn">
 							<view :style="segmentsWrapperStyle">
 								<view v-for="(c, i) in segColors" :key="i" :style="{
 						           flex: 1,
 						           height: '100%',
 						           backgroundColor: c
-						         }" />
+						         }" >
+								 </view>
 							</view>
 
 							<view :style="innerStyle">
 								<text :style="textStyle">改价</text>
 							</view>
 						</view>
+						<view v-else
+							:class="showvalue.jianhuobtn==false?`jianhuobutton-gray-bad`: `jianhuobutton-gray`">
+							改价
+						</view>
 						<view @click="openjianhuoclick"
 							:class="showvalue.jianhuobtn==false?`jianhuobutton-gray-bad`: `jianhuobutton-gray`">
 							拣货
@@ -2542,13 +2547,13 @@
 			}
 
 			.contain-right-middle {
-				width: 95%;
+				width: 96%;
 				height: 460rpx;
 				margin-top: 20rpx;
 				margin-left: 5%;
 
 				.middle-Y {
-					width: 92%;
+					width: 100%;
 					height: 100%;
 					margin-right: 3%;
 
@@ -2608,9 +2613,9 @@
 		position: fixed;
 		height: 102vh;
 		background-color: #fff;
-		width: 61vw;
+		width: 62.3vw;
 		top:-5vh;
-		right: 0;
+		right:-1vw;
 	}
 
 	.wuliao-title {
@@ -3393,6 +3398,7 @@
 		border-radius: 40rpx;
 		box-shadow: 0 4rpx 6rpx rgba(0, 0, 0, 0.1);
 		margin-left: 20rpx;
+		margin-right: 15rpx;
 	}
 
 	.jianhuobutton-gray-bad {
@@ -3407,6 +3413,7 @@
 		border-radius: 40rpx;
 		box-shadow: 0 4rpx 6rpx rgba(0, 0, 0, 0.1);
 		margin-left: 20rpx;
+		margin-right: 15rpx;
 	}
 
 	.bottom-left:active,
diff --git a/pages/procurement/addtory.vue b/pages/procurement/addtory.vue
index 914ce11..711d626 100644
--- a/pages/procurement/addtory.vue
+++ b/pages/procurement/addtory.vue
@@ -83,10 +83,7 @@
 		}
 		queryPddInfoList(obj).then(res=>{
 			console.log(res.result.records)
-			pddlist.value.push(...res.result.records);
-			status.value = (res.result.total == pddlist.value.length ? 'nomore' : 'loadmore');
-			let s = Math.ceil(res.result.total / 3);
-			pddlist.value.forEach((item,i)=>{
+			res.result.records.forEach((item,i)=>{
 				item.picPatharr = [];
 				item.zk = false;
 				item.yczk=false;
@@ -97,10 +94,18 @@
 					item.picPatharr = item.picPath.split(",");
 					item.picPatharr = item.picPatharr.filter(item => item !== '');
 				}
+				
+			})
+			
+			pddlist.value.push(...res.result.records);
+			let s = Math.ceil(res.result.total / 3);
+			pddlist.value.forEach((item,i)=>{
 				if(Math.ceil((i + 1) / 3) == s && s>2){
 					item.dczk = true;
 				}
 			})
+			status.value = (res.result.total == pddlist.value.length ? 'nomore' : 'loadmore');
+			
 		})
 	}
 	const scrolltolower = () =>{
diff --git a/pages/procurement/common/toryitem.vue b/pages/procurement/common/toryitem.vue
index edf677c..c75b7f8 100644
--- a/pages/procurement/common/toryitem.vue
+++ b/pages/procurement/common/toryitem.vue
@@ -37,7 +37,7 @@
 						</view>
 						<view class="dot">
 							<view style="text-align: right;">{{v?.pdsl?v?.pdsl:'--'}}</view>
-							<text>盘点数量</text>
+							<text style="text-align: right;">盘点数量</text>
 						</view>
 					</view>
 				</view>
@@ -91,8 +91,8 @@
 										<image :src="serverUrl+p" mode="aspectFill"></image>
 										<!-- <image :src="'/static/zhanwei.png'" mode="aspectFill" style="width: 2.1vw;height: 2.1vw;">
 										</image> -->
-										<view @click.stop="open=1;del(v,o)">
-											<image src="/static/x.png" mode="aspectFill" style="width: 100%;height: 100%;"></image>
+										<view @click.stop="open=1;del(v,o)" style="border-radius: 0.35vw;">
+											<image src="/static/index/procurement/del1.png" mode="aspectFill" style="width: 75%;height: 70%;"></image>
 										</view>
 									</view>
 									<view class="clkpz" @click="uplod(v,i)"  v-if="v.picPatharr?.length<6&&pddType == 1">
@@ -671,7 +671,7 @@
 				height: 100%;
 				overflow: hidden;
 				position: absolute;
-				left: 12vw;
+				left: 13vw;
 				top: 0;
 
 				.wltwo {
@@ -752,7 +752,7 @@
 				display: flex;
 				flex-direction: column;
 				position: absolute;
-				left: 0;
+				left: 0.4vw;
 				top: 0;
 
 				.cardp {
@@ -798,10 +798,11 @@
 					justify-content: center;
 					align-items: center;
 					margin: 0.8vw auto 0;
-
+					padding: 0.5vw;
 					>image {
 						width: 8.8vw;
 						height: 7.5vw;
+						border-radius: 0.4vw;
 					}
 				}