- 
+ 
{{ $store.state.user.realName }}
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index afe06e31e..18c4a1574 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -118,7 +118,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
- 新增
-
+ label="场所名称"
+ min-width="280">
-
+ label="场所地址"
+ min-width="280">
-
+ label="场所类型"
+ min-width="180">
-
+ label="规模"
+ min-width="180">
-
+ label="负责人"
+ min-width="100">
-
-
-
-
-
-
-
+ min-width="110">
+
- 查看
@@ -266,25 +214,20 @@ export default {
scaleList: [],//规模list
placeTypeList: [],//场所类型list
- unitId: '',
formData: {
- gridId: '',
- unitName: '',
- serviceMatter: '',
- type: '',
- contact: '',
- contactMobile: ''
+ placeOrgName: '',//场所名称
+ mobile: '',//联系电话
+ scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】
+ gridId: '',//场所区域【网格Id】
+ ninePlacsVal: '',//场所类型【九小场所Value值】
+ isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是
},
tableData: [],
//form相关
formShow: false,
- formTitle: '新增单位',
-
- files: "",
- fileName: "",
- uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import'
+ formTitle: '新增场所',
}
},
@@ -295,11 +238,11 @@ export default {
},
async mounted () {
- //获取服务事项
- await this.loadService()
+ //获取规格
+ await this.loadScale()
- //获取分类
- await this.loadType()
+ //获取场所类型
+ await this.loadPlaceType()
const { user } = this.$store.state
this.agencyId = user.agencyId
@@ -332,13 +275,12 @@ export default {
},
- //获取服务事项下拉框
- async loadService () {
- // const url = "/heart/icresidemanddict/subcodelist"
- const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
+ //获取场所类型
+ async loadScale () {
+ const url = "/sys/dict/data/dictlist"
let params = {
- parentCategoryCode: '1010'
+ dictType: 'scale'
}
const { data, code, msg } = await requestPost(url, params)
@@ -351,12 +293,12 @@ export default {
}
},
- //获取分类
- async loadType () {
+ //获取场所类型
+ async loadPlaceType () {
const url = "/sys/dict/data/dictlist"
let params = {
- dictType: 'party_unit_type'
+ dictType: 'nine_small_places'
}
const { data, code, msg } = await requestPost(url, params)
@@ -373,12 +315,11 @@ export default {
async loadTable () {
this.tableLoading = true
- // const url = "/heart/icpartyunit/list"
- const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
+ // const url = "/gov/org/placeorg/getlist"
+ const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
- agencyId: this.agencyId,
...this.formData
}
@@ -420,7 +361,7 @@ export default {
this.formTitle = '修改'
this.formShow = true
this.$nextTick(() => {
- this.$refs.ref_form.initForm('edit', row.id)
+ this.$refs.ref_form.initForm('edit', row.placeOrgId)
})
},
@@ -441,7 +382,7 @@ export default {
type: "warning"
})
.then(() => {
- this.deleteUnit(row)
+ this.deletePlace(row)
})
.catch(err => {
if (err == "cancel") {
@@ -451,12 +392,12 @@ export default {
});
},
- async deleteUnit (row) {
- // const url = "/heart/icpartyunit/delete"
- const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
+ async deletePlace (row) {
+ // const url = "/gov/org/placeorg/del"
+ const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/del"
let params = {
- id: row.id
+ placeOrgId: row.placeOrgId
}
const { data, code, msg } = await requestPost(url, params)
@@ -476,118 +417,15 @@ export default {
//重置搜索条件
resetSearch () {
this.formData = {
- gridId: '',
- unitName: '',
- serviceMatter: '',
- type: '',
- contact: '',
- contactMobile: ''
- }
- },
-
- //导出表格
- async handleExport () {
- let title = '联建单位列表'
-
-
- const url = "/partyunit/export"
- let params = {
- ownerName: this.ownerName,
- ownerPhone: this.ownerPhone,
- level: this.agencyObj.level,
- id: this.agencyObj.id
+ placeOrgName: '',//场所名称
+ mobile: '',//联系电话
+ scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】
+ gridId: '',//场所区域【网格Id】
+ ninePlacsVal: '',//场所类型【九小场所Value值】
+ isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是
}
-
- app.ajax.exportFilePost(
- url,
- params,
- (data, rspMsg) => {
-
- this.download(data, title + '.xls')
- },
- (rspMsg, data) => {
- this.$message.error(rspMsg);
- }
- );
-
- },
-
- // 下载文件
- download (data, fileName) {
- if (!data) {
- return
- }
-
- var csvData = new Blob([data])
-
- if (window.navigator && window.navigator.msSaveOrOpenBlob) {
- window.navigator.msSaveOrOpenBlob(csvData, fileName);
- }
- // for Non-IE (chrome, firefox etc.)
- else {
- var a = document.createElement('a');
- document.body.appendChild(a);
- a.style = 'display: none';
- var url = window.URL.createObjectURL(csvData);
- a.href = url;
- a.download = fileName;
- a.click();
- a.remove();
- window.URL.revokeObjectURL(url);
- }
-
},
- // 上传文件之前的钩子
- beforeUpload (file) {
- this.files = file;
-
- const isText = file.type === 'application/vnd.ms-excel'
- const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-
- if (!isText && !isTextComputer) {
- this.$message.error('请选择正确格式的文件')
- return false
- } else {
- this.fileName = file.name;
- return true
- }
-
- },
- // 上传文件个数超过定义的数量
- handleExceed (files, fileList) {
- this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
- },
-
- async uploadFile () {
- this.loading = true
-
- if (this.fileName == "") {
- this.$message.warning('请选择要上传的文件！')
- return false
- }
-
- //清空上传列表
- this.$refs['upload'].clearFiles()
-
- var url = '/partyunit/import'
- let fileFormData = new FormData();
- fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
- const { data, code, msg } = await requestPost(url, fileFormData)
- if (code === 0) {
- this.$message({
- type: "success",
- message: "导入成功"
- });
-
- this.loadTable()
- } else {
- this.$message.error(msg)
- }
-
-
- },
handleSizeChange (val) {
this.pageSize = val
diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
index 383174ba6..8b3fbe1c1 100644
--- a/src/views/modules/communityService/ninePlaces/places/placesForm.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
@@ -9,7 +9,23 @@
:disabled="formType === 'detail'"
class="form">
-
+
+
+
+
+
+
+
+
@@ -25,27 +41,35 @@
-
-
+ prop="placeOrgName">
+
+
-
+ prop="address">
+
+
+
+
+
+
-
@@ -53,107 +77,24 @@
-
-
- {{item.label}}
-
-
-
-
-
-
+ prop="personInCharge">
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+ prop="mobile">
+
@@ -176,14 +117,6 @@ import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost } from '@/js/dai/request'
-
-
-var map
-var search
-var markers
-var infoWindowList
-var geocoder // 新建一个正逆地址解析类
-
let loading // 加载动画
export default {
data () {
@@ -192,41 +125,33 @@ export default {
btnDisable: false,
- unitId: '',
- keyWords: '',
+ placeOrgId: '',
formData: {
gridId: '',
- unitName: '',
- serviceMatter: [],
- type: '',
- contact: '',
- contactMobile: '',
- memberCount: 0,
- remark: '', //备注【最大500字】
- address: '', //详细地址
- longitude: 36.0722275, //经度
- latitude: 120.38945519 //纬度
+ ninePlacsVal: '',
+ placeOrgName: '',
+ address: '',
+ scale: '',
+ personInCharge: '',
+ mobile: ''
},
}
},
components: {},
mounted () {
- this.initMap()
+
},
methods: {
- async initForm (type, unitId) {
+ async initForm (type, placeOrgId) {
this.$refs.ref_form.resetFields();
- // debugger
- // map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
-
this.formType = type
- if (unitId) {
- this.unitId = unitId
- this.formData.id = unitId
+ if (placeOrgId) {
+ this.placeOrgId = placeOrgId
+ this.formData.placeOrgId = placeOrgId
await this.loadFormData()
}
@@ -234,10 +159,10 @@ export default {
//加载组织
async loadFormData () {
- // const url = '/heart/icpartyunit/detail'
- const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
+ // const url = '/gov/org/placeorg/detail'
+ const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/detail'
let params = {
- id: this.unitId
+ placeOrgId: this.placeOrgId
}
const { data, code, msg } = await requestPost(url, params)
@@ -263,16 +188,16 @@ export default {
app.util.validateRule(messageObj)
this.btnDisable = false
} else {
- this.addUnit()
+ this.addPlace()
}
})
},
- async addUnit () {
+ async addPlace () {
// const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
- // if (regPhone.test(this.formData.contactMobile) === false) {
+ // if (regPhone.test(this.formData.mobile) === false) {
// this.btnDisable = false
// this.$message({
// type: 'warning',
@@ -281,18 +206,23 @@ export default {
// return false;
// }
- // let url = '/heart/icpartyunit/save'
- let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
- // if (this.formType === 'edit') {
- // this.formData.id = this.unitId
- // }
+ let url = ''
+
+ if (this.formType === 'edit') {
+ // url = '/gov/org/placeorg/edit'
+ url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/edit'
+
+ } else {
+ // url = "/gov/org/placeorg/add"
+ url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/add"
+ }
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
- message: '新增联建单位成功'
+ message: '操作成功'
})
this.resetData()
this.$emit('dialogOk')
@@ -311,133 +241,16 @@ export default {
},
- // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
- initMap () {
- // 定义地图中心点坐标
- var center = new window.TMap.LatLng(36.0722275, 120.38945519)
- // 定义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.keyWords,
- 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) => {
- this.formData.address = result.result.address
- // 显示搜索到的地址
- });
- },
-
-
resetData () {
- this.unitId = ''
- this.keyWords = ''
+ this.placeOrgId = ''
this.formData = {
gridId: '',
- unitName: '',
- serviceMatter: [],
- type: '',
- contact: '',
- contactMobile: '',
- memberCount: 0,
- remark: '', //备注【最大500字】
- address: '', //详细地址
- longitude: '', //经度
- latitude: '' //纬度
+ ninePlacsVal: '',
+ placeOrgName: '',
+ address: '',
+ scale: '',
+ personInCharge: '',
+ mobile: ''
}
},
// 开启加载动画
@@ -462,27 +275,24 @@ export default {
gridId: [
{ required: true, message: '所属网格不能为空', trigger: 'blur' }
],
- unitName: [
- { required: true, message: '单位名称不能为空', trigger: 'blur' },
+ ninePlacsVal: [
+ { required: true, message: '场所类型不能为空', trigger: 'blur' },
],
- type: [
- { required: true, message: '分类不能为空', trigger: 'blur' }
+ placeOrgName: [
+ { required: true, message: '场所名称不能为空', trigger: 'blur' }
],
- contact: [
- { required: true, message: '联系人不能为空', trigger: 'blur' }
- ],
- contactMobile: [
- { required: true, message: '联系电话不能为空', trigger: 'blur' }
+ address: [
+ { required: true, message: '场所地址不能为空', trigger: 'blur' }
],
- memberCount: [
- { required: true, message: '在职党员数不能为空', trigger: 'blur' }
+ scale: [
+ { required: true, message: '场所规模不能为空', trigger: 'blur' }
],
- address: [
- { required: true, message: '详细地址不能为空', trigger: 'blur' }
+ personInCharge: [
+ { required: true, message: '负责人不能为空', trigger: 'blur' }
],
- longitude: [
- { required: true, message: '坐标不能为空', trigger: 'blur' }
+ mobile: [
+ { required: true, message: '联系电话不能为空', trigger: 'blur' }
]
}
},
@@ -494,11 +304,11 @@ export default {
type: Array,
default: []
},
- typeList: {
+ scaleList: {
type: Array,
default: []
},
- serviceList: {
+ placeTypeList: {
type: Array,
default: []
},
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index b8849d202..615cd8e02 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -6,37 +6,37 @@
ref="ref_searchform"
:label-width="'100px'">
取 消
@@ -175,39 +152,41 @@
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost } from '@/js/dai/request'
-
-
-
var map
var search
var markers
var infoWindowList
-var geocoder // 新建一个正逆地址解析类
-
let loading // 加载动画
export default {
data () {
return {
formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+ gridList: [],
+ propertyList: [],
btnDisable: false,
- unitId: '',
- keyWords: '',
- formData: {
- gridId: '',
- unitName: '',
- serviceMatter: [],
- type: '',
- contact: '',
- contactMobile: '',
- memberCount: 0,
- remark: '', //备注【最大500字】
+ neighborHoodId: '', //小区ID
+ dataForm: {
+ neighborHoodName: '', // 小区名称【不超过50字】
+ agencyId: '', // 所属组织ID
+ agencyName: '',
+ gridId: '', //所属网格ID
+ propertyId: '', //关联物业
address: '', //详细地址
- longitude: 36.0722275, //经度
- latitude: 120.38945519 //纬度
+ remark: '', //备注【最大500字】
+ location: '', //坐标位置
+ longitude: '', //经度
+ latitude: '' //纬度
+ },
+
+ propertyFormShow: false,
+ propertyForm: {
+ name: ''
},
+ keyWords: '',
+ agencyObj: {}
}
},
components: {},
@@ -216,101 +195,6 @@ export default {
},
methods: {
-
- async initForm (type, unitId) {
- this.$refs.ref_form.resetFields();
-
- // debugger
- // map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
-
- this.formType = type
- if (unitId) {
- this.unitId = unitId
- this.formData.id = unitId
- await this.loadFormData()
- }
-
- },
-
- //加载组织
- async loadFormData () {
- // const url = '/heart/icpartyunit/detail'
- const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
- let params = {
- id: this.unitId
- }
-
- const { data, code, msg } = await requestPost(url, params)
-
- if (code === 0) {
- this.formData = data
-
- } else {
- this.$message.error(msg)
- }
- },
-
-
-
- async handleComfirm () {
-
- this.btnDisable = true
- setTimeout(() => {
- this.btnDisable = false
- }, 10000)
- this.$refs['ref_form'].validate((valid, messageObj) => {
- if (!valid) {
- app.util.validateRule(messageObj)
- this.btnDisable = false
- } else {
- this.addUnit()
- }
-
- })
-
-
- },
- async addUnit () {
- // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
- // if (regPhone.test(this.formData.contactMobile) === false) {
- // this.btnDisable = false
- // this.$message({
- // type: 'warning',
- // message: '请输入正确的手机号码'
- // })
- // return false;
- // }
-
- // let url = '/heart/icpartyunit/save'
- let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
- // if (this.formType === 'edit') {
- // this.formData.id = this.unitId
- // }
-
- const { data, code, msg } = await requestPost(url, this.formData)
-
- if (code === 0) {
- this.$message({
- type: 'success',
- message: '新增联建单位成功'
- })
- this.resetData()
- this.$emit('dialogOk')
- this.btnDisable = false
- } else {
- this.btnDisable = false
- this.$message.error(msg)
- }
-
- },
-
- handleCancle () {
-
- this.resetData()
- this.$emit('dialogCancle')
-
- },
-
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap () {
// 定义地图中心点坐标
@@ -331,14 +215,11 @@ export default {
})
infoWindowList = Array(10)
- geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
-
// 监听地图平移结束
map.on('panend', () => {
this.handleMoveCenter()
})
this.handleMoveCenter()
- this.convert()
},
setMarker (lat, lng) {
@@ -373,13 +254,10 @@ export default {
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()
+ this.dataForm.latitude = lat
+ this.dataForm.longitude = lng
} else {
this.$message.error('未检索到相关位置坐标')
}
@@ -391,54 +269,185 @@ export default {
const center = map.getCenter()
const lat = center.getLat()
const lng = center.getLng()
- this.formData.latitude = lat
- this.formData.longitude = lng
+ this.dataForm.latitude = lat
+ this.dataForm.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);
+ async initForm (type, row, agencyObj) {
+ this.$refs.ref_form.resetFields();
+ this.agencyObj = agencyObj
+ // debugger
+ map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
+
+ this.formType = type
+ if (row) {
+
+ this.dataForm = JSON.parse(JSON.stringify(row))
+ this.neighborHoodId = this.dataForm.neighborHoodId
+ }
+
+
+ await this.loadAgency()
+ await this.loadGrid()
+ await this.loadProperty()
+ },
+
+ //加载组织
+ async loadAgency () {
+ const url = '/epmetuser/customerstaff/staffbasicinfo'
+ let params = {}
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.dataForm.agencyId = data.agencyId
+ this.dataForm.agencyName = data.agencyName
+ } else {
+ this.$message.error(msg)
+ }
+ },
+ //加载网格
+ async loadGrid () {
+ const url = '/gov/org/grid/allgridsnopermission '
+ // const url = "https://epmet-dev.elinkservice.cn:7082/api/apimock-v2/95518686fa128a53f64c678906848062/gov/org/grid/allgrids"
+ let params = {
+ agencyId: this.dataForm.agencyId
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.gridList = data
} else {
- location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+ this.$message.error(msg)
}
+ },
+ //加载物业
+ async loadProperty () {
+ const url = '/gov/org/propertymanagement/list'
+ // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/list"
+ let params = {}
- // map.setCenter(location);
- markers.updateGeometries([
- {
- id: 'main', // 点标注数据数组
- position: location,
- },
- ]);
- geocoder
- .getAddress({ location: location }) // 将给定的坐标位置转换为地址
- .then((result) => {
- this.formData.address = result.result.address
- // 显示搜索到的地址
- });
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.propertyList = data
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
+ handleAddProperty () {
+ this.propertyForm.name = ''
+ this.propertyFormShow = true
+ },
+
+ async handleComfirm () {
+
+ if (this.propertyFormShow) {
+
+ this.addProperty()
+
+ } else {
+ this.btnDisable = true
+ setTimeout(() => {
+ this.btnDisable = false
+ }, 10000)
+ this.$refs['ref_form'].validate((valid, messageObj) => {
+ if (!valid) {
+ app.util.validateRule(messageObj)
+ this.btnDisable = false
+ } else {
+ this.addCommunity()
+ }
+
+ })
+
+ }
},
+ async addCommunity () {
+
+ let url = ''
+ if (this.formType === 'add') {
+ url = '/gov/org/neighborhood/neighborhoodadd'
+ // url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
+ } else {
+ url = '/gov/org/neighborhood/neighborhoodupdate'
+ this.dataForm.neighborHoodId = this.neighborHoodId
+ }
+
+ const { data, code, msg } = await requestPost(url, this.dataForm)
+ if (code === 0) {
+ this.$message({
+ type: 'success',
+ message: '添加小区成功'
+ })
+ this.resetData()
+ this.$emit('dialogOk')
+ this.btnDisable = false
+ } else {
+ this.btnDisable = false
+ this.$message.error(msg)
+ }
+
+ },
+ async addProperty () {
+ if (!this.propertyForm.name || this.propertyForm.name === '') {
+ this.$message({
+ type: 'error',
+ message: '物业名称不能为空'
+ })
+ return false
+ }
+ const url = '/gov/org/propertymanagement/add'
+ // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/add"
+ let params = {
+ name: this.propertyForm.name
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.$message({
+ type: 'success',
+ message: '操作成功'
+ })
+ this.dataForm.propertyId = data.propertyId
+ this.propertyForm.name = ''
+ this.propertyFormShow = false
+ this.loadProperty()
+ } else {
+ this.$message.error(msg)
+ }
+ },
+ handleCancle () {
+ if (this.propertyFormShow) {
+ this.propertyForm.name = ''
+ this.propertyFormShow = false
+ } else {
+ this.resetData()
+ this.$emit('dialogCancle')
+ }
+ },
resetData () {
- this.unitId = ''
this.keyWords = ''
- this.formData = {
- gridId: '',
- unitName: '',
- serviceMatter: [],
- type: '',
- contact: '',
- contactMobile: '',
- memberCount: 0,
- remark: '', //备注【最大500字】
+ this.neighborHoodId = '' //小区ID
+ this.dataForm = {
+ neighborHoodName: '', // 小区名称【不超过50字】
+ agencyId: '', // 所属组织ID
+ agencyName: '',
+ gridId: '', //所属网格ID
+ propertyId: '', //关联物业
address: '', //详细地址
+ remark: '', //备注【最大500字】
+ location: '', //坐标位置
longitude: '', //经度
latitude: '' //纬度
}
+ this.propertyFormShow = false
},
// 开启加载动画
startLoading () {
@@ -459,24 +468,20 @@ export default {
computed: {
dataRule () {
return {
- gridId: [
- { required: true, message: '所属网格不能为空', trigger: 'blur' }
- ],
- unitName: [
- { required: true, message: '单位名称不能为空', trigger: 'blur' },
- ],
- type: [
- { required: true, message: '分类不能为空', trigger: 'blur' }
- ],
-
- contact: [
- { required: true, message: '联系人不能为空', trigger: 'blur' }
+ neighborHoodName: [
+ { required: true, message: '小区名称不能为空', trigger: 'blur' },
+ {
+ min: 1,
+ max: 50,
+ message: '小区名称长度在 1 到 50个字符',
+ trigger: 'blur'
+ }
],
- contactMobile: [
- { required: true, message: '联系电话不能为空', trigger: 'blur' }
+ agencyId: [
+ { required: true, message: '所属组织不能为空', trigger: 'blur' }
],
- memberCount: [
- { required: true, message: '在职党员数不能为空', trigger: 'blur' }
+ gridId: [
+ { required: true, message: '所属网格不能为空', trigger: 'blur' }
],
address: [
{ required: true, message: '详细地址不能为空', trigger: 'blur' }
@@ -486,23 +491,14 @@ export default {
]
}
},
-
+ propertyRule () {
+ name: [
+ { required: true, message: '物业名称不能为空', trigger: 'blur' }
+ // { min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
+ ]
+ }
},
- props: {
-
- gridList: {
- type: Array,
- default: []
- },
- typeList: {
- type: Array,
- default: []
- },
- serviceList: {
- type: Array,
- default: []
- },
- }
+ props: {}
}
-
diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 50f54367a..dbb0a3c43 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -95,264 +95,7 @@ export default {
selBuildingName: '',
roomLoaded: false,
- roomArray: [
- {
- houseId: "1",
- houseName: "101室",
- categoryList: [
- {
- name: '党员',
- iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
- isSpecial: '1',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "2",
- houseName: "102室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "3",
- houseName: "103室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "4",
- houseName: "104室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "5",
- houseName: "105室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "6",
- houseName: "106室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- }, {
- houseId: "1",
- houseName: "101室",
- categoryList: [
- {
- name: '党员',
- iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
- isSpecial: '1',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "2",
- houseName: "102室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "3",
- houseName: "103室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "4",
- houseName: "104室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "5",
- houseName: "105室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "6",
- houseName: "106室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- }, {
- houseId: "1",
- houseName: "101室",
- categoryList: [
- {
- name: '党员',
- iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
- isSpecial: '1',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "2",
- houseName: "102室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- },
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "3",
- houseName: "103室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "4",
- houseName: "104室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "5",
- houseName: "105室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- },
- {
- houseId: "6",
- houseName: "106室",
- categoryList: [
- {
- name: '低保',
- iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
- isSpecial: '0',
- }
- ]
- }
- ],
+ roomArray: [],
selHouseId: '',
selHouseName: '',
selHouseIndex: 0,
@@ -414,6 +157,7 @@ export default {
//点击全部成员
async handleShowAllUser (selIndex) {
// this.startLoading()
+ await this.loadUser(this.roomArray[selIndex].houseId, selIndex)
this.roomArray.forEach((element, index) => {
let obj = JSON.parse(JSON.stringify(element))
@@ -422,7 +166,7 @@ export default {
obj.showAllUser = !obj.showAllUser
this.$set(this.roomArray, selIndex, obj)
- this.loadUser(element.houseId, selIndex)
+
} else {
obj.showAllUser = false
this.$set(this.roomArray, index, obj)
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index fffed07dc..8c0f4a590 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -316,7 +316,7 @@ const vueGis = {
name: '搜索'
}
this.$nextTick(() => {
- this.$refs.ref_search.loadList();
+ this.$refs.ref_search.reset();
});
} else {
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 8fa9049e2..a75bebad5 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -353,6 +353,7 @@ export default {
},
userId() {
this.getApiData();
+ window.scrollTo(0, 0);
},
},
diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue
index e19d780fa..7e44c6d3b 100644
--- a/src/views/modules/visual/basicinfo/peopleSearch.vue
+++ b/src/views/modules/visual/basicinfo/peopleSearch.vue
@@ -97,7 +97,10 @@ export default {
}
},
-
+ reset () {
+ this.searchName = ''
+ this.tableData = []
+ },
async loadList () {
if (this.searchName) {
const url = "/epmetuser/icresiuser/searchbyname"
@@ -130,7 +133,11 @@ export default {
this.pageNo = val
this.loadList()
},
- }
+ },
+ destroyed () {
+ console.log("我已经离开了！");
+
+ },
};
diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue
index 7b6dce78c..41c80f97f 100644
--- a/src/views/modules/visual/warning/components/screen-table/index.vue
+++ b/src/views/modules/visual/warning/components/screen-table/index.vue
@@ -1,62 +1,101 @@
- 新增
-
- 导入
-
- 导出
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
- 经度
-
-
- 纬度
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+ placeholder="请输入电话">
-
+
+
+
-
@@ -44,42 +44,20 @@
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
+ label="分队名称"
+ min-width="180">
-
+ label="负责人"
+ min-width="180">
-
+ label="联系电话"
+ min-width="110">
-
+ label="负责区域"
+ min-width="280">
-
+ label="负责场所类型"
+ min-width="180">
-
+ label="监察计划"
+ min-width="180">
-
+ label="创建时间"
+ min-width="120">
+
@@ -232,12 +175,11 @@
width="850px"
top="5vh"
@closed="diaClose">
-
@@ -245,7 +187,7 @@
+
+
+
diff --git a/src/views/modules/communityService/ninePlaces/team/unitsForm.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
similarity index 52%
rename from src/views/modules/communityService/ninePlaces/team/unitsForm.vue
rename to src/views/modules/communityService/shzz/cpts/edit.vue
index 383174ba6..c6875c5e6 100644
--- a/src/views/modules/communityService/ninePlaces/team/unitsForm.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -1,99 +1,78 @@
- 新增
-
- 导入
-
- 导出
-
-
-
-
+
-
+
+
+ {{ dataForm.agencyName }}
+
+ :key="item.gridId"
+ :label="item.gridName"
+ :value="item.gridId">
-
+ placeholder="请输入小区名称"
+ v-model="dataForm.neighborHoodName">
-
-
-
+
+ 添加物业
-
-
- {{item.label}}
-
-
-
-
-
-
-
-
-
+ maxlength="50"
+ show-word-limit
+ placeholder="请输入详细地址"
+ v-model="dataForm.address">
-
-
+ v-model="dataForm.remark">
+
+
-
+
+
-
+ maxlength="10"
+ placeholder="请输入小区名称"
+ v-model="propertyForm.name">
-
-
-
-
+
+ 查询
+
-
-
+
-
-
-
-
-
- 查询
-
-
经度
+ v-model="dataForm.longitude">
纬度
+ v-model="dataForm.latitude">
-
-
-
\ No newline at end of file
+
{{item.title}}
+
+
+ 加载中
+
+
+ {{ item.title }}
-
- 加载中
-
+
-
- {{item}}
-
- 更多>
-
-
- {{item}}
-
+ {{ item }}
-
-
- 
+
+
+
+
+