diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue
index d811815..863cd9f 100644
--- a/pages/Warehouse/finish.vue
+++ b/pages/Warehouse/finish.vue
@@ -952,7 +952,7 @@
 							<view
 								style="width: 100%;justify-content: space-between;display: flex;align-items: center;height: 60rpx;margin-top: 20rpx;">
 								<view class="">
-									拣货数量：
+									拣货数量:
 									<text style="font-weight: 600;color: #555555;">
 										{{item.crkNum}}
 									</text>
@@ -968,7 +968,7 @@
 							</view>
 							<view style="width: 100%;justify-content: space-between;display: flex;">
 								<view class="">
-									采购单价：
+									采购单价:
 
 									<text style="font-weight: 600;color: #555555;">
 										￥{{Number(item.oldPrice).toFixed(2)}}
@@ -976,22 +976,22 @@
 
 								</view>
 								<view class="">
-									拣货人：
+									拣货人:
 									<text style="color: #888888;font-weight: 600;">
 										{{item.createBy}}
 									</text>
 
 								</view>
 							</view>
-							<view style="width: 100%;justify-content: space-between;display: flex;margin-top: 10rpx;">
-								<view class="">
-									到货单价：
-									<text style="font-weight: 600;color: #555555;">
+							<view style="width: 100%;justify-content: space-between;display: flex;margin-top: 10rpx;white-space: nowrap;">
+								<view class="" style="white-space: nowrap;">
+									到货单价:
+									<text style="font-weight: 600;color: #555555;white-space: nowrap;">
 										￥{{Number(item.newPrice).toFixed(2)}}
 									</text>
 
 								</view>
-								<view class="">
+								<view class="" style="white-space: nowrap;">
 									{{item.createTime.replace(/-/g, '.')}}
 								</view>
 							</view>
diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue
index 2759e79..798d0b2 100644
--- a/pages/Warehouse/index/component/index.vue
+++ b/pages/Warehouse/index/component/index.vue
@@ -172,7 +172,7 @@
 			</view> -->
 		</view>
 	</view>
-	<view class="fixed-card" :style="openleft?{}:{right:`-33vw`}">
+	<view class="fixed-card" :style="openleft?{right: '2.4vw'}:{right:`-33vw`}">
 		<view class="fixed-card-left">
 			<image class="card-left-img" :src="`/static/index/newindex/wendu/2.png`" />
 			<view class="">
@@ -971,6 +971,7 @@
 		display: flex;
 		align-items: center;
 		transition: all 0.5s ease;
+		z-index: 555;
 
 		.fixed-card-left {
 			display: flex;
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index cfb0280..95d43e2 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -3132,11 +3132,11 @@
 
 	.jianhuofather {
 		position: fixed;
-		top: 50%;
+		top: 0%;
 		left: 50%;
-		transform: translate(-50%, -50%);
-		width: 50%;
-		height: 95%;
+		transform: translate(-50%, 0%);
+		width: 55%;
+		height: 100%;
 		border-radius: 40rpx;
 		background-color: #fff;
 		transition: all 0.3s;
diff --git a/pages/procurement/api/lunpan.js b/pages/procurement/api/lunpan.js
index 13b81e4..db9df71 100644
--- a/pages/procurement/api/lunpan.js
+++ b/pages/procurement/api/lunpan.js
@@ -407,3 +407,11 @@ export const voidedPddMain = (params) => {
 		data: params,
 	})
 }
+
+export const queryCareList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/warehouse/queryCareList`,
+		method: 'get',
+		data: params,
+	})
+} 
\ No newline at end of file
diff --git a/pages/procurement/common/submits.vue b/pages/procurement/common/submits.vue
index 4ca9954..c52b129 100644
--- a/pages/procurement/common/submits.vue
+++ b/pages/procurement/common/submits.vue
@@ -115,8 +115,8 @@
 		box-shadow: 0rpx 0rpx 1.3vw 0rpx rgba(163, 167, 182, 0.16);
 		border-radius: 1.6vw;
 		position: fixed;
-		top: 8vw;
-		left: 20vw;
+		top: 4vw;
+		right: 20vw;
 		z-index: 200;
 		padding: 1vw 2vw;
 
diff --git a/pages/procurement/common/thitem.vue b/pages/procurement/common/thitem.vue
index 7542246..d6dee84 100644
--- a/pages/procurement/common/thitem.vue
+++ b/pages/procurement/common/thitem.vue
@@ -450,7 +450,7 @@
 			margin-left: 0.5vw;
 
 			.carditem {
-				width: 26.5vw;
+				width: 27.5vw;
 				height: 13vw;
 				background: rgba(245, 246, 248, 1);
 				border-radius: 1.1vw;
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index add48c5..d4283b3 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -431,6 +431,7 @@
 				>image {
 					width: 100%;
 					height: 100%;
+					border-radius: 1.1vw;
 				}
 			}
 			
diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue
index e4b1c38..cfc8e54 100644
--- a/pages/procurement/inventory.vue
+++ b/pages/procurement/inventory.vue
@@ -58,14 +58,7 @@
 							<view class="scroll-title-left">
 								<view class="title-font">
 									{{ item.pddNo }}
-								</view>
-
-								<view class="title-success" v-if="item.pydNum>0">
-									盘盈
-								</view>
-								<view class="title-error" v-if="item.pkdNum>0">
-									盘亏
-								</view>
+								</view> 
 							</view>
 							<view class="scroll-title-right">
 								{{ item.pddType_dictText }}
@@ -113,9 +106,19 @@
 							</view>
 						</view>
 						<view class="scroll-item-end">
-							<image class="title-imge" src="/static/home.png" mode="aspectFit"></image>
-							<view class="title-font">
-								{{ item.nuName}}
+							<view>
+								<view class="title-success" v-if="item.pydNum>0">
+									盘盈
+								</view>
+								<view class="title-error" v-if="item.pkdNum>0">
+									盘亏
+								</view>
+							</view>
+							<view>
+								<image class="title-imge" src="/static/home.png" mode="aspectFit"></image>
+								<view class="title-font">
+									{{ item.nuName}}
+								</view>
 							</view>
 						</view>
 
@@ -583,6 +586,7 @@
 		background-color: rgb(239, 240, 244);
 		padding-left: 1vw;
 		padding-top:2vh;
+		width: 90vw;
 	}
 
 	.buttons-father {
@@ -839,36 +843,6 @@
 								margin-right: 10rpx;
 							}
 
-							.title-success {
-								width: 65rpx;
-								height: 40rpx;
-								display: flex;
-								justify-content: center;
-								align-items: center;
-								background-color: rgba(3, 133, 250, 0.1);
-								font-size: 25rpx;
-								font-weight: 500;
-								color: #1083F8;
-								border: 2rpx solid #1083F8;
-								margin-left: 5rpx;
-								border-radius: 5rpx;
-							}
-
-							.title-error {
-								width: 65rpx;
-								height: 40rpx;
-								display: flex;
-								justify-content: center;
-								align-items: center;
-								background-color: #FFF1F1;
-								font-size: 25rpx;
-								font-weight: 500;
-								color: #FF5757;
-								border: 2rpx solid #FF5757;
-								margin-left: 5rpx;
-								margin-right: 5rpx;
-								border-radius: 5rpx;
-							}
 						}
 
 						.scroll-title-right {
@@ -961,10 +935,43 @@
 					.scroll-item-end {
 						width: 100%;
 						display: flex;
-						justify-content: flex-end;
+						justify-content: space-between;
 						align-items: center;
-						margin-top: 15rpx;
-
+						>view{
+							margin-top: 15rpx;
+							display: flex;
+							align-items: center;
+						}
+						.title-success {
+							width: 65rpx;
+							height: 40rpx;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							background-color: rgba(3, 133, 250, 0.1);
+							font-size: 25rpx;
+							font-weight: 500;
+							color: #1083F8;
+							border: 2rpx solid #1083F8;
+							margin-left: 5rpx;
+							border-radius: 5rpx;
+						}
+						
+						.title-error {
+							width: 65rpx;
+							height: 40rpx;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							background-color: #FFF1F1;
+							font-size: 25rpx;
+							font-weight: 500;
+							color: #FF5757;
+							border: 2rpx solid #FF5757;
+							margin-left: 5rpx;
+							margin-right: 5rpx;
+							border-radius: 5rpx;
+						}
 						.title-imge {
 							width: 1.8vw;
 							height: 1.8vw;
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index f63fa16..22a2a53 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -837,7 +837,7 @@
 					height: 7vw;
 					margin: 0.5vw auto 0.5vw;
 					display: block;
-					border-radius: 1vw;
+					border-radius: 0.7vw;
 				}
 
 				>view {
diff --git a/pages/procurement/retstock.vue b/pages/procurement/retstock.vue
index 22e3bbe..eb70d80 100644
--- a/pages/procurement/retstock.vue
+++ b/pages/procurement/retstock.vue
@@ -35,12 +35,12 @@
 					</view>
 				</view>
 			</view>
-			<view class="rightbtn">
+			<!-- <view class="rightbtn">
 				<view class="back" @click="uni.navigateBack()">
 					<image src="/static/index/procurement/bk.png" mode="aspectFill"></image>
 					返回
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="t-box">
 			<view class="leftscr">
@@ -64,14 +64,14 @@
 								<image :src=" '/static/index/procurement/k.png'" mode="aspectFill" />
 								<text>退货</text>
 							</view>
-							<view class="ritcon">
+							<view class="ritcon" style="margin-top: 1.5vw;">
 								<view class="rq">
 									退货日期：<text>{{v.fqTime?.replace(/-/g, '.').substring(0, 10)}}</text>
 								</view>
 								<view class="rq">
 									申请人：{{v.fqrName}}
 								</view>
-								<view class="fwjd" v-if="v.status==0">
+								<!-- <view class="fwjd" v-if="v.status==0">
 									<view class="jx" @click="start(v,i)">开始服务</view>
 									<view>服务结束</view>
 								</view>
@@ -86,7 +86,7 @@
 								<view class="fwjd" v-if="v.status==3">
 									<view>开始服务</view>
 									<view>服务结束</view>
-								</view>
+								</view> -->
 							</view>
 						</view>
 					</view>
@@ -126,19 +126,56 @@
 			@click="opendata=false;">
 		</view>
 		<errorshow :show="openmessage" :font="errormessage" @close="openmessage=false"  />
+		
+		<view class="fixed-card" :style="openleft?{}:{right:`-34vw`}" v-if="tharrlist[cardindex].orderIzFinish=='N'&&qcobj">
+			<view class="fixed-card-left">
+				<image class="card-left-img" :src="serverUrl+(qcobj?.netPreviewFileSmall?qcobj?.netPreviewFileSmall:qcobj?.netPreviewFile)" />
+				<view class="">
+					{{qcobj.directiveName}}
+				</view>
+			</view>
+			<view>
+				<view class="big-time">
+					{{qcobj.startTime}} - {{qcobj.endTime}}
+				</view>
+				<view class="icon-people">
+					<image class="people-img" src="/static/index/newindex/leftmenu/iconleft.png" />
+					{{qcobj.optTypeName}}
+					<image style="margin-left: 1vw;" class="people-img"
+						src="/static/index/newindex/leftmenu/iconright.png" />
+					{{qcobj.employeeName}}
+				</view>
+				<view style="color: #555555;">
+					业务单号：{{qcobj.orderNo}}
+				</view>
+				<view class="icon-button">
+					<view class="" :class="qcobj.izStart=='N'?'button-left':'button-right'">
+						开始服务
+					</view>
+					<view :class="qcobj.izFinish=='N'?'button-left':'button-right'">
+						结束服务
+					</view>
+				</view>
+			</view>
+			<view class="left-open" @click="openleft = !openleft">
+				<image :style="openleft?{}:{transform: `rotate(180deg)`}" class="open-img"
+					src="/static/index/newindex/leftmenu/openleft.png" />
+			</view>
+		</view>
 	</view>
 </template>
 
 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent,watch } from 'vue';
 	import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app"
-	import { thdList, transRead, thdNuMaterialList, addThc, thcList, removeWl, removeAll, submitThd, startServe, finishServe } from './api/lunpan.js'
+	import { thdList, transRead, thdNuMaterialList, addThc, thcList, removeWl, removeAll, submitThd, startServe, finishServe,queryCareList } from './api/lunpan.js'
 
 	import thwl from './common/thwl.vue'
 	import thitem from './common/thitem.vue'
 	import tanchuang from './components/tanchuang.vue'
 	import submits from './common/submits.vue'
 	import calendar from '@/component/public/calendar.vue'
+	const openleft = ref(true)
 	const props = defineProps({
 		isShow: { type: Boolean }
 	});
@@ -258,7 +295,7 @@
 			tharrlist.value.push(...res.result.records);
 			status.value = res.result.total == tharrlist.value.length ? 'nomore' : 'loadmore';
 			if (form.pageNo == 1) {
-				// cardcon(tharrlist.value[cardindex.value], cardindex.value);
+				cardcon(tharrlist.value[cardindex.value], cardindex.value);
 				// 取消红点
 				cardindex.value = cardindex.value;
 				cardtop.value = Math.floor(cardindex.value - 1) * 154;
@@ -280,6 +317,7 @@
 		cardtop.value = Math.floor(i - 1) * 154;
 		console.log(v)
 		wuliao();
+		qCareList(v)
 		thdNuMaterialList({ nuId: v.nuId, id: v.id }).then(res => {
 			console.log({ nuId: v.nuId, id: v.id })
 			cardarr.value = res.result
@@ -288,6 +326,13 @@
 			transReads(v, i)
 		}
 	}
+	const qcobj = ref({})
+	const qCareList = (v)=>{
+		queryCareList({id:v.orderId}).then(res=>{
+			qcobj.value = res.result
+			console.log(res)
+		})
+	}
 	const addMaterial = ref([])
 	const transReads = (v, i) => {
 		transRead({ id: v.id })
@@ -398,6 +443,105 @@
 </script>
 
 <style scoped lang="less">
+	.left-open {
+		position: absolute;
+		left: -1.5vw;
+		top: 50%;
+		transform: translateY(-50%);
+		width: 3vw;
+		height: 5vw;
+		border: 1rpx solid #B8C4DA;
+		background-color: #F2F7FD;
+		z-index: 999;
+		border-radius: 3vw;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		transition: all 0.5s ease;
+	
+		.open-img {
+			width: 3vw;
+			height: 3vw;
+		}
+	}
+	.fixed-card {
+		position: fixed;
+		right: 1vw;
+		top: 2vh;
+		width: 35vw;
+		height: 28vh;
+		background-color: rgba(239, 246, 255, 0.95);
+		border-radius: 1.5vw;
+		border: 1rpx solid #638DFF;
+		box-shadow: 0 2rpx 6rpx #A0B9FF;
+		display: flex;
+		align-items: center;
+		transition: all 0.5s ease;
+		z-index: 999;
+	
+		.fixed-card-left {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+	
+			.card-left-img {
+				width: 12vw;
+				height: 8vw;
+			}
+		}
+	
+		.big-time {
+			font-weight: 600;
+			font-size: 2.8vw;
+		}
+	
+		.icon-people {
+			display: flex;
+			margin: 0.3vw 0;
+			color: #555555;
+	
+			.people-img {
+				width: 1.5vw;
+				height: 1.5vw;
+				margin-right: 0.3vw;
+				margin-top: 0.1vw;
+			}
+		}
+	
+		.icon-button {
+			display: flex;
+			margin-top: 1vw;
+			font-size: 1.5vw;
+	
+			.button-left {
+				width: 8.5vw;
+				height: 3.3vw;
+				background-color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 1.2vw;
+				border: 1rpx solid #C7D2E4;
+				color: #333333;
+			}
+	
+			.button-right {
+				width: 8.5vw;
+				height: 3.3vw;
+				background-color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 1.2vw;
+				border: 1rpx solid #5AAEFF;
+				color: #249BFA;
+				margin-left: 1vw;
+				background: linear-gradient(to bottom, #fff, #D1EAFF);
+			}
+		}
+	}
+	
+	
 	.thdfed {
 		width: 4.9vw;
 		height: 4.9vw;
@@ -604,7 +748,7 @@
 		margin-top: 1vw;
 
 		.rightscr {
-			width: 57vw;
+			width: 58vw;
 			height: 100%;
 			background: #F9F9F9;
 			border-radius: 1.6vw;