Browse Source

暂提

feature
zxc 3 years ago
parent
commit
c7c12e834b
  1. 10
      src/views/modules/communityService/worklog/workLog.vue
  2. 20
      src/views/modules/communityService/worklog/workLogDetail.vue
  3. 387
      src/views/modules/communityService/worklog/workLogForm.vue

10
src/views/modules/communityService/worklog/workLog.vue

@ -229,10 +229,10 @@
top="5vh"
class="dialog-h"
@closed="editDiaClose">
<ggfw-form ref="ref_form"
<work-log-form ref="ref_form"
:typeList="typeList"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></ggfw-form>
@dialogOk="addFormOk"></work-log-form>
</el-dialog>
<el-dialog :visible.sync="detailShow"
@ -243,8 +243,8 @@
top="5vh"
class="dialog-h"
@closed="diaClose">
<ggfw-detail ref="ref_detail"
@diaClose="diaClose"></ggfw-detail>
<work-log-detail ref="ref_detail"
@diaClose="diaClose"></work-log-detail>
</el-dialog>
</div>
@ -503,7 +503,7 @@ export default {
handleAdd () {
this.formTitle = '新增'
this.formShow = 'edit'
this.formShow = 'add'
this.$nextTick(() => {
this.$refs.ref_form.initForm('add', null)
})

20
src/views/modules/communityService/worklog/workLogDetail.vue

@ -10,7 +10,8 @@
<el-form-item label="服务类型"
prop="serviceTypeName"
label-width="150px"
style="display: block">
style="display: block"
class="input-width">
<span>{{formData.serviceTypeName}}</span>
</el-form-item>
@ -24,8 +25,9 @@
<el-form-item label="申请人"
prop="applicantName"
label-width="150px"
class="input-width"
style="display: block">
<span>{{formData.areaCovered}}</span>
<span>{{formData.applicantName}}</span>
</el-form-item>
<el-form-item label="住址"
@ -34,31 +36,31 @@
style="display: block">
<span>{{formData.applicantAddress}}</span>
</el-form-item>
<el-form-item label="服务内容"
prop="principal"
<el-form-item label="服务内容"
prop="serviceContent"
label-width="150px"
style="display: block">
<span>{{formData.applicantContent}}</span>
<span>{{formData.serviceContent}}</span>
</el-form-item>
<el-form-item label="联系电话"
<el-form-item label="联系电话"
prop="mobile"
label-width="150px"
style="display: block">
<span>{{formData.applicantMobile}}</span>
</el-form-item>
<el-form-item label="负责人"
<el-form-item label="负责人"
style="display: block"
prop="address"
label-width="150px">
<span>{{formData.principalName}}</span>
</el-form-item>
<el-form-item label="服务时间"
<el-form-item label="服务时间"
style="display: block"
prop="address"
label-width="150px">
<span>{{formData.serviceTime}}</span>
</el-form-item>
<el-form-item label="备注"
<el-form-item label="备注"
style="display: block"
prop="address"
label-width="150px">

387
src/views/modules/communityService/worklog/workLogForm.vue

@ -9,91 +9,105 @@
:disabled="formType === 'detail'"
class="form">
<el-form-item label="场所名称"
prop="name"
<el-form-item label="所属网格"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入场所名称"
v-model="formData.name">
</el-input>
</el-form-item>
<el-form-item label="场所类型"
prop="category"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.category"
placeholder="请选择"
style="display: block"
prop="gridId">
<el-select v-model="formData.gridId"
filterable
placeholder="请选择"
clearable>
<el-option v-for="item in serviceList"
<el-option v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="服务类型"
label-width="150px"
style="display: block"
prop="serviceType">
<el-select v-model="formData.serviceType"
filterable
placeholder="请选择"
clearable>
<el-option v-for="item in serviceTypeList"
:key="item.id"
:label="item.serviceTypeName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="申请人"
prop="applicantName"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入申请人"
v-model="formData.applicantName">
</el-input>
</el-form-item>
<el-form-item label="占地面积"
<el-form-item label="住址"
style="display: block"
prop="areaCovered"
label-width="150px">
<el-input-number class="item_width_4"
v-model="formData.areaCovered"
:precision="2"
:step="0.01"
:min="0"
:max="9600000"
label="占地面积"></el-input-number>
label-width="150px"
prop="applicantAddress">
<el-input v-model="formData.applicantAddress"
class="item_width_1"
placeholder="请输入住址"></el-input>
</el-form-item>
<el-form-item label="容纳人数"
<el-form-item label="服务内容"
style="display: block"
prop="capacity"
label-width="150px">
<el-input-number class="item_width_4"
v-model="formData.capacity"
:min="0"
:max="9999"
label="容纳人数"></el-input-number>
label-width="150px"
prop="serviceContent">
<el-input v-model="formData.serviceContent"
class="item_width_1"
type="textarea"
placeholder="请输入服务内容"></el-input>
</el-form-item>
<el-form-item label="联系电话"
style="display: block"
label-width="150px"
prop="applicantMobile">
<el-input v-model="formData.applicantMobile"
class="item_width_1"
placeholder="请输入联系电话"></el-input>
</el-form-item>
<el-form-item label="负责人"
style="display: block"
label-width="150px"
prop="principal">
<el-input v-model="formData.principal"
prop="principalName">
<el-input v-model="formData.principalName"
class="item_width_1"
placeholder="请输入负责人姓名"></el-input>
placeholder="请输入负责人"></el-input>
</el-form-item>
<el-form-item label="联系电话"
<el-form-item label="服务时间"
style="display: block"
label-width="150px"
prop="mobile">
<el-input v-model="formData.mobile"
prop="serviceTime">
<el-input v-model="formData.serviceTime"
class="item_width_1"
placeholder="请输入联系电话"></el-input>
placeholder="请输入服务时间"></el-input>
</el-form-item>
<el-form-item label="地址"
prop="address"
<el-form-item label="备注"
style="display: block"
label-width="150px"
style="display: block">
<div class="item_width_1">
<el-input style="width:420px"
:placeholder="'请输入所在地址'"
v-model="formData.address">
</el-input>
<el-button style="margin-left: 10px"
type="default"
size="small"
@click="handleSearchMap">查询</el-button>
<div id="app"
class="div_map"></div>
</div>
prop="remark">
<el-input v-model="formData.remark"
class="item_width_1"
type="textarea"
placeholder="请输入备注"></el-input>
</el-form-item>
</el-form>
</div>
@ -127,93 +141,83 @@ export default {
data () {
return {
formType: 'add', // addeditdetail
agencyId: '',
btnDisable: false,
icPublicServiceId: '',
applicantId: '',
keyWords: '',
formData: {
name: '',//
category: '',
areaCovered: '',//
capacity: '',//
address: '', //
longitude: 36.0722275, //
latitude: 120.38945519, //
principal: '',
mobile: ''
serviceType: '',
gridId: '',
applicantAddress: '',
applicantName: '',
serviceContent: '',
applicantMobile: '',
principalName: '',
serviceTime: '',
remark: ''
},
serviceList: [],//list
optionsG: [],
serviceTypeList: [],
publicServiceData: {},
}
},
components: {},
async created () {
this.getGridList('query')
this.getServiceTypeList()
},
mounted () {
},
methods: {
async initForm (type, icPublicServiceId) {
async initForm (type, applicantId) {
this.startLoading()
this.$refs.ref_form.resetFields();
//
await this.loadService()
await this.getServiceTypeList()
this.formType = type
if (icPublicServiceId) {
this.icPublicServiceId = icPublicServiceId
this.formData.icPublicServiceId = icPublicServiceId
await this.loadFormData()
if (applicantId) {
this.applicantId = applicantId
this.formData.applicantId = applicantId
// await this.loadFormData()
} else {
// map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
// this.setMarker(36.0722275, 120.38945519)
}
}
this.endLoading()
},
//
async loadService () {
const url = "/gov/org/coverage/dict-select-list/public_service"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service"
async getServiceTypeList () {
// const url = "/heart/workdiaryService/serviceType/page"
let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
let params = {
pageNo: 1,
pageSize: 10000
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.serviceList = data
this.serviceTypeList = data.list
} else {
this.$message.error(msg)
}
},
//
async loadFormData () {
const url = '/gov/org/icPublicService/detail'
async getGridList (type) {
const { user } = await this.$store.state;
const url = '/gov/org/customergrid/gridoption'
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail'
let params = {
icPublicServiceId: this.icPublicServiceId
agencyId: user.agencyId,
purpose: type,
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
console.log(data)
if (null != data) {
data: this.publicServiceData
}
this.formData = { ...data }
// let { latitude, longitude } = this.$store.state.user;
// const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
// const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') {
map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
this.setMarker(this.formData.latitude, this.formData.longitude)
}
this.optionsG = data;
} else {
this.$message.error(msg)
}
@ -222,7 +226,6 @@ export default {
async handleComfirm () {
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
@ -234,15 +237,13 @@ export default {
} else {
this.addUnit()
}
})
},
async addUnit () {
let url = ''
if (this.formType === 'add') {
url = '/gov/org/icPublicService/add'
// url = '/heart/workdiaryService/record/save'
url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/save'
} else {
url = '/gov/org/icPublicService/edit'
}
@ -267,138 +268,17 @@ export default {
this.$emit('dialogCancle')
},
// init
initMap () {
let { latitude, longitude } = this.$store.state.user;
console.log('lat' + latitude + ',lon' + longitude)
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
//
var center = new window.TMap.LatLng(latitude, longitude);
// map TMap.Map()
map = new window.TMap.Map(document.getElementById('app'), {
center: center, //
zoom: 17.2, //
pitch: 43.5, //
rotation: 45 //
})
search = new window.TMap.service.Search({ pageSize: 10 })
//
markers = new TMap.MultiMarker({
map: map,
geometries: []
})
infoWindowList = Array(10)
geocoder = new TMap.service.Geocoder(); //
//
map.on('panend', () => {
this.handleMoveCenter()
})
// this.handleMoveCenter()
this.convert()
},
setMarker (lat, lng) {
markers.setGeometries([])
markers.add([
{
id: '4',
styleId: 'marker',
position: new TMap.LatLng(lat, lng),
properties: {
title: 'marker4'
}
}
])
},
handleSearchMap () {
infoWindowList.forEach((infoWindow) => {
infoWindow.close()
})
infoWindowList.length = 0
markers.setGeometries([])
//
search
.searchRectangle({
keyword: this.formData.address,
bounds: map.getBounds()
})
.then((result) => {
let { data } = result
if (Array.isArray(data) && data.length > 0) {
const {
location: { lat, lng }
} = data[0]
map.setCenter(new TMap.LatLng(lat, lng))
this.setMarker(lat, lng)
this.formData.latitude = lat
this.formData.longitude = lng
this.convert()
} else {
this.$message.error('未检索到相关位置坐标')
}
})
},
handleMoveCenter () {
//
const center = map.getCenter()
const lat = center.getLat()
const lng = center.getLng()
this.formData.latitude = lat
this.formData.longitude = lng
this.setMarker(lat, lng)
this.convert(lat, lng)
},
convert (lat, lng) {
markers.setGeometries([]);
// var input = document.getElementById('location').value.split(',');
let location
if (lat && lng) {
location = new TMap.LatLng(lat, lng);
} else {
location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
}
// map.setCenter(location);
markers.updateGeometries([
{
id: 'main', //
position: location,
},
]);
geocoder
.getAddress({ location: location }) //
.then((result) => {
console.log(this.formData)
// this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
this.formData.address = this.formData.address !== '' && this.formData.address !== null && (this.formData.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address
//
});
},
resetData () {
this.icPublicServiceId = ''
this.keyWords = ''
this.formData = {
name: '',
category: '',
areaCovered: '',
capacity: '',
address: '', //
longitude: '', //
latitude: '' //
serviceType: '',
gridId: '',
applicantAddress: '',
applicantName: '',
serviceContent: '',
applicantMobile: '',
principalName: '',
serviceTime: '',
remark: ''
}
},
//
@ -420,22 +300,27 @@ export default {
computed: {
dataRule () {
return {
name: [
{ required: true, message: '场所名称不能为空', trigger: 'blur' },
gridId: [
{ required: true, message: '所属网格不能为空', trigger: 'blur' },
],
serviceType: [
{ required: true, message: '服务类型不能为空', trigger: 'blur' }
],
applicantAddress: [
{ required: true, message: '住址不能为空', trigger: 'blur' }
],
category: [
{ required: true, message: '场所类别不能为空', trigger: 'blur' }
applicantName: [
{ required: true, message: '申请人不能为空', trigger: 'blur' }
],
address: [
{ required: true, message: '地址不能为空', trigger: 'blur' }
serviceContent: [
{ required: true, message: '服务内容不能为空', trigger: 'blur' }
],
/*longitude: [
{ required: true, message: '坐标不能为空', trigger: 'blur' }
serviceTime: [
{ required: true, message: '服务时间不能为空', trigger: 'blur' }
],
latitude: [
{ required: true, message: '坐标不能为空', trigger: 'blur' }
]*/
applicantMobile: [
{ required: true, message: '联系电话不能为空', trigger: 'blur' }
]
}
},

Loading…
Cancel
Save