From 11cfec702172022207304a4bdbbc6f21e846468e Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 29 Nov 2023 11:27:21 +0800
Subject: [PATCH] 修复优化部分问题

---
 subPackage/workbench/views/editExamine.vue |   77 ++++++++++++++++++++++++++++----------
 1 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index 109ddea..75801e6 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -26,7 +26,7 @@
 						:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
 						uploadIcon="/static/icon/upload.png"
 						:maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImg($event,'imageUrls')"
-						@delete="deletePic">
+						@delete="deletePic($event,'imageUrls')">
 					</u-upload>
 				</view>
 			</view>
@@ -37,7 +37,7 @@
 						:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
 						uploadIcon="/static/icon/upload.png"
 						:maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImg($event,'planImageUrls')"
-						@delete="deletePic">
+						@delete="deletePic($event,'planImageUrls')">
 					</u-upload>
 				</view>
 			</view>
@@ -73,6 +73,7 @@
 	import uploadMixin from "@/mixin/uploadMixin";
 	import boxTitle from "@/subPackage/workbench/components/boxTitle/index.vue"
 	import formItem from '../components/formItem.vue'
+	import { minioBaseUrl } from '@/common/setting'
 	export default {
 		mixins: [uploadMixin],
 		components: {
@@ -148,22 +149,32 @@
 						return
 					}
 					const placePractitioner = data?.placePractitioner || []
-					Object.keys(this.form).forEach(key => {
-						this.form[key] = data[key]
-						if (key === 'imageUrls' || key === 'planImageUrls') {
-							data[key] = data[key] || ''
-							this.form[key] = []
-							if (!!data[key]) {
-								data[key] = JSON.parse(data[key])
-								if (Array.isArray(data[key])) {
-									this.form[key] = data[key]
-								} else {
-									this.form[key].push(data[key])
-								}
+					// Object.keys(this.form).forEach(key => {
+					// 	this.form[key] = data[key]
+					// 	if (key === 'imageUrls' || key === 'planImageUrls') {
+					// 		data[key] = data[key] || ''
+					// 		this.form[key] = []
+					// 		if (!!data[key]) {
+					// 			data[key] = JSON.parse(data[key])
+					// 			if (Array.isArray(data[key])) {
+					// 				this.form[key] = data[key]
+					// 			} else {
+					// 				this.form[key].push(data[key])
+					// 			}
+					// 		}
+					// 	}
+					// })
+					
+					for(let i in this.form){
+						if(i === 'imageUrls' || i === 'planImageUrls'){
+							if(this.form[i]){
+								this.form[i] = this.setImageUrl(i,data[i].split('、'))
 							}
+						}else{
+							this.form[i]  = data[i]
 						}
-					})
-
+					}
+					
 					this.personNum = placePractitioner.length
 					const componetns = this.$refs.formItemRef || []
 					this.$refs.formItemRef.forEach((item, index) => {
@@ -171,9 +182,36 @@
 					})
 				})
 			},
+			
+			
+			setImageUrl(key,arr){
+				let urls = [];
+				for(let i of arr){
+					urls.push({
+						name:i,
+						url:`${minioBaseUrl}${i}`
+					}) 
+				}
+				return urls
+			},
+			
+			getImageUrl(key){
+				if(this.form[key].length){
+					let urls = [];
+				   for(let i of this.form[key]){
+					    urls.push(i.name)  
+				   }
+				   return urls.join('、');
+				}else {
+					return "";
+				}
+			},
+		
 			updatePlaceExt(data) {
-				data['imageUrls'] = data['imageUrls'].join('、')
-				data['planImageUrls'] = data['planImageUrls'].join('、')
+				data['imageUrls'] = this.getImageUrl('imageUrls')
+				data['planImageUrls'] = this.getImageUrl('planImageUrls')
+				// data['imageUrls'] = data['imageUrls'].join('、')
+				// data['planImageUrls'] = data['planImageUrls'].join('、')
 				updatePlaceExtData({
 					...data
 				}).then(res => {
@@ -189,11 +227,10 @@
 					}
 					uni.showToast({
 						title: '提交成功',
-						icon: 'success',
 						complete() {
 							setTimeout(() => {
 								uni.navigateBack()
-							}, 1500)
+							}, 1000)
 						}
 					})
 				})

--
Gitblit v1.9.3