diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css
index a898042..1af49d6 100644
--- a/pages/NursingNew/component/nurse/index.css
+++ b/pages/NursingNew/component/nurse/index.css
@@ -992,7 +992,7 @@
 	justify-content: center;
 	align-items: center;
 	/* 添加毛玻璃效果 */
-	z-index: 98;
+	z-index: 999;
 
 	.popup-overlay-content {
 		position: absolute;
diff --git a/pages/NursingNew/component/nurse/index.vue b/pages/NursingNew/component/nurse/index.vue
index 07b02cb..86034e7 100644
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
@@ -419,7 +419,7 @@
 		</view>
 		<!-- 点击的弹出层 -->
 		<view v-show="isopen" class="popup-overlay" @click="isopen=false;flyNumber.index0=999;touchindex1=-1">
-			<view class="popup-overlay-content" style="height: 390rpx;" :class="getjiao"
+			<view class="popup-overlay-content" style="height: 390rpx;" popup-overlay:class="getjiao"
 				v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.izPackage==='N'"
 				:style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }"
 				@click.stop>
@@ -1548,7 +1548,7 @@
 									openX.value = Math.floor(res.left) - 18
 									jiao.value[0] = false
 								}
-								if (res.top > 500) {
+								if (res.top > 300) {
 									// 表格太靠上侧，修改到下面
 									openY.value = Math.floor(res.top) + 100;
 									jiao.value[1] = true
@@ -1561,7 +1561,7 @@
 								
 								showDetail.value[0] = index0;
 								showDetail.value[1] = index1;
-								console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage)
+								// console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage)
 								isopacity.value = false;
 								//加动画
 								setTimeout(() => {
diff --git a/pages/NursingNew/component/pleasetake/common/addwl.vue b/pages/NursingNew/component/pleasetake/common/addwl.vue
index 6f12f74..9782ef0 100644
--- a/pages/NursingNew/component/pleasetake/common/addwl.vue
+++ b/pages/NursingNew/component/pleasetake/common/addwl.vue
@@ -3,12 +3,18 @@
 		<view class="kcyj">
 			<view class="kjlt">
 				请领物料
-				<view class="mhao" v-if="Material.length>0">{{Material.length}}</view>
+				<view class="mhao" v-if="Material.length>0">
+					<view class="mhao-font">
+						{{Material.length}}
+					</view>
+
+				</view>
 			</view>
-			<scroll-view scroll-x="true" class="kcscrol guodu"  @scroll="onScroll"
-				scroll-with-animation :scroll-left="scrollleft"  :style="qb?'width:calc(100% - 21.8vw)':'width:calc(100% - 10vw)' ">
-				<view class="yjbox" v-for="(v,i) in Material" :key="i" >
-					<image :src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
+			<scroll-view scroll-x="true" class="kcscrol guodu" @scroll="onScroll" scroll-with-animation
+				:scroll-left="scrollleft" :style="qb?'width:calc(100% - 21.8vw)':'width:calc(100% - 10vw)' ">
+				<view class="yjbox" v-for="(v,i) in Material" :key="i">
+					<image
+						:src="v.materialInfo?.materialImg?serverUrl+v.materialInfo?.materialImg:'/static/index/procurement/k.png'"
 						mode="aspectFill"></image>
 					<view>{{v.materialInfo?.materialName}}</view>
 					<text class="ytj" v-if="v.qlNum>=0">{{v.qlNum}}</text>
@@ -16,9 +22,15 @@
 						<view>-</view>
 					</view>
 				</view>
-				<defaultr cont="暂无数据" v-if="Material.length==0&&timeout" style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
+				<view class="que" v-if="Material.length==0&&timeout">
+					<image src="/static/index/procurement/que.png" mode="aspectFill"></image>
+					<view>暂无数据</view>
+				</view>
+				<!-- <defaultr cont="暂无数据" v-if="Material.length==0&&timeout"
+					style="position: absolute;width: 10vw;height: 10vw;"></defaultr> -->
 			</scroll-view>
-			<view class="kjlt more guodu" :style="qb?'width:15vw':'' "  @touchstart="ts" @touchmove="canmove" v-if="Material.length>0">
+			<view class="kjlt more guodu" :style="qb?'width:15vw':'' " @touchstart="ts" @touchmove="canmove"
+				v-if="Material.length>0">
 				<view @click="zksq" class="righ0">
 					{{!qb?'更多':'收起'}}
 					<image class="guodu" :style="qb?'transform: rotate(180deg);':''"
@@ -40,46 +52,46 @@
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive } from 'vue';
+	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
 	import defaultr from './default.vue'
 	import tanchuang from '../common/tanchuang.vue';
 	const props = defineProps({
-		Material:{
-			type:Array,
+		Material: {
+			type: Array,
 			required: true,
 		}
 	});
-	const emit = defineEmits([ 'delall' ,'del','submit'])
+	const emit = defineEmits(['delall', 'del', 'submit'])
 	const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
 	const qb = ref(false)
 	const moredex = ref(0)
-	watch(()=>props.Material,
-	()=>{
-		if(props.Material.length==0){
-			qb.value = false;
-			moredex.value=0;
-		}
-	})
-	const delall = ()=>{
+	watch(() => props.Material,
+		() => {
+			if (props.Material.length == 0) {
+				qb.value = false;
+				moredex.value = 0;
+			}
+		})
+	const delall = () => {
 		emit('delall');
-		setTimeout(()=>{
+		setTimeout(() => {
 			moredex.value = 0;
 			qb.value = false;
-		},100)
+		}, 100)
 	}
-	const del =(v)=>{
-		emit('del',v)
+	const del = (v) => {
+		emit('del', v)
 	}
-	const zksq = () =>{
-		if(props.Material.length==0){
+	const zksq = () => {
+		if (props.Material.length == 0) {
 			uni.showToast({
-				icon:'none',
-				title:'请添加请领物料！'
+				icon: 'none',
+				title: '请添加请领物料！'
 			})
 			return
 		}
-		qb.value=!qb.value;
-		moredex.value=0;
+		qb.value = !qb.value;
+		moredex.value = 0;
 		moveleft();
 	}
 	const startX = ref(0)
@@ -93,7 +105,7 @@
 	}
 	const scrollleft = ref(0)
 	const canmove = (e : any) => {
-		if(props.Material.length==0){ return }
+		if (props.Material.length == 0) { return }
 		const moveX = e.touches[0].clientX
 		const diff = moveX - startX.value
 		// diff 为负值就是向左滑
@@ -129,10 +141,10 @@
 		}
 	}
 	const timeout = ref(false)
-	onMounted(()=>{
-		setTimeout(()=>{
+	onMounted(() => {
+		setTimeout(() => {
 			timeout.value = true
-		},500)
+		}, 500)
 	})
 </script>
 
@@ -157,22 +169,28 @@
 			font-size: 1.4vw;
 			position: relative;
 			z-index: 10;
-			.mhao{
-				width: 1.6vw;
-				min-height: 0vw;
-				border-radius: 0.8vw;
-				border: 1px solid #FF4E4E;
-				font-weight: 400;
-				font-size: 1.1vw;
-				color: #FF4E4E;
-				padding: 0.4vw 0vw;
+
+			.mhao {
 				position: absolute;
-				top: -0.8vw;
-				right: -0.4vw;
-				transform: rotate(-90deg);
+				top: -0.2vw;
+				/* 根据视觉需要微调 */
+				right: -0.2vw;
+				box-sizing: border-box;
+				width: 1.8vw;
+				height: 1.8vw;
+				border-radius: 50%;
+				border: 1px solid #FF4E4E;
+				color: #FF4E4E;
 				display: flex;
-				justify-content: center;
 				align-items: center;
+				justify-content: center;
+				background: transparent;
+				writing-mode: horizontal-tb;
+				overflow: hidden;
+				.mhao-font{
+					font-size: 25rpx;
+					letter-spacing: -0.05em; /* 负值 = 字符之间更近 */
+				}
 			}
 		}
 
@@ -221,7 +239,7 @@
 					right: 7.7vw;
 					z-index: 2;
 				}
-				
+
 				&:nth-child(4) {
 					right: 11.6vw;
 					z-index: 2;
@@ -234,8 +252,9 @@
 			}
 
 		}
+
 		.kcscrol {
-			width:calc(100% - 10vw);
+			width: calc(100% - 10vw);
 			height: 10vw;
 			white-space: nowrap;
 			margin-left: 0.6vw;
@@ -250,14 +269,16 @@
 				border-radius: 1.1vw;
 				margin-right: 0.8vw;
 				position: relative;
-				.zhanwei{
+
+				.zhanwei {
 					width: 100%;
 					height: 100%;
 					position: absolute;
 					top: 0;
 					left: 0;
 					z-index: 200;
-					view{
+
+					view {
 						position: absolute;
 						width: 2.2vw;
 						height: 2.2vw;
@@ -276,6 +297,7 @@
 						color: rgba(255, 78, 78, 1);
 					}
 				}
+
 				.ytj {
 					min-width: 1.5vw;
 					height: 1.8vw;
@@ -288,7 +310,7 @@
 					text-align: center;
 					line-height: 1.75vw;
 					position: absolute;
-					padding:  0 0.8vw;
+					padding: 0 0.8vw;
 					top: 0.8vw;
 					right: 0.8vw;
 				}
@@ -316,9 +338,40 @@
 			}
 		}
 	}
+
 	.guodu {
 		transition: .4s;
 		-webkit-transform-style: preserve-3d;
 		-webkit-overflow-scrolling: touch;
 	}
+	.que{
+		width: 16vw;
+		height: 16vw;
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 82.2vw;
+		height: 10vw;
+		background: rgba(245, 246, 248, 1);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 20rpx;
+		
+		image{
+			width: 12vw;
+			height: 12vw;
+		}
+		view{
+			width: 12vw;
+			text-align: center;
+			position: absolute;
+			bottom: 0.5vw;
+			left: 50%;
+			transform: translateX(-50%);
+			font-weight: 300;
+			font-size: 1.4vw;
+			color: #555555;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue
index 5d8e639..4a802b7 100644
--- a/pages/NursingNew/component/pleasetake/common/carditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/carditem.vue
@@ -220,6 +220,7 @@
 			position: absolute;
 			bottom: 0.8vw;
 			right: 0vw;
+			
 		}
 	}
 	.msitem {
@@ -370,7 +371,7 @@
 	
 	.itembox{
 		width: 100%;
-		height: 64vh;
+		height: 66vh;
 		padding:1vw 2vw 0 0;
 		
 		.box{
diff --git a/pages/NursingNew/component/pleasetake/common/cgdclass.vue b/pages/NursingNew/component/pleasetake/common/cgdclass.vue
index 0f941d8..5d65b64 100644
--- a/pages/NursingNew/component/pleasetake/common/cgdclass.vue
+++ b/pages/NursingNew/component/pleasetake/common/cgdclass.vue
@@ -335,7 +335,7 @@
 				min-width: 8vw;
 				height: 3.8vw;
 				background: #EDEDEF;
-				border-radius: 1.6vw;
+				border-radius: 3vw;
 				padding: 0 2vw;
 				margin-left: 1vw;
 				border: 1px solid #EDEDEF;
diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue
index b1caa7d..efe748e 100644
--- a/pages/NursingNew/component/pleasetake/common/htditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/htditem.vue
@@ -307,7 +307,7 @@
 					font-size: 1.6vw;
 					color: #222222;
 					height: 3vw;
-					padding-top: 1.3vw;
+					padding-top: 1.2vw;
 					text-overflow: ellipsis;
 					overflow: hidden;
 					white-space: nowrap;
diff --git a/pages/NursingNew/component/pleasetake/common/medetails.vue b/pages/NursingNew/component/pleasetake/common/medetails.vue
index 01024d5..4396ec7 100644
--- a/pages/NursingNew/component/pleasetake/common/medetails.vue
+++ b/pages/NursingNew/component/pleasetake/common/medetails.vue
@@ -7,8 +7,8 @@
 				<view class="leftbox">
 					<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
 					<view>
-						<text>耗材用品</text>
-						<text>复健用品</text>
+						<view>{{ objtake?.categoryId_dictText }}</view>
+						<view>{{ objtake?.typeId_dictText }}</view>
 					</view>
 				</view>
 				<view class="youcont">
@@ -70,15 +70,15 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 	const showbox = ref(false)
 	watch(()=>props.show,
 		()=>{
-			console.log(props.objtake)
+			// console.log(`11111111111`,props.objtake)
 			if(props.show==true){
 				let obj = {
 					nuId:uni.getStorageSync('nuId'),
-					elderId:uni.getStorageSync('NUall').id,
+					elderId:uni.getStorageSync('NUall').elderId,
 					wlId:props.objtake.wlId
 				}
 				queryMaterialInfo(obj).then(res=>{
-					console.log(res)
+					console.log(`wuobj`,res)
 					wuobj.value = res.result
 				})
 				setTimeout(()=>{
@@ -113,6 +113,7 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 		}
 		.quxiao{
 			background: #EDEDEF;
+			color: #888888;
 		}
 		.plsbuy-bottom-blue {
 			background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
@@ -142,14 +143,16 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick,  watch, reactive }
 				width: 14.2vw;
 				height: 100%;
 				border-right: 2px solid #E5E5E5;
-
+				
 				view {
 					width: 100%;
 					margin-top: 0.6vw;
 					display: flex;
-					justify-content: space-around;
-
-					text {
+					// justify-content: space-around;
+					flex-direction: column;
+					align-items: center;
+					
+					view {
 						width: 6vw;
 						height: 2vw;
 						border-radius: 1vw;
diff --git a/pages/NursingNew/component/pleasetake/common/submits.vue b/pages/NursingNew/component/pleasetake/common/submits.vue
index 7c72056..190d2a5 100644
--- a/pages/NursingNew/component/pleasetake/common/submits.vue
+++ b/pages/NursingNew/component/pleasetake/common/submits.vue
@@ -211,7 +211,7 @@
 									font-size: 1.6vw;
 									color: #222222;
 									height: 3vw;
-									padding-top: 1.3vw;
+									padding-top: 1.2vw;
 									text-overflow: ellipsis;
 									overflow: hidden;
 									white-space: nowrap;
@@ -266,6 +266,7 @@
 			font-weight: 400;
 			font-size: 1.4vw;
 			color: #555555;
+			margin-left: 1.1vw;
 		}
 		.itemcan{
 			width: 100%;
@@ -273,6 +274,8 @@
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
+			padding-left: 1vw;
+			padding-right: 1vw;
 			text{
 				font-weight: 400;
 				font-size: 1.4vw;
@@ -280,7 +283,7 @@
 			}
 		}
 		.tit {
-			width: 100%;
+			width: 96.5%;
 			height: 3.5vw;
 			line-height: 6vw;
 			font-weight: 400;
@@ -290,6 +293,8 @@
 			justify-content: space-between;
 			align-items: center;
 			border-bottom: 1px solid #E5E5E5;
+			margin: 0 1vw;
+			
 		}
 	}
 	.mengban{
@@ -338,6 +343,7 @@
 		}
 		.quxiao{
 			background: #EDEDEF;
+			color: #888888;
 		}
 		.plsbuy-bottom-blue {
 			background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
diff --git a/pages/NursingNew/component/pleasetake/common/takeing.vue b/pages/NursingNew/component/pleasetake/common/takeing.vue
index 8aeaa5f..b8e848a 100644
--- a/pages/NursingNew/component/pleasetake/common/takeing.vue
+++ b/pages/NursingNew/component/pleasetake/common/takeing.vue
@@ -227,6 +227,7 @@
 				   	}
 				   	.quxiao{
 				   		background: #EDEDEF;
+						color: #888888;
 				   	}
 				   	.plsbuy-bottom-blue {
 				   		background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
@@ -317,6 +318,7 @@
 					font-size: 1.4vw;
 					font-weight: 500;
 					text-align: center;
+					margin-left: 1.5vw;
 				}
 				
 			   .cont{
diff --git a/pages/NursingNew/component/pleasetake/common/takerecord.vue b/pages/NursingNew/component/pleasetake/common/takerecord.vue
index 71c0a8c..39c633b 100644
--- a/pages/NursingNew/component/pleasetake/common/takerecord.vue
+++ b/pages/NursingNew/component/pleasetake/common/takerecord.vue
@@ -10,8 +10,8 @@
 				<view class="leftbox">
 					<image :src="objtake?.materialImg?serverUrl+objtake?.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"/>
 					<view>
-						<text>耗材用品</text>
-						<text>复健用品</text>
+						<view v-if="objtake?.categoryId_dictText">{{objtake?.categoryId_dictText}}</view>
+						<view v-if="objtake?.typeId_dictText">{{objtake?.typeId_dictText}}</view>
 					</view>
 				</view>
 				<view class="youcont">
@@ -101,10 +101,11 @@
 			if(props.show==true){
 				let obj = {
 					nuId:uni.getStorageSync('nuId'),
-					elderId:uni.getStorageSync('NUall').id,
+					elderId:uni.getStorageSync('NUall').elderId,
 					wlId:props.objtake.wlId, 
 				}
 				queryMaterialInfo(obj).then(res=>{
+					console.log("入参",obj,`返回`,res)
 					wuobj.value = res.result
 				})
 				qglog()
@@ -175,7 +176,8 @@
 				.dian{
 					 width: 0.5vw;
 					 height: 0.5vw;
-					 margin: 01.6vw;
+					 margin: 1.6vw;
+					 margin-right: 1vw;
 					 background: #888888;
 					 border-radius: 50%;
 					 position: relative;
@@ -192,24 +194,25 @@
 					background: white;
 				}
 				.riqi{
-					min-width: 7.2vw;
+					width: 12vw;
 					height: 2vw;
 					background: #F9F9FA;
 					border-radius: 1vw;
-					border: 1px solid #D2D2D2;
+					border: 1rpx solid #D2D2D2;
 					display: flex;
 					justify-content: center;
 					align-items: center;
 					font-weight: 400;
 					font-size: 1vw;
 					color: #888888;
-					padding: 0 0.6vw;
+					padding: 0 0.4vw;
 				}
 				.qlr{
+					width: 11vw;
 					font-weight: 400;
-					font-size: 1.3vw;
+					font-size: 1.2vw;
 					color: #999999;
-					margin-left: 1.8vw;
+					margin-left: 1vw;
 					text{
 						color: #333;
 					}
@@ -249,12 +252,14 @@
 			
 					view {
 						width: 100%;
-						margin-top: 0.6vw;
+						margin-top: 0.3vw;
 						display: flex;
-						justify-content: space-around;
-			
-						text {
-							min-width: 4.8vw;
+						flex-direction: column;
+						align-items: center;
+						// justify-content: space-around;
+						
+						view {
+							width: 6vw;
 							height: 2vw;
 							border-radius: 1vw;
 							border: 1px solid #D2D2D2;
@@ -290,7 +295,7 @@
 							height: 3.6vw;
 							display: flex;
 							justify-content: flex-start;
-							margin-top: 1.8vw;
+							margin-top: 1.6vw;
 			
 							>view {
 								width: 50%;
@@ -311,15 +316,15 @@
 			
 						&:nth-child(1) {
 							width: 100%;
-							height: 1.8vw;
+							height: 2vw;
 							font-weight: bold;
-							font-size: 1.6vw;
+							font-size: 1.5vw;
 							color: #222222;
 							white-space: nowrap;
 							text-overflow: ellipsis;
 							overflow: hidden;
-							line-height: 1.8vw;
 						}
+						
 					}
 				}
 			
@@ -365,6 +370,7 @@
 		}
 		.quxiao{
 			background: #EDEDEF;
+			color: #888888;
 		}
 		.plsbuy-bottom-blue {
 			background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index b9476da..da2cc49 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -232,7 +232,7 @@
 	watch(
 		() => props.isShow,
 		(newVal, oldVal) => {
-			console.log("??????",newVal, oldVal)
+			// console.log("??????",newVal, oldVal)
 			// 当旧值为false，新值为true时延迟0.2秒调用方法
 			if (!oldVal && newVal) {
 				transition.value = false;
@@ -333,7 +333,7 @@
 	const firstgetqueryCgdList = () => {
 		queryQld(plzinfo).then((res : any) => {
 			transition.value = true;
-			// console.log("kankan",plzinfo,res)
+			// console.log("kankan",res)
 			if (((res.message === "缺少参数") || (!res.result?.total)) && cannomessage.value) {
 				nomessageshow.value = true;
 				return
@@ -356,6 +356,8 @@
 					rightarray.value.push(...element.result)
 					rightdonghua.value = true;
 				})
+			}else{
+				rightarray.value = []
 			}
 
 			if (res.result.records.length < plzinfo.pageSize) {
diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
index 81d8a61..98c7571 100644
--- a/pages/NursingNew/component/pleasetake/component/returnorder.vue
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -10,7 +10,7 @@
 					作废
 				</view>
 			</view>
-			<view class="right-button" style="width: 11vw;" @click="tijiaoshow=true">
+			<view class="right-button" style="width: 11vw;" @click="tijiaoshow=true" v-if="rightarray.length">
 				<image src="/static/index/warehouse/procurement/picking/caigou.png" />
 				<view>
 					提交请购单
@@ -183,7 +183,8 @@
 			// 当旧值为false，新值为true时延迟0.2秒调用方法
 			if (!oldVal && newVal) {
 				transition.value = false;
-				// console.log("????",transition.value)
+				plzinfo.pageNo = 1;
+				plzinfo.canpull = true;
 				setTimeout(() => {
 					transition.value = true;
 					lefttarget.value = 0;
@@ -286,7 +287,7 @@
 			plsbuy.value = [];
 			// console.log(res)
 			plsbuy.value.push(...res.result.records)
-			// console.log("入参", plzinfo)
+			console.log("入参", plzinfo)
 			console.log("查看数组", res.result.records)
 			alltotal.value = res.result.total
 
@@ -426,6 +427,7 @@
 				setTimeout(()=>{
 					plsbuy.value[lefttarget.value] = res.result.result
 					tijiaoshow.value = false;
+					
 					rightinfolist();
 				},800)
 			}else{
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index 3b804f7..bbcc1e7 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -1,9 +1,9 @@
 <template>
-	<view  v-if="isShow">
+	<view v-if="isShow">
 		<view class="buttons-father">
 			<view class="boxtwo">
 				<view class="ipt">
-					<input type="text" placeholder="物料名称/物料简拼"  v-model="form.wlParamInfo" @confirm="search"/>
+					<input type="text" placeholder="物料名称/物料简拼" v-model="form.wlParamInfo" @confirm="search" />
 					<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
 						@click="search(0)"></image>
 				</view>
@@ -16,8 +16,7 @@
 						筛选
 					</view>
 				</view>
-				<view class="shx" @click="chongzhi"
-				v-if="form.categoryId!=''||form.wlParamInfo!='' " >
+				<view class="shx" @click="chongzhi" v-if="form.categoryId!=''||form.wlParamInfo!='' ">
 					<image src="/static/index/requestform/chongzhi.png" mode="aspectFill"></image>
 					<view class="shx-font">
 						重置
@@ -30,12 +29,14 @@
 					<view class="shx-font" @click="changePage(1)">
 						请领单
 					</view>
+					<view class="qlthbtn-red" v-if="isQingling"></view>
 				</view>
 				<view class="qlthbtn">
 					<image src="/static/index/requestform/ql1.png" mode="aspectFill"></image>
 					<view class="shx-font" @click="changePage(2)">
 						回退单
 					</view>
+					<view class="qlthbtn-red" v-if="isRead"></view>
 				</view>
 				<view class="qlthbtn" @click="thshow = true">
 					<image src="/static/index/requestform/ql2.png" mode="aspectFill"></image>
@@ -46,21 +47,22 @@
 			</view>
 		</view>
 		<addwl :Material="addMaterial" @delall="delall" @del="adddel" @submit="submit"></addwl>
-		<carditem :InvoicingList="listarr" @scrolltolower="scrolltolower" :status="status"  @comfig="comfig"></carditem>
+		<carditem :InvoicingList="listarr" @scrolltolower="scrolltolower" :status="status" @comfig="comfig"></carditem>
 		<takeing :show="takeshow" :objtake="objtake" @fill="takeshow = false" @right="right"></takeing>
-		<cgdclass @confirm="confirm" :show="ification"  :typenum="0" ref="classication" @fill="ification = false"></cgdclass>
-		<medetails :show="detaishow"  @fill="detaishow = false" @confirm="confirm"  :objtake="objtake"></medetails>
+		<cgdclass @confirm="confirm" :show="ification" :typenum="0" ref="classication" @fill="ification = false">
+		</cgdclass>
+		<medetails :show="detaishow" @fill="detaishow = false" @confirm="confirm" :objtake="objtake"></medetails>
 		<tanchuang @back="tanshow = false" :show="tanshow" font="确定将该物料从本次请领清单中移除吗？" @right="del"></tanchuang>
 		<takerecord :objtake="objtake" :show="recordshow" @fill="recordshow = false"></takerecord>
 		<submits :show="subshow" :list="addMaterial" @fill="subshow = false" @config="tijiao"></submits>
 		<tanchuang @back="thshow = false" :show="thshow" font="是否发起退货流程？" @right="thclk"></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, onBeforeUnmount, computed, nextTick,  watch, reactive } from 'vue';
-	import { queryInvoicingList,wlzd,queryGwcInfo,addGwc ,deleteGwcWl,removeAllGwc,submitQld,requireTH} from '../api/api.js'
+	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
+	import { queryInvoicingList, wlzd, queryGwcInfo, addGwc, deleteGwcWl, removeAllGwc, submitQld, requireTH, queryQld } from '../api/api.js'
 	import addwl from '../common/addwl.vue';
 	import carditem from '../common/carditem.vue';
 	import takeing from '../common/takeing.vue';
@@ -70,28 +72,33 @@
 	import takerecord from '../common/takerecord.vue';
 	import submits from '../common/submits.vue'
 	const form = reactive({
-		pageNo:1,
-		pageSize:10,
-		nuId:uni.getStorageSync('nuId'),
-		elderId:uni.getStorageSync('NUall').elderId,
-		wlParamInfo:'',
-		categoryId:'',
-		typeId:'',
-		medicationId:''
+		pageNo: 1,
+		pageSize: 10,
+		nuId: uni.getStorageSync('nuId'),
+		elderId: uni.getStorageSync('NUall').elderId,
+		wlParamInfo: '',
+		categoryId: '',
+		typeId: '',
+		medicationId: ''
 	})
 	const props = defineProps({
 		isShow: {
-			type: Boolean 
+			type: Boolean
 		},
 	});
 	const transition = ref(false);
 	watch(
 		() => props.isShow,
 		(newVal, oldVal) => {
-			form.pageNo = 1;
 			listarr.value = [];
-			config()
-			wuliao() 
+			form.categoryId = '';
+			form.typeId = '';
+			form.medicationId = '';
+			form.pageNo = 1;
+			form.wlParamInfo = '',
+				config()
+			wuliao()
+			getreddian()
 			if (!oldVal && newVal) {
 				transition.value = false;
 				setTimeout(() => {
@@ -100,7 +107,7 @@
 			} else {
 				transition.value = false;
 			}
-	
+
 		}
 	)
 	const takeshow = ref(false)
@@ -114,21 +121,56 @@
 	const errmsg = ref('')
 	const classication = ref<InstanceType<typeof ChildComponent>>()
 	const addMaterial = ref([])
-	const wuliao = () =>{
-		let obj = {
-			nuId:form.nuId,
-			elderId:form.elderId
+
+	const isRead = ref(false)
+	const isQingling = ref(false)
+	const getreddian = () => {
+		let plzinfo0 = {
+			pageNo: 1,
+			pageSize: 1,
+			searchContent: "",
+			status: "3",
+			elderId: uni.getStorageSync('NUall').elderId,
+			nuId: uni.getStorageSync('nuId')
 		}
-		queryGwcInfo(obj).then(res=>{
-			console.log(res)
+		queryQld(plzinfo0).then((res : any) => {
+			if (res.result.records[0].izYgRead == `N`) {
+				isRead.value = true;
+			} else {
+				isRead.value = false;
+			}
+		})
+		let plzinfo1 = {
+			pageNo: 1,
+			pageSize: 1,
+			searchContent: "",
+			status: "4",
+			elderId: uni.getStorageSync('NUall').elderId,
+			nuId: uni.getStorageSync('nuId')
+		}
+		queryQld(plzinfo1).then((res : any) => {
+			if (res.result.records[0].izYgRead == `N`) {
+				isQingling.value = true;
+			} else {
+				isQingling.value = false;
+			}
+		})
+	}
+	const wuliao = () => {
+		let obj = {
+			nuId: form.nuId,
+			elderId: form.elderId
+		}
+		queryGwcInfo(obj).then(res => {
+			// console.log(res)
 			addMaterial.value = res.result
 		})
 	}
 	const listarr = ref([])
 	const status = ref('loadmore')
-	const config = ()=>{
-		queryInvoicingList(form).then(res=>{
-			res.result.records.forEach(item=>{
+	const config = () => {
+		queryInvoicingList(form).then(res => {
+			res.result.records.forEach(item => {
 				item.zk = false;
 				item.scrollleft = 0;
 			})
@@ -136,18 +178,19 @@
 			status.value = (res.result.total == listarr.value.length ? 'nomore' : 'loadmore')
 		})
 	}
-	const thclk =() =>{
-		requireTH({nuId:form.nuId,elderId:form.elderId}).then(res=>{
-			if(res.success){
+	const thclk = () => {
+		requireTH({ nuId: form.nuId, elderId: form.elderId }).then(res => {
+			if (res.success) {
 				thshow.value = false;
 				uni.showToast({
-					icon:'none',
-					title:res.message
+					icon: 'none',
+					title: res.message
 				})
-			}else{
+			} else {
 				thshow.value = false;
 				errmsg.value = res.message;
 				openerror.value = true;
+				console.log("?????")
 			}
 		})
 	}
@@ -157,188 +200,190 @@
 		listarr.value = [];
 		config();
 	}
-	const scrolltolower = ( ) => {
-		if (status.value=='loading'||status.value=='nomore') { return }
-			status.value = 'loading';
-			form.pageNo++;
-			config()
-		}
-	const submit = ()=>{
+	const scrolltolower = () => {
+		if (status.value == 'loading' || status.value == 'nomore') { return }
+		status.value = 'loading';
+		form.pageNo++;
+		config()
+	}
+	const submit = () => {
 		wuliao();
 		subshow.value = true;
 	}
-	const adddel = (v)=>{
-		listarr.value.forEach(item=>{
-			if(item.wlId == v.wlId){
+	const adddel = (v) => {
+		listarr.value.forEach(item => {
+			if (item.wlId == v.wlId) {
 				objtake.value = item
 			}
 		})
-		if(!objtake.value.wlId){
+		if (!objtake.value.wlId) {
 			objtake.value = v;
 		}
 		tanshow.value = true;
 		console.log(objtake.value)
 	}
-	const del = ()=>{
+	const del = () => {
 		let obj = {
-			nuId:form.nuId,
-			elderId:form.elderId,
-			wlId:objtake.value.wlId
+			nuId: form.nuId,
+			elderId: form.elderId,
+			wlId: objtake.value.wlId
 		}
 		console.log(obj)
-		deleteGwcWl(obj).then(res=>{
-			if(res.success){
+		deleteGwcWl(obj).then(res => {
+			if (res.success) {
 				wuliao();
 				tanshow.value = false;
 				objtake.value.isAdd = null;
 				objtake.value.qlNum = null;
-			}else{
+			} else {
 				errmsg.value = res.message;
 				openerror.value = true;
 			}
 		})
 	}
-	const delall = () =>{
-		console.log({nuId:form.nuId, elderId:form.elderId})
-		removeAllGwc({nuId:form.nuId, elderId:form.elderId}).then(res=>{
-			 if(res.success){
-			 	wuliao();
-				listarr.value.forEach(item=>{
+	const delall = () => {
+		console.log({ nuId: form.nuId, elderId: form.elderId })
+		removeAllGwc({ nuId: form.nuId, elderId: form.elderId }).then(res => {
+			if (res.success) {
+				wuliao();
+				listarr.value.forEach(item => {
 					item.isAdd = null;
 					item.qlNum = null;
 					item.gwcId = null;
 				})
-			 }else{
-				 errmsg.value = res.message;
-				 openerror.value = true;
-			 }
-		})
-	}
-	const objtake = ref({})
-	const comfig=(v,i,t)=>{
-		// console.log(v,i,t)
-		switch (t){
-			case 0:
-				objtake.value = v;
-				if(v.isAdd==1){
-					tanshow.value = true;
-				}else{
-					takeshow.value = true;
-				}
-			
-				break;
-			
-			case 1:
-			objtake.value = v;
-			recordshow.value = true;
-			
-				break;
-				
-			case 2:
-			objtake.value = v;
-			detaishow.value = true;
-				break;
-			case 3:
-			let obj = {
-				nuId:form.nuId,
-				elderId:form.elderId,
-				wlId:v.wlId,
-				izZd:v.zhiDingId?false:true
-			}
-			wlzd(obj).then(res=>{
-				console.log(obj,res)
-				if(res.success){
-					// objtake.value = v;
-					// objtake.value.zk = false;
-					// objtake.value.scrollleft = 0;
-					// objtake.value = v.zhiDingId?false:true;
-					// listarr.value.splice(i,1);
-					// listarr.value.unshift(v)
-					listarr.value = [];
-					form.pageNo = 1;
-					
-					config()
-				}else{
-					errmsg.value = res.message;
-					openerror.value = true;
-				}
-			})
-			
-				break;
-				
-			default:
-				break;
-		}
-	}
-	const right = (e,v) =>{
-		console.log(v)
-		let obj = {
-			kfId:v.nuId,
-			wlId:v.wlId,
-			qlNum:e,
-			nuId:form.nuId,
-			elderId:form.elderId
-		}
-		addGwc(obj).then(res=>{
-			if(res.success){
-				takeshow.value = false;
-				v.isAdd = 1;
-				v.qlNum = e;
-				wuliao();
-			}else{
+			} else {
 				errmsg.value = res.message;
 				openerror.value = true;
 			}
 		})
 	}
-	const tijiao = ()=>{
-		let obj = {
-			nuId:form.nuId,
-			elderId:form.elderId
-		}
-		submitQld(obj).then(res=>{
-			if(res.success&&res.result.status=='success'){
-				uni.showToast({
-					icon:'success',
-					title:'提交成功'
+	const objtake = ref({})
+	const comfig = (v, i, t) => {
+		console.log(`看看数据`, v, i, t)
+		switch (t) {
+			case 0:
+				objtake.value = v;
+				if (v.isAdd == 1) {
+					tanshow.value = true;
+				} else {
+					takeshow.value = true;
+				}
+
+				break;
+
+			case 1:
+				objtake.value = v;
+				recordshow.value = true;
+
+				break;
+
+			case 2:
+				objtake.value = v;
+				detaishow.value = true;
+				break;
+			case 3:
+				let obj = {
+					nuId: form.nuId,
+					elderId: form.elderId,
+					wlId: v.wlId,
+					izZd: v.zhiDingId ? false : true
+				}
+				wlzd(obj).then(res => {
+					console.log(obj, res)
+					if (res.success) {
+						// objtake.value = v;
+						// objtake.value.zk = false;
+						// objtake.value.scrollleft = 0;
+						// objtake.value = v.zhiDingId?false:true;
+						// listarr.value.splice(i,1);
+						// listarr.value.unshift(v)
+						listarr.value = [];
+						form.pageNo = 1;
+
+						config()
+					} else {
+						errmsg.value = res.message;
+						openerror.value = true;
+					}
 				})
-				setTimeout(()=>{
-					subshow.value = false;
-					wuliao();
-				},800)
-			}else{
-				errmsg.value = res.result.message;
+
+				break;
+
+			default:
+				break;
+		}
+	}
+	const right = (e, v) => {
+		console.log(v)
+		let obj = {
+			kfId: v.nuId,
+			wlId: v.wlId,
+			qlNum: e,
+			nuId: form.nuId,
+			elderId: form.elderId
+		}
+		addGwc(obj).then(res => {
+			if (res.success) {
+				takeshow.value = false;
+				v.isAdd = 1;
+				v.qlNum = e;
+				wuliao();
+			} else {
+				errmsg.value = res.message;
 				openerror.value = true;
 			}
 		})
 	}
-	const confirm = (e)=>{
+	const tijiao = () => {
+		let obj = {
+			nuId: form.nuId,
+			elderId: form.elderId
+		}
+		submitQld(obj).then(res => {
+			if (res.success && res.result.status == 'success') {
+				uni.showToast({
+					icon: 'success',
+					title: '提交成功'
+				})
+				setTimeout(() => {
+					subshow.value = false;
+					wuliao();
+					changePage(1)
+				}, 800)
+			} else {
+				// console.log("!!!!!",res)
+				errmsg.value = res.result.message?res.result.message:res.message
+				openerror.value = true;
+			}
+		})
+	}
+	const confirm = (e) => {
 		form.categoryId = e.categoryId;
 		form.typeId = e.typeId;
 		form.medicationId = e.medicationId;
-		form.pageNo=1;
+		form.pageNo = 1;
 		listarr.value = [];
 		config();
 		ification.value = false;
 		console.log(e)
 	}
-	const chongzhi=()=>{
+	const chongzhi = () => {
 		form.categoryId = '';
 		form.typeId = '';
 		form.medicationId = '';
-		form.pageNo=1;
-		form.wlParamInfo= '',
-		listarr.value = [];
-		classication.value.typescroll(1,-1,{});
+		form.pageNo = 1;
+		form.wlParamInfo = '',
+			listarr.value = [];
+		classication.value.typescroll(1, -1, {});
 		classication.value.qingkong();
 		classication.value.config();
 	}
 	const emit = defineEmits(['changePageNumber']) // 也可以用类型签名（见下面）
-	const changePage = (index:number) => {
-		emit('changePageNumber', index) 
+	const changePage = (index : number) => {
+		emit('changePageNumber', index)
 	}
 </script>
 
 <style lang="less" scoped>
 	@import "../css/take.less";
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/NursingNew/component/pleasetake/css/take.less b/pages/NursingNew/component/pleasetake/css/take.less
index fc3dc96..e52f23d 100644
--- a/pages/NursingNew/component/pleasetake/css/take.less
+++ b/pages/NursingNew/component/pleasetake/css/take.less
@@ -38,7 +38,7 @@
 	
 	.buttons-father {
 		width: 100%;
-		height: 90rpx;
+		height: 70rpx;
 		display: flex;
 		justify-content: space-between;
 		.flexend{
@@ -80,7 +80,7 @@
 			border-radius: 1.65vw;
 			border: 1rpx solid #D9DADC;
 			font-weight: 400;
-			font-size: 1.2vw;
+			font-size: 1.4vw;
 			color: #222;
 			display: flex;
 			justify-content: center;
@@ -88,10 +88,21 @@
 			box-shadow: 0.5rpx 3rpx 3rpx #dadee1;
 			margin: 0 0 0 0.5vw;
 			color: #555555;
+			position: relative;
+			.qlthbtn-red{
+				position: absolute;
+				right: -0vw;
+				top: -0vw;
+				width: 1vw;
+				height: 1vw;
+				background-color: rgba(255, 78, 78, 1);
+				border-radius: 50%;
+			}
+			
 			image {
-				width: 1.8vw;
-				height: 1.8vw;
-				margin: 0 0.2vw 0 0;
+				width: 1.5vw;
+				height: 1.5vw;
+				margin: 0.1vw 0.3vw 0 0;
 			}
 		}
 	
@@ -135,6 +146,7 @@
 	
 			.shx-font {
 				margin-top: 3rpx;
+				// font-size: 1.4vw;
 				// margin-left: -5rpx;
 			}
 		}
diff --git a/pages/Warehouse/api/lunpan.js b/pages/Warehouse/api/lunpan.js
index ff33762..d1449f6 100644
--- a/pages/Warehouse/api/lunpan.js
+++ b/pages/Warehouse/api/lunpan.js
@@ -1,6 +1,6 @@
 // 引入 request 文件
 import request from '@/request/index.js'
- 
+
 // 查询仓库对应物料
 export const queryInvoicingList = (params) => {
 	return request({
@@ -8,21 +8,22 @@ export const queryInvoicingList = (params) => {
 		method: 'get',
 		data: params,
 	})
-} 
+}
 
 // 获取物料分类树（请购列表使用）
 export const getMaterialTreeData = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData?nuId=`+params.nuId,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getMaterialTreeData?nuId=` + params.nuId,
 		method: 'get',
 		data: params,
 	})
-} 
+}
 
 // （业务）获取物料分类树（购物车使用）
 export const getGwcMaterialTreeData = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcMaterialTreeData?nuId=`+params.nuId,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcMaterialTreeData?nuId=` + params
+			.nuId,
 		method: 'get',
 		data: params
 	})
@@ -30,7 +31,8 @@ export const getGwcMaterialTreeData = (params) => {
 // （业务）获取物料分类树（采购单使用）
 export const getCgdMaterialTreeData = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdMaterialTreeData?nuId=`+params.nuId,
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgdMaterialTreeData?nuId=` + params
+			.nuId,
 		method: 'get',
 		data: params,
 	})
@@ -42,7 +44,7 @@ export const queryNuInfoByNuId = (params) => {
 		method: 'get',
 		data: params,
 	})
-} 
+}
 // 修改库房启用停用
 
 export const updateKfstatus = (params) => {
@@ -51,7 +53,7 @@ export const updateKfstatus = (params) => {
 		method: 'post',
 		data: params,
 	})
-} 
+}
 //获得采购单信息
 export const queryCgdList = (params) => {
 	return request({
@@ -59,7 +61,7 @@ export const queryCgdList = (params) => {
 		method: 'get',
 		data: params,
 	})
-} 
+}
 
 // 查询采购项目
 export const queryCgdInfoList = (params) => {
@@ -68,7 +70,7 @@ export const queryCgdInfoList = (params) => {
 		method: 'get',
 		data: params,
 	})
-} 
+}
 // 查询采购项目的详情
 export const queryWlInfoByWlId = (params) => {
 	return request({
@@ -76,21 +78,21 @@ export const queryWlInfoByWlId = (params) => {
 		method: 'get',
 		data: params,
 	})
-} 
+}
 export const addShoppingCartList = (params) => {
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/addShoppingCartList`,
 		method: 'post',
 		data: params,
 	})
-} 
+}
 export const queryShoppingCartList = (params) => {
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryShoppingCartList`,
 		method: 'get',
 		data: params,
 	})
-} 
+}
 export const generatedPurchaseOrder = (params) => {
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/generatedPurchaseOrder`,
@@ -107,14 +109,14 @@ export const generatedPurchaseViewOrder = (params) => {
 }
 export const deleteQgInfoById = (params) => {
 	return request({
-		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/deleteQgInfoById?id=`+params,
-		method: 'DELETE' 
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/deleteQgInfoById?id=` + params,
+		method: 'DELETE'
 	})
 }
 export const emptiedQgInfo = (params) => {
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/emptiedQgInfo`,
-		method: 'DELETE' 
+		method: 'DELETE'
 	})
 }
 
@@ -125,7 +127,7 @@ export const upload = (params) => {
 		method: 'post',
 		data: params,
 	})
-} 
+}
 // 作废
 export const voidedCgdMain = (params) => {
 	return request({
@@ -133,7 +135,7 @@ export const voidedCgdMain = (params) => {
 		method: 'post',
 		data: params,
 	})
-} 
+}
 
 //修改库房物料是否启用
 export const updateWarehouserEnabled = (params) => {
@@ -142,14 +144,14 @@ export const updateWarehouserEnabled = (params) => {
 		method: 'post',
 		data: params,
 	})
-} 
+}
 //获得采购人
 export const getCgrLis = () => {
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getCgrList`,
 		method: 'get'
 	})
-} 
+}
 
 //获得采购人
 export const getGysList = () => {
@@ -157,7 +159,7 @@ export const getGysList = () => {
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGysList`,
 		method: 'get'
 	})
-} 
+}
 
 //改价
 export const editPrice = (params) => {
@@ -166,7 +168,7 @@ export const editPrice = (params) => {
 		method: 'post',
 		data: params,
 	})
-} 
+}
 
 //(业务)拣货、销账操作
 export const pickingInfo = (params) => {
@@ -175,7 +177,7 @@ export const pickingInfo = (params) => {
 		method: 'post',
 		data: params
 	})
-} 
+}
 
 //（业务）查询随行单照片集合
 export const querySxdList = (params) => {
@@ -184,7 +186,7 @@ export const querySxdList = (params) => {
 		method: 'get',
 		data: params
 	})
-} 
+}
 //（业务）查询随行单照片集合
 export const addSxd = (params) => {
 	return request({
@@ -200,7 +202,7 @@ export const queryJhzpList = (params) => {
 		method: 'get',
 		data: params
 	})
-} 
+}
 // （业务）采购单拣货记录
 export const queryPickingRecordList = (params) => {
 	return request({
@@ -208,11 +210,11 @@ export const queryPickingRecordList = (params) => {
 		method: 'get',
 		data: params
 	})
-} 
+}
 export const editIzNew = (params) => {
- 	return request({
- 		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editIzNew`,
- 		method: 'post',
- 		data: params,
- 	})
- }
\ No newline at end of file
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editIzNew`,
+		method: 'post',
+		data: params,
+	})
+}
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 63cc9a0..06ef1a9 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -1051,7 +1051,7 @@
 	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';
+	
 
 	const open = ref(0);
 	const typechange = ref(0);
@@ -1353,7 +1353,7 @@
 	const nomessageshow = ref(false);
 	const firstgetqueryCgdList = () => {
 		queryCgdList(plzinfo).then((res : any) => {
-
+			console.log("数据呢",res)
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
 			if (!res.result.total) {
@@ -1406,7 +1406,7 @@
 		// console.log("!!!!",form)
 		queryCgdInfoList(form).then(res => {
 			InvoicingList.value = []
-			// console.log("数据呢", res.result.records)
+			console.log("数据呢", form)
 			InvoicingList.value.push(...res.result.records);
 			if (form.pageNo) {
 				clickmiddle(0);
@@ -1454,7 +1454,7 @@
 	const mobanform = {
 		nuId: '',
 		pageNo: 1,
-		pageSize: 9,
+		pageSize: -1,
 		categoryId: '',
 		typeId: '',
 		medicationId: '',
@@ -1512,6 +1512,7 @@
 		// if (!plzinfo.cgdParamInfo) return
 		plzinfo.pageNo = 1;
 		plsbuy.value = [];
+		plzinfo.canpull = true
 		queryCgdList(plzinfo).then((res : any) => {
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
diff --git a/pages/procurement/api/lunpan.js b/pages/procurement/api/lunpan.js
index 289d18b..f4406a4 100644
--- a/pages/procurement/api/lunpan.js
+++ b/pages/procurement/api/lunpan.js
@@ -355,3 +355,27 @@ export const outbound = (params) => {
 		data: params,
 	})
 }
+// 盘点单所有的接口
+// 获得列表
+export const queryPddList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/queryPddList`,
+		method: 'get',
+		data: params,
+	})
+}
+//获得采购人
+export const queryPddStartByList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/queryPddStartByList`,
+		method: 'get',
+		data: params,
+	})
+} 
+export const addPddMain = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/pdd/addPddMain`,
+		method: 'post',
+		data: params,
+	})
+}
\ No newline at end of file
diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue
index 0b74b3d..b51d474 100644
--- a/pages/procurement/inventory.vue
+++ b/pages/procurement/inventory.vue
@@ -2,8 +2,7 @@
 	<view class="all-bgc">
 		<view class="buttons-father">
 			<view class="ipt">
-				<input type="text" v-model="plzinfo.searchContent" placeholder="盘点单号/盘点人/盘点日期"
-					@confirm="clickconfirm" />
+				<input type="text" v-model="plzinfo.pddInfo" placeholder="盘点单号/盘点人/盘点日期" @confirm="clickconfirm" />
 			</view>
 			<view class="scr" @click="clickconfirm">
 				检索
@@ -21,21 +20,8 @@
 					重置
 				</view>
 			</view>
-			<!-- 	<view class="right-button" @click="badshow=true" v-show="plsbuy[lefttarget]?.status==`1`">
-				<image src="/static/index/warehouse/procurement/picking/bebad.png" />
-				<view>
-					作废
-				</view>
-			</view> -->
 
-			<view class="right-buttons" @click="startselect()">
-				<!-- <view :class="manyselect?`right-button-blue`:`right-button-white`"
-					v-show="plsbuy[lefttarget]?.status==`1`">
-					<image :src="`/static/index/warehouse/procurement/picking/piliang${manyselect?`target`:``}.png`" />
-					<view>
-						批量选择
-					</view>
-				</view> -->
+			<view class="right-buttons">
 				<view class="left-selecttype">
 					<view :class="selectType===index?`selecttype-target`: `selecttype`"
 						v-for="(item,index) in tagsarray" @click="changetype(index)">
@@ -61,29 +47,27 @@
 			<nomessage cont="暂无数据" :show="nomessageshow" />
 			<view class="zhedang" v-if="nomessageshow"></view>
 		</view>
-		<tanchuang :show="badshow" font="确定要回退这个请领单吗" @back="badshow=false;" @right="huitui"> </tanchuang>
-		<tanchuang :show="chukushow" font="确定要出库吗" @back="chukushow=false;" @right="chukuclick"> </tanchuang>
 
 		<view class="all-contain" v-show=" !nomessageshow">
 			<scroll-view scroll-y="true" scroll-with-animation class="all-scroll" :scroll-top="leftscrolltop"
-				:lower-threshold="200">
+				@scrolltolower="plsbuytolower"  :lower-threshold="200">
 				<view class="scroll-items">
-					<view class="scroll-item" v-for="(item,index) in [1,1,1,1,1,1,1,1,1,1,1,1,1]" :key="index">
+					<view class="scroll-item" v-for="(item,index) in plsbuy" :key="index">
 						<view class="scroll-item-title">
 							<view class="scroll-title-left">
 								<view class="title-font">
-									101P20251020001
+									{{ item.pddNo }}
 								</view>
 
-								<view class="title-success" v-if="index>3">
+								<view class="title-success" v-if="item.pydNum>0">
 									盘盈
 								</view>
-								<view class="title-error" v-if="index<5 && index">
+								<view class="title-error" v-if="item.pkdNum>0">
 									盘亏
 								</view>
 							</view>
 							<view class="scroll-title-right">
-								{{ index?`已完成`:`盘点中` }}
+								{{ item.pddType_dictText }}
 
 							</view>
 						</view>
@@ -91,11 +75,9 @@
 							<view class="middle-heng"></view>
 							<view class="contect-one">
 								<view class="contect-title">
-									2025.10.03
+									{{ item.pddStartTime?.split(' ')[0] }}
 								</view>
 								<view class="middle-heng-father">
-
-									<!-- <view class="middle-ball"></view> -->
 									<image class="middle-ball-img" src="/static/index/requestform/isok.png" />
 								</view>
 								<view class="end-font">
@@ -111,11 +93,12 @@
 							<view class="contect-one">
 								<view class="contect-title">
 
-									{{ index?`2025.10.03`: ``}}
+									{{ item.pddEndTime?.split(' ')[0] }}
 								</view>
 								<view class="middle-heng-father">
 
-									<view class="middle-ball" v-if="!index" style="background-color: #EEEEEE;"></view>
+									<view class="middle-ball" v-if="item.pddType!='2'"
+										style="background-color: #EEEEEE;"></view>
 									<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
 								</view>
 								<view class="end-font">
@@ -123,7 +106,7 @@
 										盘点结束
 									</view>
 									<view style="color: #888888;">
-										{{ index?`[ 王嘉尔 ]`: `` }}
+										{{ item.pddType=='2'?`[ 王嘉尔 ]`: `` }}
 									</view>
 								</view>
 							</view>
@@ -131,7 +114,7 @@
 						<view class="scroll-item-end">
 							<image class="title-imge" src="/static/home.png" mode="aspectFit"></image>
 							<view class="title-font">
-								生活用品库
+								{{ item.nuName}}
 							</view>
 						</view>
 
@@ -139,190 +122,8 @@
 				</view>
 
 			</scroll-view>
-			<!-- <view class="other-contain-left">
-				<view class="left-selecttype">
-					<view :class="selectType===index?`selecttype-target`: `selecttype`"
-						v-for="(item,index) in tagsarray" @click="changetype(index)">
-						{{ item }}
-					</view>
-					<view class="heng-blue" :style="{ left: `${selectType === 0 ? 14 : 13.5 + selectType * 23.5}%` }">
-					</view>
-				</view>
-				<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
-					@scrolltolower="plsbuytolower" :lower-threshold="200">
-					<view style="height: 1%;"></view>
-					<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)"
-						:style="{borderColor: manyselect ? (selectarray.includes(v.qldNo) ? '' : 'transparent'): (i === lefttarget ? '' : 'transparent'),background: manyselect  ? (selectarray.includes(v.qldNo) ? '' : 'rgba(255,255,255,0.6)') : (i === lefttarget ? '' : 'rgba(255,255,255,0.6)')}">
-						<view
-							style="background: #ff5757;position: absolute;width: 1.3vw;height: 1.3vw;border-radius: 50%;right: -0.5vw;top: -0.2vw;"
-							v-if="v.izYgRead=='N'">
-						</view>
-						<view class="pls-card-title">
-							<view class="middle-title-spec">
-								请领单号
-							</view>
-							<view class="title-left">
-								{{ v.qldNo }}
-							</view>
-						</view>
-						<view class="pls-card-middle">
-							<view class="middle-heng"></view>
-							<view class="pls-card-middle-one">
-								<view class="middle-title">
-									{{ v.tjTime.replace(/-/g, '.') }}
-								</view>
-								<view class="middle-heng-father">
-									<image class="middle-ball-img" src="/static/index/requestform/isok.png" />
-								</view>
-								<view class="end-font">
-
-									<view>
-										待出库
-									</view>
-									<view style="font-size: 25rpx;">
-										{{ "[ " + v.tjByName + " ]" }}
-									</view>
-								</view>
-							</view>
-							<view class="pls-card-middle-one">
-								<view class="middle-title"
-									:style=" v?.status === '2' || v?.status === '3' ?{color:`#FF5757`}:{}">
-									{{
-									Number(v.status)>1?
-								  v?.status === '2' 
-								    ? v.zfTime?.slice(0,10).replace(/-/g, '.') 
-								    : v?.status === '3'
-								      ? v.htTime?.slice(0,10).replace(/-/g, '.') 
-								      : v.ckTime?.slice(0,10).replace(/-/g, '.') 
-									  : ""
-								}}
-
-								</view>
-								<view class="middle-heng-father">
-									<image class="middle-ball-img" style="width: 32rpx;height: 32rpx;"
-										v-if="v?.status === '2' || v?.status === '3'"
-										src="/static/index/requestform/iserror.png" />
-									<view class="middle-ball" style="background-color: #1083F8;"
-										v-else-if="Number(v.status)==1">
-									</view>
-									<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
-								</view>
-								<view class="end-font">
-
-									<view :style="v?.status === '2' || v?.status === '3' ?{color:`#FF5757`}:{}">
-										{{
-									  v?.status === '2' 
-									    ? `已作废`
-									    : v?.status === '3'
-									      ? `已回退`
-									      : `已出库`
-									}}
-
-									</view>
-									<view style="font-size: 25rpx;" v-if="Number(v.status)>1"
-										:style=" v?.status === '2' || v?.status === '3' ?{color:`#FF5757`}:{}">
-										{{ "[ " +   (v?.status === '2' 
-									    ? v?.zfByName
-									    : v?.status === '3'
-									      ? v?.htByName
-									      : v?.ckByName)+ " ]" }}
-									</view>
-								</view>
-							</view>
-							<view class="pls-card-middle-one">
-								<view class="middle-title">
-									{{ Number(v.status)==5 ? v.shTime?.slice(0,10).replace(/-/g, '.') :""}}
-								</view>
-
-								<view class="middle-heng-father">
-
-									<view class="middle-ball"
-										:style="Number(v.status)<4?{backgroundColor: `#E5E5E5`}:{}"
-										v-if="Number(v.status)!=5"></view>
-									<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
-								</view>
-								<view class="end-font">
-									<view v-if="v?.cgdType!='9'">
-										已收货
-									</view>
-									<view style="font-size: 25rpx;" v-if="Number(v.status)==5">
-										{{ "[ " + v.shByName + " ]" }}
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="pls-card-end">
-							<view class="end-left">
-								<image class="end-left-img" src="/static/index/requestform/gongyingshang.png" />
-								<view class="end-left-font">
-									{{ v.nuName }}
-								</view>
-							</view>
-							<view :class="v?.status === '2' || v?.status === '3' ?`tag-fail`:`tag-success`">
-								{{ v.statusText  }}
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view> -->
-			<!-- <view class="other-contain-right">
-				<scroll-view scroll-y="true" scroll-with-animation class="right-contain">
-					<view class="right-ones">
-						<view class="right-one" v-for="(item,index) in rightarray" :key="index">
-							<view class="right-one-left">
-								<image class="left-image"
-									:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'"
-									mode="aspectFill"></image>
-								<view class="left-tages" style="margin-top: -15rpx;">
-									{{ item.materialInfo.categoryName}}
-								</view>
-								<view class="left-tages">
-									{{ item.materialInfo.typeName}}
-								</view>
-							</view>
-							<view class="right-one-right">
-								<view class="right-title">
-									{{ item.materialInfo.materialName }}
-								</view>
-								<view class="right-setting">
-									规格型号
-								</view>
-								<view class="right-mm">
-									{{ item.materialInfo.materialNo }}
-								</view>
-								<view class="right-down">
-									<view class="">
-										<view class="right-first-num">
-											{{ item.qlNum }}
-										</view>
-										<view class="right-first-type">
-											请领数量
-										</view>
-									</view>
-									<view class="right-shu"></view>
-									<view class="">
-										<view class="right-first-num" style="font-weight: 500;">
-											{{ item.materialInfo.materialUnits }}
-										</view>
-										<view class="right-first-type">
-											请领单位
-										</view>
-									</view>
-								</view>
-							</view>
-
-						</view>
-					</view>
-					<defaultr cont="暂无数据" v-if="rightarray.length==0 && rightdonghua"
-						style="width: 30%;height: 30%;position: absolute;">
-					</defaultr>
-				</scroll-view>
-				<view class="bottom-buttons" v-show="plsbuy[lefttarget]?.status==`1`">
-					<view class="button-blue" @click="chukushow=true">
-						出库
-					</view>
-				</view>
-			</view> -->
+			<defaultr cont="暂无数据" v-if="plsbuy.length==0">
+			</defaultr>
 		</view>
 		<view v-show="openselect" class="mengban" @click="openselect=false"></view>
 		<view class="left-select-more" v-show="openselect" @click="opendata=false">
@@ -332,44 +133,42 @@
 				</view>
 				<view class="bottom-right" @click="openselect=false">
 					确定
-					<text style="font-size: 25rpx;margin-top: 5rpx;" v-if="alltotal">
-						（{{ alltotal }}采购单）
-					</text>
 				</view>
 			</view>
 			<view class="more-title">
 				盘点状态
 			</view>
 			<view class="more-statues-father">
-				<view :class="plzinfo.cgdType==`0,1`?`more-statues-button-target`:`more-statues-button`"
-					@click="plzinfo.cgdType=`0,1`;">
+				<view :class="plzinfo.pddType==``?`more-statues-button-target`:`more-statues-button`"
+					@click="plzinfo.pddType=``;firstgetqueryCgdList()">
 					全部
 				</view>
-				<view :class="plzinfo.cgdType==`0`?`more-statues-button-target`:`more-statues-button`"
-					@click="plzinfo.cgdType=`0`;">
+				<view :class="plzinfo.pddType==`1`?`more-statues-button-target`:`more-statues-button`"
+					@click="plzinfo.pddType=`1`;firstgetqueryCgdList()">
 					盘点中
 				</view>
-				<view :class="plzinfo.cgdType==`1`?`more-statues-button-target`:`more-statues-button`"
-					@click="plzinfo.cgdType=`1`;">
+				<view :class="plzinfo.pddType==`2`?`more-statues-button-target`:`more-statues-button`"
+					@click="plzinfo.pddType=`2`;firstgetqueryCgdList()">
 					已完成
 				</view>
 			</view>
 
-			
-			<view class="more-select" style="margin-top: 10rpx;">
+
+		<!-- 	<view class="more-select" style="margin-top: 10rpx;">
 				盘点单号
 			</view>
-			<view class="more-time-select">
-				<input class="more-gray" placeholder="请输入采购人" placeholder-style="color: #BFBFBF;"
-					style="margin-left: 30rpx;width: 400rpx;"></input>
-				<image class="select-img" src="/static/index/warehouse/procurement/picking/center.png" />
-			</view>
+			<view class="more-time-select" @click="pandian=true">
+				<input class="more-gray" v-model="plzinfo.pddInfo" placeholder="请输入盘点单号"
+					placeholder-style="color: #BFBFBF;" style="margin-left: 30rpx;width: 100%;" @confirm="pandianclick"
+					@blur="pandianclick"></input>
+
+			</view> -->
 			<view class="more-select">
 				盘点人
 			</view>
-			<view class="more-time-select">
-				<input class="more-gray" placeholder="请输入供应商" placeholder-style="color: #BFBFBF;"
-					style="margin-left: 30rpx;width: 400rpx;"></input>
+			<view class="more-time-select" @click="pandianren=true">
+				<input class="more-gray" v-model="peoplename" placeholder="请输入盘点人" placeholder-style="color: #BFBFBF;"
+					style="margin-left: 30rpx;width: 400rpx;" @input="changeName"></input>
 				<image class="select-img" src="/static/index/warehouse/procurement/picking/center.png" />
 			</view>
 			<view class="more-time">
@@ -382,7 +181,7 @@
 				<view class="more-black" v-show="plzinfo.startTime">
 					{{ plzinfo.startTime }}
 				</view>
-			
+
 				<view style="font-size: 32rpx;margin-left: 10rpx;">
 					至
 				</view>
@@ -398,22 +197,22 @@
 				盘盈/盘亏
 			</view>
 			<view class="selected">
-				<view class="selected-item" @click="plzinfo.get=!plzinfo.get">
-					<view class="selected-kuai" v-if="!plzinfo.get">
-						
+				<view class="selected-item" @click="clickkuai(`1`)">
+					<view class="selected-kuai" v-if="plzinfo.pydOrPkd!='1,2'&&plzinfo.pydOrPkd!='1'">
+
 					</view>
-					<view class="selected-kuai-target" v-else >
+					<view class="selected-kuai-target" v-else>
 						√
 					</view>
 					<view class="">
 						盘盈单
 					</view>
 				</view>
-				<view class="selected-item" @click="plzinfo.lose=!plzinfo.lose">
-					<view class="selected-kuai" v-if="!plzinfo.lose">
-						
+				<view class="selected-item" @click="clickkuai(`2`)">
+					<view class="selected-kuai" v-if="plzinfo.pydOrPkd!='1,2'&&plzinfo.pydOrPkd!='2'">
+
 					</view>
-					<view class="selected-kuai-target" v-else >
+					<view class="selected-kuai-target" v-else>
 						√
 					</view>
 					<view class="">
@@ -427,56 +226,53 @@
 	<view class="calendar-father" v-show="opendata" v-if="xiaohui">
 		<calendar @datachange="dateget" />
 	</view>
-	<view
-		v-show="opendata"
-		class="mengban" 
-		style="background: transparent;"
-		@click="opendata=false;">
+	<view v-show="opendata" class="mengban" style="background: transparent;" @click="opendata=false;">
 	</view>
-	<errorshow :show="openerror" font="注意：只能选择待出库的请领单" @close="openerror=false" />
-	<errorshow :show="qinglingshow" font="注意：批量选择模式请选择一项或以上的请领单" @close="qinglingshow=false" />
+	<view v-show="pandian" class="mengban" style="background: transparent;" @click="pandian=false;">
+	</view>
+	<!-- 给模糊搜索用的 -->
+	<view v-show="filteredCgrList.length&&peoplename" class="mengban" style="background: transparent;z-index: 9999;"
+		@click="closefilteredCgrList"></view>
+
+	<view class="input-next" v-if="filteredCgrList.length && peoplename">
+		<view v-show="filteredCgrList[0].cgBy!=`暂无数据`" class="next-father"
+			v-for="(item, index) in filteredCgrList.slice(0, 5)" :key="index" @click="clickfilteredCgrList(item)">
+			{{ item.name }}
+		</view>
+		<view class="nomessage" v-if="filteredCgrList[0].cgBy===`暂无数据`">
+			暂无数据
+		</view>
+	</view>
+	<tanchuang :show="addshow" font="确定要新增盘点单吗" @back="addshow=false;" @right="addnew"> </tanchuang>
+	<errorshow :show="openmessage" :font="errormessage" @close="openmessage=false"  />
 </template>
 
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
-	import { queryQld, queryQldWlInfo, newtransRead, orderReturn, outbound } from './api/lunpan.js'
+	import { queryPddList, queryPddStartByList,addPddMain } from './api/lunpan.js'
 	import nomessage from './components/nomessage.vue'
 	import defaultr from './components/default.vue'
 	import calendar from '@/component/public/calendar.vue'
-	// const props = defineProps({
-	// 	isShow: {
-	// 		type: Boolean,
-	// 		required: true,
-	// 	},
-	// });
 	const xiaohui = ref(true);
 	const shaixuan = ref(false);
 	const opendata = ref(false);
 	const openselect = ref(false);
 	const manyselect = ref(false);
+	const addshow = 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;
-	// 		}
+	const cgrlist = ref([]);
 
-	// 	}
-	// )
+
+	const getSelectList = () => {
+		queryPddStartByList({nuId:uni.getStorageSync('nuId')}).then((res : any) => {
+			cgrlist.value = res.result;
+		
+		})
+	}
 	onMounted(() => {
 		firstgetqueryCgdList();
+		getSelectList();
 	})
 	type datetype = {
 		start : string,
@@ -485,7 +281,7 @@
 	const dateget = (res : datetype) => {
 		plzinfo.startTime = res.start;
 		plzinfo.endTime = res.end;
-		
+		firstgetqueryCgdList()
 	}
 	const lanjie = ref(false);
 
@@ -505,20 +301,95 @@
 
 		switch (index) {
 			case 0:
-				plzinfo.status = `1,4,5`
+				plzinfo.pddType = ``
 				break
 			case 1:
-				plzinfo.status = `1`
+				plzinfo.pddType = `1`
 				break
 			case 2:
-				plzinfo.status = `4`
-				break
-			case 3:
-				plzinfo.status = `5`
+				plzinfo.pddType = `2`
 				break
+
 		}
 		firstgetqueryCgdList()
 	}
+	const pandianren = ref(false)
+	const peoplename = ref("")
+	const filteredCgrList = ref([])
+	// --- 模糊匹配 ---
+	function fuzzyMatch(text : unknown, q : string) {
+		const s = String(text ?? '').toLowerCase()
+		const ql = String(q ?? '').toLowerCase().trim()
+		if (!ql) return true
+		if (s.includes(ql)) return true
+
+		// subsequence 模糊字符序列
+		let i = 0
+		for (let j = 0; j < s.length && i < ql.length; j++) {
+			if (s[j] === ql[i]) i++
+		}
+		return i === ql.length
+	}
+
+	// --- 0.3 秒防抖专用变量 ---
+	let debounceTimer : number | null = null
+
+	/**
+	 * changeName - 防抖搜索（0.3 秒后无再次输入才执行）
+	 */
+	function changeName(res : any) {
+		console.log("0000",res)
+		if (!res.detail.value) {
+			plzinfo.pddStartBy = "";
+			filteredCgrList.value = [];
+			firstgetqueryCgdList()
+			return
+		}
+
+		const keyword = String(
+			typeof res === 'string' ? res : res?.detail?.value ?? ''
+		).trim()
+
+		// 清除上一次的定时器
+		if (debounceTimer) clearTimeout(debounceTimer)
+
+		// 重新等待 300ms
+		debounceTimer = setTimeout(() => {
+			
+			if (!keyword) {
+				filteredCgrList.value = cgrlist.value.slice()
+				
+				return
+			}
+
+			filteredCgrList.value = cgrlist.value.filter(item =>
+				fuzzyMatch(item?.name, keyword)
+			)
+			if (!filteredCgrList.value.length) {
+				filteredCgrList.value.push({ cgBy: `暂无数据` })
+			}
+			// console.log("9999",filteredCgrList.value)
+			// console.log("0000",cgrlist.value)
+		}, 300)
+	}
+	const closefilteredCgrList = () => {
+		// console.log("?????????")
+		filteredCgrList.value = [];
+		peoplename.value = plzinfo.pddStartBy;
+		firstgetqueryCgdList()
+	}
+	const clickfilteredCgrList = (item : any) => {
+		filteredCgrList.value = [];
+		plzinfo.pddStartBy = item.name
+		peoplename.value = plzinfo.pddStartBy;
+		firstgetqueryCgdList()
+	}
+	const pandian = ref(false)
+	const pandianclick = () => {
+		pandian.value = false
+		firstgetqueryCgdList()
+	}
+
 	const clickconfirm = () => {
 		if (chongzhiLock) return
 		chongzhiLock = true
@@ -538,13 +409,15 @@
 		if (chongzhiLock) return
 		chongzhiLock = true
 		xiaohui.value = false;
-		plzinfo.searchContent = ""
-		plzinfo.startTime = ""
-		plzinfo.endTime = ""
-		plzinfo.get = false
-		plzinfo.lose = false
+		plzinfo.pddInfo = "";
+		plzinfo.pddNo = "";
+		plzinfo.pddStartBy = "";
+		plzinfo.pydOrPkd = "";
+		plzinfo.pddType = "";
+		plzinfo.startTime = "";
+		plzinfo.pddStartBy = ""
+		plzinfo.endTime = "";
 		changetype(0)
-		firstgetqueryCgdList()
 
 		setTimeout(() => {
 			chongzhiLock = false;
@@ -555,19 +428,33 @@
 	const alltotal = ref(0);
 	const lefttarget = ref(0)
 	const plzinfo = reactive({
+		nuId: uni.getStorageSync('nuId'),
 		pageNo: 1,
-		pageSize: 5,
+		pageSize: 9,
 		canpull: true,
-		searchContent: "",
-		status: "1,4,5",
-		cgdType: "0,1",
-
+		pddInfo: "",
+		pddNo: "",
+		pddStartBy: "",
+		pydOrPkd: "",
+		pddType: "",
 		startTime: "",
 		endTime: "",
-		get:false,
-		lose:false
 	})
+	const clickkuai = (index : string) => {
+		// index 可以是 '1' 或 '2'（或数字）
+		const key = String(index);
+		const cur = plzinfo.pydOrPkd || '';              // 可能为 '' 或 '1' 或 '2' 或 '1,2'
+		const set = new Set(cur ? cur.split(',') : []); // 转成集合方便增删
 
+		if (set.has(key)) set.delete(key);
+		else set.add(key);
+
+		// 保持有顺序 '1,2'，空集合 -> 空字符串
+		const arr = Array.from(set).filter(Boolean).sort((a, b) => a - b);
+		plzinfo.pydOrPkd = arr.length ? arr.join(',') : '';
+
+		firstgetqueryCgdList()
+	}
 	const nomessageshow = ref(false);
 	const leftscrolltop = ref(0)
 
@@ -576,8 +463,10 @@
 	const cannomessage = ref(true)
 	const rightdonghua = ref(true);
 	const firstgetqueryCgdList = () => {
-		queryQld(plzinfo).then((res : any) => {
-			transition.value = true;
+		plzinfo.pageNo = 1;
+		plzinfo.canpull = true
+		queryPddList(plzinfo).then((res : any) => {
+
 			// console.log("kankan", plzinfo, res)
 			if (((res.message === "缺少参数") || (!res.result?.total)) && cannomessage.value) {
 				nomessageshow.value = true;
@@ -589,16 +478,6 @@
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
 
-			if (res.result.records.length) {
-				rightdonghua.value = false;
-
-				queryQldWlInfo({ qldNo: res.result.records[0].qldNo }).then((element : any) => {
-					rightarray.value = []
-					rightarray.value.push(...element.result)
-					rightdonghua.value = true;
-				})
-			}
-
 			if (res.result.records.length < plzinfo.pageSize) {
 				plzinfo.canpull = false;
 			}
@@ -619,220 +498,56 @@
 	//获得采购单列表
 	const getqueryCgdList = () => {
 		if (!plzinfo.canpull) return
-		queryQld(plzinfo).then((res : any) => {
-			// console.log("???加载", res.result.records)
+		queryPddList(plzinfo).then((res : any) => {
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
 			if (res.result.records.length < plzinfo.pageSize) {
 				plzinfo.canpull = false;
 			}
 		})
-	}
-	const openerror = ref(false)
-	const clickLeftMenu = (index : any, item : any) => {
-
-		let num = Math.ceil((index + 1))
-		leftscrolltop.value = (num - 2) * 175.4;
-		if (item.izYgRead == 'N') {
-			let param = {
-				status: `yg`,
-				qldNo: plsbuy.value[index].qldNo,
-			}
-			newtransRead(param).then((res : any) => {
-				if (res.success) {
-					item.izYgRead = 'Y'
-				}
-			})
-		}
-		if (manyselect.value) {
-			if (item.status == `1`) {
-				if (selectarray.value.includes(item.qldNo)) {
-					// 删除
-					selectarray.value = selectarray.value.filter(v => v !== item.qldNo)
-				} else {
-					// 加入
-					selectarray.value.push(item.qldNo)
-				}
-			} else {
-				openerror.value = true
-			}
-			return
-		}
-
-
-		lefttarget.value = index;
-
-		rightdonghua.value = false;
-		queryQldWlInfo({ qldNo: plsbuy.value[index].qldNo }).then((element : any) => {
-			rightarray.value = [];
-			rightarray.value.push(...element.result)
-			rightdonghua.value = true;
-		})
-		// form.cgdId = plsbuy.value[index].id
-		// form.pageNo = 1
-		// form.canpull = true;
-		// // console.log("!!!!",form)
-		// queryCgdInfoList(form).then(res => {
-		// 	InvoicingList.value = []
-		// 	// console.log("数据呢", res.result.records)
-		// 	InvoicingList.value.push(...res.result.records);
-		// 	if (form.pageNo) {
-		// 		clickmiddle(0);
-		// 	}
-		// })
-
-
 	}
 	const serverUrl = ref("")
 	onLoad(() => {
 		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
 	})
-	const badshow = ref(false)
-	const huitui = () => {
-
-		orderReturn({ qldNo: plsbuy.value[lefttarget.value].qldNo }).then((res : any) => {
-			// console.log('回退', res)
-			badshow.value = false
-			if (res.success) {
-				plsbuy.value[lefttarget.value] = res.result.result
-			} else {
-				plzinfo.pageNo = 1;
-				plzinfo.canpull = true;
-				leftscrolltop.value = 1
-				setTimeout(() => {
-					leftscrolltop.value = 0
-				}, 50)
-				lefttarget.value = 0
-				firstgetqueryCgdList();
-			}
-
-			setTimeout(() => {
-				uni.showToast({
-					title: res.success ? res.result.message : res.message,
-					icon: 'none', // 'none' 表示不带图标
-					duration: 3000
-				})
-			}, 300)
-
-		})
-	}
-	// const shouhuoshow = ref(false)
-
-	// const shouhuo = () => {
-	// 	// let param = {
-	// 	// 	qldNo: plsbuy.value[lefttarget.value].qldNo,
-	// 	// 	elderId: uni.getStorageSync('NUall').elderId,
-	// 	// 	nuId: uni.getStorageSync('nuId')
-	// 	// }
-	// 	// confirmReceipt(param).then((res : any) => {
-	// 	// 	console.log('收货', param, res)
-	// 	// 	shouhuoshow.value = false
-	// 	// 	if (res.success) {
-	// 	// 		plsbuy.value[lefttarget.value] = res.result.result
-	// 	// 	} else {
-	// 	// 		plzinfo.pageNo = 1;
-	// 	// 		leftscrolltop.value = 1
-	// 	// 		setTimeout(() => {
-	// 	// 			leftscrolltop.value = 0
-	// 	// 		}, 50)
-	// 	// 		lefttarget.value = 0
-	// 	// 		plzinfo.canpull = true;
-	// 	// 		firstgetqueryCgdList();
-	// 	// 	}
-
-	// 	// 	setTimeout(() => {
-	// 	// 		uni.showToast({
-	// 	// 			title: res.success ? res.result.message : res.message,
-	// 	// 			icon: 'none', // 'none' 表示不带图标
-	// 	// 			duration: 3000
-	// 	// 		})
-	// 	// 	}, 300)
-
-	// 	// })
-	// }
 	const goback = () => {
 		uni.navigateBack()
 	}
-	const selectarray = ref([]);
-
-	const startselect = () => {
-
-		selectarray.value = [];
-		manyselect.value = !manyselect.value
-		if (!manyselect.value) {
-			lefttarget.value = 0
-		}
-	}
-	// const quxiao = () => {
-	// 	selectarray.value = [];
-	// 	manyselect.value = false;
-
-	// }
-	const chukushow = ref(false);
-	const qinglingshow = ref(false)
-	const chukuclick = () => {
-		if (manyselect.value && !selectarray.value.length) {
-			qinglingshow.value = true
-			return
-		}
-		outbound({ qldNo: manyselect.value ? selectarray.value.join(',') : plsbuy.value[lefttarget.value].qldNo }).then((res : any) => {
-			selectarray.value = [];
-			manyselect.value = false
-			chukushow.value = false
-			plzinfo.pageNo = 1;
-			lefttarget.value = 0
-			plzinfo.canpull = true;
-			leftscrolltop.value = 1
-			setTimeout(() => {
-				leftscrolltop.value = 0
-			}, 50)
-			lefttarget.value = 0
-			firstgetqueryCgdList();
-
-			setTimeout(() => {
-				uni.showToast({
-					title: res.success ? res.result.message : res.message,
-					icon: 'none', // 'none' 表示不带图标
-					duration: 3000
-				})
-			}, 300)
-
+	const errormessage = ref("")
+	const openmessage = ref(false)
+	const addnew = () =>{
+		addPddMain({nuId:uni.getStorageSync('nuId')}).then((res:any)=>{
+			// console.log("res",res)
+			if(res.success){
+				addshow.value = false
+				chongzhi()
+				setTimeout(()=>{
+					uni.showToast({
+						title: `新增成功`,
+						icon: 'none', // 'none' 表示不带图标
+						duration: 2000
+					})
+				},50)
+			}else{
+				openmessage.value = true
+				errormessage.value = res.message
+			}
 		})
-
 	}
 </script>
 
 <style scoped lang="less">
 	.all-bgc {
 		background-color: rgb(239, 240, 244);
-		// padding: 2vw;
 		padding-left: 2vw;
 		padding-top: 5.5vh;
 	}
 
-	.right-container-tem {
-		display: flex;
-
-		.right-container-tem-text {
-			font-size: 30rpx;
-			margin-right: 20rpx;
-		}
-
-
-		.right-container-tem-img {
-			width: 38rpx;
-			height: 38rpx;
-		}
-	}
-
 	.buttons-father {
 		width: 100%;
 		height: 7.5vh;
-		// transition: opacity 1s ease;
 		display: flex;
 		position: relative;
-		// background-color: rgb(239, 240, 244);
-		// padding-top: 5vh;
 
 		.ipt {
 			display: flex;
@@ -915,47 +630,6 @@
 			}
 		}
 
-		.right-button-white {
-			width: 10vw;
-			height: 3.3vw;
-			background-color: #fff;
-			border-radius: 1.65vw;
-			border: 1px solid #D9DADC;
-			font-weight: 400;
-			font-size: 1.4vw;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			color: #555555;
-			margin-right: 15rpx;
-
-			image {
-				width: 1.5vw;
-				height: 1.5vw;
-				margin: 0.1vw 0.2vw 0 0;
-			}
-		}
-
-		.right-button-blue {
-			width: 10vw;
-			height: 3.3vw;
-			background-color: #fff;
-			border-radius: 1.65vw;
-			border: 1px solid #1083F8;
-			font-weight: 400;
-			font-size: 1.4vw;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			color: #1083F8;
-			margin-right: 15rpx;
-
-			image {
-				width: 1.5vw;
-				height: 1.5vw;
-				margin: 0.1vw 0.2vw 0 0;
-			}
-		}
 		.shx-target {
 			width: 6.5vw;
 			height: 3.3vw;
@@ -969,15 +643,16 @@
 			align-items: center;
 			margin: 0 0 0 0.5vw;
 			color: #1083F8;
-		
+
 			image {
 				width: 1.5vw;
 				height: 1.5vw;
 				margin: 0 0.2vw 0 0;
 			}
-		
-		
+
+
 		}
+
 		.right-button:active,
 		.scr:active,
 		.shx:active {
@@ -990,395 +665,6 @@
 		}
 	}
 
-	.other-contain {
-		width: 100%;
-		height: 87vh;
-		display: flex;
-		// background-color: rgb(239, 240, 244);
-		// transition: opacity 1s ease;
-
-		.other-contain-left {
-			width: 32%;
-			height: 100%;
-
-			.left-menu-scroll {
-				margin-top: 3%;
-				height: 91%;
-				width: 100%;
-				// position: relative;
-				// overflow: auto;
-
-				// background-color: red;
-				.pls-card {
-					width: 98%;
-					height: 25.3vh;
-					border: #0f9fff 3rpx solid;
-					background-color: #fff;
-					border-radius: 40rpx;
-					margin-bottom: 1.5vh;
-					// margin: 1vh 0;
-					padding: 0 30rpx;
-					position: relative;
-
-					.pls-card-title {
-						height: 5.5vh;
-						width: 105%;
-						display: flex;
-						justify-content: space-between;
-						align-items: flex-end;
-
-						padding-left: 10rpx;
-						padding-right: 35rpx;
-
-						.middle-title-spec {
-							color: #888888;
-							font-size: 29rpx;
-						}
-
-						.title-left {
-							font-weight: 600;
-							font-size: 34rpx;
-							// color: #888888;
-						}
-
-						.title-right {
-							display: flex;
-							align-items: flex-end;
-							font-size: 30rpx;
-							position: relative;
-
-							.title-right-big {
-								font-weight: 600;
-								font-size: 40rpx;
-								margin-right: 35rpx;
-								color: #555555;
-							}
-
-							.title-right-img {
-								position: absolute;
-								right: -10rpx;
-								bottom: 6rpx;
-								width: 40rpx;
-								height: 40rpx;
-							}
-						}
-					}
-
-					.pls-card-middle {
-						width: 100%;
-						height: 11vh;
-						margin-top: 1.5vh;
-						display: flex;
-						position: relative;
-
-						.middle-heng {
-							position: absolute;
-							left: 4%;
-							top: 34%;
-							transform: translateY(-35%);
-							width: 92%;
-							height: 2px;
-							/* 虚线粗细 */
-							background-image: repeating-linear-gradient(to right,
-									#E5E5E5 0,
-									#E5E5E5 6px,
-									transparent 6px,
-									transparent 10px);
-						}
-
-						.pls-card-middle-one {
-							width: 33.3%;
-							height: 100%;
-
-							// background-color: yellow;
-							.middle-title {
-								width: 100%;
-								height: 2.1vh;
-								// background-color: #007CFF;
-								color: #888888;
-								text-align: center;
-								font-size: 25rpx;
-								overflow: hidden;
-							}
-
-							.middle-heng-father {
-								width: 100%;
-								height: 4vh;
-								position: relative;
-
-								.middle-ball-img {
-									width: 35rpx;
-									height: 35rpx;
-									position: absolute;
-									top: 50%;
-									left: 50%;
-									transform: translate(-50%, -50%);
-								}
-
-								.middle-ball {
-									width: 20rpx;
-									height: 20rpx;
-									background-color: #1083F8;
-									position: absolute;
-									top: 50%;
-									left: 50%;
-									transform: translate(-50%, -50%);
-									border-radius: 50%;
-								}
-							}
-
-							.end-font {
-								width: 100%;
-								height: 6vh;
-								text-align: center;
-								color: #666666;
-								overflow: hidden;
-								text-overflow: ellipsis;
-								white-space: nowrap;
-								font-size: 25rpx;
-							}
-						}
-					}
-
-					.pls-card-end {
-						width: 100%;
-						height: 6vh;
-						display: flex;
-						justify-content: space-between;
-						position: relative;
-						padding-left: 15rpx;
-						margin-top: 10rpx;
-
-						.end-left {
-							height: 100%;
-							display: flex;
-							align-items: center;
-
-							.end-left-img {
-								width: 35rpx;
-								height: 35rpx;
-							}
-
-							.end-left-font {
-								margin-top: 3rpx;
-								width: 400rpx;
-								// background-color: #007CFF;
-								// font-size: 26rpx;
-								color: #666666;
-								margin-left: 3rpx;
-								overflow: hidden;
-								white-space: nowrap;
-								text-overflow: ellipsis;
-							}
-						}
-
-						.tag-fail {
-							width: 120rpx;
-							height: 50rpx;
-							border-radius: 30rpx;
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							background-color: #FDEBEC;
-							color: #FF5757;
-							border: 1rpx solid #FF5757;
-							position: absolute;
-							right: 0rpx;
-							bottom: 20rpx;
-						}
-
-						.tag-success {
-							width: 120rpx;
-							height: 50rpx;
-							border-radius: 30rpx;
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							background-color: #ECF6FF;
-							color: #1083F8;
-							border: 1rpx solid #1083F8;
-							position: absolute;
-							right: 0rpx;
-							bottom: 20rpx;
-						}
-					}
-				}
-			}
-
-
-		}
-
-		.other-contain-right {
-			width: 65%;
-			margin-left: 1%;
-			height: 98%;
-			background-color: #fff;
-			border-radius: 40rpx;
-			position: relative;
-
-			.right-contain {
-				width: 100%;
-				height: 95%;
-				margin-top: 20rpx;
-				display: flex;
-				flex-wrap: wrap;
-				position: relative;
-
-
-				.right-ones {
-					display: flex;
-					width: 100%;
-					flex-wrap: wrap;
-					padding-left: 20rpx;
-					padding-bottom: 80rpx;
-
-
-					.right-one {
-						width: 630rpx;
-						height: 270rpx;
-						margin-left: 20rpx;
-						margin-top: 15rpx;
-						background-color: #F9F9F9;
-						border-radius: 30rpx;
-						display: flex;
-
-						.right-one-left {
-							height: 100%;
-							width: 40%;
-							display: flex;
-							flex-direction: column;
-							align-items: center;
-
-							.left-image {
-								width: 150rpx;
-								height: 150rpx;
-								// margin: 15rpx 0;
-								margin-top: 10rpx;
-								margin-bottom: 15rpx;
-								// margin-top: 5rpx;
-							}
-
-							.left-tages {
-								width: 130rpx;
-								height: 43rpx;
-								border-radius: 30rpx;
-								display: flex;
-								justify-content: center;
-								align-items: center;
-								color: #555555;
-								border: 1rpx solid #D2D2D2;
-								margin-top: 5rpx;
-								font-size: 23rpx;
-							}
-						}
-
-						.right-one-right {
-							height: 100%;
-							width: 60%;
-
-							.right-title {
-								font-size: 34rpx;
-								font-weight: 600;
-								margin-top: 25rpx;
-								color: #222222;
-								width: 300rpx;
-								overflow: hidden;
-								/* 必须 */
-								white-space: nowrap;
-								/* 强制单行 */
-								text-overflow: ellipsis;
-								/* 显示省略号 */
-							}
-
-							.right-setting {
-								color: #888888;
-								margin-top: 5rpx;
-								font-size: 25rpx;
-							}
-
-							.right-mm {
-								color: #555555;
-								font-size: 28rpx;
-							}
-
-							.right-down {
-								display: flex;
-								margin-top: 15rpx;
-
-								.right-first-num {
-									font-size: 35rpx;
-									color: #555555;
-									font-weight: 600;
-								}
-
-								.right-first-type {
-									color: #888888;
-									font-size: 23rpx;
-								}
-
-								.right-shu {
-									width: 2rpx;
-									height: 50rpx;
-									background-color: #C9C9C9;
-									margin: 0 40rpx;
-									margin-top: 10rpx;
-								}
-							}
-						}
-					}
-				}
-
-			}
-		}
-	}
-
-	.bottom-buttons {
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		height: 10%;
-		display: flex;
-		justify-content: flex-end;
-		align-items: center;
-		background-color: #fff;
-		border-radius: 40rpx;
-	}
-
-	.button-gray {
-		background-color: #f8f8f8;
-		color: #555555;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: #555555;
-		width: 180rpx;
-		height: 70rpx;
-		border-radius: 40rpx;
-		margin-right: 30rpx;
-	}
-
-	.button-blue {
-		background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
-		border: 1rpx solid #1083F8;
-		color: #1083F8;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 180rpx;
-		height: 70rpx;
-		border-radius: 40rpx;
-		margin-right: 60rpx;
-	}
-
-	.button-gray:active {
-		color: #1083F8;
-		background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
-		border: 1rpx solid #1083F8;
-		transition: .4s;
-		-webkit-transform-style: preserve-3d;
-		-webkit-overflow-scrolling: touch;
-	}
 
 	.right-buttons {
 		position: absolute;
@@ -1819,6 +1105,7 @@
 			}
 		}
 	}
+
 	.calendar-father {
 		position: fixed;
 		top: 100rpx;
@@ -1828,15 +1115,18 @@
 		background-color: #fff;
 		z-index: 9998;
 	}
-	.selected{
-		margin-top: 20rpx;
+
+	.selected {
+		margin-top: 40rpx;
 		width: 100%;
 		display: flex;
-		.selected-item{
+
+		.selected-item {
 			width: 50%;
 			display: flex;
 			align-items: center;
-			.selected-kuai{
+
+			.selected-kuai {
 				width: 40rpx;
 				height: 40rpx;
 				background-color: #F8F8FA;
@@ -1844,7 +1134,8 @@
 				border-radius: 10rpx;
 				margin-right: 20rpx;
 			}
-			.selected-kuai-target{
+
+			.selected-kuai-target {
 				width: 40rpx;
 				height: 40rpx;
 				background-color: #F8F8FA;
@@ -1859,4 +1150,33 @@
 			}
 		}
 	}
+	.input-next {
+		position: fixed;
+		bottom: 850rpx;
+		left: 70rpx;
+		width: 610rpx;
+		// height: 300rpx;
+		border-radius: 30rpx;
+		z-index: 102;
+		background-color: #fff;
+		box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+		padding: 40rpx 30rpx;
+		z-index: 9999;
+	
+		.next-father {
+			color: #999;
+			margin: 10rpx;
+			font-size: 28rpx;
+		}
+	}
+	
+	.nomessage {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+		height: 200rpx;
+		font-size: 34rpx;
+		color: #999;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index 6f8e097..1f45739 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -183,7 +183,7 @@
 						<view class="right-one" v-for="(item,index) in rightarray" :key="index">
 							<view class="right-one-left">
 								<image class="left-image"
-									:src="item.materialInfo.materialImg?serverUrl+item.materialInfo.materialImg:'/static/index/procurement/k.png'"
+									:src="item.materialInfo?.materialImg?serverUrl+item.materialInfo?.materialImg:'/static/index/procurement/k.png'"
 									mode="aspectFill"></image>
 								<view class="left-tages" style="margin-top: -15rpx;">
 									{{ item.materialInfo.categoryName}}
@@ -371,7 +371,6 @@
 			plsbuy.value = []
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
-
 			if (res.result.records.length) {
 				rightdonghua.value = false;
 
@@ -380,6 +379,8 @@
 					rightarray.value.push(...element.result)
 					rightdonghua.value = true;
 				})
+			}else{
+				rightarray.value = []
 			}
 
 			if (res.result.records.length < plzinfo.pageSize) {
diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue
index d636a6c..7fdb492 100644
--- a/pages/procurement/purchaseorder.vue
+++ b/pages/procurement/purchaseorder.vue
@@ -537,7 +537,7 @@
 	const mobanform = {
 		nuId: uni.getStorageSync('nuId'),
 		pageNo: 1,
-		pageSize: 9,
+		pageSize: -1,
 		categoryId: '',
 		typeId: '',
 		medicationId: '',
diff --git a/static/index/procurement/+.png b/static/index/procurement/+.png
index 1f0fbf4..b429fca 100644
Binary files a/static/index/procurement/+.png and b/static/index/procurement/+.png differ
diff --git a/static/index/procurement/-.png b/static/index/procurement/-.png
index b9dab55..7ec9d14 100644
Binary files a/static/index/procurement/-.png and b/static/index/procurement/-.png differ