From 3cb2690474465b6aa8217378ce35c54e5095aaac Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Thu, 19 May 2022 18:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partymember/icpartyorg-add-or-update.vue  | 575 ++++++++++--------
 .../modules/partymember/icpartyorgtree.vue    | 154 +++--
 2 files changed, 417 insertions(+), 312 deletions(-)

diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index 7ec6c23e..43da1d9e 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -1,87 +1,91 @@
 <template>
     <el-dialog :visible.sync="visible" :title="!dataForm.id ? '新增党组织' : '更新党组织'" :close-on-click-modal="false"
                :close-on-press-escape="false">
-        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+        <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 label="上级组织" prop="orgPid">-->
-            <!--            <el-input v-model="dataForm.orgPid" placeholder="上级组织"></el-input>-->
-            <!--        </el-form-item>-->
-            <el-form-item prop="orgPidName"
-                          label="上级组织"
-                          class="dept-list">
-                <el-popover v-model="orgListVisible"
-                            ref="orgListPopover"
-                            placement="bottom-start"
-                            trigger="click">
-                    <el-tree :data="orgList"
-                             :props="{ label: 'partyOrgName', children: 'children' }"
-                             node-key="id"
-                             ref="deptListTree"
-                             :highlight-current="true"
-                             :expand-on-click-node="false"
-                             accordion
-                             @current-change="orgListTreeCurrentChangeHandle">
-                    </el-tree>
-                </el-popover>
-                <el-input v-model="dataForm.orgPidName"
-                          v-popover:orgListPopover
-                          :readonly="true"
-                          placeholder="上级分类">
-                    <i v-if="dataForm.orgPid !== '0'"
-                       slot="suffix"
-                       @click.stop="orgListTreeSetDefaultHandle()"
-                       class="el-icon-circle-close el-input__icon">
-                    </i>
-                </el-input>
-            </el-form-item>
-<!--            <el-form-item label="组织类型" prop="partyOrgType">-->
-<!--                <el-input v-model="dataForm.partyOrgType" placeholder="党组织类型"></el-input>-->
-<!--            </el-form-item>-->
-            <el-form-item label="组织类型" prop="partyOrgType">
-                <el-select v-model="dataForm.partyOrgType" @change="changePartyOrgType" clearable placeholder="组织类型">
-                    <el-option v-for="item in partyOrgTypeList" :key="item.value" :label="item.name" :value="item.value">
+            <el-form-item prop="partyOrgType" label="组织类型">
+                <el-select v-model="dataForm.partyOrgType" @change="changePartyOrgType" clearable placeholder="请选择组织类型">
+                    <el-option
+                    v-for="item in partyOrgTypeList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value">
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="组织名称" prop="partyOrgName">
-                <el-input v-model="dataForm.partyOrgName" placeholder="组织名称"></el-input>
+            <el-form-item  prop="partyOrgName" label="组织名称">
+                <el-input  v-model="dataForm.partyOrgName" placeholder="请输入组织名称"  style="width:300px"></el-input>
             </el-form-item>
             <el-form-item label="组织编码" prop="partyOrgCode">
-                <el-input v-model="dataForm.partyOrgCode" placeholder="组织编码"></el-input>
+                <el-input v-model="dataForm.partyOrgCode" placeholder="组织编码" style="width:300px"></el-input>
+            </el-form-item>
+            <el-form-item v-if="dataForm.partyOrgType != '5'" prop="maSelectAgency" label="行政组织">
+                <el-cascader
+                    style="width:300px"
+                    v-model="dataForm.maSelectAgency"
+                    :options="agencyOrgList"
+                    placeholder="请选择行政组织"
+                    :props="{ checkStrictly: true, label: 'name', value: 'id', children: 'children' }"
+                    @change="handleChangeAgency"
+                    clearable />
             </el-form-item>
-<!--            <el-form-item label="行政组织" prop="agencyId">-->
-<!--                <el-input v-model="dataForm.agencyId" placeholder="行政组织"></el-input>-->
-<!--            </el-form-item>-->
-            <el-form-item prop="agencyName"
-                          label="行政组织"
-                          v-if="dataForm.partyOrgType != '5'"
-                          class="dept-list">
-                <el-popover v-model="agencyListVisible"
-                            ref="agencyOrgListPopover"
-                            placement="bottom-start"
-                            trigger="click">
-                    <el-tree :data="agencyOrgList"
-                             :props="{ label: 'name', children: 'children' }"
-                             node-key="id"
-                             ref="agencyListTree"
-                             :highlight-current="true"
-                             :expand-on-click-node="false"
-                             accordion
-                             @current-change="agencyListTreeCurrentChangeHandle">
-                    </el-tree>
-                </el-popover>
-                <el-input v-model="dataForm.agencyName"
-                          v-popover:agencyOrgListPopover
-                          :readonly="true"
-                          placeholder="行政组织">
-<!--                    <i v-if="dataForm.orgPid !== '0'"-->
-<!--                       slot="suffix"-->
-<!--                       class="el-icon-circle-close el-input__icon">-->
-<!--                    </i>-->
-                </el-input>
+            <el-form-item  prop="mySelectOrg" label="上级组织">
+                <el-cascader
+                    style="width:300px"
+                    v-model="dataForm.mySelectOrg"
+                    :options="orgList"
+                    placeholder="请选择上级组织"
+                    :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
+                    @change="handleChangeOrg"
+                    clearable />
             </el-form-item>
             <el-form-item label="党组织介绍" prop="introduction">
-                <el-input v-model="dataForm.introduction" type="textarea" maxlength="500" placeholder="党组织介绍"></el-input>
+                <el-input style="width:300px" v-model="dataForm.introduction" type="textarea" maxlength="500" 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>
+                </div>
             </el-form-item>
         </el-form>
         <template slot="footer">
@@ -92,35 +96,44 @@
 </template>
 
 <script>
+    var map
+    var search
+    var markers
+    var infoWindowList
+    var geocoder // 新建一个正逆地址解析类
     import debounce from 'lodash/debounce'
 
     export default {
         data() {
             return {
                 visible: false,
+                keyWords: '',
                 dataForm: {
                     id: '',
+                    partyOrgType: '', // 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
+                    partyOrgName: '', // 组织名称
+                    partyOrgCode: '', // 组织编码
+                    mySelectOrg:'', // 我选中的当前党组织
+                    orgPid: '', // 党组织的上级ID,没有上级时为0
+                    orgPids: '', // 党组织的所有上级ID,没有上级时为0
+                    maSelectAgency: '', // 我选中的当前行政组织
+                    agencyId: '', // 行政组织id
+                    agencyPids:'', // 行政组织父ids(英文逗号隔开)
+                    longitude: 36.0722275, //经度
+                    latitude: 120.38945519, //纬度
+                    address: '',
+                    introduction: '', // 党组织介绍
+
                     customerId: '',
                     staffId:'',
-                    orgPid: '',
-                    orgPids: '',
                     orgPidName: '',
-                    agencyId: '',
                     agencyName:'',
-                    agencyPids: '',
-                    partyOrgType: '',
-                    partyOrgName: '',
-                    partyOrgCode: '',
-                    longitude: '1',
-                    latitude: '1',
-                    address: '',
-                    introduction: '',
                     delFlag: '',
                     revision: '',
                     createdBy: '',
                     createdTime: '',
                     updatedBy: '',
-                    updatedTime: ''
+                    updatedTime: '',
                 },
                 orgListVisible: false,
                 agencyListVisible:false,
@@ -130,98 +143,36 @@
                 agencyOrgList:[]
             }
         },
-        computed: {
-            dataRule() {
-                return {
-                    customerId: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    orgPid: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    orgPids: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    agencyId: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    agencyPids: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    partyOrgType: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    partyOrgName: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    longitude: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    latitude: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    address: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    delFlag: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    revision: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    createdBy: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    createdTime: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    updatedBy: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    updatedTime: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    orgPidName: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    agencyName: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ]
-                }
-            }
+        mounted () {
+            setTimeout(() => {
+                this.initMap()
+            }, 500);
         },
         methods: {
-            changePartyOrgType(value){
-                if(value != '5'){
-                    this.dataForm.agencyId = ''
-                    this.dataForm.agencyName = ''
-                }
-                this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType',
-                    {params:
-                            {agencyId: this.agencyId,
-                            orgType:value}
-                    }).then(({data: res}) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.msg)
-                    }
-                    this.agencyOrgList = res.data
-                }).catch(() => {
+            init() {
+                this.visible = true
+                this.agencyId = localStorage.getItem('agencyId')
+                this.dataForm.customerId = localStorage.getItem('customerId')
+                this.dataForm.staffId = localStorage.getItem('staffId')
+                this.$nextTick(() => {
+                    this.$refs['dataForm'].resetFields()
+                    //设置党组织类型
+                    this.setPartyOrgType()
+                    this.getOrgList().then(() => {
+                        if (this.dataForm.id) {
+                            this.getInfo()
+                        } else {
+                            this.dataForm.mySelectOrg = this.dataForm.orgPids.split(',')
+                            this.orgListTreeSetDefaultHandle()
+                        }
+                    })
                 })
             },
             //设置组织类型
             setPartyOrgType() {
-                /**
-                 * 社区级：community，
-                 街道级:street,
-                 区县级: district,
-                 市级: city
-                 省级:province
-                 *
-                 */
+                // 社区级：community，街道级:street,区县级: district,市级: city 省级:province
+                // 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
                 this.level = localStorage.getItem('level')
-                /**
-                 * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部
-                 */
                 if (this.level == 'province') {
                     this.partyOrgTypeList = [
                         {value: '0', name: '省委'},
@@ -259,6 +210,20 @@
                     ]
                 }
             },
+            // 选中组织类型 组织类型为支部时不需要选择行政组织
+            changePartyOrgType(value){
+                if(value != '5'){ // 支部
+                    this.dataForm.agencyId = ''
+                    this.dataForm.agencyPids = ''
+                    this.dataForm.maSelectAgency = ''
+                }
+                this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    }
+                    this.agencyOrgList = res.data
+                }).catch(() => {})
+            },
             // 获取党组织列表
             getOrgList() {
                 return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => {
@@ -269,43 +234,32 @@
                 }).catch(() => {
                 })
             },
-            // 上级党组织树, 设置默认值
-            orgListTreeSetDefaultHandle() {
-                this.dataForm.orgPid = '0'
-                this.dataForm.orgPidName = '一级组织'
-            },
-            // 上级党组织树, 选中
-            orgListTreeCurrentChangeHandle(data) {
-                this.dataForm.orgPid = data.id
-                this.dataForm.orgPidName = data.partyOrgName
-                this.dataForm.orgPids = data.orgPids+data.id+","
-                //默认设置行政组织id为父节点的行政组织id
-                this.dataForm.agencyId = data.agencyId
-                this.orgListVisible = false
-            },
-            // 上级行政组织树, 选中
-            agencyListTreeCurrentChangeHandle(data) {
-                this.dataForm.agencyId = data.id
-                this.dataForm.agencyName = data.name
-                this.agencyListVisible = false
+            // 党组织选中事件
+            handleChangeOrg(e) {
+                if (this.dataForm.mySelectOrg.length > 0 && this.dataForm.mySelectOrg) {
+                    this.dataForm.orgPid = this.dataForm.mySelectOrg[this.dataForm.mySelectOrg.length - 1]
+                    this.dataForm.orgPids = ''
+                    this.dataForm.mySelectOrg.forEach(element => {
+                        this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ',' + element : element
+                    });
+                } else {
+                    this.dataForm.orgPid = ''
+                    this.dataForm.orgPids = ''
+                }
             },
-            init() {
-                this.visible = true
-                this.agencyId = localStorage.getItem('agencyId')
-                this.dataForm.customerId = localStorage.getItem('customerId')
-                this.dataForm.staffId = localStorage.getItem('staffId')
-                this.$nextTick(() => {
-                    this.$refs['dataForm'].resetFields()
-                    //设置党组织类型
-                    this.setPartyOrgType()
-                    this.getOrgList().then(() => {
-                        if (this.dataForm.id) {
-                            this.getInfo()
-                        } else {
-                            this.orgListTreeSetDefaultHandle()
-                        }
-                    })
-                })
+            // 行政组织选中事件
+            handleChangeAgency(e){
+                console.log(this.dataForm.maSelectAgency)
+                if (this.dataForm.maSelectAgency.length > 0 && this.dataForm.maSelectAgency) {
+                    this.dataForm.agencyId = this.dataForm.maSelectAgency[this.dataForm.maSelectAgency.length - 1]
+                    this.dataForm.agencyPids = ''
+                    this.dataForm.maSelectAgency.forEach(element => {
+                        this.dataForm.agencyPids = this.dataForm.agencyPids ? this.dataForm.agencyPids + ',' + element : element
+                    });
+                } else {
+                    this.dataForm.agencyId = ''
+                    this.dataForm.agencyPids = ''
+                }
             },
             // 获取信息
             getInfo() {
@@ -317,6 +271,13 @@
                         ...this.dataForm,
                         ...res.data
                     }
+                    // 党组织组织
+                    this.dataForm.mySelectOrg = this.dataForm.orgPids.split(',')
+                    console.log(this.dataForm.orgPids.split(','))
+                    // 行政组织
+                    this.dataForm.maSelectAgency = this.dataForm.agencyPids.split(',')
+                    console.log(this.dataForm.agencyPids.split(','))
+                    
                 }).catch(() => {
                 })
 
@@ -336,6 +297,116 @@
                 }).catch(() => {
                 })
             },
+            // 上级党组织树, 设置默认值
+            orgListTreeSetDefaultHandle() {
+                this.dataForm.orgPid = '0'
+                this.dataForm.orgPidName = '一级组织'
+            },
+            // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+            initMap () {
+            if (document.getElementById('app')) {
+                document.getElementById('mapSeach_id').style.display = "block"
+                document.getElementById('lon_lat_id').style.display = "block"
+            }
+            
+            // 定义地图中心点坐标
+            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.dataForm.latitude = lat
+                        this.dataForm.longitude = lng
+                        this.convert()
+                    } else {
+                        this.$message.error('未检索到相关位置坐标')
+                    }
+                })
+            },
+
+            handleMoveCenter () {
+                //修改地图中心点
+                const center = map.getCenter()
+                const lat = center.getLat()
+                const lng = center.getLng()
+                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);
+                } else {
+                    location = new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude);
+                }
+                // map.setCenter(location);
+                markers.updateGeometries([
+                    {
+                    id: 'main', // 点标注数据数组
+                    position: location,
+                    },
+                ]);
+                // 将给定的坐标位置转换为地址
+                geocoder.getAddress({ location: location }).then((result) => {
+                    this.dataForm.address = result.result.address
+                    // 显示搜索到的地址
+                });
+            },
             // 表单提交
             dataFormSubmitHandle: debounce(function () {
                 this.$refs['dataForm'].validate((valid) => {
@@ -359,52 +430,66 @@
                     })
                 })
             }, 1000, {'leading': true, 'trailing': false})
-        }
-    }
-</script>
-<style lang="scss">
-    .mod-sys__dept {
-        .dept-list {
-            .el-input__inner,
-            .el-input__suffix {
-                cursor: pointer;
+        },
+        computed: {
+            dataRule() {
+                return {
+                    mySelectOrg: [
+                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                    ],
+                    partyOrgType: [
+                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                    ],
+
+                    longitude: [
+                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                    ],
+                    latitude: [
+                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                    ],
+                    maSelectAgency: [
+                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                    ]
+                }
             }
         }
     }
+</script>
 
-    .el-popover {
-        height: 320px;
-        overflow-y: scroll;
-    }
-
-    .el-dialog__footer {
-        margin-top: 100px;
-    }
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+<style  lang="scss" scoped>
+.item_width_1 {
+  width: 560px;
 
-    .avatar-uploader .el-upload {
-        border: 1px dashed #d9d9d9;
-        border-radius: 6px;
-        cursor: pointer;
-        position: relative;
-        overflow: hidden;
-    }
+  /deep/.tox .tox-dialog {
+    z-index: 20000;
+  }
+}
 
-    .avatar-uploader .el-upload:hover {
-        border-color: #409eff;
-    }
 
-    .avatar-uploader-icon {
-        font-size: 28px;
-        color: #8c939d;
-        width: 178px;
-        height: 178px;
-        line-height: 178px;
-        text-align: center;
-    }
+.div_map {
+  position: relative;
+}
+.div_searchmap {
+  z-index: 5000;
+  position: absolute;
+  top: 5px;
+  left: 5px;
+}
 
-    .avatar {
-        width: 178px;
-        height: 178px;
-        display: block;
-    }
+.tinymce_view {
+  height: 400px;
+  overflow: auto;
+}
+.text_p {
+  margin: 0;
+  padding: 0 10px;
+  border: 1px solid #d9d9d9;
+  border-radius: 5px;
+  > p {
+    margin: 0;
+  }
+}
 </style>
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 36c297e1..f6e6bd1b 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -1,72 +1,65 @@
 <template>
-  <div class="resi-container">
-    <el-card class="resi-card-table">
+  <el-card class="resi-card-table">
       <div class="resi-row-btn">
         <el-button class="diy-button--add"
-                   size="small"
-                   @click="addOrUpdateHandle()">新增</el-button>
+                  size="small"
+                  @click="addOrUpdateHandle()">新增</el-button>
       </div>
-
-      <el-table :data="tableData"
-                v-loading="tableLoading"
-                border
-                style="width: 100%"
-                class="resi-table">
-        <table-tree-column prop="partyOrgName" label="党组织名称" header-align="center"></table-tree-column>
-        <el-table-column label="操作"
-                         align="center"
-                         width="300">
-          <template slot-scope="scope">
-            <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                       @click="handleLook(scope.row)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--detail">{{'查看党员'}}</el-button>
-            <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                       @click="handleAdd('2', 'add', scope.row)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--add">新增下级</el-button>
-            <el-button  v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                       @click="addOrUpdateHandle(scope.row.id)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--edit">修改</el-button>
-            <el-button  v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                       @click="handleEdit(scope.row, 'edit')"
-                       type="text"
-                       size="small"
-                       class="div-table-button--edit">删除</el-button>
-          </template>
-        </el-table-column>
+      <!-- 列表表格 -->
+      <el-table
+          class="table"
+          v-loading="tableLoading"
+          :data="tableData"
+          :default-expand-all="true"
+          row-key="id"
+          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+          :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}">
+          <el-table-column prop="partyOrgName" label="党组织名称"></el-table-column>
+          <el-table-column label="操作" align="center" width="300">
+              <template slot-scope="scope">
+                <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
+                          @click="handleLook(scope.row)"
+                          type="text"
+                          size="small"
+                          class="div-table-button--detail">{{'查看党员'}}</el-button>
+                <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
+                          @click="addOrUpdateHandle('', scope.row.orgPids)"
+                          type="text"
+                          size="small"
+                          class="div-table-button--add">新增下级</el-button>
+                <el-button  v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
+                          @click="addOrUpdateHandle(scope.row.id)"
+                          type="text"
+                          size="small"
+                          class="div-table-button--edit">修改</el-button>
+                <el-button  v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
+                            @click="deleteAgency(scope.row.id)"
+                            type="text"
+                            size="small"
+                            class="div-table-button--edit">删除</el-button>
+              </template>
+          </el-table-column>
       </el-table>
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </el-card>
-  </div>
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getTableData"></add-or-update>
+  </el-card>
 </template>
 
 <script>
-    import mixinViewModule from '@/mixins/view-module'
     import AddOrUpdate from './icpartyorg-add-or-update'
     import TableTreeColumn from '@/components/table-tree-column'
 
     export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/resi/partymember/icPartyOrg/getTreelist',
-        getDataListIsPage: true,
-        deleteURL: '/resi/partymember/icPartyOrg',
-        deleteIsBatch: true
-      },
       dataForm: {
         id: '',
-        customerId: ''
+        customerId: '',
+        orgPids: ''
       },
       tableLoading: false,
       tableData: [],
-      agencyId: ''
+      agencyId: '',
+      addOrUpdateVisible: false
     }
   },
   components: {
@@ -80,30 +73,57 @@
     // this.pageLoading = true
   },
   methods:{
+    // 查询列表
+    async getTableData () {
+      this.tableLoading = true
+      let params = {
+        customerId: localStorage.getItem('customerId')
+      }
+      await this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: this.dataForm}).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        } else {
+          this.tableData = res.data
+        }
+      }).catch(() => {})
+      this.tableLoading = false
+    },
     // 新增 / 修改
-    addOrUpdateHandle (id) {
+    addOrUpdateHandle (id, orgPids) {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
         this.$refs.addOrUpdate.dataForm.id = id
+        // 新增下级需要传
+        this.$refs.addOrUpdate.dataForm.orgPids = orgPids // 党组织
+        
         this.$refs.addOrUpdate.init()
       })
     },
-    async getTableData () {
-      this.tableLoading = true
-      let params = {
-        customerId: localStorage.getItem('customerId')
-      }
-      await this.$http
-              .get('/resi/partymember/icPartyOrg/getTreelist', {params: this.dataForm})
-              .then(({ data: res }) => {
-                if (res.code !== 0) {
-                  return this.$message.error(res.msg)
-                } else {
-                  this.tableData = res.data
-                }
-              })
-              .catch(() => {})
-      this.tableLoading = false
+    // 删除
+    deleteAgency (id) {
+      this.$confirm(this.$t('prompt.info', { 'handle': this.$t('delete') }), this.$t('prompt.title'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+       this.$http.delete('/resi/partymember/icPartyOrg/delete', {'data': [id]}).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.$message({
+          message: this.$t('prompt.success'),
+          type: 'success',
+          duration: 500,
+          onClose: () => {
+            this.getTableData()
+          }
+        })
+      }).catch(() => {})
+      }).catch(() => {})
+    },
+    // 查看党员
+    handleLook(row) {
+      console.log('这里是查看党员', row)
     }
   }
 }