From 6a787b9af792e04ae40625ed44c362fa0c9a3f4e Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 17 四月 2025 18:26:31 +0800
Subject: [PATCH] 提交

---
 h5/pages/workOrder_dca/workOrder_dca.vue |   62 +++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/h5/pages/workOrder_dca/workOrder_dca.vue b/h5/pages/workOrder_dca/workOrder_dca.vue
index 485b5ae..850fb68 100644
--- a/h5/pages/workOrder_dca/workOrder_dca.vue
+++ b/h5/pages/workOrder_dca/workOrder_dca.vue
@@ -16,7 +16,7 @@
 			<view class="dca_list_item" style="flex-direction: column;">
 				<view class="dca_list_item_label">鍥剧墖</view>
 				<view class="dca_list_item_tu" v-if="info.multifileList">
-					<view class="dca_list_item_tu_item" v-for="(item, index) in info.multifileList" :key="index">
+					<view class="dca_list_item_tu_item" v-for="(item, index) in info.multifileList" :key="index" @click="previewImage(item.fileurlFull, info.multifileList.map(item => item.fileurlFull))">
 						<image :src="item.fileurlFull" mode="widthFix"></image>
 					</view>
 					<view class="dca_list_item_tu_zw"></view>
@@ -32,7 +32,7 @@
 				<view class="lc">
 					<view class="lc_item" v-for="(item, index) in info.logList" :key="index">
 						<view class="lc_item_dian"></view>
-						<view class="lc_item_xian" v-if="info.logList.length === 1 ? false : index === 0"></view>
+						<view class="lc_item_xian" v-if="info.logList.length === 1 ? false : index !== info.logList.length - 1"></view>
 						<view class="lc_item_title">{{item.title}}</view>
 						<view class="lc_item_info">{{item.companyName}}/{{item.userName}} {{item.createDate}}</view>
 						<view class="lc_item_content" v-if="![0,4].includes(item.objType)">
@@ -52,8 +52,8 @@
 							<view class="lc_item_content_item">
 								<view class="lc_item_content_item_label">鍥剧墖锛�</view>
 								<view class="lc_item_content_item_img" v-if="item.multifileList">
-									<view class="image" v-for="(item, index) in item.multifileList" :key="index">
-										<image :src="item.fileurlFull" mode="widthFix"></image>
+									<view class="image" v-for="(child, index) in item.multifileList" :key="index" @click="previewImage(child.fileurlFull, item.multifileList.map(item => item.fileurlFull))">
+										<image :src="child.fileurlFull" mode="widthFix"></image>
 									</view>
 									<view class="imagezw"></view>
 									<view class="imagezw"></view>
@@ -104,6 +104,7 @@
 								@afterRead="afterRead"
 								@delete="deletePic"
 								name="2"
+								multiple
 								style="margin-top: 15rpx;" />
 						</u-form-item>
 					</u--form>
@@ -129,6 +130,7 @@
 								@afterRead="afterRead"
 								@delete="deletePic"
 								name="1"
+								multiple
 								style="margin-top: 15rpx;" />
 						</u-form-item>
 					</u--form>
@@ -183,6 +185,12 @@
 			this.getDetails()
 		},
 		methods: {
+			previewImage(current, urls) {
+				uni.previewImage({
+					current,
+					urls
+				});
+			},
 			closeGB() {
 				this.canScroll()
 				this.show1 = false
@@ -209,8 +217,8 @@
 				}).then(res =>{
 					console.log(res)
 					if (res.errCode === 0) {
-						this.model.passOnUserName = res.result.userList.map(item => item.name)
-						this.model.passOnUserId = res.result.userList.map(item => item.id)
+						this.model.passOnUserName = res.result.userList.map(item => item.name).join(',')
+						this.model.passOnUserId = res.result.userList.map(item => item.id).join(',')
 					}
 				})
 			},
@@ -227,6 +235,7 @@
 					if (res.code === 200) {
 						uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'none' })
 						that.canScroll()
+						uni.$emit('update')
 						that.show = false
 						that.getDetails()
 					}
@@ -251,6 +260,7 @@
 						workorderId: that.info.id
 					})
 					if (res.code === 200) {
+						uni.$emit('update')
 						uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'none' })
 						that.canScroll()
 						that.show1 = false
@@ -277,21 +287,43 @@
 			},
 			// 鏂板鍥剧墖
 			afterRead(event) {
+				var that = this
+				uni.showLoading({ title: '涓婁紶涓�...', mask: true })
 				uni.uploadFile({
-					url: this.$baseUrl + '/web/public/upload',
-					filePath: event.file.url,
-					name: "file",
+					url: this.$baseUrl + '/web/public/uploadBatch',
+					files: event.file.map(e => {
+						return { name: 'files', uri: e.url }
+					}),
 					formData: {
-						folder: "WORKORDER_LOG_FILE_PATH"
-					},	
-					success: (res) => {
+						folder: "WORKORDER_LOG_FILE_PATH",
+					},
+					success(res) {
+						uni.hideLoading();
 						let obj = JSON.parse(res.data)
 						if (obj.code === 200) {
-							obj.data.fileurl = obj.data.imgaddr
-							this.model.multifileList.push(obj.data)
+							console.log(obj.data)
+							obj.data.forEach(item => {
+								item.fileurl = item.imgaddr
+							})
+							that.model.multifileList = [...that.model.multifileList, ...obj.data]
 						}
 					}
-				});
+				})
+				// uni.uploadFile({
+				// 	url: this.$baseUrl + '/web/public/upload',
+				// 	filePath: event.file.url,
+				// 	name: "file",
+				// 	formData: {
+				// 		folder: "WORKORDER_LOG_FILE_PATH"
+				// 	},	
+				// 	success: (res) => {
+				// 		let obj = JSON.parse(res.data)
+				// 		if (obj.code === 200) {
+				// 			obj.data.fileurl = obj.data.imgaddr
+				// 			this.model.multifileList.push(obj.data)
+				// 		}
+				// 	}
+				// });
 			}
 		}
 	}

--
Gitblit v1.9.3