diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 17f0079c2..b6d89577b 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -229,10 +229,10 @@
top="5vh"
class="dialog-h"
@closed="editDiaClose">
-
+ @dialogOk="addFormOk">
-
+
@@ -503,7 +503,7 @@ export default {
handleAdd () {
this.formTitle = '新增'
- this.formShow = 'edit'
+ this.formShow = 'add'
this.$nextTick(() => {
this.$refs.ref_form.initForm('add', null)
})
diff --git a/src/views/modules/communityService/worklog/workLogDetail.vue b/src/views/modules/communityService/worklog/workLogDetail.vue
index 917d571be..86c44280c 100644
--- a/src/views/modules/communityService/worklog/workLogDetail.vue
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@@ -10,7 +10,8 @@
+ style="display: block"
+ class="input-width">
{{formData.serviceTypeName}}
@@ -24,8 +25,9 @@
- {{formData.areaCovered}}
+ {{formData.applicantName}}
{{formData.applicantAddress}}
-
- {{formData.applicantContent}}
+ {{formData.serviceContent}}
-
{{formData.applicantMobile}}
-
{{formData.principalName}}
-
{{formData.serviceTime}}
-
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
index 6765d69e9..f61d35883 100644
--- a/src/views/modules/communityService/worklog/workLogForm.vue
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -9,91 +9,105 @@
:disabled="formType === 'detail'"
class="form">
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
- 平方公里
+ label-width="150px"
+ prop="applicantAddress">
+
-
-
+ label-width="150px"
+ prop="serviceContent">
+
+
+
+
+
-
+
+ placeholder="请输入负责人">
-
-
+
+ placeholder="请输入服务时间">
-
-
+ prop="remark">
+
+
@@ -127,93 +141,83 @@ export default {
data () {
return {
formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-
+ 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' }
+ ]
}
},