diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue
index e2c578f..4bdb55a 100644
--- a/pages/NursingNew/component/pleasetake/component/returnorder.vue
+++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue
@@ -21,7 +21,7 @@
 		<view class="button-tilte">
 			回退单
 		</view>
-		<view class="right-button-father">
+		<view class="right-button-father" v-if="rightarray.length || !rightdonghua">
 			<view class="right-button" @click="badshow=true">
 				<image src="/static/index/warehouse/procurement/picking/bebad.png" />
 				<view>
@@ -220,10 +220,11 @@
 						</view>
 					</view>
 				</view>
-				<defaultr cont="暂无数据" v-if="rightarray.length==0 && rightdonghua"
-					style="width: 30%;height: 30%;position: absolute;">
-				</defaultr>
+				
 			</scroll-view>
+			<defaultr cont="暂无数据" v-if="rightarray.length==0 && rightdonghua"
+				style="width: 30%;height: 30%;position: absolute;">
+			</defaultr>
 		</view>
 	</view>
 </template>
diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue
index 4a36528..d41a200 100644
--- a/pages/Warehouse/finish.vue
+++ b/pages/Warehouse/finish.vue
@@ -1,14 +1,50 @@
 <template>
 	<view class="contain">
-		<view v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia" class="mengban"
-			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false"></view>
+		<view
+			v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata"
+			class="mengban" :style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
+			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]">
+		</view>
+		<!-- 没数据了，遮罩 -->
+		<nomessageimge cont="暂无数据" :show="nomessageshow" />
+		<!-- 给模糊搜索用的 -->
+		<view v-show="filteredCgrListsecond.length&&gysvalue" class="mengban" style="background: transparent;"
+			@click="closefilteredCgrListsecond">
+		</view>
 
+		<view class="input-next" style="bottom: 660rpx;" v-if="filteredCgrListsecond.length && gysvalue">
+			<view v-show="filteredCgrListsecond[0].suppliersName!=`暂无数据`" class="next-father"
+				v-for="(item, index) in filteredCgrListsecond.slice(0, 5)" :key="index"
+				@click="clickfilteredCgrListsecond(item,index)">
+				{{ item.suppliersName }}
+			</view>
+			<view class="nomessage" v-if="filteredCgrListsecond[0].suppliersName===`暂无数据`">
+				暂无数据
+			</view>
+		</view>
+		<!-- 给模糊搜索用的 -->
+		<view v-show="filteredCgrList.length&&cgrvalue" class="mengban" style="background: transparent;"
+			@click="closefilteredCgrList"></view>
+
+		<view class="input-next" v-if="filteredCgrList.length && cgrvalue">
+			<view v-show="filteredCgrList[0].cgBy!=`暂无数据`" class="next-father"
+				v-for="(item, index) in filteredCgrList.slice(0, 5)" :key="index" @click="clickfilteredCgrList(item)">
+				{{ item.cgBy }}
+			</view>
+			<view class="nomessage" v-if="filteredCgrList[0].cgBy===`暂无数据`">
+				暂无数据
+			</view>
+		</view>
+		<!-- 日期 -->
+		<view class="calendar-father" v-show="opendata" v-if="xiaohui">
+			<calendar @datachange="dateget" />
+		</view>
 		<!-- 改价 -->
 		<view class="gaijiafather" v-show="opengaijia" :style="donghuaopo?{opacity:1}:{opacity:0}">
 			<view style="width: 100%;margin-top: 50rpx;font-size: 30rpx;">
 				采购单价:
 				<text style="color: #888888;">
-					￥1.50
+					￥{{ gaijia }}
 				</text>
 
 			</view>
@@ -16,17 +52,17 @@
 				<view style="font-size: 30rpx;margin-bottom: 10rpx;">
 					到货单价
 				</view>
-				<view class="gray-input">
-					¥1500.00
+				<view class="gray-input" style="width: 410rpx;">
+					¥ {{ gaijia }}
 				</view>
 			</view>
 			<view style="position: absolute;right: 30rpx;bottom: 30rpx;">
 				<view style="display: flex;">
-					<view
+					<view @click="opengaijia=false"
 						style="width: 160rpx;height: 75rpx;background-color: #ebeced;color: #888888;display: flex;justify-content: center;align-items: center;font-size: 30rpx;border-radius: 40rpx;">
 						取消
 					</view>
-					<view
+					<view @click="dogaijia"
 						style="width: 160rpx;height: 75rpx;;color: #0385FA;display: flex;justify-content: center;align-items: center;font-size: 30rpx;border-radius: 40rpx;border: 1rpx solid #0385FA;background: linear-gradient(to bottom,#E9F4FF,#CAE0F9);margin: 0 40rpx;">
 						确定
 					</view>
@@ -35,162 +71,166 @@
 			</view>
 			<view class="jianhuo-jianpan" style="right: -40rpx;bottom: 150rpx;">
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="press('1')">
 						1
 					</view>
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="press('2')">
 						2
 					</view>
 
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="press('3')">
 						3
 					</view>
 				</view>
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="press('4')">
 						4
 					</view>
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="press('5')">
 						5
 					</view>
 
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="press('6')">
 						6
 					</view>
 				</view>
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="press('7')">
 						7
 					</view>
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="press('8')">
 						8
 					</view>
 
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="press('9')">
 						9
 					</view>
 				</view>
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan">
-						AC
+					<view class="gray-button-jianpan" style="font-size: 30rpx;" @click="press('AC')">
+						清零
 					</view>
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="press('0')">
 						0
 					</view>
 
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="press('.')">
 						.
 					</view>
 				</view>
 			</view>
 		</view>
 		<!-- 拣货 -->
-		<view class="jianhuofather" v-show="openjianhuo" :style="donghuaopo?{opacity:1}:{opacity:0}">
+		<view class="jianhuofather guodu" v-show="openjianhuo" :style="donghuaopo?{opacity:1}:{opacity:0}">
 			<view style="margin: 40rpx 0;width: 100%;text-align: center;font-size: 35rpx;font-weight: 600;">
-				留置针敷贴（医用透明敷料）
+				{{showvalue.wlName}}
 			</view>
 			<view style="display: flex;justify-content: space-between;width: 100%;">
 				<view style="font-weight: 600;font-size: 30rpx;">
 					物料信息
 				</view>
-				<view style="font-weight: 600;font-size: 35rpx;">
-					￥10.12
+				<view style="font-weight: 600;font-size: 35rpx;color: #555555;">
+					￥{{showvalue.totalPrice}}
 				</view>
 			</view>
 			<view style="display: flex;margin-top: 10rpx;">
-				<view class="" style="width: 30%;">
-					<view style="color: #888888;margin-top: 10rpx;">
+				<view class="" style="width: 33%;">
+					<view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
 						物料编码
 					</view>
-					<view class="" style="margin-top: 5rpx;">
-						FLYP001
+					<view class="" style="margin-top: 5rpx;font-size: 34rpx;">
+						{{showvalue.wlMaterialNo}}
 					</view>
 				</view>
-				<view class="" style="width: 30%;">
-					<view style="color: #888888;margin-top: 10rpx;">
+				<view style="width: 33%;">
+					<view style="color: #999999;margin-top: 10rpx;white-space: nowrap;font-size: 25rpx;">
 						规格型号
 					</view>
-					<view class="" style="margin-top: 5rpx;">
-						800mm*680mm
+					<view
+						style="margin-top: 5rpx;font-size: 34rpx;white-space: nowrap;display: flex;flex-wrap: nowrap;">
+						{{showvalue.wlSpecificationModel}}
 					</view>
 				</view>
 			</view>
-			<view style="display: flex;margin-top: 20rpx;">
-				<view class="" style="width: 30%;">
-					<view style="color: #888888;margin-top: 10rpx;">
+			<view style="display: flex;margin-top: 15rpx;">
+				<view class="" style="width: 33%;">
+					<view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
 						采购单价
 					</view>
-					<view class="" style="margin-top: 5rpx;font-weight: 600;">
-						￥0.1
+					<view class="text-anim" style="margin-top: 5rpx;font-weight: 600;font-size: 34rpx;">
+						￥{{showvalue.arrivalPrice?Number(showvalue.arrivalPrice).toFixed(2):Number(showvalue.procurementPrice).toFixed(2)}}
 					</view>
 				</view>
-				<view class="" style="width: 30%;">
-					<view style="color: #888888;margin-top: 10rpx;">
+				<view class="" style="width: 33%;">
+					<view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
 						采购数量
 					</view>
-					<view class="" style="margin-top: 5rpx;font-weight: 600;">
-						30
+					<view class="" style="margin-top: 5rpx;font-weight: 600;font-size: 34rpx;">
+						{{showvalue.purchaseQuantity}}
 					</view>
 				</view>
-				<view class="" style="width: 30%;">
-					<view style="color: #888888;margin-top: 10rpx;">
+				<view class="" style="width: 33%;">
+					<view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
 						采购单位
 					</view>
-					<view class="" style="margin-top: 5rpx;">
-						个
+					<view class="" style="margin-top: 5rpx;font-size: 34rpx;">
+						{{showvalue.wlUnits}}
 					</view>
 				</view>
 			</view>
 			<view style="width: 95%;height: 0.5rpx;	background-color: #eff1f3;margin-top: 10rpx;margin-bottom: 5rpx;">
 			</view>
 			<view style="">
-				<view style="font-weight: 600;font-size: 30rpx;">
+				<view style="font-weight: 600;font-size: 30rpx;margin-top: 10rpx;">
 					入库信息
 				</view>
 			</view>
 			<view style="display: flex;margin-top: 10rpx;">
-				<view class="" style="width: 30%;">
-					<view style="color: #888888;margin-top: 10rpx;">
+				<view class="" style="width: 33%;">
+					<view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
 						入库数量
 					</view>
-					<view class="" style="margin-top: 5rpx;">
-						0
+					<view class="" style="margin-top: 5rpx;font-size: 34rpx;">
+						{{showvalue.rksl}}
 					</view>
 				</view>
-				<view class="" style="width: 30%;">
-					<view style="color: #888888;margin-top: 10rpx;">
+				<view class="" style="width: 33%;">
+					<view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
 						挂账数量
 					</view>
-					<view class="" style="margin-top: 5rpx;">
-						0
+					<view class="" style="margin-top: 5rpx;font-size: 34rpx;">
+						{{showvalue.wrksl}}
 					</view>
 				</view>
-				<view class="" style="width: 30%;">
-					<view style="color: #888888;margin-top: 10rpx;">
+				<view class="" style="width: 33%;">
+					<view style="color: #999999;margin-top: 10rpx;font-size: 25rpx;">
 						销账数量
 					</view>
-					<view class="" style="margin-top: 5rpx;">
-						0
+					<view class="" style="margin-top: 5rpx;font-size: 34rpx;">
+						{{showvalue.xzsl}}
 					</view>
 				</view>
 			</view>
 			<view style="width: 95%;height: 0.5rpx;	background-color: #eff1f3;margin-top: 10rpx;margin-bottom: 5rpx;">
 			</view>
 			<view style="">
-				<view style="font-weight: 600;font-size: 30rpx;">
+				<view style="font-weight: 600;font-size: 30rpx;margin-top: 10rpx;">
 					拣货拍照
 				</view>
 			</view>
 			<view style="display: flex;flex-wrap: wrap;width: 60%;">
-				<view
-					style="width: 40%;height: 150rpx;margin-right: 4%;margin-top: 3%;background-color: #F9F9F9;display: flex;justify-content: center;align-items: center;"
-					v-for="(item,index) in [1,1,1]" :key="index">
-					<image style="width: 60%;height: 60%;" src="/static/zhanwei.png" />
-				</view>
-				<view style="width: 40%;height: 150rpx;margin-right: 4%;margin-top: 3%;">
-
+				<view class="moban-photo" v-for="(item,index) in albumlist" :key="index">
 					<view
-						style="width: 100%;height: 100%;display: flex;flex-direction: column;justify-content: center;align-items: center;background-color:#fafdff ;border: 1rpx solid #78B1EB;border-radius: 20rpx;">
+						style="width: 1.6vw;height: 1.6vw;z-index: 20;position: absolute; right: 0.1vw;top: 0.1vw;background: rgba(255, 255, 255, 0.7);display: flex;justify-content: center;align-items: center;"
+						@click.stop="deldex=index;open=1">
+						<image src="/static/x.png" mode="aspectFill" style="width: 100%;height: 100%;"></image>
+					</view>
+					<image style="width: 100%;height: 100%;" :src="item?item:'/static/zhanwei.png'" mode="aspectFill"
+						@click="previewImage(item,index,albumlist)" />
+				</view>
+				<view style="width: 40%;height: 150rpx;margin-right: 4%;margin-top: 3%;" v-if="albumlist.length<4"
+					@click="uplod(0)">
+					<view class="moban-photo-special">
 						<image style="width: 50rpx;height: 50rpx;margin-bottom: 5rpx;"
 							src="/static/index/warehouse/procurement/picking/addphoto.png" />
 						<view style="color: #78B1EB;font-size: 25rpx;">
@@ -199,7 +239,7 @@
 					</view>
 				</view>
 				<view
-					style="width: 95%;height: 0.5rpx;background-color: #eff1f3;margin-top: 10rpx;margin-bottom: 5rpx;">
+					style="width: 87%;height: 0.5rpx;	background-color: #eff1f3;margin-top: 10rpx;margin-bottom: 5rpx;">
 				</view>
 			</view>
 			<view style="">
@@ -207,28 +247,30 @@
 					数量
 				</view>
 			</view>
-			<view style="display: flex;margin-top: 30rpx;margin-left: 20rpx;">
-				<view class="gray-button">
+			<view style="display: flex;margin-top: 20rpx;">
+				<view class="gray-button" @click="jjnum(-1)" @longpress="handleTouchStart(-1)"
+					@touchend="handleTouchEnd">
 					-
 				</view>
-				<view class="gray-input">
-					1500
+				<view class="gray-input" style="width:12vw;">
+					<text v-for="(v,i) in stringjh" :key="i">{{v}}</text>
 				</view>
-				<view class="gray-button">
+				<!-- <text></text>{{showvalue.num}} -->
+				<view class="gray-button" @click="jjnum(1)" @longpress="handleTouchStart(1)" @touchend="handleTouchEnd">
 					+
 				</view>
 			</view>
 			<view class="jianhuobutton">
 				<view style="display: flex;">
-					<view
+					<view @click="openjianhuo = false;clickflag = false"
 						style="width: 160rpx;height: 75rpx;background-color: #ebeced;color: #888888;display: flex;justify-content: center;align-items: center;font-size: 30rpx;border-radius: 40rpx;">
 						关闭
 					</view>
-					<view
+					<view @click="config(1)"
 						style="width: 160rpx;height: 75rpx;;color: #0385FA;display: flex;justify-content: center;align-items: center;font-size: 30rpx;border-radius: 40rpx;border: 1rpx solid #0385FA;background: linear-gradient(to bottom,#E9F4FF,#CAE0F9);margin: 0 20rpx;">
 						销账
 					</view>
-					<view
+					<view @click="config(0)"
 						style="width: 160rpx;height: 75rpx;;color: #0385FA;display: flex;justify-content: center;align-items: center;font-size: 30rpx;border-radius: 40rpx;border: 1rpx solid #0385FA;background: linear-gradient(to bottom,#E9F4FF,#CAE0F9);">
 						入库
 					</view>
@@ -236,51 +278,51 @@
 			</view>
 			<view class="jianhuo-jianpan">
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="clknum(1)">
 						1
 					</view>
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="clknum(2)">
 						2
 					</view>
 
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="clknum(3)">
 						3
 					</view>
 				</view>
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="clknum(4)">
 						4
 					</view>
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="clknum(5)">
 						5
 					</view>
 
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="clknum(6)">
 						6
 					</view>
 				</view>
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="clknum(7)">
 						7
 					</view>
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="clknum(8)">
 						8
 					</view>
 
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="clknum(9)">
 						9
 					</view>
 				</view>
 				<view style="display: flex;width: 480rpx;">
-					<view class="gray-button-jianpan">
-						AC
+					<view class="gray-button-jianpan" style="font-size: 30rpx;" @click="clknum('AC')">
+						清零
 					</view>
-					<view class="gray-button-jianpan">
+					<view class="gray-button-jianpan" @click="clknum(0)">
 						0
 					</view>
 
-					<view class="gray-button-jianpan">
-						.
+					<view class="gray-button-jianpan" @click="clknum('AE')">
+						<image src="/static/cleanone.png" mode="aspectFill" style="width: 50%;height: 50%;"></image>
 					</view>
 				</view>
 			</view>
@@ -290,27 +332,29 @@
 			<view class="photowall-title">
 				<view class="photowall-name">
 					{{ !topbuttontarget?`拣货照片`:`随行单` }}
-
 				</view>
 				<view class="">
 					<text class="photowall-left">
 						采购单号：
 					</text>
 					<text class="photowall-right">
-						10120251024012
+						{{plsbuy[lefttarget]?.cgdNo}}
 					</text>
 
 				</view>
 			</view>
-			<view class="photowall-other">
-				<view class="photowall-other-one" v-for="(item,index) in [1,1,1,1,1]" :key="index">
-					<image style="width: 100%;height: 70%;" src="/static/ceshiyaoshan.png" />
+			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation v-if="topbuttontarget==0">
+				<view class="photowall-other-one" v-for="(item,index) in jhdanarr" :key="index"
+					@click="previewImage(item,index,jhdanarr,2)">
+					<image style="width: 100%;height: 70%;border-radius: 30rpx;"
+						:src="item.jhPic?serverUrl + item.jhPic:'/static/ceshiyaoshan.png'" mode="aspectFill"
+						:lazy-load="true" />
 					<view style="margin-top: 20rpx;">
 						<text style="color: #888888;">
 							上传时间:
 						</text>
 						<text style="margin-left: 15rpx;">
-							2025.10.11 10:12:56
+							{{item.createTime.replace(/-/g, '.')}}
 						</text>
 					</view>
 					<view style="margin-top: 10rpx;">
@@ -318,14 +362,55 @@
 							上传人:
 						</text>
 						<text>
-							赵晓璇
+							{{item.createBy}}
 						</text>
 					</view>
 				</view>
-				<!-- <view class="photowall-other-one" v-if="topbuttontarget==1">
+				<view class="noarray" v-if="!jhdanarr.length">
 
-					<view
-						style="width: 100%;height: 70%;display: flex;flex-direction: column;justify-content: center;align-items: center;background-color:#fafdff ;border: 1rpx solid #78B1EB;border-radius: 30rpx;">
+					<image class="noarray-img" src="/static/index/warehouse/procurement/picking/noarray.png"
+						mode="aspectFill" />
+					<view class="noarray-font">
+						暂无拣货照片
+					</view>
+				</view>
+			</scroll-view>
+
+			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation v-if="topbuttontarget==1"
+				style="margin-top:0 !important;">
+				<view class="photowall-other-one" v-for="(item,index) in suixingdanarr" :key="index"
+					@click="previewImage(item,index,suixingdanarr,1)">
+					<image style="width: 100%;height: 70%;border-radius: 30rpx;"
+						:src="item.sxdPic?serverUrl + item.sxdPic:'/static/ceshiyaoshan.png'" mode="aspectFill" />
+					<view style="margin-top: 20rpx;">
+						<text style="color: #888888;">
+							上传时间:
+						</text>
+						<text style="margin-left: 15rpx;">
+							{{item.createTime.replace(/-/g, '.')}}
+						</text>
+					</view>
+					<view style="margin-top: 10rpx;">
+						<text style="color: #888888;letter-spacing: 8.9rpx;">
+							上传人:
+						</text>
+						<text>
+							{{item.createBy}}
+						</text>
+					</view>
+				</view>
+				<view class="noarray" v-if="!suixingdanarr.length">
+				
+					<image class="noarray-img" src="/static/index/warehouse/procurement/picking/noarray.png"
+						mode="aspectFill" />
+					<view class="noarray-font">
+						暂无随行单
+					</view>
+				</view>
+				<!-- <view class="photowall-other-one" v-if="topbuttontarget==1">
+					<view style="width: 100%;height: 71%;display: flex;flex-direction: column;
+						justify-content: center;align-items: center;position: absolute;top:1vw;left: 0;
+						background-color:#fafdff ;border: 1rpx solid #78B1EB;border-radius: 30rpx;" @click="uplod(1)">
 						<image style="width: 70rpx;height: 70rpx;margin-bottom: 5rpx;"
 							src="/static/index/warehouse/procurement/picking/addphoto.png" />
 						<view style="color: #78B1EB;">
@@ -333,18 +418,23 @@
 						</view>
 					</view>
 				</view> -->
-			</view>
+
+			</scroll-view>
 		</view>
+
+
+
 		<view class="contain-left">
+			<view v-show="openselect" class="mengban" style="background: transparent;" @click="openselect=false"></view>
 			<view class="left-select-more" v-show="openselect">
 				<view class="more-bottom">
-					<view class="bottom-left">
+					<view class="bottom-left" @click="chongzhi">
 						重置
 					</view>
-					<view class="bottom-right">
+					<view class="bottom-right" @click="openselect=false">
 						确定
-						<text style="font-size: 25rpx;margin-top: 5rpx;">
-							(10+采购单)
+						<text style="font-size: 25rpx;margin-top: 5rpx;" v-if="alltotal>=99">
+							(99+采购单)
 						</text>
 
 					</view>
@@ -353,59 +443,66 @@
 					采购单状态
 				</view>
 				<view class="more-statues-father">
-					<view :class="!typestatues?`more-statues-button-target`:`more-statues-button`"
-						@click="typestatues=0">
+					<view :class="plzinfo.cgdType==`0,1`?`more-statues-button-target`:`more-statues-button`"
+						@click="plzinfo.cgdType=`0,1`;search()">
 						全部
 					</view>
-					<view :class="typestatues==1?`more-statues-button-target`:`more-statues-button`"
-						@click="typestatues=1">
+					<view :class="plzinfo.cgdType==`0`?`more-statues-button-target`:`more-statues-button`"
+						@click="plzinfo.cgdType=`0`;search()">
 						待入库
 					</view>
-					<view :class="typestatues==2?`more-statues-button-target`:`more-statues-button`"
-						@click="typestatues=2">
+					<view :class="plzinfo.cgdType==`1`?`more-statues-button-target`:`more-statues-button`"
+						@click="plzinfo.cgdType=`1`;search()">
 						待完结
 					</view>
 				</view> -->
-				<view class="more-title">
+
+
+				<view class="more-time">
 					采购日期
 				</view>
-				<view class="more-time-select">
-					<view class="more-gray">
+				<view class="more-time-select" @click="opendata=!opendata">
+					<view class="more-gray" v-show="!plzinfo.startTime">
 						开始日期
 					</view>
+					<view class="more-black" v-show="plzinfo.startTime">
+						{{ plzinfo.startTime }}
+					</view>
+
 					<view style="font-size: 32rpx;">
 						至
 					</view>
-					<view class="more-gray">
+					<view class="more-gray" v-show="!plzinfo.endTime">
 						结束日期
 					</view>
+					<view class="more-black" v-show="plzinfo.endTime">
+						{{ plzinfo.endTime }}
+					</view>
 					<image class="more-img" src="/static/index/warehouse/procurement/picking/data.png" />
 				</view>
 				<view class="more-select">
 					采购人
 				</view>
-				<view class="more-time-select">
-					<view class="more-gray" style="margin-left: 30rpx;">
-						请输入采购人
-					</view>
+				<view class="more-time-select" @click="opencgr=true">
+					<input class="more-gray" v-model="cgrvalue" placeholder="请输入采购人" placeholder-style="color: #BFBFBF;"
+						style="margin-left: 30rpx;width: 400rpx;" @input="changeArray"></input>
 					<image class="select-img" src="/static/index/warehouse/procurement/picking/center.png" />
 				</view>
 				<view class="more-select">
 					供应商
 				</view>
-				<view class="more-time-select">
-					<view class="more-gray" style="margin-left: 30rpx;">
-						请输入供应商
-					</view>
+				<view class="more-time-select" @click="opengys=true">
+					<input class="more-gray" v-model="gysvalue" placeholder="请输入供应商" placeholder-style="color: #BFBFBF;"
+						style="margin-left: 30rpx;width: 400rpx;" @input="changeArraysecond"></input>
 					<image class="select-img" src="/static/index/warehouse/procurement/picking/center.png" />
 				</view>
 			</view>
 			<view class="title-input-father">
-				<input class="title-input" type="text" v-model="searchValue" maxlength="15" placeholder="采购单号/采购日期/供应商"
-					@confirm="search()" />
-				<image v-show="searchValue" class="title-input-img" src="@/static/x.png"
-					@click="searchValue='';search()" />
-				<view class="title-input-button" @click="search()">
+				<input class="title-input" type="text" v-model="plzinfo.cgdParamInfo" maxlength="15"
+					placeholder="采购单号/采购日期/供应商" @confirm="search()" />
+				<image v-show="plzinfo.cgdParamInfo" class="title-input-img" src="@/static/x.png"
+					@click="plzinfo.cgdParamInfo='';search()" />
+				<view class="title-input-button" @click="search();">
 					检索
 				</view>
 				<view class="filter">
@@ -416,38 +513,36 @@
 					</view>
 				</view>
 			</view>
-			<!-- <view class="statues-father">
-				<view class="statues-gray">
+			<view class="statues-father">
+				<!-- <view class="statues-gray">
 					单据状态
 				</view>
-				<view :class="!typestatues?`statues-button-target`:`statues-button`" style="margin-left: 4%;"
-					@click="typestatues=0">
+				<view :class="plzinfo.cgdType==`0,1`?`statues-button-target`:`statues-button`" style="margin-left: 4%;"
+					@click="plzinfo.cgdType=`0,1`;search()">
 					全部
 				</view>
-				<view :class="typestatues==1?`statues-button-target`:`statues-button`" @click="typestatues=1">
+				<view :class="plzinfo.cgdType==`0`?`statues-button-target`:`statues-button`"
+					@click="plzinfo.cgdType=`0`;search()">
 					待入库
 				</view>
-				<view :class="typestatues==2?`statues-button-target`:`statues-button`" @click="typestatues=2">
+				<view :class="plzinfo.cgdType==`1`?`statues-button-target`:`statues-button`"
+					@click="plzinfo.cgdType=`1`;search()">
 					待完结
-				</view>
-			</view> -->
+				</view> -->
+			</view>
 			<view class="left-menu-father">
 				<scroll-view scroll-y="true" scroll-with-animation class="left-menu-scroll" :scroll-top="leftscrolltop"
 					@scrolltolower="plsbuytolower" :lower-threshold="400">
-					<view class="pls-card" v-for="(v,i) in [1,1,1]" :key='i' @click="clickLeftMenu(i)"
-						:style="{borderColor: i==lefttarget? ``:`#fff` }">
-
-						<view v-if="moreindex==i" class="more-father">
-							<view class="more-one" @click="share">
-								分享
-							</view>
-							<view class="more-one" @click="bebad">
-								作废
-							</view>
-						</view>
+					<view class="pls-card" v-for="(v,i) in plsbuy" :key='i' @click="clickLeftMenu(i,v)" :style="{
+						  borderColor: i === lefttarget ? '' : 'transparent',
+						  background: i === lefttarget ? '#fff' : 'rgba(255,255,255,0.6)'
+						}">
+						<text style="display: block;background: #ff5757;
+						position: absolute;width: 1.3vw;height: 1.3vw;border-radius: 50%;right: -0.1vw;top: -0.1vw;" v-if="v.izNew=='Y'">
+						</text>
 						<view class="pls-card-title">
 							<view class="title-left">
-								10120251023012
+								{{ v.cgdNo }}
 							</view>
 							<view class="title-right">
 								<text style="position: absolute;bottom: 4rpx;left: -30rpx;">
@@ -455,91 +550,67 @@
 								</text>
 
 								<view class="title-right-big">
-									800.55
+									{{ Number(v.totalPrice).toFixed(2) }}
 								</view>
 
-								<!-- <image class="title-right-img" src="/static/more.png" @click="openmore(i)" /> -->
-
 							</view>
 						</view>
 						<view class="pls-card-middle">
+							<view class="middle-heng"></view>
 							<view class="pls-card-middle-one">
 								<view class="middle-title">
-									2025.10.03
+									{{ v.qgDate.replace(/-/g, '.') }}
 								</view>
 								<view class="middle-heng-father">
-									<view class="middle-heng"
-										style="border-top-left-radius: 20rpx;border-bottom-left-radius: 20rpx;"></view>
-									<view class="middle-heng" style="border-radius: 20rpx;background-color: #1083F8;">
-									</view>
-									<!-- <view class="middle-heng" v-if="Number(v.status)<3 "
-											style="border-radius: 20rpx;background-color: #1083F8;"></view> -->
-									<!-- <view class="middle-ball"
-										:style="Number(v.status)<3?{backgroundColor: `#1083F8`}:{} "></view> -->
-									<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
+									<image class="middle-ball-img" src="/static/index/requestform/isok.png" />
 								</view>
 								<view class="end-font">
-									<!-- <view class="" :style="Number(v.status)<3?{color: `#1083F8`}:{} ">
-										采购
-									</view> -->
-									<view class="" :style="{color: `#1083F8`}">
+
+									<view>
 										采购
 									</view>
-									<view style="font-size: 25rpx;">
-										[ 梁嘉豪 ]
+									<view>
+										{{ "[ " + v.qgBy + " ]" }}
 									</view>
 								</view>
 							</view>
 							<view class="pls-card-middle-one">
 								<view class="middle-title">
-									2025.10.04
+									{{ Number(v.status)<1 ? "": v.jhTime?.slice(0,10).replace(/-/g, '.') }}
 								</view>
 								<view class="middle-heng-father">
-									<view class="middle-heng"></view>
-									<view class="middle-heng"
-										style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
-									</view>
-									<!-- 	<view class="middle-heng" v-if="Number(v.status)<3 && Number(v.status)>0 "
-										style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
-									</view> -->
-									<!-- <view class="middle-ball"
-										:style="Number(v.status)<3 && Number(v.status)>0?{backgroundColor: `#1083F8`}:{} ">
-									</view> -->
-									<view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view>
+
+									<view class="middle-ball" v-if="Number(v.status)<2"></view>
+									<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
 								</view>
 								<view class="end-font">
-									<!-- <view class=""
-										:style="Number(v.status)<3 && Number(v.status)>0?{color: `#1083F8`}:{} ">
-										拣货
-									</view> -->
-									<view class="" :style="{color: `#1083F8`}">
+
+									<view>
 										拣货
 									</view>
-									<view style="font-size: 25rpx;">
-										[ 梁嘉豪 ]
+									<view v-if=" v.jhBy">
+										{{ Number(v.status)<1 ? "":"[ " + v.jhBy + " ]" }}
 									</view>
 								</view>
 							</view>
 							<view class="pls-card-middle-one">
 								<view class="middle-title">
-									2025.10.06
+									{{ Number(v.status)>=2 ? v.wjTime?.slice(0,10).replace(/-/g, '.') :""}}
 								</view>
+
 								<view class="middle-heng-father">
-									<view class="middle-heng"
-										style="border-top-right-radius: 20rpx;border-bottom-right-radius: 20rpx;">
-									</view>
-									<view class="middle-heng"
-										style="border-radius: 20rpx;background-color: #1083F8;width: 105%;margin-left: -5%;">
-									</view>
-									<view class="middle-ball" :style="{backgroundColor: `#1083F8`} ">
-									</view>
+
+									<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
+									<view class="middle-ball" :style="{backgroundColor: `#E5E5E5`}"
+										v-if="Number(v.status)!=2"></view>
+									<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
 								</view>
 								<view class="end-font">
-									<view class="" :style="{color: `#1083F8`} ">
+									<view>
 										完结
 									</view>
-									<view style="font-size: 25rpx;">
-										[ 梁嘉豪 ]
+									<view style="font-size: 25rpx;" v-if=" v.wjBy">
+										{{ "[ " + v.wjBy + " ]" }}
 									</view>
 								</view>
 							</view>
@@ -548,16 +619,11 @@
 							<view class="end-left">
 								<image class="end-left-img" src="/static/shili.png" />
 								<view class="end-left-font">
-									长春市天林商贸有限公司
+									{{ v.gysId_dictText }}
 								</view>
 							</view>
-							<!-- <view :class="v?.cgdType=='9' ?`tag-fail`:`tag-success`">
-
-								{{ tagesstatues[Number(v.status)] }}
-							</view> -->
 							<view class="tag-success">
-
-								已完结
+								{{ tagesstatues[Number(v.status)] }}
 							</view>
 						</view>
 					</view>
@@ -573,26 +639,21 @@
 						<!-- <view class="wuliao-heng"></view> -->
 					</view>
 				</view>
-				<view :class="!topbuttontarget?`contain-right-button-target`: `contain-right-button`"
-					style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;" @click="donghuastart(0)">
-					<image class="buttont-img"
-						:src="`/static/index/warehouse/procurement/picking/camera${!topbuttontarget?`target`:``}.png`" />
+				<view :class=" `contain-right-button`" @click="donghuastart(0)" style="width: 10vw;">
+					<image class="buttont-img" :src="`/static/index/warehouse/procurement/picking/camera.png`" />
 					<view class="button-font">
 						拣货照片
 					</view>
 				</view>
-				<view :class="topbuttontarget==1?`contain-right-button-target`: `contain-right-button`"
-					style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;" @click="donghuastart(1)">
-					<image class="buttont-img"
-						:src="`/static/index/warehouse/procurement/picking/work${topbuttontarget==1?`target`:``}.png`" />
+				<view :class=" `contain-right-button`" @click="donghuastart(1)" style="width: 9vw;">
+					<image class="buttont-img" :src="`/static/index/warehouse/procurement/picking/work.png`" />
 					<view class="button-font">
 						随行单
 					</view>
 				</view>
-				<!-- 	<view :class="Number(plsbuy[lefttarget]?.status)==0?`contain-right-button`: `contain-right-button-bad`"
-					style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;">
-					<image class="buttont-img"
-						:src="`/static/index/warehouse/procurement/picking/bebad${Number(plsbuy[lefttarget]?.status)==1?``:`target`}.png`" />
+				<!-- <view :class="!Number(plsbuy[lefttarget]?.status)?`contain-right-button`: `contain-right-title-bad`"
+					style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;" @click="bebad">
+					<image class="buttont-img" :src="`/static/index/warehouse/procurement/picking/bebad.png`" />
 					<view class="button-font">
 						作废
 					</view>
@@ -606,25 +667,21 @@
 				</view>
 			</view>
 			<view class="contain-right-middle">
-				<scroll-view scroll-x="true" class="middle-Y" @scrolltolower="getmore">
+				<scroll-view scroll-x="true" class="middle-Y" :scroll-left="Invoiscroll" scroll-with-animation>
 					<view class="middle-Y-father">
-						<view class="middle-one" v-for="(v,i) in [1,1,1,1]" :key='i'
-							:style="{border: middletarget === i? '4rpx solid #1083F8': '4rpx solid transparent'}"
+						<view class="middle-one" v-for="(v,i) in InvoicingList" :key='i'
+							:style="{border: middletarget === i? '4rpx dashed #1083F8': '4rpx solid transparent',backgroundColor:middletarget === i?`#F9FCFF`:``}"
 							@click="clickmiddle(i)">
-							<view class="up-tags">
-								{{ tagsArray[i] }}
+							<view :class="v.status<2?`up-tags-target`: `up-tags`">
+								{{v.status_dictText}}
 							</view>
-							<!-- <image class="middle-img"
-								:src="v.materialImg?serverUrl + v.materialImg : '/static/zhiniaoku.png'"
-								mode="aspectFill"></image> -->
-							<image class="middle-img" :src=" '/static/zhiniaoku.png'" mode="aspectFill"></image>
+							<image class="middle-img"
+								:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
+								mode="aspectFill"></image>
+							<!-- <image class="middle-img" :src=" '/static/zhiniaoku.png'" mode="aspectFill"></image> -->
 							<view class="middle-right">
 								<view class="right-title">
-									{{ i == 0 ? '纸尿裤-拉拉裤'
-									  : i == 1 ? '纸尿裤-拉拉裤'
-									  : i == 2 ? '纸尿裤'
-									  : '纸尿裤'
-									}}
+									{{ v.wlName }}
 								</view>
 								<view class="juzhong">
 									<view class="">
@@ -633,29 +690,25 @@
 										</text>
 
 										<text style="font-size: 30rpx;"
-											:style="{fontWeight:middletarget !== i?`600`:``}">
-											{{ i==0 ? '86.16'
-											  : i==1 ? '86.16'
-											  : i==2 ? '189.55'
-											  : '189.55'
-											}}
+											:style="{fontWeight:middletarget !== i?`600`:``,color:middletarget !== i?`#333333`:`#888888`}">
+											{{v.arrivalPrice?Number(v.arrivalPrice).toFixed(2):Number(v.procurementPrice).toFixed(2) }}
 										</text>
 
 									</view>
 									<view class="" style="font-size: 30rpx;position: relative;">
-										<text style="font-weight: 600;margin-right: 14rpx;"
-											:style="{fontWeight:middletarget === i?`600`:``,color:middletarget === i?``:`#888888`}">
-											20
+										<text style="font-weight: 600;margin-right: 5rpx;"
+											:style="{fontWeight:middletarget === i?`600`:``,color:middletarget === i?`#333333`:`#888888`}">
+											{{ v.purchaseQuantity }}
 										</text>
-										<text
-											style="position: absolute;right: -10rpx;font-size: 26rpx;bottom: 2rpx;color: #888888;">
-											片
+										<text style="font-size: 26rpx;color: #888888;">
+											{{ v.wlUnits}}
 										</text>
+
 									</view>
 
 								</view>
 								<view class="right-middle">
-									800mm*680mm
+
 								</view>
 								<view class="juzhong">
 									<view class="">
@@ -664,8 +717,8 @@
 										</text>
 									</view>
 									<view class="">
-										<text :style=" {fontWeight:  `600`  }">
-											{{ i==0 ? 10 : i==1 ? 10 : i==2 ? 5 : 5 }}
+										<text :style=" {fontWeight: v.rksl>0? `600` :`` }">
+											{{v.rksl}}
 										</text>
 									</view>
 
@@ -677,8 +730,8 @@
 										</text>
 									</view>
 									<view class="">
-										<text style="">
-											0
+										<text :style=" {fontWeight: v.wrksl>0? `600` :`` }">
+											{{v.wrksl}}
 										</text>
 									</view>
 
@@ -690,8 +743,8 @@
 										</text>
 									</view>
 									<view class="">
-										<text :style=" {fontWeight: i>1? `600` :`` }">
-											{{ i==0 ? 0 : i==1 ? 0 : i==2 ? 5 : 5 }}
+										<text :style=" {fontWeight: v.xzsl>0? `600` :`` }">
+											{{v.xzsl}}
 										</text>
 									</view>
 
@@ -712,7 +765,7 @@
 							<view class="wuliao-heng"></view>
 						</view>
 					</view>
-					<!-- <view style="display: flex;margin-top: 20rpx;font-size: 30rpx;">
+					<!-- <view style="display: flex;margin-top: 10rpx;font-size: 30rpx;">
 						<view :style="outerStyle" @click="opengaijiaclick">
 							<view :style="segmentsWrapperStyle">
 								<view v-for="(c, i) in segColors" :key="i" :style="{
@@ -727,7 +780,7 @@
 							</view>
 						</view>
 						<view @click="openjianhuoclick"
-							style="background-color: #f8f8f8;color: #555555;display: flex;align-items: center;justify-content: center;color: #555555;width: 180rpx;height: 70rpx;border-radius: 40rpx;box-shadow: 0 4rpx 6rpx rgba(0, 0, 0, 0.1);margin-left: 20rpx;">
+							:class="showvalue.jianhuobtn==false?`jianhuobutton-gray-bad`: `jianhuobutton-gray`">
 							拣货
 						</view>
 					</view> -->
@@ -736,35 +789,36 @@
 				<view style="width: 95%;height: 0.5rpx;	background-color: #eff1f3;margin-left: 5%;"></view>
 				<view class="right-bottom" v-show="!typechange">
 					<view class="right-bottom-left">
-						<!-- 		<image class="left-img"
-							:src="showvalue?.materialImg?serverUrl + showvalue?.materialImg : '/static/zhiniaoku.png'"
-							mode="aspectFill"></image> -->
-						<image class="left-img" :src=" '/static/zhiniaoku.png'" mode="aspectFill"></image>
-						<view class="left-tags">
-							<view class="tags-one">
-								耗材用品
-							</view>
-							<view class="tags-one">
-								复健用品
-							</view>
-							<view class="tags-one">
-								支架
-							</view>
+						<image class="left-img"
+							:src="showvalue?.materialImg?serverUrl + showvalue?.materialImg : '/static/index/warehouse/procurement/k.png'"
+							mode="aspectFill"></image>
 
+						<view class="left-tags">
+							<view class="tags-one" v-if="showvalue.categoryId_dictText">
+								{{showvalue.categoryId_dictText}}
+							</view>
+							<view class="tags-one" v-if="showvalue.typeId_dictText">
+								{{showvalue.typeId_dictText}}
+							</view>
+							<view class="tags-one" v-if="showvalue.medicationId_dictText">
+								{{showvalue.medicationId_dictText}}
+							</view>
 						</view>
 					</view>
 					<view class="right-bottom-right">
 						<view class="bottom-right-title">
 							<view class="title-left">
-								纸尿裤-拉拉裤纸尿裤
+								{{showvalue.wlName}}
 							</view>
-							<view class="title-right">
+							<!-- <view class="title-right">
 								<text
 									style="position: absolute;top: 8rpx;left: -35rpx;font-weight: 300;font-size: 28rpx;">
 									￥
 								</text>
-								100.55
-							</view>
+								<view style="color: #555555;">
+									{{Number(showvalue.totalPrice).toFixed(2) }}
+								</view>
+							</view> -->
 						</view>
 						<view class="bottom-right-middle">
 							<view class="middle-onecard">
@@ -773,15 +827,15 @@
 										物料编码
 									</view>
 									<view class="right-text">
-										ZHYP044
+										{{showvalue.wlMaterialNo}}
 									</view>
 								</view>
 								<view class="threeone">
 									<view class="gray-text">
 										规格型号
 									</view>
-									<view class="right-text">
-										800mm*680mm
+									<view class="right-text" style="white-space: nowrap;">
+										{{showvalue.wlSpecificationModel}}
 									</view>
 								</view>
 								<view class="gray-heng"></view>
@@ -793,7 +847,7 @@
 										采购单价
 									</view>
 									<view class="right-text">
-										￥15
+										￥{{showvalue.arrivalPrice? Number(showvalue.arrivalPrice).toFixed(2):Number(showvalue.procurementPrice).toFixed(2) }}
 									</view>
 								</view>
 								<view class="threeone">
@@ -801,7 +855,7 @@
 										采购数量
 									</view>
 									<view class="right-text">
-										200
+										{{showvalue.purchaseQuantity}}
 									</view>
 								</view>
 								<view class="threeone">
@@ -809,7 +863,7 @@
 										采购单位
 									</view>
 									<view class="right-text">
-										片
+										{{showvalue.wlUnits}}
 									</view>
 								</view>
 								<view class="gray-heng"></view>
@@ -821,7 +875,7 @@
 										库存数量
 									</view>
 									<view class="right-text">
-										853
+										{{showvalue.kcsl}}
 									</view>
 								</view>
 								<view class="threeone">
@@ -829,7 +883,7 @@
 										物料上限 ↑
 									</view>
 									<view class="right-text">
-										4000
+										{{showvalue.wlUpperLimit}}
 									</view>
 								</view>
 								<view class="threeone">
@@ -837,7 +891,7 @@
 										物料下限 ↓
 									</view>
 									<view class="right-text">
-										60
+										{{showvalue.wlLowerLimit}}
 									</view>
 								</view>
 								<view class="gray-heng"></view>
@@ -849,7 +903,7 @@
 										入库数量
 									</view>
 									<view class="right-text">
-										200
+										{{showvalue.rksl}}
 									</view>
 								</view>
 								<view class="threeone">
@@ -857,7 +911,7 @@
 										挂账数量
 									</view>
 									<view class="right-text">
-										0
+										{{showvalue.wrksl}}
 									</view>
 								</view>
 								<view class="threeone">
@@ -865,87 +919,109 @@
 										销账数量
 									</view>
 									<view class="right-text">
-										0
+										{{showvalue.xzsl}}
 									</view>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view style="width: 100%;display: flex;justify-content: space-between;margin-top: 20rpx;">
-					<view style="font-size: 35rpx;font-weight: 600;margin-left: 20rpx;">
-						留置针敷贴(医用...
-					</view>
-					<view style="color: black;">
-						<text style="color: #888888;">
-							采购数量：
-						</text>
-
-						<text style="font-weight: 600;">
-							100
-						</text>
-
-						片
-					</view>
-				</view>
-				<view style="width: 110%;height: 400rpx;display: flex;flex-wrap: wrap;">
+				<view class="right-bottom" v-show="typechange==1" style="padding: 0 50rpx;flex-direction: column;">
 					<view
-						style="width: 45%;height: 180rpx;background-color: #F9F9F9;border-radius: 30rpx;margin-right: 2%;margin-top: 20rpx;padding: 0 30rpx;color: #888888;"
-						v-for="(item,index) in [1,1,1,1]" :key="index">
-						<view
-							style="width: 100%;justify-content: space-between;display: flex;align-items: center;height: 60rpx;margin-top: 20rpx;">
-							<view class="">
-								拣货数量：
-								<text style="font-weight: 600;color: black;">
-									20
-								</text>
-								<text style="color: black;">
-									片
-								</text>
-
-							</view>
-							<view
-								style="width: 110rpx;height: 50rpx;border-radius: 30rpx;display: flex;justify-content: center;align-items: center;border: 1rpx solid #C3C3C3;background-color: #f1f1f1;color: #888888;margin-top: -10rpx;">
-								{{ index?`销账`:`入库` }}
-							</view>
+						style="width: 100%;display: flex;justify-content: space-between;margin-top: 30rpx;margin-bottom: 10rpx;">
+						<view style="font-size: 35rpx;font-weight: 600;margin-left: 20rpx;color: #222222;">
+							{{showvalue.wlName}}
 						</view>
-						<view style="width: 100%;justify-content: space-between;display: flex;">
-							<view class="">
-								采购单价：
+						<view style="color: black;margin-top: 5rpx;">
+							<text style="color: #888888;">
+								采购数量：
+							</text>
 
-								<text style="font-weight: 600;color: black;">
-									￥1.50
-								</text>
-
-							</view>
-							<view class="">
-								拣货人：
-								<text style="color: black;">
-									梁嘉豪
-								</text>
-
-							</view>
-						</view>
-						<view style="width: 100%;justify-content: space-between;display: flex;margin-top: 10rpx;">
-							<view class="">
-								到货单价：
-
-								<text style="font-weight: 600;color: black;">
-									￥1.50
-								</text>
-
-							</view>
-							<view class="">
-								2025.10.03 10:10:30
-
-							</view>
+							<text style="font-weight: 600;color: #555555;">
+								{{showvalue.purchaseQuantity}}
+							</text>
+							{{showvalue.wlUnits}}
 						</view>
 					</view>
-					<view style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 20rpx;">
-						<image
+					<scroll-view style="width: 110%;height: 400rpx;display: flex;flex-wrap: wrap;" scroll-y="true"
+						scroll-with-animation @scrolltolower="lhjlfy()">
+						<view
+							style=" display: inline-block;width: 45%;height: 180rpx;background-color: #F9F9F9;border-radius: 30rpx;margin-right: 2%;margin-top: 20rpx;padding: 0 30rpx;color: #888888;"
+							v-for="(item,index) in lhjlarr" :key="index">
+							<view
+								style="width: 100%;justify-content: space-between;display: flex;align-items: center;height: 60rpx;margin-top: 20rpx;">
+								<view class="">
+									拣货数量：
+									<text style="font-weight: 600;color: #555555;">
+										{{item.crkNum}}
+									</text>
+									<text style="color: #555555;">
+										{{showvalue.materialUnits}}
+									</text>
+
+								</view>
+								<view
+									style="width: 110rpx;height: 50rpx;border-radius: 30rpx;display: flex;justify-content: center;align-items: center;border: 1rpx solid #C3C3C3;background-color: #f1f1f1;color: #888888;margin-top: -10rpx;">
+									{{ item.crkStatus_dictText}}
+								</view>
+							</view>
+							<view style="width: 100%;justify-content: space-between;display: flex;">
+								<view class="">
+									采购单价：
+
+									<text style="font-weight: 600;color: #555555;">
+										￥{{Number(item.oldPrice).toFixed(2)}}
+									</text>
+
+								</view>
+								<view class="">
+									拣货人：
+									<text style="color: #888888;font-weight: 600;">
+										{{item.createBy}}
+									</text>
+
+								</view>
+							</view>
+							<view style="width: 100%;justify-content: space-between;display: flex;margin-top: 10rpx;">
+								<view class="">
+									到货单价：
+									<text style="font-weight: 600;color: #555555;">
+										￥{{Number(item.newPrice).toFixed(2)}}
+									</text>
+
+								</view>
+								<view class="">
+									{{item.createTime.replace(/-/g, '.')}}
+								</view>
+							</view>
+						</view>
+						<!-- <view
+							style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 20rpx;"
+							v-if="lhjlarr.length">
+							<image v-if="statustory=='loading'"
+								style="width: 25rpx;height: 25rpx;margin-right: 10rpx;margin-top: 5rpx;margin-left: -10rpx;"
+								src="/static/index/warehouse/procurement/picking/loading.png" />
+							<text v-if="statustory=='loading'">上划加载更多</text>
+							<text v-if="statustory=='nomore'">已加载全部~</text>
+							<text v-if="statustory=='loadmore'">加载中~</text>
+						</view> -->
+
+					</scroll-view>
+					<view style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 40rpx;"
+						v-if="lhjlarr.length">
+						<image v-if="statustory=='loading'"
 							style="width: 25rpx;height: 25rpx;margin-right: 10rpx;margin-top: 5rpx;margin-left: -10rpx;"
 							src="/static/index/warehouse/procurement/picking/loading.png" />
-						点击加载更多
+						<text v-if="statustory=='loading'">上划加载更多</text>
+						<text v-if="statustory=='nomore'">已加载全部~</text>
+						<text v-if="statustory=='loadmore'">加载中~</text>
+					</view>
+					<view class="nomessage-samll" v-if="!lhjlarr.length">
+						<image style="width: 300rpx;height: 300rpx;margin-top: -200rpx;"
+							src="/static/index/warehouse/procurement/picking/nomessage.png" />
+						<view class="noarray-font">
+							暂无拣货记录
+						</view>
 					</view>
 				</view>
 			</view>
@@ -999,67 +1075,263 @@
 					</view>
 				</view>
 			</view>
-		</view>
-		<view :class="['neuro-wrapper', donghuacs ? 'is-active' : '']" v-show="badshow">
-			<view class="neuro-mask" @click="badshow=false;"></view>
-			<view class="neuro-box" @click.stop>
 
-				<view class="button-father">
-					<view class="button-white" @click="badshow=false;">取消</view>
-					<view class="button" @click="zuofei">确定</view>
-				</view>
-
-				<view class="title">作废</view>
-				<view class="card-font">
-					确定要作废这个采购单吗
-				</view>
-			</view>
 		</view>
+		<tanchuang :show="badshow" font="确定要作废这个采购单吗" @back="badshow=false;" @right="zuofei"> </tanchuang>
+		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del()"> </tanchuang>
+		<tanchuang :show="open==2" font="是否销账此物料？" @back="open = 0" @right="sctp(1)"> </tanchuang>
 	</view>
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick,  onUnmounted } from 'vue';
-	import { queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain } from './api/lunpan.js'
+	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, onUnmounted } from 'vue';
+	import { editIzNew, queryPickingRecordList, queryJhzpList, addSxd, querySxdList, queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload, editPrice, pickingInfo } from './api/lunpan.js'
 	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);
+	const stringjh = ref("")
 	const serverUrl = ref("");
 	const opengaijia = ref(false);
+	const guiling = ref(false);
 	const openjianhuo = ref(false);
+	const opendata = ref(false);
+	const gaijia = ref("");
+
+
+	// 改价
+	const dogaijia = () => {
+		// console.log("????",showvalue.value.id,gaijia.value)
+		editPrice({ id: showvalue.value.id, arrivalPrice: gaijia.value }).then((res) => {
+			// console.log("改价", showvalue.value.id,gaijia.value)
+			console.log("res", res)
+			if (res.code == 200) {
+				showvalue.value.arrivalPrice = gaijia.value;
+				// console.log("000",Number(gaijia.value),Number(showvalue.value.purchaseQuantity))
+				showvalue.value.totalPrice = Number(gaijia.value) * Number(showvalue.value.purchaseQuantity);
+				plsbuy.value[lefttarget.value].totalPrice = res.result.totalPrice
+				// showvalue.value.arrivalPrice
+				// plsbuy.value[lefttarget.value].totalPrice = gaijia.value
+				opengaijia.value = false;
+			}
+		})
+	}
+	// 计算器
+	function press(k : string) {
+
+		if (guiling.value) {
+			gaijia.value = '';
+			guiling.value = false
+		}
+
+		if (k === 'AC') {
+			gaijia.value = '0'
+			return
+		}
+
+		// 小数点
+		if (k === '.') {
+			if (!gaijia.value.includes('.')) {
+				gaijia.value = gaijia.value === '' ? '0.' : gaijia.value + '.'
+			}
+			return
+		}
+
+		// 数字
+		if (/^\d$/.test(k)) {
+			// 有小数
+			if (gaijia.value.includes('.')) {
+				const [i, d] = gaijia.value.split('.')
+				if ((d || '').length < 2) gaijia.value += k
+				return
+			}
+
+			// 无小数，整数部分限制 4 位
+			let intPart = gaijia.value
+			if (intPart === '0') intPart = '' // 防止 01
+
+			if (intPart.length < 4) gaijia.value = intPart + k
+		}
+	}
+	// 模糊查询
+	const gysclick = (res : any) => {
+		console.log("///", res);
+		opengys.value = false;
+	}
 
 	const openjianhuoclick = () => {
+		// console.log("测试",InvoicingList.value[middletarget.value].rksl)
+		if (showvalue.value.jianhuobtn == false) {
+			return
+		}
 		openjianhuo.value = true;
+		clickflag.value = true;
 		donghuaopo.value = false;
 		setTimeout(() => {
 			donghuaopo.value = true;
 		}, 100)
 	}
-	// const opengaijiaclick = () => {
-	// 	opengaijia.value = true;
-	// 	donghuaopo.value = false;
-	// 	setTimeout(() => {
-	// 		donghuaopo.value = true;
-	// 	}, 100)
-	// }
 	const opengaijiaclick = () => {
 		opengaijia.value = true;
+		guiling.value = true
+		gaijia.value = (showvalue.value.arrivalPrice ? showvalue.value.arrivalPrice : showvalue.value.procurementPrice).toString()
 		donghuaopo.value = false;
 		setTimeout(() => {
 			donghuaopo.value = true;
 		}, 100)
 	}
+	// 过滤后的结果，页面上渲染用这个
+	const filteredCgrList = ref([]);
+
+	const closefilteredCgrList = () => {
+		filteredCgrList.value = [];
+		cgrvalue.value = plzinfo.cgBy;
+	}
+	const clickfilteredCgrList = (item : any) => {
+		filteredCgrList.value = [];
+		plzinfo.cgBy = item.cgBy
+		cgrvalue.value = plzinfo.cgBy;
+		search()
+	}
+
+	// --- 模糊匹配 ---
+	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
+
+	/**
+	 * changeArray - 防抖搜索（0.3 秒后无再次输入才执行）
+	 */
+	function changeArray(res : any) {
+		if (!res.detail.value) {
+			plzinfo.cgBy = "";
+			filteredCgrList.value = [];
+			search()
+			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?.cgBy, keyword)
+			)
+			if (!filteredCgrList.value.length) {
+				filteredCgrList.value.push({ cgBy: `暂无数据` })
+			}
+
+		}, 300)
+	}
+	// 过滤后的结果，页面上渲染用这个
+	const filteredCgrListsecond = ref([]);
+	const secondindex = ref(-1)
+
+	const closefilteredCgrListsecond = () => {
+		filteredCgrListsecond.value = [];
+		gysvalue.value = "";
+		plzinfo.suppliers = "";
+		search()
+	}
+	const clickfilteredCgrListsecond = (item : any, index : number) => {
+		filteredCgrListsecond.value = [];
+		plzinfo.suppliers = item.suppliers;
+		gysvalue.value = item.suppliersName;
+		secondindex.value = index;
+		search()
+	}
+	const cgrvalue = ref("");
+	const gysvalue = ref("");
+	function changeArraysecond(res : any) {
+		if (!res.detail.value) {
+			plzinfo.suppliers = "";
+			filteredCgrListsecond.value = [];
+			secondindex.value = -1;
+			gysvalue.value = "";
+			search()
+			return
+		}
+
+		const keyword = String(
+			typeof res === 'string' ? res : res?.detail?.value ?? ''
+		).trim()
+
+		// 清除上一次的定时器
+		if (debounceTimer) clearTimeout(debounceTimer)
+
+		// 重新等待 300ms
+		debounceTimer = setTimeout(() => {
+			if (!keyword) {
+				filteredCgrListsecond.value = gyslist.value.slice()
+				return
+			}
+
+			filteredCgrListsecond.value = gyslist.value.filter(item =>
+				fuzzyMatch(item?.suppliersName, keyword)
+			)
+
+			// filteredCgrListsecond.value = [...filteredCgrListsecond.value, ...filteredCgrListsecond.value, ...filteredCgrListsecond.value, ...filteredCgrList.value, ...filteredCgrList.value]
+			if (!filteredCgrListsecond.value.length) {
+				filteredCgrListsecond.value.push({ suppliersName: `暂无数据` })
+			}
+
+		}, 300)
+	}
+
+
 	onLoad(() => {
 		firstgetqueryCgdList();
 		serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
+		getSelectList();
 	})
+	const opencgr = ref(false);
+	const opengys = ref(false);
+
+
+	const cgrlist = ref([]);
+	const gyslist = ref([]);
+
+	const getSelectList = () => {
+		getCgrLis().then((res : any) => {
+			cgrlist.value = res.result;
+		})
+		getGysList().then((res : any) => {
+			gyslist.value = res.result;
+			// console.log("isright", res)
+		})
+	}
 
 	const openselect = ref(false);
 
 	const searchValue = ref("");
 	const middletarget = ref(0);
-	const tagesstatues = ["待采购", "拣货", "完结", "作废"];
+	const tagesstatues = ["待入库", "待完结", '已完结'];
 
 	const topbuttontarget = ref(-1);
 
@@ -1068,24 +1340,66 @@
 	const plzinfo = reactive({
 		pageNo: 1,
 		pageSize: 10,
-		canpull: true
+		canpull: true,
+		cgdParamInfo: "",
+		suppliers: "",
+		cgdType: "2",
+		startTime: "",
+		endTime: "",
+		cgBy: "",
+		nuId: uni.getStorageSync('nuId')
 	})
 	const mobanplzinfo = {
 		pageNo: 1,
 		pageSize: 10,
-		canpull: true
+		canpull: true,
+		cgdParamInfo: "",
+		suppliers: "",
+		cgdType: "2",
+		startTime: "",
+		endTime: "",
+		cgBy: "",
+		nuId: uni.getStorageSync('nuId')
+	}
+	// 销毁日历
+	const xiaohui = ref(true);
+	const chongzhi = () => {
+		xiaohui.value = false;
+		setTimeout(() => {
+			xiaohui.value = true;
+		}, 300)
+		Object.assign(plzinfo, mobanplzinfo);
+		cgrvalue.value = "";
+		gysvalue.value = ""
+		search()
+	}
+	type datetype = {
+		start : string,
+		end : string
+	}
+	const dateget = (res : datetype) => {
+		plzinfo.startTime = res.start;
+		plzinfo.endTime = res.end;
+		search()
 	}
 	const leftscrolltop = ref(0)
 
 	const plsbuy = ref([])
-
+	const alltotal = ref(0);
+	const nomessageshow = ref(false);
 	const firstgetqueryCgdList = () => {
 		queryCgdList(plzinfo).then((res : any) => {
+
 			plsbuy.value.push(...res.result.records)
-			// console.log("zzzz", plsbuy.value)
+			alltotal.value = res.result.total
+			if (!res.result.total) {
+				// console.log("没数据了!!!")
+				nomessageshow.value = true;
+			}
+			// console.log("请购单数据呢???", res)
 			if (res.result.records.length) {
 				form.cgdId = plsbuy.value[0].id
-				queryInvo();
+				queryInvo(0);
 			}
 
 			if (res.result.records.length < plzinfo.pageSize) {
@@ -1111,16 +1425,16 @@
 		if (!plzinfo.canpull) return
 		queryCgdList(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 lefttarget = ref(0);
-	const clickLeftMenu = (index : any) => {
+	const clickLeftMenu = (index : any, item : any) => {
 		let num = Math.ceil((index + 1))
-		leftscrolltop.value = (num - 2) * 186;
+		leftscrolltop.value = (num - 2) * 178;
 		lefttarget.value = index;
 		form.cgdId = plsbuy.value[index].id
 		form.pageNo = 1
@@ -1128,21 +1442,34 @@
 		// console.log("!!!!",form)
 		queryCgdInfoList(form).then(res => {
 			InvoicingList.value = []
-			console.log("数据呢", res.result.records)
-			if (res.result.records.length == 1) {
-				InvoicingList.value.push(...res.result.records);
-				InvoicingList.value.push(...res.result.records);
-				InvoicingList.value.push(...res.result.records);
-				InvoicingList.value.push(...res.result.records);
-			}
+			// console.log("数据呢", res.result.records)
 			InvoicingList.value.push(...res.result.records);
 			if (form.pageNo) {
 				clickmiddle(0);
 			}
 		})
+		if (item.izNew == 'Y') {
+			item.izNew = 'N'
+			editIzNew({ id: item.id })
+		}
+
 	}
 	const showvalue = ref({
-		materialImg: ""
+		materialImg: "",
+		cgrvalue: "",
+		gysvalue: "",
+		wlName: "",
+		procurementPrice: "",
+		wlMaterialNo: "",
+		wlSpecificationModel: "",
+		purchaseQuantity: "",
+		wlUnits: "",
+		kcsl: "",
+		wlUpperLimit: "",
+		wlLowerLimit: "",
+		suppliersName: "",
+		jianhuobtn: false,
+
 	})
 
 	const goback = () => {
@@ -1151,7 +1478,7 @@
 	const form = reactive({
 		nuId: '',
 		pageNo: 1,
-		pageSize: 9,
+		pageSize: -1,
 		categoryId: '',
 		typeId: '',
 		medicationId: '',
@@ -1171,66 +1498,70 @@
 		cgdId: "",
 		isWaring: 0
 	}
-	const tagsArray = [`已入库`, `已入库`, `已销账`, `已销账`]
+	const Invoiscroll = ref(0)
+	const tagsArray = [`待入库`, `挂账中`, `已入库`, `已销账`,]
 	const clickmiddle = (index : number) => {
+		// console.log(showvalue.value)
 		middletarget.value = index;
 		showvalue.value = InvoicingList.value[index];
+		showvalue.value.jianhuobtn = false;
+		Invoiscroll.value = (index - 2) * 172;
+		if (Number(showvalue.value.status) == 0 || (Number(showvalue.value.status) > 0 && Number(showvalue.value.wrksl) > 0)) {
+			showvalue.value.maxnum = (showvalue.value.rksl == 0 && showvalue.value.wrksl == 0 && showvalue.value.xzsl == 0) ? showvalue.value.purchaseQuantity : showvalue.value.wrksl
+			showvalue.value.num = showvalue.value.maxnum;
+			stringjh.value = toFixed4ByPadStart(showvalue.value.num);
+			showvalue.value.jianhuobtn = true;
+		}
 		Object.assign(form, mobanform)
-
+		lhjpageNo.value = 1;
+		lhjlarr.value = [];
+		lhjilu()
 	}
 	const InvoicingList = ref([])
-	const queryInvo = () => {
+	const queryInvo = (index : number) => {
 		queryCgdInfoList(form).then(res => {
-			if (res.result.records.length == 1) {
-				InvoicingList.value.push(...res.result.records);
-				InvoicingList.value.push(...res.result.records);
-				InvoicingList.value.push(...res.result.records);
-				InvoicingList.value.push(...res.result.records);
-			}
-			InvoicingList.value.push(...res.result.records);
-
-			clickmiddle(0);
+			InvoicingList.value = res.result.records;
+			clickmiddle(index);
 		})
 	}
-	const getmore = () => {
-		if (form.canpull) {
-			form.pageNo++
-			queryCgdInfoList(form).then(res => {
-				InvoicingList.value.push(...res.result.records);
-				if (res.result.records.length != 10) {
-					form.canpull = false
-				}
-				console.log("??????", res.result.records)
-			})
+	const lhjlarr = ref([])
+	const lhjpageNo = ref(1)
+	const statustory = ref('loading')
+	const lhjilu = () => {
+		let obj = {
+			cgdId: showvalue.value.cgdId,
+			wlId: showvalue.value.wlId,
+			pageNo: lhjpageNo.value,
+			pageSize: 10,
 		}
-
+		queryPickingRecordList(obj).then(res => {
+			lhjlarr.value.push(...res.result.records)
+			statustory.value = (res.result.total == lhjlarr.value.length || res.result.records.length == 0 ? 'nomore' : 'loadmore')
+		})
+	}
+	const lhjlfy = () => {
+		if (statustory.value == 'nomore') { return }
+		lhjpageNo.value++;
+		lhjilu()
 	}
 	const search = () => {
-		// if (!searchValue.value) return
-		form.pageNo = 1;
-		InvoicingList.value = [];
-		middletarget.value = 0;
-		form.wlParamInfo = searchValue.value;
-		form.cgdId = plsbuy.value[lefttarget.value].id
-		queryInvo();
+		// if (!plzinfo.cgdParamInfo) return
+		plzinfo.pageNo = 1;
+		plsbuy.value = [];
+		queryCgdList(plzinfo).then((res : any) => {
+			plsbuy.value.push(...res.result.records)
+			alltotal.value = res.result.total
+			if (res.result.records.length) {
+				form.cgdId = plsbuy.value[0].id
+				queryInvo(0);
+			}
+			if (res.result.records.length < plzinfo.pageSize) {
+				plzinfo.canpull = false;
+			}
+		})
 	}
 	const moreindex = ref(-1);
 	const zuofeiindex = ref(-1);
-	const openmore = (index : number) => {
-		zuofeiindex.value = index;
-		if (plsbuy.value[index].cgdType == '9') {
-			setTimeout(() => {
-				uni.showToast({
-					title: '该采购单已作废',
-					icon: 'error', // 不显示小图标
-					duration: 2000
-				})
-			}, 300)
-
-		} else {
-			moreindex.value = index;
-		}
-	}
 	const shareShow = ref(false);
 	const deletedownisopacity = ref(false)
 	const share = () => {
@@ -1241,7 +1572,10 @@
 			deletedownisopacity.value = true
 		}, 100)
 	}
+
 	const clickshare = () => {
+		console.log("-----------------------> 点击分享按钮");
+
 		uni.share({
 			provider: "weixin",
 			scene: "WXSceneSession",
@@ -1251,48 +1585,338 @@
 			summary: "采购单",
 			imageUrl: "https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni@2x.png",
 			success: function (res) {
-				console.log("success:");
+				uni.showToast({
+					title: res,
+					icon: 'none', // 'none' 表示不带图标
+					duration: 20000
+				})
+				console.log("-------------------success:", res);
 			},
 			fail: function (err) {
-				console.log("fail:");
+				console.log("------------------- fail:", err);
+				uni.showToast({
+					title: err,
+					icon: 'none', // 'none' 表示不带图标
+					duration: 20000
+				})
 			}
 		});
 	}
 	const badshow = ref(false);
-	const donghuacs = ref(false)
 	const bebad = () => {
-		badshow.value = true;
-		moreindex.value = -1;
-		donghuacs.value = false;
-		setTimeout(() => donghuacs.value = true, 50)
+		if (!Number(plsbuy.value[lefttarget.value]?.status) && plsbuy.value.length) {
+			badshow.value = true;
+			moreindex.value = -1;
+		}
 	}
 	const zuofei = () => {
-		voidedCgdMain({ id: plsbuy.value[zuofeiindex.value].id }).then((res : any) => {
-			// console.log("res", res)
+		voidedCgdMain({ id: plsbuy.value[lefttarget.value].id }).then((res : any) => {
+			console.log("res", res)
 			if (res.success) {
 				uni.showToast({
 					title: res.message,
 					icon: 'success', // 'none' 表示不带图标
 					duration: 2000
 				})
+				lefttarget.value = 0;
 				badshow.value = false;
 				InvoicingList.value = [];
 				plsbuy.value = []
 				Object.assign(plzinfo, mobanplzinfo)
 				Object.assign(form, mobanform)
 				firstgetqueryCgdList();
+			} else {
+				uni.showToast({
+					title: res.message,
+					icon: 'none',
+					duration: 2000
+				})
+				badshow.value = false;
 			}
 		})
 	}
 	const donghuaopo = ref(false)
+	const suixingdanarr = ref([])
+	const jhdanarr = ref([])
+
 	const donghuastart = (index : number) => {
+		if (index == 1) {
+			sxdarr()
+		} else {
+			JhzpList()
+		}
+
 		topbuttontarget.value = index;
 		donghuaopo.value = false;
 		setTimeout(() => {
 			donghuaopo.value = true;
-			console.log("zzz", donghuaopo.value)
 		}, 100)
 	}
+	const Jhz = ref(1)
+	const JhzpList = () => {
+		let obj = {
+			cgdId: plsbuy.value[lefttarget.value].id,
+		}
+		queryJhzpList(obj).then(res => {
+			jhdanarr.value = res.result
+		})
+	}
+	const sxdarr = () => {
+		let obj = {
+			cgdId: plsbuy.value[lefttarget.value].id,
+			pageNo: 1,
+			pageSize: -1
+		}
+		querySxdList(obj).then(res => {
+			console.log(res.result.records)
+			suixingdanarr.value = res.result.records
+		})
+	}
+	const sxdupld = (e) => {
+		let now = new Date();
+		let year = now.getFullYear();
+		let month = now.getMonth() + 1;
+		uni.uploadFile({
+			url: uni.getStorageSync('serverUrl') + '/sys/common/upload',
+			filePath: e,
+			name: 'file',
+			formData: {
+				biz: year + '/' + month + '/sxdPic'
+			},
+			header: {
+				'X-Access-Token': uni.getStorageSync('token')
+			},
+			success: res => {
+				const data = JSON.parse(res.data)
+				addSxd({ sxdPic: data.message, cgdId: plsbuy.value[lefttarget.value].id }).then(resd => {
+					if (resd.success) {
+						sxdarr()
+					}
+				})
+			},
+			fail: () => {
+				uni.showToast({ title: '上传失败', icon: 'none' })
+			}
+		})
+	}
+	// 上传
+	const albumlist = ref([])
+	const uplod = (type : number) => {
+		uni.chooseImage({
+			count: 1, //默认9
+			sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
+			sourceType: ['camera'], //从相册选择
+			success: (e) => {
+				let ar = JSON.stringify(e.tempFilePaths)
+				uni.compressImage({
+					src: JSON.parse(ar)[0],
+					quality: 60,
+					success: res => {
+						if (!type) {
+							albumlist.value.push(res.tempFilePath)
+						} else if (type == 1) {
+							sxdupld(res.tempFilePath)
+							console.log(res.tempFilePath)
+						}
+
+					}
+				})
+			}
+		});
+	}
+	// 预览
+	const previewImage = (v, i, arr, n) => {
+		if (n == 1) {
+			let u = []
+			arr.forEach(e => {
+				u.push(serverUrl.value + e.sxdPic)
+			})
+			uni.previewImage({
+				current: i,
+				urls: u,
+				showmenu: false,
+				longPressActions: {
+					itemList: [],
+				}
+			})
+		}
+		else if (n == 2) {
+			let u = []
+			arr.forEach(e => {
+				u.push(serverUrl.value + e.jhPic)
+			})
+			uni.previewImage({
+				current: i,
+				urls: u,
+				showmenu: false,
+				longPressActions: {
+					itemList: [],
+				}
+			})
+		}
+		else {
+			uni.previewImage({
+				current: i,
+				urls: arr,
+				showmenu: false,
+				longPressActions: {
+					itemList: [],
+				}
+			})
+		}
+	}
+	// 删除1个
+	const deldex = ref(-1)
+	const del = () => {
+		albumlist.value.splice(deldex.value, 1)
+		deldex.value = -1;
+		open.value = 0;
+	}
+	const clickflag = ref(false);
+	const clknum = (item : any) => {
+		// showvalue.value.maxnum = showvalue.value.purchaseQuantity : showvalue.value.wrksl
+		// showvalue.value.num 
+		if (item == "AC") {
+			showvalue.value.num = 0;
+			stringjh.value = toFixed4ByPadStart(showvalue.value.num);
+			return
+		}
+		if (item == "AE") {
+			showvalue.value.num = Math.trunc(showvalue.value.num / 10)
+			stringjh.value = toFixed4ByPadStart(showvalue.value.num);
+
+			return
+		}
+		if (clickflag.value == true) {
+			showvalue.value.num = item;
+			clickflag.value = false;
+			stringjh.value = toFixed4ByPadStart(showvalue.value.num)
+			return
+		}
+		if (digitCountByString(showvalue.value.num) > 3) {
+		} else {
+			if (!showvalue.value.num) {
+				showvalue.value.num = item
+			} else {
+				showvalue.value.num = showvalue.value.num * 10 + item;
+			}
+			// cy()
+			stringjh.value = toFixed4ByPadStart(showvalue.value.num)
+		}
+	}
+	// 数字转化
+	const digitCountByString = (n) => {
+		const s = Math.abs(n).toString();
+		return s.length;
+	}
+	// 数字转化
+	const toFixed4ByPadStart = (n) => {
+		const intPart = Math.floor(Math.abs(n));
+		return String(intPart).padStart(4, '0');
+	}
+	// 加减
+	const InteroutId = ref(null)
+	const handleTouchStart = (e : number) => {
+		Interval(e)
+	}
+	const handleTouchEnd = () => {
+		clearInterval(InteroutId.value);
+		// 清除定时器
+	}
+	const Interval = (e : number) => {
+		InteroutId.value = setInterval(() => {
+			jjnum(e);
+		}, 120);
+	}
+	const jjnum = (e : number) => {
+		let m = showvalue.value.maxnum;
+		if (m <= showvalue.value.num && e == 1) { showvalue.value.num = m; return }
+		if (showvalue.value.num <= 1 && e == -1) { showvalue.value.num = 1; return }
+		showvalue.value.num += e;
+		stringjh.value = toFixed4ByPadStart(showvalue.value.num)
+	}
+	// 
+	const fag = (e) => {
+		let str = '';
+		addupimg.value.forEach(item => {
+			str += item + ','
+		})
+
+		let obj = {
+			jhId: showvalue.value.id,
+			jhNum: showvalue.value.num,
+			jhType: e,
+			jhPic: str == '' ? null : str,
+			cgdId: showvalue.value.cgdId
+		}
+		pickingInfo(obj).then(res => {
+			console.log(`入参`, obj)
+			console.log(`返回`, res)
+			uni.showToast({
+				icon: 'none',
+				title: res.message ? res.message : '操作成功'
+			})
+			if (res.success) {
+				plsbuy.value[lefttarget.value].totalPrice = res.result.cgdTotalPrice
+				albumlist.value = [];
+				addupimg.value = [];
+				openjianhuo.value = false;
+				open.value = 0;
+				form.cgdId = plsbuy.value[lefttarget.value].id;
+				plsbuy.value[lefttarget.value] = res.result.cgdInfo;
+				queryInvo(middletarget.value)
+			}
+		})
+	}
+	const addupimg = ref([])
+	const sctp = (e : number) => {
+		if (albumlist.value.length == 0) {
+			fag(e)
+			return
+		}
+		let now = new Date();
+		let year = now.getFullYear();
+		let month = now.getMonth() + 1;
+		albumlist.value.forEach(item => {
+			uni.uploadFile({
+				url: uni.getStorageSync('serverUrl') + '/sys/common/upload',
+				filePath: item,
+				name: 'file',
+				formData: {
+					biz: year + '/' + month + '/jhPic'
+				},
+				header: {
+					'X-Access-Token': uni.getStorageSync('token')
+				},
+				success: res => {
+					const data = JSON.parse(res.data)
+					addupimg.value.push(data.message)
+					if (addupimg.value.length == albumlist.value.length) {
+						fag(e)
+					}
+				},
+				fail: () => {
+					uni.showToast({ title: '上传失败', icon: 'none' })
+				}
+			})
+
+		})
+
+	}
+
+	const config = (e) => {
+		// console.log("ceshi",Number(stringjh.value))
+		if (!Number(stringjh.value)) {
+			uni.showToast({ title: '数量为0的时候，无法销账或入库', icon: 'none' })
+			return
+		}
+
+		if (e == 1) {
+			open.value = 2;
+		} else {
+			sctp(0)
+		}
+	}
 	// 配置
 	const SEG_COUNT = 8;       // 分段数量
 	const PADDING = 2;        // 外层 padding（rpx）
@@ -1374,7 +1998,7 @@
 	const textStyle = computed(() => ({
 		color: segColors.value[0] || rgbToHex(from),
 		fontSize: '30rpx',
-		fontWeight: '500',
+		fontWeight: '600',
 		zIndex: 3
 	}));
 
@@ -1391,6 +2015,7 @@
 	onUnmounted(() => {
 		if (timer) clearInterval(timer);
 	});
+	const jiansuotarget = ref(false);
 </script>
 
 <style lang="less" scoped>
@@ -1402,20 +2027,21 @@
 		display: flex;
 
 		.contain-left {
-			height: 82vh;
+			height: 95vh;
 			width: 30%;
 			position: relative;
+			z-index: 99;
 
 			.left-select-more {
 				position: absolute;
-				top: 8.5%;
+				top: 7%;
 				left: 0;
 				width: 100%;
 				height: 83%;
 				background-color: #fff;
 				border-radius: 30rpx;
 				box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-				z-index: 100;
+				z-index: 9999;
 				padding: 0 50rpx;
 
 				.more-bottom {
@@ -1438,7 +2064,7 @@
 					}
 
 					.bottom-right {
-						padding: 0 30rpx;
+						padding: 0 50rpx;
 						height: 80rpx;
 						color: #0385FA;
 						border: 1rpx solid #0385FA;
@@ -1459,7 +2085,7 @@
 				}
 
 				.more-time {
-					margin-top: 20rpx;
+					margin-top: 50rpx;
 					font-size: 30rpx;
 				}
 
@@ -1487,6 +2113,14 @@
 						align-items: center;
 					}
 
+					.more-black {
+						font-size: 28rpx;
+						width: 200rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+					}
+
 					.more-img {
 						width: 35rpx;
 						height: 35rpx;
@@ -1503,11 +2137,13 @@
 				}
 
 				.more-statues-father {
-					width: 100%;
+					width: 103%;
 					height: 7vh;
 					margin-top: 30rpx;
 					display: flex;
 					margin-left: -10rpx;
+					// background-color: green;
+					justify-content: space-between;
 					// align-items: center;
 
 					.more-statues-gray {
@@ -1517,7 +2153,8 @@
 
 					.more-statues-button {
 						width: 30%;
-						margin-right: 2%;
+						// margin-right: 2%;
+						margin: 0 1%;
 						height: 5.5vh;
 						border-radius: 40rpx;
 						font-size: 28rpx;
@@ -1532,13 +2169,13 @@
 
 					.more-statues-button-target {
 						width: 30%;
-						margin-right: 2%;
+						margin: 0 1%;
 						height: 5.5vh;
 						border-radius: 40rpx;
 						font-size: 28rpx;
-						background-color: #DFF4FC;
+						background-color: #fff;
 						border: 1rpx solid #0da6f8;
-						color: #1083F8;
+						color: #0da6f8;
 						display: flex;
 						justify-content: center;
 						align-items: center;
@@ -1577,11 +2214,14 @@
 					align-items: center;
 					box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.1);
 				}
+
+
+
 			}
 
 			.statues-father {
 				width: 100%;
-				height: 7vh;
+				height: 1.5vh;
 				display: flex;
 				align-items: center;
 				margin-top: -4rpx;
@@ -1612,9 +2252,9 @@
 					height: 4vh;
 					border-radius: 40rpx;
 					font-size: 28rpx;
-					background-color: #DFF4FC;
+					background-color: #fff;
 					border: 1rpx solid #0da6f8;
-					color: #1083F8;
+					color: #0da6f8;
 					display: flex;
 					justify-content: center;
 					align-items: center;
@@ -1623,7 +2263,7 @@
 			}
 
 			.left-menu-father {
-				margin-top: 1.3vh;
+				// margin-top: 1.3vh;
 				width: 100%;
 				height: 85vh;
 
@@ -1633,7 +2273,7 @@
 
 					.pls-card {
 						width: 100%;
-						height: 27vh;
+						height: 25.3vh;
 						border: #0f9fff 3rpx solid;
 						background-color: #fff;
 						border-radius: 40rpx;
@@ -1642,7 +2282,6 @@
 						position: relative;
 
 						.pls-card-title {
-							margin-top: 1vh;
 							height: 5.5vh;
 							width: 105%;
 							display: flex;
@@ -1664,6 +2303,7 @@
 									font-weight: 600;
 									font-size: 40rpx;
 									margin-right: 35rpx;
+									color: #555555;
 								}
 
 								.title-right-img {
@@ -1679,9 +2319,24 @@
 						.pls-card-middle {
 							width: 100%;
 							height: 11vh;
-							margin-top: 1vh;
-							// background-color: blue;
+							margin-top: 1.5vh;
 							display: flex;
+							position: relative;
+
+							.middle-heng {
+								position: absolute;
+								left: 4%;
+								top: 35%;
+								transform: translateY(-35%);
+								width: 92%;
+								height: 2px;
+								/* 虚线粗细 */
+								background-image: repeating-linear-gradient(to right,
+										#E5E5E5 0,
+										#E5E5E5 6px,
+										transparent 6px,
+										transparent 10px);
+							}
 
 							.pls-card-middle-one {
 								width: 33.3%;
@@ -1690,11 +2345,12 @@
 								// background-color: yellow;
 								.middle-title {
 									width: 100%;
-									height: 2vh;
+									height: 2.1vh;
 									// background-color: #007CFF;
 									color: #888888;
 									text-align: center;
 									font-size: 25rpx;
+									overflow: hidden;
 								}
 
 								.middle-heng-father {
@@ -1702,21 +2358,19 @@
 									height: 4vh;
 									position: relative;
 
-									.middle-heng {
-										width: 100%;
-										height: 0.8vh;
+									.middle-ball-img {
+										width: 35rpx;
+										height: 35rpx;
 										position: absolute;
-										left: 0;
 										top: 50%;
-										transform: translateY(-50%);
-										background-color: #EEEEEE;
-
+										left: 50%;
+										transform: translate(-50%, -50%);
 									}
 
 									.middle-ball {
-										width: 30rpx;
-										height: 30rpx;
-										background-color: #EEEEEE;
+										width: 20rpx;
+										height: 20rpx;
+										background-color: #1083F8;
 										position: absolute;
 										top: 50%;
 										left: 50%;
@@ -1728,6 +2382,7 @@
 								.end-font {
 									width: 100%;
 									height: 6vh;
+									font-size: 23rpx;
 									text-align: center;
 									color: #666666;
 									overflow: hidden;
@@ -1740,7 +2395,7 @@
 						.pls-card-end {
 							width: 100%;
 							height: 7vh;
-							margin-top: 1vh;
+
 							display: flex;
 							justify-content: space-between;
 							position: relative;
@@ -1791,6 +2446,7 @@
 								justify-content: center;
 								background-color: #ECF6FF;
 								color: #1083F8;
+								border: 1rpx solid #1083F8;
 								position: absolute;
 								right: -5rpx;
 								bottom: 20rpx;
@@ -1816,77 +2472,58 @@
 				position: relative;
 
 				.contain-right-button {
+					width: 7.3vw;
+					height: 3.3vw;
+					background: #FFFFFF;
+					border-radius: 1.65vw;
+					border: 1px solid #D9DADC;
+					font-weight: 400;
+					font-size: 1.4vw;
+					color: #222;
 					display: flex;
 					justify-content: center;
 					align-items: center;
-					height: 100%;
-					padding: 0 35rpx;
-					border-radius: 40rpx;
-					border: 1rpx solid #555555;
-					margin-left: 20rpx;
+					margin: 0 0 0 0.7vw;
+					color: #555555;
 
-					.buttont-img {
-						width: 40rpx;
-						height: 40rpx;
-						margin-right: 5rpx;
-						// margin-top: 4rpx;
-					}
-
-					.button-font {
-						font-size: 30rpx;
-						color: #555555;
+					image {
+						width: 1.5vw;
+						height: 1.5vw;
+						margin: 0 0.2vw 0 0;
 					}
 				}
 
-				.contain-right-button-bad {
+				.contain-right-title-bad {
+					width: 7.3vw;
+					height: 3.3vw;
+					background: #f8f8f8;
+					border-radius: 1.65vw;
+					border: 1px solid #D9DADC;
+					font-weight: 400;
+					font-size: 1.4vw;
+					color: #999;
 					display: flex;
 					justify-content: center;
 					align-items: center;
-					height: 100%;
-					padding: 0 35rpx;
-					border-radius: 40rpx;
-					border: 1rpx solid #555555;
-					margin-left: 20rpx;
-					background-color: #D9DADC;
-					color: #999999;
+					margin: 0 0 0 0.7vw;
+					color: #555555;
 
-					.buttont-img {
-						width: 40rpx;
-						height: 40rpx;
-						margin-right: 5rpx;
-						// margin-top: 4rpx;
-					}
-
-					.button-font {
-						font-size: 30rpx;
-						// color: #555555;
+					image {
+						width: 1.5vw;
+						height: 1.5vw;
+						margin: 0 0.2vw 0 0;
 					}
 				}
 
-				.contain-right-button-target {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					height: 100%;
-					padding: 0 35rpx;
-					border-radius: 40rpx;
-					border: 1rpx solid #3699FF;
-					margin-left: 20rpx;
-					// background-color: #D9DADC;
+				.contain-right-button:active {
 					color: #1083F8;
-
-					.buttont-img {
-						width: 40rpx;
-						height: 40rpx;
-						margin-right: 5rpx;
-						// margin-top: 4rpx;
-					}
-
-					.button-font {
-						font-size: 30rpx;
-						// color: #555555;
-					}
+					background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
+					border: 1px solid #1083F8;
+					transition: .4s;
+					-webkit-transform-style: preserve-3d;
+					-webkit-overflow-scrolling: touch;
 				}
+
 			}
 
 			.contain-right-middle {
@@ -1895,21 +2532,19 @@
 				margin-top: 20rpx;
 
 				.middle-Y {
-					width: 100%;
+					width: 97%;
 					height: 100%;
+					margin-left: 3%;
 
 					.middle-Y-father {
 						display: flex;
-						// flex-wrap: wrap;
-						// width: 100%;
-						padding-left: 20rpx;
-
+						
 						.middle-one {
 							min-width: 325rpx;
 							height: 450rpx;
 							background-color: #F9F9F9;
 							border-radius: 30rpx;
-							margin-left: 20rpx;
+							margin-right: 20rpx;
 							margin-bottom: 30rpx;
 							display: flex;
 							flex-direction: column;
@@ -1937,13 +2572,13 @@
 									display: block;
 									font-weight: 600;
 									font-size: 30rpx;
-									margin-bottom: 7rpx;
+									margin-bottom: 15rpx;
 									text-align: center;
 								}
 
 								.right-middle {
 									// margin-bottom: 7rpx;
-
+									height: 15rpx;
 								}
 							}
 						}
@@ -2006,11 +2641,13 @@
 			height: 100%;
 			width: 30%;
 			padding-left: 30rpx;
+			padding-top: 30rpx;
 
 			.left-img {
 				width: 250rpx;
 				height: 250rpx;
 				margin-left: 50rpx;
+				margin-top: 2vw;
 			}
 
 			.left-tags {
@@ -2020,7 +2657,7 @@
 			}
 
 			.tags-one {
-				width: 130rpx;
+				min-width: 130rpx;
 				height: 60rpx;
 				display: flex;
 				justify-content: center;
@@ -2028,9 +2665,10 @@
 				border-radius: 30rpx;
 				border: 1rpx solid #D2D2D2;
 				margin-left: 20rpx;
-				margin-top: 20rpx;
-				font-size: 25rpx;
+				margin-top: 10rpx;
+				font-size: 23rpx;
 				color: #555555;
+				padding: 0 0.5vw;
 			}
 		}
 
@@ -2080,6 +2718,7 @@
 
 					.right-text {
 						font-size: 32rpx;
+						color: #555555;
 					}
 				}
 			}
@@ -2097,8 +2736,8 @@
 	}
 
 	.title-input-img {
-		width: 50rpx;
-		height: 50rpx;
+		width: 35rpx;
+		height: 35rpx;
 		position: absolute;
 		right: 220rpx;
 		top: 50%;
@@ -2137,6 +2776,7 @@
 		top: 0;
 		left: 0;
 		z-index: 100;
+		background: RGBA(239, 240, 244, 0.55);
 	}
 
 	.popup-share {
@@ -2477,11 +3117,11 @@
 		transform: translate(-50%, -50%);
 		width: 50%;
 		height: 55%;
-		border-radius: 30rpx;
+		border-radius: 40rpx;
 		background-color: #fff;
 		transition: all 0.3s;
 		z-index: 999;
-		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
+		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
 		padding: 0 60rpx;
 	}
 
@@ -2492,11 +3132,11 @@
 		transform: translate(-50%, -50%);
 		width: 50%;
 		height: 95%;
-		border-radius: 30rpx;
+		border-radius: 40rpx;
 		background-color: #fff;
 		transition: all 0.3s;
 		z-index: 999;
-		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
+		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
 		padding: 0 60rpx;
 
 		.jianhuobutton {
@@ -2512,20 +3152,21 @@
 		top: 54%;
 		left: 50%;
 		transform: translate(-50%, -50%);
-		width: 70%;
+		width: 80%;
 		height: 83%;
 		border-radius: 30rpx;
 		background-color: #fff;
 		transition: all 0.3s;
 		z-index: 999;
-		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.2);
+		box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
 		padding: 0 90rpx;
 
 		.photowall-title {
-			margin-top: 80rpx;
+			margin-top: 50rpx;
 			display: flex;
 			justify-content: space-between;
 			width: 100%;
+			margin-bottom: 50rpx;
 
 			.photowall-name {
 				font-size: 38rpx;
@@ -2543,62 +3184,86 @@
 		}
 
 		.photowall-other {
-			width: 110%;
+			width: 107%;
+			height: 67vh;
 			display: flex;
-			flex-wrap: wrap;
-			margin-top: 40rpx;
+			margin-top: 20rpx;
 
 			.photowall-other-one {
 				width: 28.5%;
-				height: 400rpx;
-				margin-right: 3%;
-				margin-bottom: 3%;
+				height: 430rpx;
+				margin-right: 3vw;
+				margin-bottom: 0%;
 				border-radius: 30rpx;
-				// background-color: red;
+				display: inline-block;
+				position: relative;
 			}
 		}
 	}
 
 	.gray-button {
 		font-size: 50rpx;
-		background-color: #F3F5F9;
+		background-color: #f3f5f9;
+		// box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.12);
 		border-radius: 20rpx;
 		width: 100rpx;
 		height: 100rpx;
-		border: 1rpx solid #CBCFD0;
+		border: 1rpx solid #eeeeee;
 		display: flex;
 		justify-content: center;
 		align-items: center;
 		margin-right: 10rpx;
 	}
 
+	.gray-button:active {
+		background: linear-gradient(to top, #00C9FF, #0076FF);
+		color: #fff;
+		font-size: 44rpx;
+		font-weight: 700;
+		border: 1rpx solid #00C9FF;
+	}
+
+	.gray-button-jianpan:active {
+		background: linear-gradient(to top, #00C9FF, #0076FF);
+		color: #fff;
+		font-size: 44rpx;
+		font-weight: 700;
+		border: 1rpx solid #00C9FF;
+	}
+
 	.gray-button-jianpan {
 		font-size: 40rpx;
 		font-weight: 600;
-		background-color: #F3F5F9;
-		border-radius: 30rpx;
+		background-color: #f3f5f9;
+		border-radius: 35rpx;
+		// box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.12);
+		color: #555555;
 		width: 100rpx;
 		height: 100rpx;
-		border: 1rpx solid #CBCFD0;
+		border: 1rpx solid #eeeeee;
 		display: flex;
 		justify-content: center;
 		align-items: center;
 		margin-right: 30rpx;
 		margin-bottom: 20rpx;
+		transition: .1s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
 	}
 
 	.gray-input {
 		font-size: 50rpx;
 		font-weight: 600;
-		background-color: #F3F5F9;
+		background-color: #f3f5f9;
 		border-radius: 20rpx;
-		// width: 100rpx;
+		// box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.12);
 		padding: 0 30rpx;
 		letter-spacing: 10rpx;
+
 		height: 100rpx;
-		border: 1rpx solid #CBCFD0;
+		border: 1rpx solid #eeeeee;
 		display: flex;
-		justify-content: center;
+		justify-content: flex-end;
 		align-items: center;
 		padding-left: 40rpx;
 		margin-right: 10rpx;
@@ -2606,7 +3271,171 @@
 
 	.jianhuo-jianpan {
 		position: absolute;
-		right: 0rpx;
-		bottom: 15%;
+		right: -10rpx;
+		bottom: 12%;
+	}
+
+	.text-anim {
+		animation: colorScale 2s linear infinite;
+		transform-origin: left bottom;
+		animation-iteration-count: 1;
+		color: #1083F8;
+	}
+
+	@keyframes colorScale {
+		0% {
+			color: #1083F8;
+			transform: scale(calc(1));
+		}
+
+		50% {
+			color: #333333;
+			transform: scale(calc(3));
+		}
+
+		100% {
+			color: #1083F8;
+			transform: scale(calc(1));
+		}
+	}
+
+	.calendar-father {
+		position: fixed;
+		top: 350rpx;
+		left: 60rpx;
+		width: 700rpx;
+		height: 600rpx;
+		background-color: #fff;
+		z-index: 999;
+	}
+
+	.input-next {
+		position: fixed;
+		bottom: 850rpx;
+		left: 40rpx;
+		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;
+
+		.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;
+	}
+
+	.moban-photo {
+		width: 40%;
+		height: 150rpx;
+		margin-right: 4%;
+		margin-top: 3%;
+		background-color: #F9F9F9;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 20rpx;
+		border-radius: 0.6vw;
+		overflow: hidden;
+		position: relative;
+	}
+
+	.moban-photo-special {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		background-color: #fafdff;
+		border: 1rpx solid #c4ebff;
+		border-radius: 20rpx;
+	}
+
+	.jianhuobutton-gray {
+		background-color: #f8f8f8;
+		color: #555555;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #555555;
+		width: 180rpx;
+		height: 70rpx;
+		border-radius: 40rpx;
+		box-shadow: 0 4rpx 6rpx rgba(0, 0, 0, 0.1);
+		margin-left: 20rpx;
+	}
+
+	.jianhuobutton-gray-bad {
+		background-color: #f8f8f8;
+		color: #999;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		// color: #555555;
+		width: 180rpx;
+		height: 70rpx;
+		border-radius: 40rpx;
+		box-shadow: 0 4rpx 6rpx rgba(0, 0, 0, 0.1);
+		margin-left: 20rpx;
+	}
+
+	.bottom-left:active,
+	.title-input-button:active,
+	.donghua-do:active,
+	.contain-right-button:active,
+	.jianhuobutton-gray:active {
+		color: #1083F8;
+		background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
+		border: 1px solid #1083F8;
+		transition: .4s;
+		-webkit-transform-style: preserve-3d;
+		-webkit-overflow-scrolling: touch;
+	}
+
+	.noarray {
+		width: 90%;
+		height: 100%;
+		// background-color: red;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+
+		.noarray-img {
+			margin-top: -200rpx;
+			width: 350rpx;
+			height: 350rpx;
+		}
+
+	}
+
+	.noarray-font {
+		margin-top: -60rpx;
+		color: #888888;
+		font-size: 25rpx;
+	}
+
+	.nomessage-samll {
+		width: 100%;
+		height: 100%;
+		// background-color: red;
+		display: flex;
+		// justify-content: center;
+		align-items: center;
+		flex-direction: column;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 2b4d519..0c04948 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="contain">
 		<view
-			v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata || opencgr || opengys"
+			v-show="moreindex!=-1 || topbuttontarget!=-1 || openjianhuo || opengaijia || opendata"
 			class="mengban" :style="opencgr||opengys||opendata ?{background:`transparent`}:{}"
 			@click="moreindex=-1; topbuttontarget=-1;openjianhuo=false;opengaijia=false;opendata=false;opencgr=false;opengys=false;albumlist=[]">
 		</view>
@@ -255,7 +255,6 @@
 				<view class="gray-input" style="width:12vw;">
 					<text v-for="(v,i) in stringjh" :key="i">{{v}}</text>
 				</view>
-				<!-- <text></text>{{showvalue.num}} -->
 				<view class="gray-button" @click="jjnum(1)" @longpress="handleTouchStart(1)" @touchend="handleTouchEnd">
 					+
 				</view>
@@ -414,8 +413,6 @@
 			</scroll-view>
 		</view>
 
-
-
 		<view class="contain-left">
 			<view v-show="openselect" class="mengban" style="background: transparent;" @click="openselect=false"></view>
 			<view class="left-select-more" v-show="openselect">
@@ -428,7 +425,6 @@
 						<text style="font-size: 25rpx;margin-top: 5rpx;" v-if="alltotal>=99">
 							(99+采购单)
 						</text>
-
 					</view>
 				</view>
 				<view class="more-title">
@@ -449,7 +445,6 @@
 					</view>
 				</view>
 
-
 				<view class="more-time">
 					采购日期
 				</view>
@@ -591,8 +586,6 @@
 								</view>
 
 								<view class="middle-heng-father">
-
-									<!-- <view class="middle-ball" :style="{backgroundColor: `#1083F8`}"></view> -->
 									<view class="middle-ball" :style="{backgroundColor: `#E5E5E5`}"
 										v-if="Number(v.status)!=2"></view>
 									<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
@@ -628,7 +621,6 @@
 				<view class="left-top-tags">
 					<view class="wuliao-title">
 						物料信息
-						<!-- <view class="wuliao-heng"></view> -->
 					</view>
 				</view>
 				<view :class=" `contain-right-button`" @click="donghuastart(0)" style="width: 10vw;">
@@ -670,7 +662,6 @@
 							<image class="middle-img"
 								:src="v.materialImg?serverUrl + v.materialImg : '/static/index/warehouse/procurement/k.png'"
 								mode="aspectFill"></image>
-							<!-- <image class="middle-img" :src=" '/static/zhiniaoku.png'" mode="aspectFill"></image> -->
 							<view class="middle-right">
 								<view class="right-title">
 									{{ v.wlName }}
@@ -802,15 +793,6 @@
 							<view class="title-left">
 								{{showvalue.wlName}}
 							</view>
-							<!-- <view class="title-right">
-								<text
-									style="position: absolute;top: 8rpx;left: -35rpx;font-weight: 300;font-size: 28rpx;">
-									￥
-								</text>
-								<view style="color: #555555;">
-									{{Number(showvalue.totalPrice).toFixed(2) }}
-								</view>
-							</view> -->
 						</view>
 						<view class="bottom-right-middle">
 							<view class="middle-onecard">
@@ -860,7 +842,6 @@
 								</view>
 								<view class="gray-heng"></view>
 							</view>
-							<!-- <view class="gray-heng"></view> -->
 							<view class="middle-onecard">
 								<view class="threeone">
 									<view class="gray-text">
@@ -888,7 +869,6 @@
 								</view>
 								<view class="gray-heng"></view>
 							</view>
-							<!-- <view class="gray-heng"></view> -->
 							<view class="middle-onecard">
 								<view class="threeone">
 									<view class="gray-text">
@@ -987,16 +967,6 @@
 								</view>
 							</view>
 						</view>
-						<!-- <view
-							style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 20rpx;"
-							v-if="lhjlarr.length">
-							<image v-if="statustory=='loading'"
-								style="width: 25rpx;height: 25rpx;margin-right: 10rpx;margin-top: 5rpx;margin-left: -10rpx;"
-								src="/static/index/warehouse/procurement/picking/loading.png" />
-							<text v-if="statustory=='loading'">上划加载更多</text>
-							<text v-if="statustory=='nomore'">已加载全部~</text>
-							<text v-if="statustory=='loadmore'">加载中~</text>
-						</view> -->
 
 					</scroll-view>
 					<view style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 40rpx;"
@@ -1179,6 +1149,7 @@
 	const filteredCgrList = ref([]);
 
 	const closefilteredCgrList = () => {
+		console.log("?????????")
 		filteredCgrList.value = [];
 		cgrvalue.value = plzinfo.cgBy;
 	}
@@ -1497,7 +1468,7 @@
 		middletarget.value = index;
 		showvalue.value = InvoicingList.value[index];
 		showvalue.value.jianhuobtn = false;
-		Invoiscroll.value = (index - 2) * 205;
+		Invoiscroll.value = (index - 2) * 172;
 		if (Number(showvalue.value.status) == 0 || (Number(showvalue.value.status) > 0 && Number(showvalue.value.wrksl) > 0)) {
 			showvalue.value.maxnum = (showvalue.value.rksl == 0 && showvalue.value.wrksl == 0 && showvalue.value.xzsl == 0) ? showvalue.value.purchaseQuantity : showvalue.value.wrksl
 			showvalue.value.num = showvalue.value.maxnum;
@@ -2524,21 +2495,19 @@
 				margin-top: 20rpx;
 
 				.middle-Y {
-					width: 100%;
+					width: 97%;
 					height: 100%;
+					margin-left: 3%;
 
 					.middle-Y-father {
 						display: flex;
-						// flex-wrap: wrap;
-						// width: 100%;
-						padding-left: 20rpx;
-
+						
 						.middle-one {
 							min-width: 325rpx;
 							height: 450rpx;
 							background-color: #F9F9F9;
 							border-radius: 30rpx;
-							margin-left: 20rpx;
+							margin-right: 20rpx;
 							margin-bottom: 30rpx;
 							display: flex;
 							flex-direction: column;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d3101e9..60a3d94 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -191,7 +191,7 @@
 		return typeof str === 'string' && str.length === 11;
 	}
 	const jumpTo = (url : string) => {
-		uni.redirectTo({
+		uni.navigateTo({
 			url: url
 		});
 	}
diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index fe39f1a..d8ebebe 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -156,7 +156,7 @@
 		()=>props.show,
 		()=>{
 			if(props.show){
-				console.log(props.caigouobj)
+				// console.log(props.caigouobj)
 				let a = [
 					{
 						multiUnitType:1,
@@ -172,16 +172,17 @@
 					},
 					{
 						multiUnitType:3,
-						price:props.caigouobj.referenceUnitPrice,
+						price:props.caigouobj.unitPrice,
 						unit:props.caigouobj.materialUnits,
 						num:1
 					}
 				];
+				
 				if(props.caigouobj.wlUnits){
 					type.value = a.find(item=>
 						item.unit == props.caigouobj.wlUnits
 					);
-					console.log(props.caigouobj.wlUnits,type.value)
+					// console.log(props.caigouobj.wlUnits,type.value)
 				}else{
 					type.value = a.find(item=>
 						item.multiUnitType == props.caigouobj.multiUnitType
@@ -190,13 +191,15 @@
 				
 				cgdwarr.value = []
 				downslength.value = 0;
+				// console.log("a",a)
 				a.forEach((element:any)=>{
 					if(element.unit&&element.num){
 						cgdwarr.value.push(element)
+						// console.log("!!!!",element)
 					}
 				})
 				
-				console.log("a",a)
+				// console.log("a",a)
 				let n = [];
 				let id = [];
 				gysarr.value = [];
@@ -252,7 +255,10 @@
 		console.log(sx.value,num,bl)
 	}
 	const cd =(v,i)=>{
+		
+		// return
 		type.value = v;
+		// console.log("cd",type.value,cgdwarr.value)
 		cgdwflag.value = false;
 		cgdwec.value = false;
 		jssl()
@@ -334,6 +340,7 @@
 			return
 		}
 		
+	
 		emit('right', relNumber.value,gysarr.value[gysidnum.value],type.value)
 	}
 	const colse = ()=>{
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 5887979..64d6ef1 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -379,6 +379,7 @@
 			return
 		}
 		timers.value = false;
+		
 		let dt = {
 			nuId: form.nuId,
 			purchaseQuantity: num,
@@ -390,7 +391,10 @@
 			referenceUnitPrice: type.price,
 			dhbl: type.num
 		}
+		console.log("注意",dt)
+	
 		addShoppingCartList([dt]).then(res => {
+			
 			uni.showToast({
 				icon: res.success ? 'success' : 'none',
 				title: res.message
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index f9c265a..8e9edec 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -105,7 +105,7 @@
 				item.zk = false;
 				item.scrollleft = 0;
 	 		})
-			console.log(res.result.records)
+			// console.log(`最上层`,res.result.records)
 	 		InvoicingList.value.push(...res.result.records);
 	 		status.value = res.result.total == InvoicingList.value.length ? 'nomore' : 'loadmore';
 	 	})
@@ -118,8 +118,9 @@
 	 }
 	 
 	 const addcartory =(e:any)=>{
-	 	console.log(e)
+	 	console.log(`eeeeeeeeeee`,e)
 	 	 caigouobj.value = e;
+		 
 	 	 addflag.value = true;
 	 }
 	 const confirm =(e:any)=>{
@@ -187,7 +188,10 @@
 			})
 		}
 		const right = (n:number,nm:any,type:Object) => {
-			connfig(nm,n,type)
+			setTimeout(()=>{
+				connfig(nm,n,type)
+			},30)
+			
 		}
 		const timers = ref(true)
 		const connfig = (nm:any,num:Number,type:Object) =>{
@@ -206,7 +210,8 @@
 				dhbl:type.num
 			}
 			 
-			console.log(dt)
+			console.log(`111111111111111111111111111111`,dt)
+			
 			eddShoppingCartList(dt).then(res=>{
 				uni.showToast({
 					icon:res.success?'success':'none',
diff --git a/pages/watch/index.vue b/pages/watch/index.vue
index cade83c..5431f2d 100644
--- a/pages/watch/index.vue
+++ b/pages/watch/index.vue
@@ -232,7 +232,7 @@
 
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, reactive } from 'vue';
-	import { onShow, onLoad, onHide } from "@dcloudio/uni-app"
+	import { onShow, onLoad, onHide,onBackPress } from "@dcloudio/uni-app"
 	import { movedirection, queryPadPageList } from './api/lunpan.js'
 	import joysticknew from '@/component/public/newgame/joysticknew.vue';
 
@@ -240,6 +240,10 @@
 	onLoad(() => {
 		cameraArray.value = cameraSmall;
 	})
+	// 我这么写是为了防止安卓组件被销毁
+	onBackPress(() => {
+	  return true; // 禁止返回
+	})
 	const zyupgrade = ref(null);
 	const menuIndex = ref(-1);
 	const typeNow = ref(-1);