Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

pages/NursingNew/component/nurse/index.vue

@@ -1804,6 +1804,11 @@
 				immediateFileFocus: "",
 				netImmediateFile: "",
 				tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
+				mp3File: allobject.mp3File,
+				netMp3File: allobject.netMp3File,
+				mp4File: allobject.mp4File,
+				netMp4File: allobject.netMp4File,
+				serviceContent: allobject.serviceContent,
 			}
 			//给表格赋值
 			timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1] = param;
@@ -1952,6 +1957,11 @@
 			immediateFileFocus: allobject.immediateFileFocus,
 			netImmediateFile: allobject.netImmediateFile,
 			tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
+			mp3File: allobject.mp3File,
+			netMp3File: allobject.netMp3File,
+			mp4File: allobject.mp4File,
+			netMp4File: allobject.netMp4File,
+			serviceContent: allobject.serviceContent,
 		}
 		//给表格赋值
 		timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1] = param;
@@ -1980,21 +1990,6 @@
 		if (!cansumit.value) {
 			return
 		}
-		//给后端编译一下
-		// let postArray = [];
-		// timearr.value.forEach((element0, index0) => {
-		// 	element0.children.forEach((element1, index1) => {
-		// 		if (!element1.directiveName && !element1.id) {
-
-		// 		} else {
-		// 			element1.positioning = index0;
-		// 			element1.positioningLong = index1;
-		// 			postArray.push(element1)
-		// 		}
-
-		// 	})
-
-		// })
 
 		let info = []
 

pages/Warehouse/picking.vue

@@ -213,19 +213,7 @@
 				</view>
 			</view>
 			<view style="display: flex;flex-wrap: wrap;width: 60%;">
-				<view style="
+				<view class="moban-photo" v-for="(item,index) in albumlist" :key="index">
-				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;" v-for="(item,index) in albumlist" :key="index">
 					<view
 						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">
@@ -234,17 +222,9 @@
 					<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">
+				<view style="width: 40%;height: 150rpx;margin-right: 4%;margin-top: 3%;" v-if="albumlist.length<4"
-					<view style="
+					@click="uplod(0)">
-					width: 100%;
+					<view class="moban-photo-special">
-					height: 100%;
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					align-items: center;
-					background-color:#fafdff ;
-					border: 1rpx solid #c4ebff;
-					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;">
@@ -380,7 +360,9 @@
 				</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;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;">
@@ -1537,17 +1519,12 @@
 	const badshow = ref(false);
 	const donghuacs = ref(false)
 	const bebad = () => {
-		// 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[lefttarget.value].id }).then((res : any) => {
@@ -1573,26 +1550,27 @@
 		donghuaopo.value = false;
 		setTimeout(() => {
 			donghuaopo.value = true;
-			console.log("zzz", donghuaopo.value)
 		}, 100)
 	}
 	// 上传
 	const albumlist = ref([])
-	const uplod = () => {
+	const uplod = (type:number) => {
 		uni.chooseImage({
 			count: 1, //默认9
 			sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
 			sourceType: ['camera'], //从相册选择
-			crop: {
-				quality: 60
-			},
 			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){
+							console.log("成功！")
+						}
+						
 					}
 				})
 			}
@@ -3152,4 +3130,31 @@
 		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;
+	}
 </style>