From 8039afb825add62a70b3ff439ab0febda31c9663 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Thu, 11 Dec 2025 10:09:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/NursingNew/component/nurse/index.css    |   2 +-
 pages/NursingNew/component/nurse/index.vue    |   6 +-
 .../component/pleasetake/common/addwl.vue     | 116 ++++++++++--------
 .../component/pleasetake/common/carditem.vue  |   1 +
 .../component/pleasetake/common/submits.vue   |   1 +
 .../component/pleasetake/common/takeing.vue   |   1 +
 .../pleasetake/common/takerecord.vue          |   3 +-
 .../pleasetake/component/takehomep.vue        |   1 +
 pages/Warehouse/picking.vue                   |   6 +-
 pages/procurement/outbound.vue                |   6 +-
 pages/procurement/purchaseorder.vue           |   2 +-
 static/index/procurement/+.png                | Bin 2021 -> 2145 bytes
 static/index/procurement/-.png                | Bin 1769 -> 2087 bytes
 13 files changed, 84 insertions(+), 61 deletions(-)

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..2282a91 100644
--- a/pages/NursingNew/component/pleasetake/common/addwl.vue
+++ b/pages/NursingNew/component/pleasetake/common/addwl.vue
@@ -5,10 +5,11 @@
 				请领物料
 				<view class="mhao" v-if="Material.length>0">{{Material.length}}</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 +17,11 @@
 						<view>-</view>
 					</view>
 				</view>
-				<defaultr cont="暂无数据" v-if="Material.length==0&&timeout" style="position: absolute;width: 10vw;height: 10vw;"></defaultr>
+				<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 +43,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 +96,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 +132,10 @@
 		}
 	}
 	const timeout = ref(false)
-	onMounted(()=>{
-		setTimeout(()=>{
+	onMounted(() => {
+		setTimeout(() => {
 			timeout.value = true
-		},500)
+		}, 500)
 	})
 </script>
 
@@ -157,22 +160,30 @@
 			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.9vw;
+				/* 根据视觉需要微调 */
+				right: -0.5vw;
+				/* 根据视觉需要微调 */
+				box-sizing: border-box;
+				width: 1.8vw;
+				/* 保证两位数也能容纳（可改成 2vw 以更宽松） */
+				height: 1.8vw;
+				/* 圆高，line-height 要与它匹配 */
+				padding: 0 0.15vw;
+				/* 给两位数一点水平缓冲 */
+				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;
 			}
 		}
 
@@ -221,7 +232,7 @@
 					right: 7.7vw;
 					z-index: 2;
 				}
-				
+
 				&:nth-child(4) {
 					right: 11.6vw;
 					z-index: 2;
@@ -234,8 +245,9 @@
 			}
 
 		}
+
 		.kcscrol {
-			width:calc(100% - 10vw);
+			width: calc(100% - 10vw);
 			height: 10vw;
 			white-space: nowrap;
 			margin-left: 0.6vw;
@@ -250,14 +262,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 +290,7 @@
 						color: rgba(255, 78, 78, 1);
 					}
 				}
+
 				.ytj {
 					min-width: 1.5vw;
 					height: 1.8vw;
@@ -288,7 +303,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,6 +331,7 @@
 			}
 		}
 	}
+
 	.guodu {
 		transition: .4s;
 		-webkit-transform-style: preserve-3d;
diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue
index 27525d5..01028e8 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 {
diff --git a/pages/NursingNew/component/pleasetake/common/submits.vue b/pages/NursingNew/component/pleasetake/common/submits.vue
index e30750c..d3c3bb3 100644
--- a/pages/NursingNew/component/pleasetake/common/submits.vue
+++ b/pages/NursingNew/component/pleasetake/common/submits.vue
@@ -338,6 +338,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 d2ff2a8..9fde54b 100644
--- a/pages/NursingNew/component/pleasetake/common/takeing.vue
+++ b/pages/NursingNew/component/pleasetake/common/takeing.vue
@@ -205,6 +205,7 @@
 				   	}
 				   	.quxiao{
 				   		background: #EDEDEF;
+						color: #888888;
 				   	}
 				   	.plsbuy-bottom-blue {
 				   		background: linear-gradient(0deg, #CAE0F9, #E9F4FF);
diff --git a/pages/NursingNew/component/pleasetake/common/takerecord.vue b/pages/NursingNew/component/pleasetake/common/takerecord.vue
index 71c0a8c..fb5df42 100644
--- a/pages/NursingNew/component/pleasetake/common/takerecord.vue
+++ b/pages/NursingNew/component/pleasetake/common/takerecord.vue
@@ -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()
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index 1aa3fd5..75c707d 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -299,6 +299,7 @@
 			elderId:form.elderId
 		}
 		submitQld(obj).then(res=>{
+			console.log("入参",obj,"res",res)
 			if(res.success&&res.result.status=='success'){
 				uni.showToast({
 					icon:'success',
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 63cc9a0..6fade28 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -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: '',
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index 6f8e097..8ea11dc 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,12 +371,14 @@
 			plsbuy.value = []
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
-
+			console.log("?????",res.result.records[0].qldNo)
 			if (res.result.records.length) {
 				rightdonghua.value = false;
 
 				queryQldWlInfo({ qldNo: res.result.records[0].qldNo }).then((element : any) => {
+					console.log("111111111",element)
 					rightarray.value = []
+					
 					rightarray.value.push(...element.result)
 					rightdonghua.value = true;
 				})
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 1f0fbf4a664daceea37a871cb54a0507e198b22a..b429fca81f4c63afa92665f5b458f89ba0fe5baa 100644
GIT binary patch
literal 2145
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
JGIG$dzW|^jc&`8e

literal 2021
zcmV<B2O9W^P)<h;3K|Lk000e1NJLTq001oj001or1^@s6IvV1d000M?Nkl<Zcmd>D
zeT-aH6+h>_nR#!wyE|{UY}Jaf(iDmoG%3cS4Yg{lA6TNM&|<1-!-phdq=b}q=S^N`
zwi^msh@aFCs9)K(f0$s!#HdBeht^OrBF5c9kq9WzcHZpQ%$u3_4!`?$I&}79W@o!F
z5N^(S=iHBT?r-kg`|i2-Y4j#cZ(Yy}9ci`FxsP_H^EZHR@9fR*vC`hppx<q!a%t3U
zil++8>44~S@yE`3q`MsHh^KPbSn2#9$8;}4#19D3_rbS_&~-$z5&HGSoIu?@%)w*U
zfOn!Zo!bwawd6>IW|<lWZ8>5A?9M><{>#iiLcbpas}Vd(Og~21Hh>0L`7%I%l}L67
zNk8hILOV-{uY|nM(!IfWDt{f#0(?WDt=`;M2%Q1gc68hUK1?E;Bw}>Cwt0!0Ft5!d
zjN7tF^M`Jt<>y)3+~e9UPS$R@+D({Ch-DE#-wL~9;P)`o9)LgEl^VMg`5DuUK%cWq
z+O2f{015Af=Wg(W8V8rUwz<kpw(QMrV@waKo7_apvsv5N<@&}_7T$o-KMtdd1J(}5
z)81AL03%<Q>VlrPbL4HMg7*MCtpkt1@g_H6tUi@!{R{H5BZq@b(%9G5YAj=++u=lK
zlH07_!cS?BM3JvaH9@!a4R=TV$YFR`j!}6^*ZG5LWQoxg3eT3F+rqg_(%gz^as_;i
z5*DxZqSs&VEi*0XMUI$JKX#Cq&WFP%id<TGa=Y<w=yOh)gn2NK;Nx(dMSowk2EDtW
zPfOE+&gkB5A^8xT9M}BdGow9iFHY-a4l0I{tw+$`7vQQuLSO4ldF!E1NmGLE*pXj@
z6>$SB3c}jDQ%>u1&|h=HTjmfZ-c70_VY$288F{<XC-P*_j>I&LzM~rA^_0x^#QvuA
zM!0jQw=AB{e`2~$Yx%+)R~yuC(I#Hhqjx|~qDi3RdVV8XEx||+WEaGCLvNUZAlL@`
z-<Pzg+ISkaC!cPFQ2`6{YD|-hpjS~fXb~)A-Ws+LPSN#T4E5Lfk#)@D_|f;GTTL|j
z22Ds+pb-~*81+lQ&u4<z0m!CNiRjL-bCGo_APe>KqYAWIbgCSS;g{qv?5JsJ*fs~4
z_y_>Bk46fghOAH(Xq1L?P&Bz8decdmexpFJ$Z91|a|Lu4LQNDd1AA_VseU2U<`M_N
zgJlFO$}$uc(4|OmDM}c8jK0nuWYftH%qPnrE-1@TR6uJY=Y}Oh&xG;~@ECIV6krU4
z+bqQKkReq-lLT#H3CmC@Ydoyp{L{6ViPtJ~>}q$`YKOPge$}oHhhZ;EUd8WW(^o+g
zm5)DK{kMkDc~pyu#s`3C!K8L)*kQ+A7^0~C5LGQvL_tacYv7QCw2^T|D!(YqPw^0+
z7T02!{2EN?=B8ThBEEkW)lD1@fUgzD@u7VMG;6{CktZC9-br<m+OcXeqP4IC4)~>7
z?M^uJUZ~a8_@*LVXj2?6v}Ykhs(_Agpw4Y5<fVk|97@w^Oe?Cl1`aiJj2x~^+Y0Ct
zJ@fuYL@EUB=<F*@3Q|z_x)XDt!V1EI{`;AoS3r*!@*yRIK-MVPY{m-wR2f5vtE|%m
z&~%@wV4^Q6*-TdFQ}nL}uT;|fa63mnq$<#^A48>_Le2X-dvhxxn?}(fb}c%OlF;u)
zCmi*vK$FAjeD+;ZN!V7R8Qkqin~0Q;U33>sNY$WG=|_s+hHx>TK56xOpNHNsA#y*6
zDYi>={#V1sFevF>65<>pel%;Ff1n9z66oRW9VZb_kB_p*_u8D{1ru!QW;3{m$=K$t
zZcnUg)z>vd16;jbh5_3G)fbI#gq%c^K&uv+rN$2+9|FH45{d339Co3<=G5hkolC;~
z=t#%(xMR9Q^^~CLO7?XQHo*905?YPJ?%sO0K4^PZ)ZRBVKhQOG3Rm&S!`Z+b|F@^`
zIyGoCJeg>HK49%~s97f7U=4V`T8PVY<ma3$C$~r|#U6&^i@;9=zHtSeu>;bCG%aY=
zZYUA^D@*WM=qfy1i_7yP^V8mi$j=$!Yr*BDYmea?KpjH<5z+iLL*sGuw0+bBt*kQ1
z)<;<5%P>s_kzeMMJdV#1DfL=He%6Eq_in_~`>^N^63Kk{zn^?#RXLof>9;OuWu56U
z{uvF7<wSfh5g9~m7xnzJ3Vb}BUrY@ob%AcBy?aP_P>8RBX-=4Kac$#suEQ?!b!kSR
zm6w+t9)aV{7?st8_a_)3Bil@L%u44Uw^I3U;WlV}SMS)0_P+f2aVLLXSD*J@wX@=L
z$2EB8|HSIeKNGO_D12-pA{`-Yf8f)_*@XE`ViuImh-M7>v^Upo`4hl@1abE&BK`#t
zje<WwOj{6*^#`K;S@&sxb$UAR<w+5Kh}E|lk<BEuh=^W*+#L{In8jy}A;(nTVo*GD
zY8dos*Z3517~nTrzR`^l!`(7FOtPQV1&h!ie#CKrQ#;}#q^1?q%_7<*u5Y}{O`10k
z*=9L@r-sw4L7(pFKMv<HVuxJY*pabY)@N*E1wdWkCd|c<?{jT)CF(XKzdM_Z9VLe`
z$aGdoJ1grZ8NVq(zXAXN|Nps#4jupi00v1!K~w_(DhMx#hJi-&00000NkvXXu0mjf
Dru*rY

diff --git a/static/index/procurement/-.png b/static/index/procurement/-.png
index b9dab553bd0881a6e493d4c9480c320adf9d54f3..7ec9d14783a7ab2f41ec14a198543b5dff5b72bb 100644
GIT binary patch
literal 2087
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

literal 1769
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
LNkvXXu0mjf4ar6%


From 55cfb1fa5427cece096249488b34ec2148d6a3a5 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Thu, 11 Dec 2025 17:30:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8B=89=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/pleasetake/common/addwl.vue     |  59 ++-
 .../component/pleasetake/common/carditem.vue  |   2 +-
 .../component/pleasetake/common/cgdclass.vue  |   2 +-
 .../component/pleasetake/common/htditem.vue   |   2 +-
 .../component/pleasetake/common/medetails.vue |  21 +-
 .../component/pleasetake/common/submits.vue   |   9 +-
 .../component/pleasetake/common/takeing.vue   |   1 +
 .../pleasetake/common/takerecord.vue          |  39 +-
 .../pleasetake/component/requestform.vue      |   6 +-
 .../pleasetake/component/returnorder.vue      |   8 +-
 .../pleasetake/component/takehomep.vue        | 371 ++++++++++--------
 .../component/pleasetake/css/take.less        |  22 +-
 pages/procurement/api/lunpan.js               |   9 +
 pages/procurement/inventory.vue               | 118 +++---
 pages/procurement/outbound.vue                |   5 +-
 15 files changed, 407 insertions(+), 267 deletions(-)

diff --git a/pages/NursingNew/component/pleasetake/common/addwl.vue b/pages/NursingNew/component/pleasetake/common/addwl.vue
index 2282a91..9782ef0 100644
--- a/pages/NursingNew/component/pleasetake/common/addwl.vue
+++ b/pages/NursingNew/component/pleasetake/common/addwl.vue
@@ -3,7 +3,12 @@
 		<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)' ">
@@ -17,8 +22,12 @@
 						<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">
@@ -163,17 +172,12 @@
 
 			.mhao {
 				position: absolute;
-				top: -0.9vw;
-				/* 根据视觉需要微调 */
-				right: -0.5vw;
+				top: -0.2vw;
 				/* 根据视觉需要微调 */
+				right: -0.2vw;
 				box-sizing: border-box;
 				width: 1.8vw;
-				/* 保证两位数也能容纳（可改成 2vw 以更宽松） */
 				height: 1.8vw;
-				/* 圆高，line-height 要与它匹配 */
-				padding: 0 0.15vw;
-				/* 给两位数一点水平缓冲 */
 				border-radius: 50%;
 				border: 1px solid #FF4E4E;
 				color: #FF4E4E;
@@ -182,8 +186,11 @@
 				justify-content: center;
 				background: transparent;
 				writing-mode: horizontal-tb;
-				/* <- 关键：让内部按横排显示数字（不被父写排规则影响） */
 				overflow: hidden;
+				.mhao-font{
+					font-size: 25rpx;
+					letter-spacing: -0.05em; /* 负值 = 字符之间更近 */
+				}
 			}
 		}
 
@@ -337,4 +344,34 @@
 		-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 cbe71e4..4a802b7 100644
--- a/pages/NursingNew/component/pleasetake/common/carditem.vue
+++ b/pages/NursingNew/component/pleasetake/common/carditem.vue
@@ -371,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 96bae86..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{
diff --git a/pages/NursingNew/component/pleasetake/common/takeing.vue b/pages/NursingNew/component/pleasetake/common/takeing.vue
index 4c3e8c5..b8e848a 100644
--- a/pages/NursingNew/component/pleasetake/common/takeing.vue
+++ b/pages/NursingNew/component/pleasetake/common/takeing.vue
@@ -318,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 fb5df42..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">
@@ -176,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;
@@ -193,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;
 					}
@@ -250,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;
@@ -291,7 +295,7 @@
 							height: 3.6vw;
 							display: flex;
 							justify-content: flex-start;
-							margin-top: 1.8vw;
+							margin-top: 1.6vw;
 			
 							>view {
 								width: 50%;
@@ -312,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;
 						}
+						
 					}
 				}
 			
@@ -366,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 28a7714..2e92ac5 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,15 +178,15 @@
 			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;
@@ -157,189 +199,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=>{
-			console.log("入参",obj,"res",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(()=>{
+
+				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 tijiao = () => {
+		let obj = {
+			nuId: form.nuId,
+			elderId: form.elderId
+		}
+		submitQld(obj).then(res => {
+			console.log("入参", obj, "res", res)
+			if (res.success && res.result.status == 'success') {
+				uni.showToast({
+					icon: 'success',
+					title: '提交成功'
+				})
+				setTimeout(() => {
 					subshow.value = false;
 					wuliao();
-				},800)
-			}else{
+					changePage(1)
+				}, 800)
+			} else {
 				errmsg.value = res.result.message;
 				openerror.value = true;
 			}
 		})
 	}
-	const confirm = (e)=>{
+	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/procurement/api/lunpan.js b/pages/procurement/api/lunpan.js
index 289d18b..d96ce92 100644
--- a/pages/procurement/api/lunpan.js
+++ b/pages/procurement/api/lunpan.js
@@ -355,3 +355,12 @@ 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,
+	})
+}
\ No newline at end of file
diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue
index caec8c1..5bd9cf7 100644
--- a/pages/procurement/inventory.vue
+++ b/pages/procurement/inventory.vue
@@ -2,7 +2,7 @@
 	<view class="all-bgc">
 		<view class="buttons-father">
 			<view class="ipt">
-				<input type="text" v-model="plzinfo.searchContent" placeholder="盘点单号/盘点人/盘点日期"
+				<input type="text" v-model="plzinfo.pddInfo" placeholder="盘点单号/盘点人/盘点日期"
 					@confirm="clickconfirm" />
 			</view>
 			<view class="scr" @click="clickconfirm">
@@ -68,22 +68,22 @@
 			<scroll-view scroll-y="true" scroll-with-animation class="all-scroll" :scroll-top="leftscrolltop"
 				: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,7 +91,7 @@
 							<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">
 
@@ -111,11 +111,11 @@
 							<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 +123,7 @@
 										盘点结束
 									</view>
 									<view style="color: #888888;">
-										{{ index?`[ 王嘉尔 ]`: `` }}
+										{{ item.pddType=='2'?`[ 王嘉尔 ]`: `` }}
 									</view>
 								</view>
 							</view>
@@ -131,7 +131,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>
 
@@ -341,16 +341,16 @@
 				盘点状态
 			</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>
@@ -398,8 +398,8 @@
 				盘盈/盘亏
 			</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 >
@@ -409,8 +409,8 @@
 						盘盈单
 					</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 >
@@ -440,7 +440,7 @@
 <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, queryQldWlInfo, newtransRead, orderReturn, outbound } from './api/lunpan.js'
 	import nomessage from './components/nomessage.vue'
 	import defaultr from './components/default.vue'
 	import calendar from '@/component/public/calendar.vue'
@@ -485,7 +485,7 @@
 	const dateget = (res : datetype) => {
 		plzinfo.startTime = res.start;
 		plzinfo.endTime = res.end;
-		
+		firstgetqueryCgdList()
 	}
 	const lanjie = ref(false);
 
@@ -505,17 +505,15 @@
 
 		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()
 	}
@@ -538,7 +536,7 @@
 		if (chongzhiLock) return
 		chongzhiLock = true
 		xiaohui.value = false;
-		plzinfo.searchContent = ""
+		plzinfo.pddInfo = ""
 		plzinfo.startTime = ""
 		plzinfo.endTime = ""
 		plzinfo.get = false
@@ -555,19 +553,43 @@
 	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) => {
+		if(plzinfo.pydOrPkd=""){
+			if(index=='1'){
+				if(plzinfo.pydOrPkd=='2'){
+					plzinfo.pydOrPkd = `1,2`
+				}else if(plzinfo.pydOrPkd==''){
+					plzinfo.pydOrPkd = `1`
+				}else{
+					plzinfo.pydOrPkd = `2`
+				}
+			}
+			if(index=='2'){
+				if(plzinfo.pydOrPkd=='1'){
+					plzinfo.pydOrPkd = `1,2`
+				}else if(plzinfo.pydOrPkd==''){
+					plzinfo.pydOrPkd = `2`
+				}else{
+					plzinfo.pydOrPkd = `1`
+				}
+			}
+		}
+		
+		firstgetqueryCgdList()
+	}
 	const nomessageshow = ref(false);
 	const leftscrolltop = ref(0)
 
@@ -576,9 +598,9 @@
 	const cannomessage = ref(true)
 	const rightdonghua = ref(true);
 	const firstgetqueryCgdList = () => {
-		queryQld(plzinfo).then((res : any) => {
+		queryPddList(plzinfo).then((res : any) => {
 			transition.value = true;
-			// console.log("kankan", plzinfo, res)
+			console.log("kankan", plzinfo, res)
 			if (((res.message === "缺少参数") || (!res.result?.total)) && cannomessage.value) {
 				nomessageshow.value = true;
 				return
@@ -589,15 +611,15 @@
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
 
-			if (res.result.records.length) {
-				rightdonghua.value = false;
+			// 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;
-				})
-			}
+			// 	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;
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
index 8ea11dc..1f45739 100644
--- a/pages/procurement/outbound.vue
+++ b/pages/procurement/outbound.vue
@@ -371,17 +371,16 @@
 			plsbuy.value = []
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
-			console.log("?????",res.result.records[0].qldNo)
 			if (res.result.records.length) {
 				rightdonghua.value = false;
 
 				queryQldWlInfo({ qldNo: res.result.records[0].qldNo }).then((element : any) => {
-					console.log("111111111",element)
 					rightarray.value = []
-					
 					rightarray.value.push(...element.result)
 					rightdonghua.value = true;
 				})
+			}else{
+				rightarray.value = []
 			}
 
 			if (res.result.records.length < plzinfo.pageSize) {

From f921484671e564b5bfa75a22dcf68bae2655395a Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Fri, 12 Dec 2025 14:13:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pleasetake/component/takehomep.vue        |    5 +-
 pages/Warehouse/api/lunpan.js                 |   66 +-
 pages/Warehouse/picking.vue                   |    3 +-
 pages/procurement/api/lunpan.js               |   15 +
 pages/procurement/inventory.vue               | 1154 ++++-------------
 5 files changed, 280 insertions(+), 963 deletions(-)

diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index 2e92ac5..bbcc1e7 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -190,6 +190,7 @@
 				thshow.value = false;
 				errmsg.value = res.message;
 				openerror.value = true;
+				console.log("?????")
 			}
 		})
 	}
@@ -339,7 +340,6 @@
 			elderId: form.elderId
 		}
 		submitQld(obj).then(res => {
-			console.log("入参", obj, "res", res)
 			if (res.success && res.result.status == 'success') {
 				uni.showToast({
 					icon: 'success',
@@ -351,7 +351,8 @@
 					changePage(1)
 				}, 800)
 			} else {
-				errmsg.value = res.result.message;
+				// console.log("!!!!!",res)
+				errmsg.value = res.result.message?res.result.message:res.message
 				openerror.value = true;
 			}
 		})
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 6fade28..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);
@@ -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 d96ce92..f4406a4 100644
--- a/pages/procurement/api/lunpan.js
+++ b/pages/procurement/api/lunpan.js
@@ -363,4 +363,19 @@ export const queryPddList = (params) => {
 		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 5bd9cf7..359dcc0 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.pddInfo" 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)">
@@ -44,7 +30,7 @@
 					<view class="heng-blue" :style="{ left: `${selectType === 0 ? 18 : 18 + selectType * 30}%` }">
 					</view>
 				</view>
-				<view class="right-button">
+				<view class="right-button" @click="addshow=true">
 					<image src="/static/index/requestform/addnew.png" />
 					<view>
 						新增
@@ -61,12 +47,10 @@
 			<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 plsbuy" :key="index">
 						<view class="scroll-item-title">
@@ -78,7 +62,7 @@
 								<view class="title-success" v-if="item.pydNum>0">
 									盘盈
 								</view>
-								<view class="title-error"  v-if="item.pkdNum>0">
+								<view class="title-error" v-if="item.pkdNum>0">
 									盘亏
 								</view>
 							</view>
@@ -91,11 +75,9 @@
 							<view class="middle-heng"></view>
 							<view class="contect-one">
 								<view class="contect-title">
-									{{ item.pddStartTime.split(' ')[0] }}
+									{{ 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">
 
-									{{ item.pddEndTime.split(' ')[0] }}
+									{{ item.pddEndTime?.split(' ')[0] }}
 								</view>
 								<view class="middle-heng-father">
 
-									<view class="middle-ball" v-if="item.pddType=='2'" 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">
@@ -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,9 +133,6 @@
 				</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">
@@ -355,21 +153,22 @@
 				</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>
@@ -400,9 +199,9 @@
 			<view class="selected">
 				<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="">
@@ -411,9 +210,9 @@
 				</view>
 				<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 { queryPddList, 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,
@@ -513,10 +309,87 @@
 			case 2:
 				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
@@ -536,13 +409,15 @@
 		if (chongzhiLock) return
 		chongzhiLock = true
 		xiaohui.value = false;
-		plzinfo.pddInfo = ""
-		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;
@@ -558,36 +433,26 @@
 		pageSize: 9,
 		canpull: true,
 		pddInfo: "",
-		pddNo:"",
-		pddStartBy:"",
-		pydOrPkd:"",
-		
-		pddType:"",
+		pddNo: "",
+		pddStartBy: "",
+		pydOrPkd: "",
+		pddType: "",
 		startTime: "",
 		endTime: "",
 	})
-	const clickkuai = (index:string) => {
-		if(plzinfo.pydOrPkd=""){
-			if(index=='1'){
-				if(plzinfo.pydOrPkd=='2'){
-					plzinfo.pydOrPkd = `1,2`
-				}else if(plzinfo.pydOrPkd==''){
-					plzinfo.pydOrPkd = `1`
-				}else{
-					plzinfo.pydOrPkd = `2`
-				}
-			}
-			if(index=='2'){
-				if(plzinfo.pydOrPkd=='1'){
-					plzinfo.pydOrPkd = `1,2`
-				}else if(plzinfo.pydOrPkd==''){
-					plzinfo.pydOrPkd = `2`
-				}else{
-					plzinfo.pydOrPkd = `1`
-				}
-			}
-		}
-		
+	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);
@@ -598,9 +463,11 @@
 	const cannomessage = ref(true)
 	const rightdonghua = ref(true);
 	const firstgetqueryCgdList = () => {
+		plzinfo.pageNo = 1;
+		plzinfo.canpull = true
 		queryPddList(plzinfo).then((res : any) => {
-			transition.value = true;
-			console.log("kankan", plzinfo, res)
+
+			// console.log("kankan", plzinfo, res)
 			if (((res.message === "缺少参数") || (!res.result?.total)) && cannomessage.value) {
 				nomessageshow.value = true;
 				return
@@ -611,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;
 			}
@@ -641,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;
@@ -937,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;
@@ -991,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 {
@@ -1012,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;
@@ -1841,6 +1105,7 @@
 			}
 		}
 	}
+
 	.calendar-father {
 		position: fixed;
 		top: 100rpx;
@@ -1850,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;
@@ -1866,7 +1134,8 @@
 				border-radius: 10rpx;
 				margin-right: 20rpx;
 			}
-			.selected-kuai-target{
+
+			.selected-kuai-target {
 				width: 40rpx;
 				height: 40rpx;
 				background-color: #F8F8FA;
@@ -1881,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