Browse Source

网格类型/公共服务组织/提示信息/社区简介

dev-用户反馈
mk 3 years ago
parent
commit
2be7245f11
  1. 4
      src/views/modules/base/communityYantai/cpts/grid-info.vue
  2. 11
      src/views/modules/base/organization/organization.vue
  3. 4
      src/views/modules/communityParty/regionalParty/activitys.vue
  4. 2
      src/views/modules/communityParty/regionalParty/activitysForm.vue
  5. 106
      src/views/modules/communityParty/regionalParty/units.vue
  6. 70
      src/views/modules/communityParty/regionalParty/unitsDetail.vue
  7. 94
      src/views/modules/communityParty/regionalParty/unitsForm.vue
  8. 4
      src/views/modules/communityService/estateManagement/estateManagement.vue

4
src/views/modules/base/communityYantai/cpts/grid-info.vue

@ -25,8 +25,8 @@
<div class="value">{{ info.mobile || '--' }}</div> <div class="value">{{ info.mobile || '--' }}</div>
</div> </div>
<div class="item"> <div class="item">
<div class="field">网格简介</div> <div class="field">网格类型</div>
<div class="value">{{ info.remark || '--' }}</div> <div class="value">{{ info.gridTypeName || '--' }}</div>
</div> </div>
<div class="item" v-if="mapData"> <div class="item" v-if="mapData">
<div class="field">管辖范围</div> <div class="field">管辖范围</div>

11
src/views/modules/base/organization/organization.vue

@ -677,6 +677,10 @@
<el-input v-model="agencyForm.mobile" <el-input v-model="agencyForm.mobile"
placeholder="请输入联系电话"></el-input> placeholder="请输入联系电话"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="社区简介">
<el-input v-model="agencyForm.remark"
type="textarea" rows=3 maxlength="500" show-word-limit placeholder="请输入社区简介"></el-input>
</el-form-item>
<el-form-item label="坐标"> <el-form-item label="坐标">
<div id="con"></div> <div id="con"></div>
</el-form-item> </el-form-item>
@ -719,6 +723,7 @@
placeholder="请输入内容" placeholder="请输入内容"
resize="none" resize="none"
rows=3 rows=3
maxlength="500"
show-word-limit show-word-limit
> >
</el-input> </el-input>
@ -772,9 +777,10 @@
type="textarea" type="textarea"
v-model="OrgDetailsForm.remark" v-model="OrgDetailsForm.remark"
placeholder="请输入内容" placeholder="请输入内容"
show-word-limit
maxlength="500"
resize="none" resize="none"
rows=3 rows=3
show-word-limit
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -1013,6 +1019,7 @@ export default {
areaName: "", areaName: "",
contacts: "", contacts: "",
mobile: "", mobile: "",
remark:"",
code: "", code: "",
}, },
// //
@ -1627,6 +1634,7 @@ export default {
(this.agencyForm.contacts = ""), (this.agencyForm.contacts = ""),
(this.agencyForm.mobile = ""), (this.agencyForm.mobile = ""),
(this.agencyForm.code = ""), (this.agencyForm.code = ""),
(this.agencyForm.remark = ""),
(this.latitude = ""), (this.latitude = ""),
(this.longitude = ""); (this.longitude = "");
}, },
@ -2356,6 +2364,7 @@ export default {
contacts: this.agencyForm.contacts, contacts: this.agencyForm.contacts,
mobile: this.agencyForm.mobile, mobile: this.agencyForm.mobile,
code: this.agencyForm.code, code: this.agencyForm.code,
remark: this.agencyForm.remark,
latitude: this.latitude, latitude: this.latitude,
longitude: this.longitude, longitude: this.longitude,
}; };

4
src/views/modules/communityParty/regionalParty/activitys.vue

@ -133,7 +133,7 @@
align="center" align="center"
type="index" type="index"
width="50"></el-table-column> width="50"></el-table-column>
<el-table-column prop="unitName" <el-table-column prop="name"
header-align="center" header-align="center"
align="center" align="center"
label="单位名称" label="单位名称"
@ -522,7 +522,7 @@ export default {
this.timeRange = [] this.timeRange = []
this.formData = { this.formData = {
gridId: '', gridId: '',
unitName: '', name: '',
serviceMatter: '', serviceMatter: '',
type: '', type: '',
contact: '', contact: '',

2
src/views/modules/communityParty/regionalParty/activitysForm.vue

@ -223,7 +223,7 @@ export default {
let _form = { let _form = {
gridId: '', gridId: '',
serviceMatter: '',// serviceMatter: '',//
serviceMatterList: [], serviceMatterList: {},
unitId: '',//ID unitId: '',//ID
unitIdList: [], unitIdList: [],
title: '',// title: '',//

106
src/views/modules/communityParty/regionalParty/units.vue

@ -19,8 +19,8 @@
</el-form-item> </el-form-item>
<el-form-item label="单位名称" <el-form-item label="单位名称"
prop="unitName"> prop="name">
<el-input v-model="formData.unitName" <el-input v-model="formData.name"
class="item_width_1" class="item_width_1"
clearable clearable
size="small" size="small"
@ -133,7 +133,7 @@
type="index" type="index"
width="50"></el-table-column> width="50"></el-table-column>
<el-table-column prop="unitName" <el-table-column prop="name"
header-align="center" header-align="center"
align="center" align="center"
label="单位名称" label="单位名称"
@ -145,13 +145,13 @@
label="所属组织" label="所属组织"
min-width="100"> min-width="100">
</el-table-column> </el-table-column>
<el-table-column prop="type" <el-table-column prop="typeName"
header-align="center" header-align="center"
align="center" align="center"
label="分类" label="分类"
min-width="80"> min-width="80">
</el-table-column> </el-table-column>
<el-table-column prop="serviceMatterListShow" <el-table-column prop="serviceMatterName"
header-align="center" header-align="center"
align="center" align="center"
label="服务事项" label="服务事项"
@ -177,12 +177,7 @@
label="联系电话" label="联系电话"
width="120"> width="120">
</el-table-column> </el-table-column>
<el-table-column prop="memberCount"
header-align="center"
align="center"
label="在职党员数"
width="100">
</el-table-column>
<!-- <el-table-column prop="satisfaction" <!-- <el-table-column prop="satisfaction"
header-align="center" header-align="center"
align="center" align="center"
@ -219,58 +214,10 @@
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-popover v-if="agencyId===scope.row.agencyId"
popper-class="btn-popper"
placement="bottom"
style="margin-left:10px"
width="20"
trigger="click">
<div v-if="scope.row.syncType==='not_sync'"
class="table-more-btn">
<el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleSync(scope.row)">同步</el-button>
</div>
<div v-if="scope.row.syncType==='sync'"
class="table-more-btn">
<el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleNoSync(scope.row)">取消同步</el-button>
</div>
<div class="table-more-btn">
<el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleFinish(scope.row)">完成情况</el-button>
</div>
<div class="table-more-btn">
<el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleScore(scope.row)">积分记录</el-button>
</div>
<div class="table-more-btn">
<el-button type="text" <el-button type="text"
class="div-table-button--delete" class="div-table-button--delete"
size="small" size="small"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
</div>
<el-button type="text"
size="small"
class="div-table-button--more"
slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
</el-popover>
<el-button v-else
type="text"
class="div-table-button--detail"
size="small"
@click="handleScore(scope.row)">积分记录</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -366,7 +313,7 @@ export default {
unitList: [],//list unitList: [],//list
serviceList: [],//list serviceList: [],//list
typeList: [],//list typeList: [{label:'实有单位',value:'1'},{label:'社会服务组织',value:'2'},{label:'志愿单位',value:'3'}],//list
agencyIdArray: [], agencyIdArray: [],
orgOptions: [], orgOptions: [],
orgOptionProps: { orgOptionProps: {
@ -376,11 +323,10 @@ export default {
children: 'subAgencyList', children: 'subAgencyList',
checkStrictly: true checkStrictly: true
}, },
unitId: '', unitId: '',
formData: { formData: {
agencyId: '', agencyId: '',
unitName: '', name: '',
serviceMatter: '', serviceMatter: '',
type: '', type: '',
contact: '', contact: '',
@ -418,9 +364,6 @@ export default {
await this.loadService() await this.loadService()
this.getOrgTreeList() this.getOrgTreeList()
//
await this.loadType()
const { user } = this.$store.state const { user } = this.$store.state
this.agencyId = user.agencyId this.agencyId = user.agencyId
@ -484,29 +427,10 @@ export default {
} }
}, },
//
async loadType () {
const url = "/sys/dict/data/dictlist"
let params = {
dictType: 'party_unit_type'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.typeList = data
} else {
this.$message.error(msg)
}
},
async loadTable () { async loadTable () {
this.tableLoading = true this.tableLoading = true
const url = "/heart/icpartyunit/list" const url = "/heart/icPublicServiceOrg/page"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list" // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
let params = { let params = {
pageSize: this.pageSize, pageSize: this.pageSize,
@ -560,7 +484,7 @@ export default {
// //
handleFinish (row) { handleFinish (row) {
this.finishDiaTitle = row.unitName + '完成情况' this.finishDiaTitle = row.name + '完成情况'
this.finishDiaShow = true this.finishDiaShow = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_finish.initTable(row) this.$refs.ref_finish.initTable(row)
@ -586,7 +510,7 @@ export default {
this.formTitle = '修改' this.formTitle = '修改'
this.formShow = true this.formShow = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_form.initForm('edit', row.id) this.$refs.ref_form.initForm('edit',row.id)
}) })
}, },
@ -639,7 +563,7 @@ export default {
let params = { let params = {
id: row.id, id: row.id,
deptName: row.unitName, deptName: row.name,
mobile: row.contactMobile, mobile: row.contactMobile,
personName: row.contact, personName: row.contact,
deptType: 'party_unit', deptType: 'party_unit',
@ -711,14 +635,14 @@ export default {
}, },
async deleteUnit (row) { async deleteUnit (row) {
const url = "/heart/icpartyunit/delete" const url = "/heart/icPublicServiceOrg/delete"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete" // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
let params = { let params = {
id: row.id id: row.id
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, [row.id])
if (code === 0) { if (code === 0) {
this.$message({ this.$message({
@ -737,7 +661,7 @@ export default {
this.agencyIdArray = [] this.agencyIdArray = []
this.formData = { this.formData = {
agencyId: '', agencyId: '',
unitName: '', name: '',
serviceMatter: '', serviceMatter: '',
type: '', type: '',
contact: '', contact: '',

70
src/views/modules/communityParty/regionalParty/unitsDetail.vue

@ -7,7 +7,7 @@
<div class="m-info"> <div class="m-info">
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">单位名称</span> <span class="info-title-2">单位名称</span>
<span>{{ formData.unitName||'--' }}</span> <span>{{ formData.name||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
@ -17,7 +17,7 @@
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">服务事项</span> <span class="info-title-2">服务事项</span>
<span>{{ formData.serviceMatterList.join(',') }}</span> <span>{{ formData.serviceMatterName }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
@ -28,10 +28,6 @@
<span class="info-title-2">联系电话</span> <span class="info-title-2">联系电话</span>
<span>{{ formData.contactMobile||'--' }}</span> <span>{{ formData.contactMobile||'--' }}</span>
</div> </div>
<div class="info-prop">
<span class="info-title-2">在职党员</span>
<span>{{ formData.memberCount||'--' }}</span>
</div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">备注</span> <span class="info-title-2">备注</span>
<span>{{ formData.remark||'--' }}</span> <span>{{ formData.remark||'--' }}</span>
@ -67,6 +63,8 @@
import { Loading } from 'element-ui' // Loading import { Loading } from 'element-ui' // Loading
import nextTick from 'dai-js/tools/nextTick' import nextTick from 'dai-js/tools/nextTick'
import daiMap from "@/utils/dai-map"; import daiMap from "@/utils/dai-map";
import { requestPost } from '@/js/dai/request'
import { log } from 'console';
var map var map
var search var search
@ -78,8 +76,19 @@ let loading // 加载动画
export default { export default {
data () { data () {
return { return {
formData: {}, formData: {
name:"",
type:"",
serviceMatterName:"",
contact:"",
contactMobile:"",
remark:"",
address:"",
latitude:"",
longitude:"",
},
initLoading: false, initLoading: false,
unitId:""
} }
}, },
components: {}, components: {},
@ -99,16 +108,38 @@ export default {
// map.destroy() // map.destroy()
} }
}, },
// async initForm (row) {
// this.startLoading()
// let { latitude, longitude } = this.$store.state.user;
// this.unitId = row.id
// await this.getDetail()
// if (!latitude || latitude == "" || latitude == "0") {
// latitude = 39.9088810666821;
// longitude = 116.39743841556731;
// }
// this.$nextTick(() => {
// if (!map) {
// this.initMap(latitude, longitude)
// } else {
// map.setCenter(latitude, longitude);
// map.setMarker(latitude, longitude);
// }
// })
// this.endLoading()
// },
async initForm (row) { async initForm (row) {
this.startLoading() this.startLoading()
this.formData = JSON.parse(JSON.stringify(row)) // this.formData = JSON.parse(JSON.stringify(row))
this.initLoading = true this.initLoading = true
console.log(this.formData) this.unitId = row.id
// await nextTick(200) // await nextTick(200)
await this.getDetail()
console.log(this.formData);
let { latitude, longitude } = this.$store.state.user; let { latitude, longitude } = this.$store.state.user;
console.log('lat' + latitude + ',lon' + longitude) console.log('lat' + latitude + ',lon' + longitude)
if (this.formData.latitude && this.formData.longitude) { if (this.formData.latitude && this.formData.longitude) {
@ -133,11 +164,22 @@ export default {
this.endLoading() this.endLoading()
}, },
async getDetail () {
const url = `/heart/icPublicServiceOrg/detail/${this.unitId}`
const { data, code, msg } = await requestPost(url)
if (code === 0) {
this.formData = data
} else {
this.$message.error(msg)
}
},
// init // init
initMap (latitude, longitude) { initMap (latitude, longitude) {
console.log(latitude, longitude);
map = new daiMap( map = new daiMap(
document.getElementById("app_detail_unit"), document.getElementById("app_detail_unit"),
{ latitude, longitude }, { latitude, longitude },

94
src/views/modules/communityParty/regionalParty/unitsForm.vue

@ -10,14 +10,14 @@
class="form"> class="form">
<el-form-item label="单位名称" <el-form-item label="单位名称"
prop="unitName" prop="name"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_1" <el-input class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入单位名称" placeholder="请输入单位名称"
v-model="formData.unitName"> v-model="formData.name">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="分类" <el-form-item label="分类"
@ -45,8 +45,8 @@
style="display:flex;flex-wrap:wrap" style="display:flex;flex-wrap:wrap"
v-model="formData.serviceMatterList"> v-model="formData.serviceMatterList">
<el-checkbox v-for="item in serviceList" <el-checkbox v-for="item in serviceList"
:key="item.value" :key="item.categoryCode"
:label="item.value">{{item.label}}</el-checkbox> :label="item.categoryCode">{{item.categoryName}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
@ -69,16 +69,7 @@
v-model="formData.contactMobile"> v-model="formData.contactMobile">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="在职党员"
style="display: block"
prop="memberCount"
label-width="150px">
<el-input-number class="item_width_4"
v-model="formData.memberCount"
:min="0"
:max="9999"
label="在职党员"></el-input-number>
</el-form-item>
<el-form-item label="备注" <el-form-item label="备注"
prop="remark" prop="remark"
label-width="150px" label-width="150px"
@ -154,16 +145,15 @@ export default {
data () { data () {
let initFormData = () => { let initFormData = () => {
let _form = { let _form = {
unitName: '', name: '',
serviceMatterList: [], serviceMatterList: [],
type: '', type: '',
contact: '', contact: '',
contactMobile: '', contactMobile: '',
memberCount: 0,
remark: '', //500 remark: '', //500
address: '', // address: '', //
longitude: this.$store.state.user.longitude, // longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude// latitude: this.$store.state.user.latitude //
} }
return _form return _form
@ -174,7 +164,7 @@ export default {
searchValue: '', searchValue: '',
resultList: [], resultList: [],
loading: false, loading: false,
serviceMatterListCody:[],
btnDisable: false, btnDisable: false,
unitId: '', unitId: '',
@ -189,7 +179,8 @@ export default {
// this.initMap() // this.initMap()
}, },
watch:{
},
methods: { methods: {
async initForm (type, unitId) { async initForm (type, unitId) {
@ -205,8 +196,7 @@ export default {
this.formType = type this.formType = type
if (unitId) { if (unitId) {
this.unitId = unitId this.unitId = unitId
this.formData.id = unitId await this.getDetail()
await this.loadFormData()
} else { } else {
this.formData.latitude = latitude this.formData.latitude = latitude
this.formData.longitude = longitude this.formData.longitude = longitude
@ -224,7 +214,7 @@ export default {
// //
async loadService () { async loadService () {
const url = "/heart/serviceitem/dict-list" const url = "/heart/serviceitem/dict-options"
let params = { let params = {
type: 'usable' type: 'usable'
// parentCategoryCode: '1010' // parentCategoryCode: '1010'
@ -234,13 +224,34 @@ export default {
if (code === 0) { if (code === 0) {
this.serviceList = data this.serviceList = data
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
}, },
async getDetail () {
const url = `/heart/icPublicServiceOrg/detail/${this.unitId}`
const { data, code, msg } = await requestPost(url)
if (code === 0) {
for(let key in data){
if(key == 'serviceMatterList'){
let arr =[]
for(let val of data[key]){
arr.push(val.categoryCode)
}
this.serviceMatterListCody = arr
}
}
this.formData = data
this.formData.serviceMatterList = this.serviceMatterListCody
} else {
this.$message.error(msg)
}
},
// //
async loadFormData () { async loadFormData () {
const url = '/heart/icpartyunit/detail' const url = '/heart/icpartyunit/detail'
@ -252,7 +263,7 @@ export default {
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) { if (!data.serviceMatterList) {
data.serviceMatterList = [] data.serviceMatterList = []
} }
@ -292,13 +303,27 @@ export default {
// return false; // return false;
// } // }
let url = '/heart/icpartyunit/save' let url = '/heart/icPublicServiceOrg/save'
// let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save" // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
// if (this.formType === 'edit') { if (this.formType === 'edit') {
// this.formData.id = this.unitId this.formData.id = this.unitId
// } url = '/heart/icPublicServiceOrg/update'
}
const { data, code, msg } = await requestPost(url, this.formData) if(this.formData.serviceMatterList.length>0){
let arr = []
for( let code of this.formData.serviceMatterList){
this.serviceList.forEach(item=>{
if( item.categoryCode == code){
arr.push({categoryCode:item.categoryCode,categoryId:item.categoryId})
}
return arr
})
}
this.formData.serviceMatterList = arr
this.formData.latitude = this.formData.latitude.toString()
this.formData.longitude = this.formData.longitude.toString()
}
const { data, code, msg } = await requestPost(url,this.formData)
if (code === 0) { if (code === 0) {
this.$message({ this.$message({
@ -321,7 +346,6 @@ export default {
this.$emit('dialogCancle') this.$emit('dialogCancle')
}, },
// init // init
initMap (latitude, longitude) { initMap (latitude, longitude) {
@ -415,12 +439,11 @@ export default {
this.unitId = '' this.unitId = ''
this.keyWords = '' this.keyWords = ''
this.formData = { this.formData = {
unitName: '', name: '',
serviceMatterList: [], serviceMatterList: [],
type: '', type: '',
contact: '', contact: '',
contactMobile: '', contactMobile: '',
memberCount: 0,
remark: '', //500 remark: '', //500
address: '', // address: '', //
longitude: this.$store.state.user.longitude, // longitude: this.$store.state.user.longitude, //
@ -447,7 +470,7 @@ export default {
dataRule () { dataRule () {
return { return {
unitName: [ name: [
{ required: true, message: '单位名称不能为空', trigger: 'blur' }, { required: true, message: '单位名称不能为空', trigger: 'blur' },
], ],
type: [ type: [
@ -460,9 +483,6 @@ export default {
contactMobile: [ contactMobile: [
{ required: true, message: '联系电话不能为空', trigger: 'blur' } { required: true, message: '联系电话不能为空', trigger: 'blur' }
], ],
memberCount: [
{ required: true, message: '在职党员数不能为空', trigger: 'blur' }
],
address: [ address: [
{ required: true, message: '详细地址不能为空', trigger: 'blur' } { required: true, message: '详细地址不能为空', trigger: 'blur' }
], ],

4
src/views/modules/communityService/estateManagement/estateManagement.vue

@ -280,8 +280,12 @@
this.$message.success("删除成功!"); this.$message.success("删除成功!");
this.getTableData(); this.getTableData();
} else { } else {
if(code>=8000){
this.$message.error(msg);
}else{
this.$message.error("操作失败!"); this.$message.error("操作失败!");
} }
}
}, },
async getTableData () { async getTableData () {

Loading…
Cancel
Save