From fb20586c9791fb62dc87766fa0bba7f9f23d2abe Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 29 Dec 2023 18:09:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
subPackage/workbench/views/editExamine.vue | 92 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 37 deletions(-)
diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index dc469e4..6abcb34 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -8,6 +8,10 @@
<u--input border="none" v-model="form.location" placeholder="请选择场所位置"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
+ <u-form-item label="经纬度" required class="form-item">
+ <u--input border="none" v-model="jwd" placeholder="请选择场所位置" disabled
+ disabledColor="#ffffff"></u--input>
+ </u-form-item>
<u-form-item label="场所名称" required class="form-item" prop="placeName">
<u--input border="none" v-model="form.placeName" placeholder="请填写场所名称"></u--input>
</u-form-item>
@@ -23,9 +27,9 @@
<box-title title="营业执照"></box-title>
<view class="upload-img">
<u-upload :fileList="form.imageUrls" :previewFullImage="uploadConfig.previewFullImage"
- :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
- uploadIcon="/static/icon/upload.png"
- :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImg($event,'imageUrls')"
+ :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
+ uploadIcon="/static/icon/upload.png" :maxCount="uploadConfig.maxCount"
+ :capture="uploadConfig.capture" @afterRead="afterReadImg($event,'imageUrls')"
@delete="deletePic($event,'imageUrls')">
</u-upload>
</view>
@@ -34,9 +38,9 @@
<box-title title="场所平面图"></box-title>
<view class="upload-img">
<u-upload :fileList="form.planImageUrls" :previewFullImage="uploadConfig.previewFullImage"
- :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
- uploadIcon="/static/icon/upload.png"
- :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImg($event,'planImageUrls')"
+ :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
+ uploadIcon="/static/icon/upload.png" :maxCount="uploadConfig.maxCount"
+ :capture="uploadConfig.capture" @afterRead="afterReadImg($event,'planImageUrls')"
@delete="deletePic($event,'planImageUrls')">
</u-upload>
</view>
@@ -73,7 +77,9 @@
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'
+ import {
+ minioBaseUrl
+ } from '@/common/setting'
export default {
mixins: [uploadMixin],
components: {
@@ -111,6 +117,7 @@
},
personNum: 1,
curSelectSite: {},
+ jwd: ""
}
},
onShow() {
@@ -125,11 +132,16 @@
methods: {
getLocation() {
uni.chooseLocation({
- success: (addressResult) => {
+ success: (res) => {
const {
- address
- } = addressResult
+ address,
+ latitude,
+ longitude
+ } = res
this.form.location = address
+ this.form.lat = latitude;
+ this.form.lng = longitude;
+ this.jwd = `${Number(longitude).toFixed(6)},${Number(data.latitude).toFixed(6)}`
}
})
},
@@ -148,6 +160,11 @@
})
return
}
+ if (data.lat) {
+ this.jwd = `${Number(data.lng).toFixed(6)},${Number(data.lat).toFixed(6)}`
+ }
+
+
const placePractitioner = data?.placePractitioner || []
// Object.keys(this.form).forEach(key => {
// this.form[key] = data[key]
@@ -164,22 +181,22 @@
// }
// }
// })
-
- for(let i in this.form){
- if(i === 'imageUrls' || i === 'planImageUrls'){
- if(this.form[i]){
- if(data[i]){
- this.form[i] = this.setImageUrl(i,data[i].split('、'))
- }else {
+
+ for (let i in this.form) {
+ if (i === 'imageUrls' || i === 'planImageUrls') {
+ if (this.form[i]) {
+ if (data[i]) {
+ this.form[i] = this.setImageUrl(i, data[i].split('、'))
+ } else {
this.form[i] = []
}
-
+
}
- }else{
- this.form[i] = data[i]
+ } else {
+ this.form[i] = data[i]
}
}
-
+
this.personNum = placePractitioner.length
const componetns = this.$refs.formItemRef || []
this.$refs.formItemRef.forEach((item, index) => {
@@ -187,31 +204,31 @@
})
})
},
-
-
- setImageUrl(key,arr){
+
+
+ setImageUrl(key, arr) {
let urls = [];
- for(let i of arr){
+ for (let i of arr) {
urls.push({
- name:i,
- url:`${minioBaseUrl}${i}`
- })
+ name: i,
+ url: `${minioBaseUrl}${i}`
+ })
}
return urls
},
-
- getImageUrl(key){
- if(this.form[key].length){
+
+ getImageUrl(key) {
+ if (this.form[key].length) {
let urls = [];
- for(let i of this.form[key]){
- urls.push(i.name)
- }
- return urls.join('、');
- }else {
+ for (let i of this.form[key]) {
+ urls.push(i.name)
+ }
+ return urls.join('、');
+ } else {
return "";
}
},
-
+
updatePlaceExt(data) {
data['imageUrls'] = this.getImageUrl('imageUrls')
data['planImageUrls'] = this.getImageUrl('planImageUrls')
@@ -269,6 +286,7 @@
height: 100%;
display: flex;
flex-direction: column;
+
.main-content {
// height: 0;
// flex: 1;
--
Gitblit v1.9.3