diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue
index 81f7738..2d2563c 100644
--- a/pages/NursingNew/component/pleasetake/common/carditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/carditem.vue
@@ -100,6 +100,7 @@
 		let absy = Math.abs(y - pageY.value);
 		ones.value = true;
 		if (absy > 30 && absx+10<absy) {
+			caigouobj.value.scrollleft = 0.01
 			setTimeout(()=>{
 				caigouobj.value.scrollleft = 0
 			},20)
diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index 9fd91cf..ba4486e 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -430,10 +430,10 @@
 	const zuofei = () => {
 
 		cancellation({ qldNo: plsbuy.value[lefttarget.value].qldNo }).then((res : any) => {
-			// console.log('作废', res)
+			console.log('作废', res)
 			badshow.value = false
 			if(res.success){
-				
+				plsbuy.value[lefttarget.value] = res.result.result
 			}else{
 				plzinfo.pageNo = 1;
 				plzinfo.canpull = true;
@@ -447,7 +447,7 @@
 			
 			setTimeout(() => {
 				uni.showToast({
-					title: res.message,
+					title: res.success?res.result.message:res.message,
 					icon: 'none', // 'none' 表示不带图标
 					duration: 3000
 				})
@@ -463,10 +463,10 @@
 			nuId: uni.getStorageSync('nuId')
 		}
 		confirmReceipt(param).then((res : any) => {
-			console.log('收货', res)
+			console.log('收货', param,res)
 			shouhuoshow.value = false
 			if(res.success){
-				
+				plsbuy.value[lefttarget.value] = res.result.result
 			}else{
 				plzinfo.pageNo = 1;
 				leftscrolltop.value = 1
@@ -480,7 +480,7 @@
 			
 			setTimeout(() => {
 				uni.showToast({
-					title: res.message,
+					title: res.success?res.result.message:res.message,
 					icon: 'none', // 'none' 表示不带图标
 					duration: 3000
 				})
diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
new file mode 100644
index 0000000..b0ec3c7
--- /dev/null
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -0,0 +1,1021 @@
+<template>
+	<view class="buttons-father" :style="transition?{opacity: `1`}:{opacity: `0`}" v-show="isShow">
+		<!-- <view class="ipt">
+			<input type="text" v-model="plzinfo.searchContent" placeholder="请领单号" @confirm="clickconfirm" />
+		</view>
+		<view class="scr" @click="clickconfirm">
+			检索
+		</view>
+		<view class="shx" @click="chongzhi">
+			<image src="/static/index/requestform/chongzhi.png" mode="aspectFill"></image>
+			<view class="shx-font">
+				重置
+			</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="button-tilte">
+			回退单
+		</view>
+		<view class="right-button-father">
+			<view class="right-button" @click="badshow=true">
+				<image src="/static/index/warehouse/procurement/picking/bebad.png" />
+				<view>
+					作废
+				</view>
+			</view>
+			<view class="right-button" style="width: 11vw;" @click="badshow=true">
+				<image src="/static/index/warehouse/procurement/picking/caigou.png" />
+				<view>
+					提交请购单
+				</view>
+			</view>
+		</view>
+		
+		<nomessage cont="暂无数据" :show="nomessageshow" />
+
+	</view>
+	<tanchuang :show="badshow" font="确定要作废这个回退单吗" @back="badshow=false;" @right="zuofei"> </tanchuang>
+	<tanchuang :show="shouhuoshow" font="这个请领单确定要收货吗" @back="shouhuoshow=false;" @right="shouhuo"> </tanchuang>
+
+	<view class="other-contain" :style="transition?{opacity: `1`}:{opacity: `0`}" v-show="isShow && !nomessageshow">
+		<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 ? 11.5 : 12 + selectType * 18.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: i === lefttarget ? '' : 'transparent',
+						  background: i === lefttarget ? '#fff' : '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">
+
+								<view class="middle-ball" style="background-color: #1083F8;"
+									:style=" v?.status === '2' || v?.status === '3' ?{backgroundColor:`#FF5757`}:{}"
+									v-if="Number(v.status)<4">
+								</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="{backgroundColor: `#1083F8`}"></view> -->
+								<view class="middle-ball" :style="{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;">
+								耗材用品
+							</view>
+							<view class="left-tages">
+								支架
+							</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 class="right-buttons">
+							
+						</view>
+					</view>
+				</view>
+				<defaultr cont="暂无数据" v-if="rightarray.length==0 && rightdonghua"
+					style="width: 30%;height: 30%;position: absolute;">
+				</defaultr>
+			</scroll-view>
+		</view>
+	</view>
+</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, transRead, cancellation, confirmReceipt } from '../api/api.js'
+	import nomessage from '../common/nomessage.vue'
+	import defaultr from '../common/default.vue'
+	const props = defineProps({
+		isShow: {
+			type: Boolean,
+			required: true,
+		},
+	});
+	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;
+				// console.log("????",transition.value)
+				setTimeout(() => {
+					transition.value = true;
+				}, 50)
+			} else {
+				transition.value = false;
+			}
+
+		}
+	)
+	onMounted(() => {
+
+	})
+	const lanjie = ref(false);
+
+	const selectType = ref(0)
+	const changetype = (index : number) => {
+		if ((selectType.value == index) && index) {
+			return
+		}
+		leftscrolltop.value = 1
+		setTimeout(() => {
+			leftscrolltop.value = 0
+		}, 50)
+		lefttarget.value = 0
+		selectType.value = index
+		plzinfo.pageNo = 1;
+		plzinfo.canpull = true;
+
+		switch (index) {
+			case 0:
+				plzinfo.status = `3`
+				break
+			case 1:
+				plzinfo.status = `1`
+				break
+			case 2:
+				plzinfo.status = `4`
+				break
+			case 3:
+				plzinfo.status = `5`
+				break
+			case 4:
+				plzinfo.status = `2`
+				break
+		}
+		firstgetqueryCgdList()
+	}
+	const clickconfirm = () => {
+		if (chongzhiLock) return
+		chongzhiLock = true
+		plzinfo.pageNo = 1;
+		plzinfo.canpull = true;
+		lefttarget.value = 0
+		firstgetqueryCgdList()
+		leftscrolltop.value = 1
+		setTimeout(() => {
+			leftscrolltop.value = 0
+		}, 10)
+		setTimeout(() => chongzhiLock = false, 500)
+	}
+	let chongzhiLock = false
+
+	const chongzhi = () => {
+		if (chongzhiLock) return
+		chongzhiLock = true
+
+		plzinfo.searchContent = ""
+		changetype(0)
+		firstgetqueryCgdList()
+
+		setTimeout(() => chongzhiLock = false, 500)
+	}
+	const plsbuy = ref([])
+	const alltotal = ref(0);
+	const lefttarget = ref(0)
+	const plzinfo = reactive({
+		pageNo: 1,
+		pageSize: 5,
+		canpull: true,
+		searchContent: "",
+		status: "3",
+		elderId: uni.getStorageSync('NUall').elderId,
+		nuId: uni.getStorageSync('nuId')
+	})
+
+	const nomessageshow = ref(false);
+	const leftscrolltop = ref(0)
+
+	const rightarray = ref([]);
+	// 检测锁
+	const cannomessage = ref(true)
+	const rightdonghua = ref(true);
+	const firstgetqueryCgdList = () => {
+		queryQld(plzinfo).then((res : any) => {
+			transition.value = true;
+			if (((res.message === "缺少参数") || (!res.result?.total)) && cannomessage.value) {
+				nomessageshow.value = true;
+				return
+			}
+			cannomessage.value = false
+			plsbuy.value = []
+			plsbuy.value.push(...res.result.records)
+			console.log("入参", plzinfo)
+			console.log("查看数组", res.result.records)
+			alltotal.value = res.result.total
+
+			// console.log("请购单数据呢???", res)
+			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;
+			}
+
+		})
+	}
+	const setout = ref(true)
+	let times = null
+	const plsbuytolower = () => {
+		if (!setout.value) { return }
+		plzinfo.pageNo++;
+		getqueryCgdList()
+		setout.value = false
+		times = setTimeout(() => {
+			setout.value = true
+		}, 500)
+	}
+	//获得采购单列表
+	const getqueryCgdList = () => {
+		if (!plzinfo.canpull) return
+		queryQld(plzinfo).then((res : any) => {
+			console.log("???加载", res.result.records)
+			plsbuy.value.push(...res.result.records)
+			alltotal.value = res.result.total
+			if (res.result.records.length < plzinfo.pageSize) {
+				plzinfo.canpull = false;
+			}
+		})
+	}
+	const clickLeftMenu = (index : any, item : any) => {
+		let num = Math.ceil((index + 1))
+		leftscrolltop.value = (num - 2) * 175.4;
+		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);
+		// 	}
+		// })
+		if (item.izYgRead == 'N') {
+			let param = {
+				status: `yg`,
+				qldNo: plsbuy.value[index].qldNo,
+			}
+			transRead(param).then((res : any) => {
+				if (res.success) {
+					item.izYgRead = 'Y'
+				}
+			})
+		}
+
+	}
+	const serverUrl = ref("")
+	onLoad(() => {
+		// console.log("查看",uni.getStorageSync('NUall'))
+		firstgetqueryCgdList();
+		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
+		// getSelectList();
+	})
+	const badshow = ref(false)
+	const zuofei = () => {
+
+		cancellation({ qldNo: plsbuy.value[lefttarget.value].qldNo }).then((res : any) => {
+			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) => {
+			shouhuoshow.value = false
+			if (res.success) {
+
+			} else {
+				plzinfo.pageNo = 1;
+				leftscrolltop.value = 1
+				setTimeout(() => {
+					leftscrolltop.value = 0
+				}, 50)
+				lefttarget.value = 0
+				plzinfo.canpull = true;
+				firstgetqueryCgdList();
+			}
+
+			setTimeout(() => {
+				uni.showToast({
+					title: res.message,
+					icon: 'none', // 'none' 表示不带图标
+					duration: 3000
+				})
+			}, 300)
+
+		})
+	}
+</script>
+
+<style scoped lang="less">
+	.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: 90rpx;
+		transition: opacity 1s ease;
+		display: flex;
+		position: relative;
+
+		.button-tilte {
+			font-size: 38rpx;
+			font-weight: 600;
+			margin: auto 0;
+			margin-left: 1.2vw;
+		}
+
+		.ipt {
+			display: flex;
+			align-items: center;
+			width: 16vw;
+			background: #E2E4E9;
+			border-radius: 1.65vw;
+			height: 3.3vw;
+
+			image {
+				width: 2.2vw;
+				height: 2.2vw;
+				margin: 0 0.5vw;
+			}
+
+			input {
+				width: 18vw;
+				height: 3.5vw;
+				font-size: 1.4vw;
+				padding-left: 1.6vw;
+
+			}
+		}
+
+		.scr {
+			border-radius: 1.65vw;
+			font-weight: 400;
+			font-size: 1.4vw;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin: 0 0 0 0.7vw;
+			background-color: #fff;
+			border: 1px solid #D9DADC;
+			color: #555555;
+			width: 6.5vw;
+			height: 3.3vw;
+		}
+
+		.shx {
+			width: 6.5vw;
+			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;
+			margin: 0 0 0 0.5vw;
+			color: #555555;
+
+			image {
+				width: 1.5vw;
+				height: 1.5vw;
+				margin: 0 0.2vw 0 0;
+			}
+
+
+		}
+		.right-button-father{
+			position: absolute;
+			right: 1.8vw;
+			top: 0;
+			display: flex;
+		}
+		.right-button {
+			width: 6.5vw;
+			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;
+			// margin: 0 0 0 0.5vw;
+			color: #555555;
+			margin-left: 10rpx;
+
+			image {
+				width: 1.5vw;
+				height: 1.5vw;
+				margin: 0.1vw 0.2vw 0 0;
+			}
+		}
+
+		.right-button:active,
+		.scr:active,
+		.shx: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;
+		}
+	}
+
+	.other-contain {
+		width: 100%;
+		height: 1050rpx;
+		display: flex;
+		transition: opacity 1s ease;
+
+		.other-contain-left {
+			width: 35%;
+			height: 100%;
+
+			.left-menu-scroll {
+				margin-bottom: 3%;
+				height: 94%;
+				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: 35%;
+							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;
+							}
+						}
+					}
+
+					.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;
+						}
+					}
+				}
+			}
+
+			.left-selecttype {
+				width: 98%;
+				height: 80rpx;
+				border-radius: 40rpx;
+				background-color: #FFFFFF;
+				display: flex;
+				padding-right: 30rpx;
+				padding-left: 15rpx;
+				position: relative;
+
+
+				.heng-blue {
+					position: absolute;
+					bottom: 0;
+					left: 50%;
+					transform: translateX(-50%);
+					width: 25rpx;
+					height: 8rpx;
+					border-radius: 10rpx;
+					background-color: #1083F8;
+					transition: 0.3s all ease;
+
+				}
+
+				.selecttype {
+					width: 20%;
+					height: 100%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					color: #999999;
+					font-size: 31rpx;
+					position: relative;
+
+				}
+
+				.selecttype-target {
+					width: 20%;
+					height: 100%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					color: #222222;
+					font-size: 31rpx;
+					font-weight: 600;
+					position: relative;
+				}
+			}
+		}
+
+		.other-contain-right {
+			width: 64%;
+			margin-left: 1%;
+			height: 103.5%;
+
+			.right-contain {
+				width: 100%;
+				height: 100%;
+				display: flex;
+				flex-wrap: wrap;
+				position: relative;
+
+
+				.right-ones {
+					display: flex;
+					width: 100%;
+					flex-wrap: wrap;
+
+					.right-one {
+						width: 570rpx;
+						height: 261rpx;
+						margin-right: 20rpx;
+						// margin-top: 15rpx;
+						margin: 7.5rpx 0;
+						background-color: #fff;
+						border-radius: 30rpx;
+						display: flex;
+						overflow: hidden;
+
+						.right-one-left {
+							height: 100%;
+							min-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%;
+							min-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;
+								}
+							}
+						}
+						.right-buttons{
+							width: 40vw;
+							height: 100%;
+							background-color: red;
+						}
+					}
+				}
+
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index 6009394..855626b 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -25,13 +25,13 @@
 			<view class="boxtwo flexend">
 				<view class="qlthbtn">
 					<image src="/static/index/requestform/ql0.png" mode="aspectFill"></image>
-					<view class="shx-font" @click="changePage()">
+					<view class="shx-font" @click="changePage(1)">
 						请领单
 					</view>
 				</view>
 				<view class="qlthbtn">
 					<image src="/static/index/requestform/ql1.png" mode="aspectFill"></image>
-					<view class="shx-font">
+					<view class="shx-font" @click="changePage(2)">
 						回退单
 					</view>
 				</view>
@@ -271,8 +271,8 @@
 		classication.value.config();
 	}
 	const emit = defineEmits(['changePageNumber']) // 也可以用类型签名（见下面）
-	const changePage = () => {
-		emit('changePageNumber', 1) 
+	const changePage = (index:number) => {
+		emit('changePageNumber', index) 
 	}
 </script>
 
diff --git a/pages/NursingNew/component/pleasetake/takehome.vue b/pages/NursingNew/component/pleasetake/takehome.vue
index 51f61aa..a8460b0 100644
--- a/pages/NursingNew/component/pleasetake/takehome.vue
+++ b/pages/NursingNew/component/pleasetake/takehome.vue
@@ -15,8 +15,8 @@
 			</view>
 		</view>
 		<takehomep v-if="!hometype" @changePageNumber="changehometype" ></takehomep>
-		<!-- v-if是实际隐藏，isshow是控制动画 -->
 		<requestformView :isShow="hometype==1" />
+		<returnorder :isShow="hometype==2" />
 	</view>
 </template>
 
@@ -26,6 +26,8 @@
 	import { queryCgdList } from '@/pages/Warehouse/api/lunpan.js'
 	import requestformView from './component/requestform.vue'
 	import takehomep from './component/takehomep.vue'
+	import returnorder from './component/returnorder.vue'
+	
 	const hometype = ref(0)
 	const transition = ref(false);
 	const props = defineProps({
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index 215319f..6f526bc 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -111,14 +111,17 @@
 		solleft(v, i)
 	}
 	const handleTouchEnd = (event : any, v : any, i : number) => {
+		console.log('结束')
 		let y = event.changedTouches[0].pageY;
 		let x = event.changedTouches[0].pageX;
 		let absx = Math.abs(x - pageX.value)
 		let absy = Math.abs(y - pageY.value)
 		if (absy > 30 && absx+10<absy) {
+			v.scrollleft = 1
 			setTimeout(()=>{
 				v.scrollleft = 0
 			},20)
+			console.log("1")
 			return
 		}
 		if (absx < 10 && absy < 10) {
@@ -127,6 +130,7 @@
 					v.scrollleft = 0
 				 },20)
 			 }
+			 console.log("2")
 			return
 		}
 		caigouobj.value = v;
@@ -135,6 +139,7 @@
 		caigouobj.value.yj = false;
 		v.zk = x > pageX.value ? false : true;
 		v.scrollleft = v.zk ? 150 : 0;
+		
 	}
 	const solleft = (v : any, i : number) => { 
 		props.InvoicingList.forEach((item, k) => {
diff --git a/static/index/warehouse/procurement/picking/caigou.png b/static/index/warehouse/procurement/picking/caigou.png
new file mode 100644
index 0000000..b41c31b
Binary files /dev/null and b/static/index/warehouse/procurement/picking/caigou.png differ
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 04100f2..12310ff 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/unpackage/dist/dev/.nvue/pages/camera.js
@@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index c959abe..dd59bdc 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js
@@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };