From 6cb384e20b18f1f74611759f668874f7f9a4734b Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Wed, 19 Nov 2025 11:09:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Warehouse/Warehouse.vue |  87 ++++++----
 pages/Warehouse/picking.vue   | 312 +++++++++++++++++++++-------------
 2 files changed, 247 insertions(+), 152 deletions(-)

diff --git a/pages/Warehouse/Warehouse.vue b/pages/Warehouse/Warehouse.vue
index 07bfaec..a3b2367 100644
--- a/pages/Warehouse/Warehouse.vue
+++ b/pages/Warehouse/Warehouse.vue
@@ -20,7 +20,7 @@
 					<!-- 采购增加层级高度方便点击 -->
 				</view>
 			</view>
-			<view class="annotation" :class="'annotation'+(i+1)" v-for="(v,i) in ['付款','采购','拣货','完结','护理单元','监控室']"
+			<view class="annotation" :class="'annotation'+(i+1)" v-for="(v,i) in ['付款','采购','拣货','完结','护理单元','监控室','请领出库','退货入库']"
 				:key='i' @click="onlyjump(i)">
 				<view> </view>
 				<view class="tp">
@@ -59,10 +59,53 @@
 		},
 	});
 	const housedex = ref(-1);
-
+	const forthmenuIndex = ref<number>(0);
+	const lastTap = ref(0)
+	const DOUBLE_TAP_DELAY = 300;
+	const setout = ref(null)
 	const housactive = (index : number) => {
-		console.log("点击哪个了",index)
-		if (index > 5) { return }
+		housedex.value = index;
+			const now = Date.now()
+			forthmenuIndex.value = i
+			if (now - lastTap.value < DOUBLE_TAP_DELAY) {
+				// 双击成立
+				clearTimeout(setout.value)
+				 if (index == 1) {
+				 	navurl.value = 'pages/procurement/material'
+				 	uni.navigateTo({
+				 		url: '/' + navurl.value
+				 	})
+				 }
+				 if (index == 2) {
+				 	navurl.value = 'pages/Warehouse/picking'
+				 	uni.navigateTo({
+				 		url: '/' + navurl.value
+				 	})
+				 }
+				 if (index == 3) {
+				 	navurl.value = 'pages/Warehouse/finish'
+				 	uni.navigateTo({
+				 		url: '/' + navurl.value
+				 	})
+				 }
+				// 重置，避免多次触发
+				lastTap.value = 0
+			} else {
+				setout.value = setTimeout(()=>{
+					console.log("点击哪个了",index)
+					 if (index === 5) {
+					 	uni.navigateTo({
+					 		url: "/pages/watch/full"
+					 	})
+					 }
+					 
+				},DOUBLE_TAP_DELAY)
+				// 记录本次时间，等待下次点击
+				lastTap.value = now
+			}
+		
+		
+		
 		if(housedex.value == index){
 			if (housedex.value == 0) {
 				navurl.value = 'pages/Warehouse/paymoney'
@@ -70,34 +113,10 @@
 					url: '/' + navurl.value
 				})
 			}
-			if (housedex.value == 1) {
-				navurl.value = 'pages/procurement/material'
-				uni.navigateTo({
-					url: '/' + navurl.value
-				})
-			}
-			if (housedex.value == 2) {
-				navurl.value = 'pages/Warehouse/picking'
-				uni.navigateTo({
-					url: '/' + navurl.value
-				})
-			}
-			if (housedex.value == 3) {
-				navurl.value = 'pages/Warehouse/finish'
-				uni.navigateTo({
-					url: '/' + navurl.value
-				})
-			}
+			
 			return
 		}
-		housedex.value = index;
-		// console.log("index", index)
-		// 只有中心的四个有动画.....所以点不到监控室
-		if (index === 5) {
-			uni.navigateTo({
-				url: "/pages/watch/full"
-			})
-		}
+		
 	}
 	onMounted(() => {
 		housedex.value = 1
@@ -512,6 +531,14 @@
 			top: 24vw;
 			right: 6vw;
 		}
+		.annotation7 {
+			top: 62vh;
+			left: 40vw;
+		}
+		.annotation8 {
+			top: 5vh;
+			left: 28vw;
+		}
 
 		// title
 		.annotation {
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 7389561..aed1917 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -39,7 +39,7 @@
 			<view style="width: 100%;margin-top: 50rpx;font-size: 30rpx;">
 				采购单价:
 				<text style="color: #888888;">
-					￥1.50
+					￥{{ gaijia }}
 				</text>
 
 			</view>
@@ -47,17 +47,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>
@@ -66,50 +66,50 @@
 			</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">
+					<view class="gray-button-jianpan" @click="press('AC')">
 						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>
@@ -234,7 +234,7 @@
 					<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%;">
+				<view style="width: 40%;height: 150rpx;margin-right: 4%;margin-top: 3%;"  v-if="albumlist.length<4" @click="uplod">
 					<view style="
 					width: 100%;
 					height: 100%;
@@ -244,8 +244,7 @@
 					align-items: center;
 					background-color:#fafdff ;
 					border: 1rpx solid #c4ebff;
-					border-radius: 20rpx;" v-if="albumlist.length<4" @click="uplod">
-
+					border-radius: 20rpx;">
 						<image style="width: 50rpx;height: 50rpx;margin-bottom: 5rpx;"
 							src="/static/index/warehouse/procurement/picking/addphoto.png" />
 						<view style="color: #78B1EB;font-size: 25rpx;">
@@ -263,7 +262,8 @@
 				</view>
 			</view>
 			<view style="display: flex;margin-top: 30rpx;margin-left: 20rpx;">
-				<view class="gray-button"  @click="jjnum(-1)" @longpress="handleTouchStart(-1)" @touchend="handleTouchEnd">
+				<view class="gray-button" @click="jjnum(-1)" @longpress="handleTouchStart(-1)"
+					@touchend="handleTouchEnd">
 					-
 				</view>
 				<view class="gray-input" style="width:12vw;">
@@ -379,7 +379,6 @@
 					</view>
 				</view>
 				<view class="photowall-other-one" v-if="topbuttontarget==1">
-
 					<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 style="width: 70rpx;height: 70rpx;margin-bottom: 5rpx;"
@@ -579,7 +578,7 @@
 							</view>
 							<view class="pls-card-middle-one">
 								<view class="middle-title">
-									
+
 								</view>
 								<view class="middle-heng-father">
 									<view class="middle-heng"
@@ -643,10 +642,10 @@
 						随行单
 					</view>
 				</view>
-				<view :class="lefttarget==1?`contain-right-button`: `contain-right-button-bad`"
-					style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;">
+				<view :class="!Number(plsbuy[lefttarget]?.status)?`contain-right-button`: `contain-right-button-bad`"
+					style="border-color: #D9DADC;box-shadow: 0 1rpx 3rpx #D9DADC;" @click="bebad">
 					<image class="buttont-img"
-						:src="`/static/index/warehouse/procurement/picking/bebad${lefttarget==1?``:`target`}.png`" />
+						:src="`/static/index/warehouse/procurement/picking/bebad${!Number(plsbuy[lefttarget]?.status)?``:`target`}.png`" />
 					<view class="button-font">
 						作废
 					</view>
@@ -1072,32 +1071,77 @@
 			</view>
 		</view>
 
-		<view class="mengban" v-if="open>0" @click="open = 0"> </view>
+		<view class="mengban" v-if="open==1"> </view>
 		<equiment :open="open==1" @del="del()" @back="open = 0" :content="'是否删除此图片？'"></equiment>
-		<equiment :open="open==2" @del="sctp(1)" @back="open = 0" :content="'是否销账此物料？'"></equiment>
 	</view>
 </template>
 
 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps, onUnmounted } from 'vue';
-	import { pickingInfo,queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload } from './api/lunpan.js'
+	import { 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 superpicker from '@/component/public/superpicker.vue'
 	import equiment from './components/equiment.vue';
 	const open = ref(0);
 	const typechange = ref(0);
-	const stringjh = ref(0)
+	const stringjh = ref("")
 	const serverUrl = ref("");
 	const opengaijia = 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;
+				opengaijia.value = false;
+			}
+		})
+	}
+	// 计算器
+	function press(k : string) {
+		if (k === 'AC') {
+			gaijia.value = ''
+			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 = () => {
 		if (showvalue.value.jianhuobtn == false) {
 			return
@@ -1109,9 +1153,9 @@
 			donghuaopo.value = true;
 		}, 100)
 	}
-
 	const opengaijiaclick = () => {
 		opengaijia.value = true;
+		gaijia.value = (showvalue.value.arrivalPrice ? showvalue.value.arrivalPrice : showvalue.value.procurementPrice).toString()
 		donghuaopo.value = false;
 		setTimeout(() => {
 			donghuaopo.value = true;
@@ -1247,6 +1291,7 @@
 	const opencgr = ref(false);
 	const opengys = ref(false);
 
+
 	const cgrlist = ref([]);
 	const gyslist = ref([]);
 
@@ -1256,6 +1301,7 @@
 		})
 		getGysList().then((res : any) => {
 			gyslist.value = res.result;
+			console.log("isright", res)
 		})
 	}
 
@@ -1319,10 +1365,12 @@
 		queryCgdList(plzinfo).then((res : any) => {
 			plsbuy.value.push(...res.result.records)
 			alltotal.value = res.result.total
+			console.log("请购单数据呢???", res)
 			if (res.result.records.length) {
 				form.cgdId = plsbuy.value[0].id
-				queryInvo();
+				queryInvo(0);
 			}
+
 			if (res.result.records.length < plzinfo.pageSize) {
 				plzinfo.canpull = false;
 			}
@@ -1360,7 +1408,15 @@
 		form.cgdId = plsbuy.value[index].id
 		form.pageNo = 1
 		form.canpull = true;
-		queryInvo()
+		// console.log("!!!!",form)
+		queryCgdInfoList(form).then(res => {
+			InvoicingList.value = []
+			// console.log("数据呢", res.result.records)
+			InvoicingList.value.push(...res.result.records);
+			if (form.pageNo) {
+				clickmiddle(0);
+			}
+		})
 	}
 	const showvalue = ref({
 		materialImg: ""
@@ -1408,10 +1464,10 @@
 
 	}
 	const InvoicingList = ref([])
-	const queryInvo = () => {
-		queryCgdInfoList(form).then(res => {
-			InvoicingList.value=res.result.records;
-			clickmiddle(0);
+	const queryInvo = (index:number) => {
+		queryCgdInfoList(form).then(res => { 
+			InvoicingList.value=res.result.records; 
+			clickmiddle(index);
 		})
 	}
 	const search = () => {
@@ -1423,7 +1479,7 @@
 			alltotal.value = res.result.total
 			if (res.result.records.length) {
 				form.cgdId = plsbuy.value[0].id
-				queryInvo();
+				queryInvo(0);
 			}
 			if (res.result.records.length < plzinfo.pageSize) {
 				plzinfo.canpull = false;
@@ -1436,21 +1492,21 @@
 	}
 	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)
+	// 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;
-		}
-	}
+	// 	} else {
+	// 		moreindex.value = index;
+	// 	}
+	// }
 	const shareShow = ref(false);
 	const deletedownisopacity = ref(false)
 	const share = () => {
@@ -1481,13 +1537,21 @@
 	const badshow = ref(false);
 	const donghuacs = ref(false)
 	const bebad = () => {
-		badshow.value = true;
-		moreindex.value = -1;
-		donghuacs.value = false;
-		setTimeout(() => donghuacs.value = true, 50)
+		// console.log("ceshi",Number(plsbuy.value[lefttarget.value]?.status))
+		// console.log("right?",plsbuy.value[lefttarget.value])
+		if (!Number(plsbuy.value[lefttarget.value]?.status) && plsbuy.value.length) {
+			badshow.value = true;
+			moreindex.value = -1;
+			donghuacs.value = false;
+			setTimeout(() => donghuacs.value = true, 50)
+		}
+		// return
+
+
 	}
 	const zuofei = () => {
-		voidedCgdMain({ id: plsbuy.value[zuofeiindex.value].id }).then((res : any) => {
+		voidedCgdMain({ id: plsbuy.value[lefttarget.value].id }).then((res : any) => {
+			// console.log("res", res)
 			if (res.success) {
 				uni.showToast({
 					title: res.message,
@@ -1509,6 +1573,7 @@
 		donghuaopo.value = false;
 		setTimeout(() => {
 			donghuaopo.value = true;
+			console.log("zzz", donghuaopo.value)
 		}, 100)
 	}
 	// 上传
@@ -1518,17 +1583,17 @@
 			count: 1, //默认9
 			sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
 			sourceType: ['camera'], //从相册选择
-			crop:{
-				quality:60
+			crop: {
+				quality: 60
 			},
 			success: (e) => {
 				let ar = JSON.stringify(e.tempFilePaths)
 				uni.compressImage({
-				  src: JSON.parse(ar)[0],
-				  quality: 60,
-				  success: res => {
-					  albumlist.value.push(res.tempFilePath)
-				  }
+					src: JSON.parse(ar)[0],
+					quality: 60,
+					success: res => {
+						albumlist.value.push(res.tempFilePath)
+					}
 				})
 			}
 		});
@@ -1547,7 +1612,6 @@
 		deldex.value = -1;
 		open.value = 0;
 	}
-	//
 	const clickflag = ref(false);
 	const clknum = (item : any) => {
 		// showvalue.value.maxnum = showvalue.value.purchaseQuantity : showvalue.value.wrksl
@@ -1563,7 +1627,7 @@
 
 			return
 		}
-		if(clickflag.value==true){
+		if (clickflag.value == true) {
 			showvalue.value.num = item;
 			clickflag.value = false;
 			stringjh.value = toFixed4ByPadStart(showvalue.value.num)
@@ -1581,100 +1645,102 @@
 		}
 	}
 	// 数字转化
-	const digitCountByString=(n)=> {
+	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)=> {
+	const handleTouchStart = (e : number) => {
 		Interval(e)
 	}
-	const handleTouchEnd=()=> {
-	  clearInterval(InteroutId.value);
-	  // 清除定时器
+	const handleTouchEnd = () => {
+		clearInterval(InteroutId.value);
+		// 清除定时器
 	}
-	const Interval = (e:number)=>{
+	const Interval = (e : number) => {
 		InteroutId.value = setInterval(() => {
-		  jjnum(e); 
-		}, 120); 
+			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;
+	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)=>{
+	const fag = (e) => {
 		let str = '';
-		addupimg.value.forEach(item=>{
-			str+=item+','
+		addupimg.value.forEach(item => {
+			str += item + ','
 		})
-		
+
 		let obj = {
-			jhId:showvalue.value.id,
-			jhNum:showvalue.value.num,
-			jhType:xdex.value,
-			jhPic:str==''?null:str,
-			cgdId:showvalue.value.cgdId
+			jhId: showvalue.value.id,
+			jhNum: showvalue.value.num,
+			jhType: xdex.value,
+			jhPic: str == '' ? null : str,
+			cgdId: showvalue.value.cgdId
 		}
-		pickingInfo(obj).then(res=>{
+		pickingInfo(obj).then(res => {
 			uni.showToast({
-				icon:'none',
+				icon: 'none',
 				title: res.message
 			})
+			albumlist.value = [];
 			addupimg.value = [];
 			openjianhuo.value = false;
 			open.value = 0;
-			form.cgdId = plsbuy.value[lefttarget.value].id
-			queryInvo()
+			form.cgdId = plsbuy.value[lefttarget.value].id;
+			queryInvo(middletarget.value)
 		})
 	}
 	const xdex = ref(-1)
 	const addupimg = ref([])
-	const sctp = (e:number)=>{
-		if(albumlist.value.length==0){
+	const sctp = (e : number) => {
+		if (albumlist.value.length == 0) {
 			fag(e)
 			return
 		}
-		albumlist.value.forEach(item=>{
-			 uni.uploadFile({
-			    url: uni.getStorageSync('serverUrl')+'/sys/common/upload',  
-			    filePath:item,
-			    name: 'file',  
-				formData:{
-					biz:'jhPic'
+		albumlist.value.forEach(item => {
+			uni.uploadFile({
+				url: uni.getStorageSync('serverUrl') + '/sys/common/upload',
+				filePath: item,
+				name: 'file',
+				formData: {
+					biz: 'jhPic'
 				},
-				header:{
-					'X-Access-Token':uni.getStorageSync('token')
+				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' })
-			    }
-			  })
-			
+				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)=>{
+
+	const config = (e) => {
 		xdex.value = e;
-		if(e==1){
+		if (e == 1) {
 			open.value = 2;
-		}else{
+		} else {
 			sctp(0)
 		}
 	}
@@ -2087,6 +2153,7 @@
 									color: #888888;
 									text-align: center;
 									font-size: 25rpx;
+									overflow: hidden;
 								}
 
 								.middle-heng-father {
@@ -3007,10 +3074,11 @@
 		// width: 100rpx;
 		padding: 0 30rpx;
 		letter-spacing: 10rpx;
+
 		height: 100rpx;
 		border: 1rpx solid #CBCFD0;
 		display: flex;
-		justify-content: center;
+		justify-content: flex-end;
 		align-items: center;
 		padding-left: 40rpx;
 		margin-right: 10rpx;

From a0ffdf2bca1d500637a964385ff9da991dd80b4d Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Wed, 19 Nov 2025 13:32:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                   |   7 ++
 pages/Warehouse/Warehouse.vue                | 102 ++++++-------------
 pages/procurement/outbound.vue               |  32 ++++++
 unpackage/dist/dev/.nvue/pages/camera.js     |   2 +-
 unpackage/dist/dev/.nvue/pages/fullcamera.js |   2 +-
 5 files changed, 72 insertions(+), 73 deletions(-)
 create mode 100644 pages/procurement/outbound.vue

diff --git a/pages.json b/pages.json
index 80f91a6..fc1357a 100644
--- a/pages.json
+++ b/pages.json
@@ -212,6 +212,13 @@
 			{
 				"navigationBarTitleText" : ""
 			}
+		},
+		{
+			"path" : "pages/procurement/outbound",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 
 		// {
diff --git a/pages/Warehouse/Warehouse.vue b/pages/Warehouse/Warehouse.vue
index a3b2367..8f9743a 100644
--- a/pages/Warehouse/Warehouse.vue
+++ b/pages/Warehouse/Warehouse.vue
@@ -21,7 +21,7 @@
 				</view>
 			</view>
 			<view class="annotation" :class="'annotation'+(i+1)" v-for="(v,i) in ['付款','采购','拣货','完结','护理单元','监控室','请领出库','退货入库']"
-				:key='i' @click="onlyjump(i)">
+				:key='i' @click.stop="housactive(i)">
 				<view> </view>
 				<view class="tp">
 					<text>{{v}}</text>
@@ -34,7 +34,6 @@
 			</view>
 			<view @click="onlyjump(5)" class="zhanwei"></view>
 
-			<!-- <arrowkeys @movecard="movecard" :getblue="getblue" :moveleft="45" /> -->
 			<view class="operationbtn">
 				<view v-for="(v,i) in ['请领出库','退货入库','库存盘点','实时监控']" @tap="onTap(i)"
 					:class="beblue === i ? 'click-box-target' : 'click-box'">
@@ -59,17 +58,21 @@
 		},
 	});
 	const housedex = ref(-1);
-	const forthmenuIndex = ref<number>(0);
 	const lastTap = ref(0)
 	const DOUBLE_TAP_DELAY = 300;
 	const setout = ref(null)
 	const housactive = (index : number) => {
 		housedex.value = index;
 			const now = Date.now()
-			forthmenuIndex.value = i
 			if (now - lastTap.value < DOUBLE_TAP_DELAY) {
 				// 双击成立
 				clearTimeout(setout.value)
+				if (index == 0) {
+					navurl.value = 'pages/Warehouse/paymoney'
+					uni.navigateTo({
+						url: '/' + navurl.value
+					})
+				}
 				 if (index == 1) {
 				 	navurl.value = 'pages/procurement/material'
 				 	uni.navigateTo({
@@ -88,6 +91,23 @@
 				 		url: '/' + navurl.value
 				 	})
 				 }
+				 if (index === 5) {
+				 	uni.navigateTo({
+				 		url: "/pages/watch/full"
+				 	})
+				 }
+				 if (index ==6) {
+				 		navurl.value = 'pages/procurement/outbound?code=0'
+				 		uni.navigateTo({
+				 			url: '/' + navurl.value
+				 		})
+				 }
+				 if (index ==7) {
+				 		navurl.value = 'pages/procurement/outbound?code=1'
+				 		uni.navigateTo({
+				 			url: '/' + navurl.value
+				 		})
+				 }
 				// 重置，避免多次触发
 				lastTap.value = 0
 			} else {
@@ -104,80 +124,20 @@
 				lastTap.value = now
 			}
 		
-		
-		
-		if(housedex.value == index){
-			if (housedex.value == 0) {
-				navurl.value = 'pages/Warehouse/paymoney'
-				uni.navigateTo({
-					url: '/' + navurl.value
-				})
-			}
-			
-			return
-		}
-		
 	}
 	onMounted(() => {
 		housedex.value = 1
 	})
 	const navurl = ref('');
-	const movecard = (type : number) => {
-		// console.log(type,housedex.value)
-		switch (type) {
-			case 0:
-				// 上
-				housedex.value > 0 ? housedex.value-- : housedex.value = 3
-				break;
-			case 1:
-				housedex.value > 2 ? housedex.value = 0 : housedex.value++
-				// →
-				break;
-			case 2:
-				housedex.value > 2 ? housedex.value = 0 : housedex.value++
-				// 下
-				break;
-			case 3:
-				housedex.value > 0 ? housedex.value-- : housedex.value = 3
-				// ←
-				break;
-			case 4:
-				// 确定
-				// console.log('选中' + housedex.value)
-				if (housedex.value == 1) {
-					navurl.value = 'pages/Warehouse/procurement'
-					uni.navigateTo({
-						url: '/' + navurl.value
-					})
-				}
-				if (housedex.value == 2) {
-					navurl.value = 'pages/Warehouse/picking'
-					uni.navigateTo({
-						url: '/' + navurl.value
-					})
-				}
-				if (housedex.value == 3) {
-					navurl.value = 'pages/Warehouse/finish'
-					uni.navigateTo({
-						url: '/' + navurl.value
-					})
-				}
-				// uni.navigateTo({
-				// 	url: '/' + navurl.value
-				// })
-				break;
-			case 5:
-				// 返回
-				uni.navigateBack()
-				break;
-
-			default:
-				break;
-		}
-	}
 	const onlyjump = (index : number) => {
 		console.log("点击了哪个图标", index)
-		if (index > 5) { return }
+		if (index > 5) {
+				navurl.value = 'pages/Warehouse/finish'
+				uni.navigateTo({
+					url: '/' + navurl.value
+				})
+			return 
+		}
 		if (index < 4) {
 			housedex.value = index;
 		}
diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue
new file mode 100644
index 0000000..a2fe5bd
--- /dev/null
+++ b/pages/procurement/outbound.vue
@@ -0,0 +1,32 @@
+<template>
+	<view>
+		<view 
+		style="
+		width: 100%;
+		height: 100vh;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 2vw;">
+		{{code==0?'请领出库':'退货入库'}}
+		
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad(e) {
+			this.code = e.code
+		},
+		data() {
+			return {
+				code:0
+			};
+		}
+	}
+</script>
+
+<style lang="less">
+
+</style>
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 12310ff..04100f2 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/unpackage/dist/dev/.nvue/pages/camera.js
@@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
 export {
   camera as default
 };
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index fc534ca..beefd5c 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js
@@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     )
   ]);
 }
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
 export {
   fullcamera as default
 };

From e457e335c98fdd07b514d04346196acbafee028a Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Wed, 19 Nov 2025 16:51:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8B=A3=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Warehouse/api/lunpan.js           |  35 +++-
 pages/Warehouse/components/equiment.vue |   1 +
 pages/Warehouse/picking.vue             | 233 +++++++++++++++++++-----
 3 files changed, 225 insertions(+), 44 deletions(-)

diff --git a/pages/Warehouse/api/lunpan.js b/pages/Warehouse/api/lunpan.js
index 62cc4a9..93b9388 100644
--- a/pages/Warehouse/api/lunpan.js
+++ b/pages/Warehouse/api/lunpan.js
@@ -175,4 +175,37 @@ export const pickingInfo = (params) => {
 		method: 'post',
 		data: params
 	})
-} 
\ No newline at end of file
+} 
+
+//（业务）查询随行单照片集合
+export const querySxdList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/querySxdList`,
+		method: 'get',
+		data: params
+	})
+} 
+//（业务）查询随行单照片集合
+export const addSxd = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/addSxd`,
+		method: 'post',
+		data: params
+	})
+}
+
+export const queryJhzpList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryJhzpList`,
+		method: 'get',
+		data: params
+	})
+} 
+// （业务）采购单拣货记录
+export const queryPickingRecordList = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryPickingRecordList`,
+		method: 'get',
+		data: params
+	})
+} 
diff --git a/pages/Warehouse/components/equiment.vue b/pages/Warehouse/components/equiment.vue
index cfd9567..f5b0573 100644
--- a/pages/Warehouse/components/equiment.vue
+++ b/pages/Warehouse/components/equiment.vue
@@ -90,6 +90,7 @@
 		z-index: 21;
 		padding: 0 10%;
 		z-index: 999;
+		border: 1px solid #999;
 	}
 .zhezhao {
 	position: fixed;
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index c4877f9..2deecb6 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -333,20 +333,21 @@
 						采购单号：
 					</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}}
 						</text>
 					</view>
 					<view style="margin-top: 10rpx;">
@@ -354,13 +355,37 @@
 							上传人:
 						</text>
 						<text>
-							赵晓璇
+							{{item.createBy}}
+						</text>
+					</view>
+				</view>
+			</scroll-view>
+			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation v-if="topbuttontarget==1">
+				<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}}
+						</text>
+					</view>
+					<view style="margin-top: 10rpx;">
+						<text style="color: #888888;letter-spacing: 8.9rpx;">
+							上传人:
+						</text>
+						<text>
+							{{item.createBy}}
 						</text>
 					</view>
 				</view>
 				<view class="photowall-other-one" v-if="topbuttontarget==1">
 					<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;"
+						style="width: 100%;height: 70%;display: flex;flex-direction: column;
+						justify-content: center;align-items: center;position: absolute;top:3vw;left: 0;
+						background-color:#fafdff ;border: 1rpx solid #78B1EB;border-radius: 30rpx;"
 						@click="uplod(1)"
 						>
 						<image style="width: 70rpx;height: 70rpx;margin-bottom: 5rpx;"
@@ -370,8 +395,12 @@
 						</view>
 					</view>
 				</view>
-			</view>
+				
+			</scroll-view>
 		</view>
+		
+		
+		
 		<view class="contain-left">
 			<view class="left-select-more" v-show="openselect">
 				<view class="more-bottom">
@@ -907,7 +936,7 @@
 				<view class="right-bottom" v-show="typechange==1" style="padding: 0 50rpx;flex-direction: column;">
 					<view style="width: 100%;display: flex;justify-content: space-between;margin-top: 20rpx;">
 						<view style="font-size: 35rpx;font-weight: 600;margin-left: 20rpx;">
-							留置针敷贴(医用...
+							{{showvalue.wlName}}
 						</view>
 						<view style="color: black;">
 							<text style="color: #888888;">
@@ -915,31 +944,31 @@
 							</text>
 
 							<text style="font-weight: 600;">
-								100
+								{{showvalue.purchaseQuantity}}
 							</text>
-
-							片
+							{{showvalue.wlUnits}}
 						</view>
 					</view>
-					<view style="width: 110%;height: 400rpx;display: flex;flex-wrap: wrap;">
+					<scroll-view style="width: 110%;height: 400rpx;display: flex;flex-wrap: wrap;" scroll-y="true" 
+					 scroll-with-animation @scrolltolower="lhjlfy()">
 						<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">
+							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: black;">
-										20
+										{{item.crkNum}}
 									</text>
 									<text style="color: black;">
-										片
+										{{showvalue.wlUnits}}
 									</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?`销账`:`入库` }}
+									{{ item.crkStatus_dictText}}
 								</view>
 							</view>
 							<view style="width: 100%;justify-content: space-between;display: flex;">
@@ -947,14 +976,14 @@
 									采购单价：
 
 									<text style="font-weight: 600;color: black;">
-										￥1.50
+										￥{{item.oldPrice}}
 									</text>
 
 								</view>
 								<view class="">
 									拣货人：
 									<text style="color: black;">
-										梁嘉豪
+										{{item.createBy}}
 									</text>
 
 								</view>
@@ -962,26 +991,27 @@
 							<view style="width: 100%;justify-content: space-between;display: flex;margin-top: 10rpx;">
 								<view class="">
 									到货单价：
-
 									<text style="font-weight: 600;color: black;">
-										￥1.50
+										￥{{item.newPrice}}
 									</text>
 
 								</view>
 								<view class="">
-									2025.10.03 10:10:30
+									{{item.createTime}}
 
 								</view>
 							</view>
 						</view>
 						<view
 							style="width: 100%;display: flex;justify-content: center;color: #C3C3C3;margin-top: 20rpx;">
-							<image
+							<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>
+					</scroll-view>
 
 				</view>
 			</view>
@@ -1055,12 +1085,13 @@
 
 		<view class="mengban" v-if="open==1"> </view>
 		<equiment :open="open==1" @del="del()" @back="open = 0" :content="'是否删除此图片？'"></equiment>
+		<equiment :open="open==2" @del="sctp(1)" @back="open = 0" :content="'是否销账此物料？'"></equiment>
 	</view>
 </template>
 
 <script setup lang="ts">
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineProps, onUnmounted } from 'vue';
-	import { queryInvoicingList, getCgdMaterialTreeData, queryNuInfoByNuId, updateKfstatus, queryCgdList, queryCgdInfoList, queryWlInfoByWlId, voidedCgdMain, getCgrLis, getGysList, upload, editPrice, pickingInfo } from './api/lunpan.js'
+	import { 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 superpicker from '@/component/public/superpicker.vue'
@@ -1443,7 +1474,9 @@
 			showvalue.value.jianhuobtn = true;
 		}
 		Object.assign(form, mobanform)
-
+		lhjpageNo.value = 1;
+		lhjlarr.value = [];
+		lhjilu()
 	}
 	const InvoicingList = ref([])
 	const queryInvo = (index : number) => {
@@ -1452,6 +1485,26 @@
 			clickmiddle(index);
 		})
 	}
+	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 (!plzinfo.cgdParamInfo) return
 		plzinfo.pageNo = 1;
@@ -1545,13 +1598,69 @@
 		})
 	}
 	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;
 		}, 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: 'sxdPic/'+year+'/'+month
+			},
+			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) => {
@@ -1568,7 +1677,8 @@
 						if(!type){
 							albumlist.value.push(res.tempFilePath)
 						}else if(type==1){
-							console.log("成功！")
+							sxdupld(res.tempFilePath)
+							console.log(res.tempFilePath)
 						}
 						
 					}
@@ -1577,11 +1687,45 @@
 		});
 	}
 	// 预览
-	const previewImage = (v, i, arr) => {
-		uni.previewImage({
-			current: i,
-			urls: arr
-		})
+	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)
@@ -1663,7 +1807,7 @@
 		let obj = {
 			jhId: showvalue.value.id,
 			jhNum: showvalue.value.num,
-			jhType: xdex.value,
+			jhType: e,
 			jhPic: str == '' ? null : str,
 			cgdId: showvalue.value.cgdId
 		}
@@ -1680,20 +1824,22 @@
 			queryInvo(middletarget.value)
 		})
 	}
-	const xdex = ref(-1)
 	const addupimg = ref([])
-	const sctp = (e : number) => {
-		if (albumlist.value.length == 0) {
+	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: 'jhPic'
+					biz: 'jhPic/'+year+'/'+month
 				},
 				header: {
 					'X-Access-Token': uni.getStorageSync('token')
@@ -1715,7 +1861,6 @@
 	}
 
 	const config = (e) => {
-		xdex.value = e;
 		if (e == 1) {
 			open.value = 2;
 		} else {
@@ -2982,16 +3127,18 @@
 
 		.photowall-other {
 			width: 110%;
+			height:67vh;
 			display: flex;
-			flex-wrap: wrap;
 			margin-top: 40rpx;
-
+			
 			.photowall-other-one {
 				width: 28.5%;
 				height: 400rpx;
-				margin-right: 3%;
+				margin-right:3vw;
 				margin-bottom: 3%;
 				border-radius: 30rpx;
+				display: inline-block;
+				position: relative;
 				// background-color: red;
 			}
 		}