diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 4b9ac6d..acf4609 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -329,7 +329,6 @@
 			<view class="photowall-title">
 				<view class="photowall-name">
 					{{ !topbuttontarget?`拣货照片`:`随行单` }}
-
 				</view>
 				<view class="">
 					<text class="photowall-left">
@@ -374,7 +373,7 @@
 				</view>
 			</scroll-view>
 
-			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation v-if="topbuttontarget==1">
+			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation v-if="topbuttontarget==1" style="margin-top:0 !important;">
 				<view class="photowall-other-one" v-for="(item,index) in suixingdanarr" :key="index"
 					@click="previewImage(item,index,suixingdanarr,1)">
 					<image style="width: 100%;height: 70%;border-radius: 30rpx;"
@@ -398,7 +397,7 @@
 				</view>
 				<view class="photowall-other-one" v-if="topbuttontarget==1">
 					<view style="width: 100%;height: 70%;display: flex;flex-direction: column;
-						justify-content: center;align-items: center;position: absolute;top:3vw;left: 0;
+						justify-content: center;align-items: center;position: absolute;top:1.05vw;left: 0;
 						background-color:#fafdff ;border: 1rpx solid #78B1EB;border-radius: 30rpx;" @click="uplod(1)">
 						<image style="width: 70rpx;height: 70rpx;margin-bottom: 5rpx;"
 							src="/static/index/warehouse/procurement/picking/addphoto.png" />
@@ -3213,11 +3212,10 @@
 				width: 28.5%;
 				height: 430rpx;
 				margin-right: 3vw;
-				margin-bottom: 3%;
+				margin-bottom: 0;
 				border-radius: 30rpx;
 				display: inline-block;
 				position: relative;
-				// background-color: red;
 			}
 		}
 	}
diff --git a/pages/procurement/components/Inventory.vue b/pages/procurement/components/Inventory.vue
index 112fb05..cffb3fc 100644
--- a/pages/procurement/components/Inventory.vue
+++ b/pages/procurement/components/Inventory.vue
@@ -215,7 +215,7 @@
 					}
 				
 					&:nth-child(1) {
-						background: #C2C4C9;
+						background: #dcdee1;
 						color: #555555;
 					}
 				}
diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index 935f565..a9070e5 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -6,10 +6,15 @@
 				<view>
 					{{gysarr[gysidnum]?.name}}
 				</view>
-				<text  @click.stop="gysflag = !gysflag">调整</text>
+				<text  @click.stop="gysflag = !gysflag">
+					<image class="guodu"
+						:style="gysflag?'transform: rotate(180deg);':''"
+						:src=" '/static/index/procurement/sj.png' "
+						mode="aspectFill"></image>
+				</text>
 			</view>
-			<view class="tanchu" v-if="gysflag">
-				<scroll-view scroll-y="true" class="gysscrol">
+			<view class="tanchu guodu" :class="gysflag?'':'hei0'">
+				<scroll-view scroll-y="true" class="gysscrol" v-if="gysflag">
 					<view v-for="(v,i) in gysarr" :key='i' :class="gysidnum==i?'acts':''" @click="gysid(i)">
 						<text>{{v.name}}</text>
 						<image src="/static/index/procurement/d.png" mode="aspectFill"></image>
@@ -43,13 +48,18 @@
 			</view>
 		</view>
 		<view class="cgdw">
-			<view class="leftr">
-				<view>采购单位</view>
-				<text>{{type.unit}}</text>
+			<view class="leftr"   @click.stop="cgdwflag = !cgdwflag,cgdwec = false">
+				<view>{{type.unit}}</view>
+				<text>
+					<image class="guodu"
+						:style="!cgdwflag?'transform: rotate(180deg);':''"
+						:src=" '/static/index/procurement/sj.png' "
+						mode="aspectFill"></image>
+				</text>
 			</view>
-			<view class="tz" @click="cgdwflag=!cgdwflag">调整</view>
-			<view class="dwdw" v-if="cgdwflag">
-				<view class="gysscrol">
+			<!-- <view class="tz" @click="cgdwflag=!cgdwflag">调整</view> -->
+			<view class="dwdw guodu"  :class="cgdwflag?'':'hei0'">
+				<view class="gysscrol guodu" v-if="cgdwec"  :class="cgdwflag?'':'hei0'" >
 					<view v-for="(v,i) in cgdwarr" :key='i' :class="type.multiUnitType==v.multiUnitType?'acts':''"
 					 @click="cd(v,i)" :style="v.unit&&v.num?'':'height:0 !important;margin-top:-0.5vw'">
 						<text  v-if="v.unit&&v.num">{{v.unit}}</text><text v-if="v.unit&&v.num">{{v.num}}{{caigouobj.materialUnits}}</text>
@@ -66,7 +76,7 @@
 				确定
 			</view>
 		</view>
-		<view class="mengban" v-if="cgdwflag||gysflag" @click="gysflag = false;cgdwflag = false"></view>
+		<view class="mengban" v-if="cgdwflag||gysflag" @click="gysflag = false;cgdwflag = false;cgdwec = false;"></view>
 	</view>
 </template>
 
@@ -122,6 +132,15 @@
 	// 		 }
 	// 	}
 	// )
+	const cgdwec = ref(false)
+	watch(()=>cgdwflag.value,
+		()=>{
+			if(cgdwflag.value==true){
+				setTimeout(()=>{
+					cgdwec.value = true
+				},200)
+			}
+		})
 	watch(
 		()=>props.show,
 		()=>{
@@ -180,6 +199,7 @@
 			}else{
 				gysflag.value = false;
 				cgdwflag.value = false;
+				cgdwec.value = false;
 				type.value = {};
 				sx.value = false;
 				gysidnum.value = 0;
@@ -208,6 +228,7 @@
 	const cd =(v,i)=>{
 		type.value = v;
 		cgdwflag.value = false;
+		cgdwec.value = false;
 		jssl()
 	}
 	const gysid = (e:number)=>{
@@ -310,28 +331,49 @@
 </script>
 
 <style lang="less" scoped>
+	.hei0 {
+		height: 0 !important;
+		view{
+			height: 0 !important;
+		}
+	}
 	.cgdw{
-		width: 90%;
-		height: 3.5vw;
+		width: 24.3vw;
 		display: flex;
+		height: 3.3vw;
 		justify-content: space-between;
-		margin: 1.5vw auto 0.8vw;
+		align-items: center;
+		margin :0.8vw auto 0;
+		background: #F8F8FA;
+		border-radius: 1.65vw;
+		padding: 0 1vw;
 		position: relative;
+		text{
+			width: 3.3vw;
+			height: 3.3vw;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			image {
+				width: 1.6vw;
+				height: 1.6vw;
+			}
+		}
 		.dwdw{
-			width: 15vw;
-			height: 11vw;
+			width: 24.3vw;
+			height: 14vw;
 			background: #FFFFFF;
 			box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(174,175,176,0.35);
 			border-radius: 1.1vw;
 			padding: 0 1vw;
 			position: absolute;
-			left:7vw;
-			top: -16vw;
+			left:0vw;
+			bottom: 3.5vw;
 			z-index: 211;
 			.gysscrol{
 				width: 100%;
 				height: 10vw;
-				.acts{
+				>.acts{
 					color: #0385FA !important;
 					image{
 						display: block;
@@ -347,13 +389,18 @@
 					margin-bottom: 1.2vw;
 					padding-right: 1.5vw;
 					position: relative;
+					white-space: nowrap;
+					text{
+						white-space: nowrap;
+						padding-right: 1vw;
+					}
 					&:nth-child(1){
 						margin-top: 1vw;
 					}
-					image{
+					>image{
 						position: absolute;
 						right: 0.2vw;
-						top: 25%;
+						top: 33%;
 						width: 1vw !important;
 						height: 0.7vw !important;
 						display: none;
@@ -377,9 +424,10 @@
 			color: #555555;
 		}
 		.leftr{
-			width: 21vw;
+			width: 100%;
 			display: flex;
 			align-items: center;
+			justify-content: space-between;
 			white-space: nowrap;
 			view{
 				width: 8.6vw;
@@ -400,19 +448,19 @@
 		position: relative;
 		margin-top: 0.5vw;
 		>.tanchu{
-			width: 25vw;
-			height: 15vw;
+			width: 24.5vw;
+			height: 25.8vw;
 			background: #FFFFFF;
 			box-shadow: 0rpx 0rpx 0.5vw 0rpx rgba(174,175,176,0.35);
 			border-radius: 1.1vw;
 			padding: 0 1.4vw;
 			position: absolute;
-			right: 7.2vw;
+			right: 1vw;
 			top: 7vw;
 			z-index: 211;
 			.gysscrol{
 				width: 100%;
-				height: 15vw;
+				height: 25vw;
 				.acts{
 					color: #0385FA !important;
 					image{
@@ -445,23 +493,25 @@
 			
 		}
 		.gssel{
-			width: 100%;
+			width: 24.3vw;
 			display: flex;
+			height: 3.3vw;
 			justify-content: space-between;
 			align-items: center;
-			margin-top:0.8vw;
+			margin :0.8vw auto 0;
+			background: #F8F8FA;
+			border-radius: 1.65vw;
+			padding: 0 1vw;
 			text{
-				width: 7.1vw;
+				width: 3.3vw;
 				height: 3.3vw;
-				border-radius: 1.65vw;
-				font-weight: 400;
-				font-size: 1.5vw;
-				color: #555;
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				border: 1px solid #D9DADC;
-				box-shadow: 0.05vw 0.5vw 0.5vw #dadee1;
+				image {
+					width: 1.6vw;
+					height: 1.6vw;
+				}
 			}
 			view{
 				width: 22vw;
@@ -477,15 +527,17 @@
 		}
 		.tlt{
 			font-weight: bold;
-			font-size: 1.8vw;
+			font-size: 1.5vw;
 			color: #333333;
+			padding-left: 3vw;
+			font-weight: 400;
 		}
 	}
 	.plsbuy-contain {
 		display: flex;
 		align-items: center;
 		flex-direction: column;
-		width: 36vw;
+		width: 32vw;
 		height: 95vh;
 		background: rgba(250, 251, 252, 1);
 		overflow: hidden;
@@ -495,7 +547,7 @@
 		left: 32vw;
 		position: fixed;
 		z-index: 200;
-		padding:1.5vw 2.8vw;
+		padding:1.5vw 1vw;
 	}
 
 
@@ -619,6 +671,11 @@
 		top: 0;
 		left: 0;
 		z-index:210;
-		background: RGBA(239, 240, 244, 0.55);
+		background: RGBA(239, 240, 244, 0);
+	}
+	.guodu {
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index 4526fed..d99d361 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -222,7 +222,7 @@
 				}
 
 				&:nth-child(1) {
-					background: #C2C4C9;
+					background: #dcdee1;
 					color: #555555;
 				}
 			}
@@ -299,6 +299,7 @@
 
 						&:nth-child(3) {
 							width: 30%;
+							text-align: right;
 							align-items: right;
 						}
 
diff --git a/pages/procurement/components/carlist.vue b/pages/procurement/components/carlist.vue
index 5a49218..aad40f9 100644
--- a/pages/procurement/components/carlist.vue
+++ b/pages/procurement/components/carlist.vue
@@ -269,7 +269,7 @@
 					}
 				}
 				&:nth-child(1) {
-					background: #C2C4C9;
+					background: #dcdee1;
 					color: #555555;
 				}
 			}
@@ -319,7 +319,7 @@
 			display: inline-block;
 
 			>view {
-				margin-top: 0.8vw;
+				margin-top: 0.65vw;
 
 				&:nth-child(5) {
 					width: 28vw;
@@ -328,6 +328,7 @@
 					justify-content: space-between;
 					position: relative;
 					left: 0;
+					top: 0.3vw;
 					>view {
 						width: 25%;
 						height: 100%;
diff --git a/pages/procurement/components/details.vue b/pages/procurement/components/details.vue
index f0aed62..c226831 100644
--- a/pages/procurement/components/details.vue
+++ b/pages/procurement/components/details.vue
@@ -216,7 +216,7 @@
 					}
 				
 					&:nth-child(1) {
-						background: #C2C4C9;
+						background:#dcdee1;
 						color: #555555;
 					}
 				}
diff --git a/pages/procurement/components/equiment.vue b/pages/procurement/components/equiment.vue
deleted file mode 100644
index cd07b09..0000000
--- a/pages/procurement/components/equiment.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-	<view>
-		<view class="zhezhao" v-show="open" @click="emit('back')">
-			<view class="neuro-box" @click.stop v-if="open">
-				<view class="button-father">
-					<view :class="buttonposition?`buttontarget button`:`button-white` " @click="emit('back')">
-						取消</view>
-					<view :class="!buttonposition?`buttontarget button`:`button-white` " @click="config()">确定</view>
-				</view>
-		
-				<view class="card-font">
-					{{content}}
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script lang="ts" setup>
-	import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps, watch, onUnmounted ,defineEmits } from 'vue';
-	const emit = defineEmits(["back", "del"])
-	const props = defineProps({
-		open: {
-			type: Boolean,
-			required: true,
-		},
-		content: {
-			type: String
-		},
-	});	
-	 const buttonposition = ref(false)
-	 const config = ()=>{
-		 emit('del')
-	 }
-</script>
-
-<style scoped lang="less">
-	.card-font {
-		margin-top: 70rpx;
-		width: 600rpx;
-		justify-content: center;
-		display: flex;
-	}
-	.button-white {
-		width: 40%;
-		border: 2rpx solid #c3cacd;
-		background: linear-gradient(to bottom, #f3f3f5, #dee4e9);
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 25rpx;
-		border-radius: 30rpx;
-	}
-	.button {
-		width: 40%;
-		background-color: #ddf0ff;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		color: #007CFF;
-		border: 1rpx solid #007CFF;
-		font-size: 25rpx;
-		border-radius: 30rpx;
-	}
-	.button-father {
-		position: absolute;
-		bottom: 60rpx;
-		left: 50%;
-		transform: translateX(-50%);
-		width: 100%;
-		height: 60rpx;
-		display: flex;
-		justify-content: space-around;
-		padding: 0 50rpx;
-	}
-	.neuro-box {
-		position: absolute;
-		left: 0;
-		top: 0;
-		bottom: 0;
-		right: 0;
-		margin: auto;
-		width: 400rpx;
-		height: 270rpx;
-		border-radius: 30rpx;
-		background-color: #fff;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		z-index: 21;
-		padding: 0 10%;
-		z-index: 999;
-	}
-.zhezhao {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100vw;
-	height: 100vh;
-	z-index: 125;
-}
-.zerotarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 50rpx;
-		--outline-offset: 0rpx;
-		/* 外扩多少 */
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		background-color: white;
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
-
-		/* 保证文本 / 子元素在最上层 */
-		position: relative;
-		z-index: 0;
-	}
-
-	.firsttarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 50%;
-		--outline-offset: 0rpx;
-		/* 外扩多少 */
-
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		background-color: white;
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
-
-		/* 保证文本 / 子元素在最上层 */
-		position: relative;
-		z-index: 0;
-	}
-
-	.buttontarget {
-		--color: #99C9FD;
-		--thick: 2px;
-		--radius: 30rpx;
-		--outline-offset: 0rpx;
-		/* 外扩多少 */
-
-		/* 内层虚线（你现在用的） */
-		border-radius: var(--radius);
-		background-color: white;
-		/* 内部背景 */
-		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
-		/* 外层虚线：放在 outline（不会影响元素尺寸） */
-		outline: var(--thick) dashed var(--color);
-		outline-offset: var(--outline-offset);
-
-		/* 保证文本 / 子元素在最上层 */
-		position: relative;
-		z-index: 0;
-	}
-
-	@keyframes scalePulse {
-		0% {
-			transform: scale(1);
-		}
-
-		25% {
-			/* 先收缩一点点 */
-			transform: scale(0.94);
-		}
-
-		65% {
-			/* 再放大到略超出的感觉 */
-			transform: scale(1.08);
-		}
-
-		100% {
-			transform: scale(1);
-		}
-	}
-</style>
diff --git a/pages/procurement/components/purorder.vue b/pages/procurement/components/purorder.vue
index 9c50544..76ce5ed 100644
--- a/pages/procurement/components/purorder.vue
+++ b/pages/procurement/components/purorder.vue
@@ -459,7 +459,7 @@
 						align-items: center;
 
 						view {
-							width: 5.5vw;
+							min-width: 5.5vw;
 							height: 1.8vw;
 							border-radius: 0.9vw;
 							border: 1px solid #D2D2D2;
@@ -470,6 +470,7 @@
 							font-weight: 400;
 							font-size: 1vw;
 							color: #555555;
+							padding:0 0.5vw;
 						}
 					}
 
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 5e07724..885bf98 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -27,7 +27,7 @@
 			<view class="kjlt" @click="tx=!tx">
 				库存预警
 			</view>
-			<scroll-view scroll-x="true" class="kcscrol guodu" :style="tx?(qb?'width:46.4vw':'width:54.4vw') : (qb?'width:91vw':'width:91vw') "
+			<scroll-view scroll-x="true" class="kcscrol guodu" :style="tx?(qb?'width:46.4vw':'width:54.4vw') : (qb?'width:78.4vw':'width:86.4vw') "
 			scroll-with-animation :scroll-top="scrolltop"  @scrolltolower="scrolltolower(1)">
 				<view class="yjbox" v-for="(v,i) in Material" :key="i"  @click="clickaddcar(v,i)">
 					<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"></image>
@@ -44,7 +44,7 @@
 				<view class="guodu" :class="qb?(moredex==2?'avt':''):'righ0'" @click="moredex=2">添加全部</view>
 
 			</view>
-			<view class="kaprght">
+			<view class="kaprght guodu">
 				<view class="ksfw guodu" :style="tx?'':'right: -38vw !important;'">
 					<view class="lcar">
 						<image :src="'/static/index/procurement/k.png'" mode="aspectFill"></image>
@@ -440,12 +440,14 @@
 		height: 10vw;
 		display: flex;
 		margin-top: 1vw;
-
+		position: relative;
 		.kaprght {
 			width: 32vw;
 			height: 10vw;
 			margin-left: 0.6vw;
-			position: relative;
+			position: absolute;
+			right: 0;
+			bottom: 0;
 
 			.ksfw {
 				width: 100%;
@@ -493,14 +495,13 @@
 						width: 4.6vw;
 						height: 1.9vw;
 						position: absolute;
-						top: 0.6vw;
+						top: 1.8vw;
 						right: 1vw;
 						font-weight: 400;
 						font-size: 1.1vw;
 						display: flex;
 						justify-content: center;
 						align-items: center;
-						line-height: 1.9vw;
 					
 						>image {
 							position: absolute;
@@ -515,7 +516,6 @@
 							position: relative;
 							z-index: 2;
 							color: #FFFFFF;
-							margin-top: 2vw;
 						}
 					}
 				}
@@ -551,10 +551,9 @@
 				.zhxng {
 					width: 100%;
 					height: 2.8vw;
-					margin-top: 0.4vw;
+					margin-top: 1vw;
 					display: flex;
 					padding: 1.1vw 0 1.1vw 0;
-					border-bottom: 2px solid #E5E5E5;
 
 					view {
 						display: flex;
@@ -583,7 +582,7 @@
 					font-weight: bold;
 					font-size: 1.5vw;
 					color: #555555;
-					margin: 1vw auto 0;
+					margin: 2vw auto 0;
 				}
 
 				.tm {
@@ -592,7 +591,7 @@
 					font-size: 2.2vw;
 					font-weight: bolder;
 					color: #555555;
-					margin-top: 2vw;
+					margin-top:0.5vw;
 				}
 
 			}
@@ -610,6 +609,8 @@
 			justify-content: center;
 			letter-spacing: 3px;
 			font-size: 1.4vw;
+			position: relative;
+			z-index: 100;
 		}
 
 		.more {
@@ -673,6 +674,8 @@
 			height: 10vw;
 			white-space: nowrap;
 			margin-left: 0.6vw;
+			position: relative;
+			z-index: 99;
 
 			.yjbox {
 				display: inline-block;