Browse Source

房屋管理

V1.0
jiangyy 3 years ago
parent
commit
3a500223b9
  1. 6
      src/views/modules/base/community/buildDetail.vue
  2. 2
      src/views/modules/base/community/buildForm.vue
  3. 1
      src/views/modules/communityParty/regionalParty/activitysDetail.vue
  4. 57
      src/views/modules/communityParty/regionalParty/activitysForm.vue
  5. 1
      src/views/modules/communityParty/regionalParty/unitsDetail.vue
  6. 55
      src/views/modules/communityParty/regionalParty/unitsForm.vue
  7. 153
      src/views/modules/partymember/icpartyorg-add-or-update.vue

6
src/views/modules/base/community/buildDetail.vue

@ -54,7 +54,7 @@
<span>{{ dataForm.coordinatePosition?dataForm.coordinatePosition:'--' }}</span>
</div>
<div v-if="dataForm.coordinatePosition"
<div v-show="dataForm.coordinatePosition"
class="info-prop">
<span class="info-title-2">地图位置</span>
<div class="div_map">
@ -151,7 +151,7 @@ export default {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
if (this.dataForm.coordinatePosition) {
this.$nextTick(() => {
if (!map) {
this.initMap(latitude, longitude)
@ -161,7 +161,7 @@ export default {
}
})
}
},

2
src/views/modules/base/community/buildForm.vue

@ -241,12 +241,14 @@ export default {
this.dataForm.latitude = latitude
this.dataForm.longitude = longitude
}
this.$nextTick(() => {
if (!map) {
this.initMap(this.dataForm.latitude, this.dataForm.longitude);
} else {
map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
}
})
},
async handleComfirm () {

1
src/views/modules/communityParty/regionalParty/activitysDetail.vue

@ -70,6 +70,7 @@
<script>
import { Loading } from 'element-ui' // Loading
import daiMap from "@/utils/dai-map";
var map
var search

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

@ -136,48 +136,32 @@
</el-date-picker>
</el-form-item>
<el-form-item label="活动坐标"
<el-form-item label="地图位置"
prop="longitude"
label-width="150px"
style="display: block">
<div class="item_width_1">
<div class="div_map">
<div id="app">
</div>
<div class="div_searchmap">
<el-input class="item_width_4"
maxlength="50"
size="mini"
placeholder="请输入关键字"
v-model="keyWords">
</el-input>
<el-button style="margin-left: 10px"
type="primary"
size="mini"
@click="handleSearchMap">查询</el-button>
</div>
</div>
<div style="margin-top: 10px">
<span>经度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入经度"
v-model="formData.longitude">
</el-input>
<span style="margin-left: 20px">纬度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入纬度"
v-model="formData.latitude">
</el-input>
</div>
<div style="width: 500px">
<el-select v-model="searchValue"
filterable
style="width: 500px"
remote
:reserve-keyword="true"
placeholder="请输入关键词"
:remote-method="remoteMethod"
:loading="loading">
<el-option v-for="(item,index) in searchOptions"
@click.native="handleClickKey(index)"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<div id="app_activity"
class="div_map"></div>
</div>
</el-form-item>
<el-form-item label="活动地址"
<el-form-item label="详细地址"
prop="address"
label-width="150px"
style="display: block">
@ -224,6 +208,7 @@ import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import Tinymce from '@c/tinymce2/index.vue'
import daiMap from "@/utils/dai-map";
var map
var search

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

@ -66,6 +66,7 @@
import { Loading } from 'element-ui' // Loading
import nextTick from 'dai-js/tools/nextTick'
import daiMap from "@/utils/dai-map";
var map
var search

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

@ -91,48 +91,32 @@
placeholder="请输入备注,不超过500字"
v-model="formData.remark"></el-input>
</el-form-item>
<el-form-item label="位置坐标"
<el-form-item label="地图位置"
prop="longitude"
label-width="150px"
style="display: block">
<div style="width: 500px">
<div class="div_map">
<div id="app">
</div>
<div class="div_searchmap">
<el-input class="item_width_4"
maxlength="50"
size="mini"
placeholder="请输入关键字"
v-model="keyWords">
</el-input>
<el-button style="margin-left: 10px"
type="primary"
size="mini"
@click="handleSearchMap">查询</el-button>
</div>
</div>
<div style="margin-top: 10px">
<span>经度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入经度"
v-model="formData.longitude">
</el-input>
<span style="margin-left: 20px">纬度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入纬度"
v-model="formData.latitude">
</el-input>
</div>
<el-select v-model="searchValue"
filterable
style="width: 500px"
remote
:reserve-keyword="true"
placeholder="请输入关键词"
:remote-method="remoteMethod"
:loading="loading">
<el-option v-for="(item,index) in searchOptions"
@click.native="handleClickKey(index)"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<div id="app_unit"
class="div_map"></div>
</div>
</el-form-item>
<el-form-item label="地理位置"
<el-form-item label="详细地址"
prop="address"
label-width="150px"
style="display: block">
@ -161,6 +145,7 @@
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import daiMap from "@/utils/dai-map";

153
src/views/modules/partymember/icpartyorg-add-or-update.vue

@ -1,56 +1,44 @@
<template>
<el-dialog
:visible.sync="visible"
<el-dialog :visible.sync="visible"
:title="!dataForm.id ? '新增党组织' : '更新党组织'"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form
class="form"
:close-on-press-escape="false">
<el-form class="form"
:model="dataForm"
:rules="dataRule"
ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()"
:label-width="$i18n.locale === 'en-US' ? '120px' : '100px'"
>
<el-form-item prop="partyOrgType" label="党组织类型">
<el-select
:disabled="dataForm.id || dataForm.orgId ? true : false"
:label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
<el-form-item prop="partyOrgType"
label="党组织类型">
<el-select :disabled="dataForm.id || dataForm.orgId ? true : false"
v-model="dataForm.partyOrgType"
@change="changePartyOrgType"
clearable
placeholder="请选择党组织类型"
>
<el-option
v-for="item in partyOrgTypeList"
placeholder="请选择党组织类型">
<el-option v-for="item in partyOrgTypeList"
:key="item.value"
:label="item.name"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="partyOrgName" label="党组织名称">
<el-input
v-model="dataForm.partyOrgName"
<el-form-item prop="partyOrgName"
label="党组织名称">
<el-input v-model="dataForm.partyOrgName"
placeholder="请输入党组织名称"
style="width: 300px"
></el-input>
style="width: 300px"></el-input>
</el-form-item>
<el-form-item label="党组织编码" prop="partyOrgCode">
<el-input
v-model="dataForm.partyOrgCode"
<el-form-item label="党组织编码"
prop="partyOrgCode">
<el-input v-model="dataForm.partyOrgCode"
placeholder="党组织编码"
style="width: 300px"
></el-input>
style="width: 300px"></el-input>
</el-form-item>
<el-form-item
v-if="dataForm.partyOrgType != '5'"
<el-form-item v-if="dataForm.partyOrgType != '5'"
prop="agencyId"
label="行政组织"
>
<el-cascader
style="width: 300px"
label="行政组织">
<el-cascader style="width: 300px"
v-model="dataForm.agencyId"
:options="agencyOrgList"
placeholder="请选择行政组织"
@ -64,16 +52,12 @@
:disabled="dataForm.id ? true : false"
:show-all-levels="false"
@change="changeAgencyOrg"
clearable
/>
clearable />
</el-form-item>
<el-form-item
v-if="!dataForm.sjdzzName"
<el-form-item v-if="!dataForm.sjdzzName"
prop="mySelectOrg"
label="上级党组织"
>
<el-cascader
ref="myOrg"
label="上级党组织">
<el-cascader ref="myOrg"
style="width: 300px"
v-model="dataForm.mySelectOrg"
:options="orgList"
@ -86,70 +70,51 @@
}"
@change="handleChangeOrg"
:disabled="dataForm.id || dataForm.orgId ? true : false"
clearable
/>
clearable />
</el-form-item>
<el-form-item v-if="dataForm.sjdzzName" label="上级党组织">
<el-input
:disabled="true"
<el-form-item v-if="dataForm.sjdzzName"
label="上级党组织">
<el-input :disabled="true"
v-model="dataForm.sjdzzName"
style="width: 300px"
></el-input>
style="width: 300px"></el-input>
</el-form-item>
<el-form-item label="党组织介绍" prop="introduction">
<el-input
style="width: 300px"
<el-form-item label="党组织介绍"
prop="introduction">
<el-input style="width: 300px"
v-model="dataForm.introduction"
type="textarea"
maxlength="500"
placeholder="党组织介绍"
></el-input>
placeholder="党组织介绍"></el-input>
</el-form-item>
<el-form-item label="党组织位置" prop="longitude" style="display: block">
<div class="item_width_1">
<div class="div_map">
<div id="app"></div>
<div style="display: none" id="mapSeach_id" class="div_searchmap">
<el-input
class="item_width_4"
maxlength="50"
size="mini"
placeholder="请输入关键字"
v-model="keyWords"
>
</el-input>
<el-button
style="margin-left: 10px"
type="primary"
size="mini"
@click="handleSearchMap"
>查询</el-button
>
</div>
</div>
<!-- <div id="lon_lat_id" style="margin-top: 10px; display: none">
<span>经度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入经度"
:readonly="true"
v-model="dataForm.longitude">
</el-input>
<span style="margin-left: 20px">纬度</span>
<el-input class="item_width_3"
maxlength="50"
placeholder="请输入纬度"
:readonly="true"
v-model="dataForm.latitude">
</el-input>
</div> -->
<el-form-item label="地图位置"
prop="longitude"
label-width="150px"
style="display: block">
<div style="width: 500px">
<el-select v-model="searchValue"
filterable
style="width: 500px"
remote
:reserve-keyword="true"
placeholder="请输入关键词"
:remote-method="remoteMethod"
:loading="loading">
<el-option v-for="(item,index) in searchOptions"
@click.native="handleClickKey(index)"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<div id="app_icparty"
class="div_map"></div>
</div>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t("cancel") }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{
<el-button type="primary"
@click="dataFormSubmitHandle()">{{
$t("confirm")
}}</el-button>
</template>
@ -157,6 +122,8 @@
</template>
<script>
import daiMap from "@/utils/dai-map";
var map;
var search;
var markers;

Loading…
Cancel
Save