From 07c73ed3e21489c1c14e7d47bd81f77bc2fb5187 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 1 Apr 2022 16:53:28 +0800
Subject: [PATCH 01/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9evn=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index de4725c1..b23cea2c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
 NODE_ENV=development
-VUE_APP_API_SERVER =  http://epmet-dev.elinkservice.cn:41080/api
-# VUE_APP_API_SERVER =  http://192.168.1.140/api
+# VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
+VUE_APP_API_SERVER =  http://192.168.1.140/api
 
 #家中开发连级的后端服务
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api

From d57851d4cedad9db465a46cdc64a1ce765d269cf Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 12 Apr 2022 09:10:19 +0800
Subject: [PATCH 02/23] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E5=92=8C=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |    1 +
 .../base/organization/organization.vue        | 1288 +++++++++++++++++
 2 files changed, 1289 insertions(+)
 create mode 100644 src/views/modules/base/organization/organization.vue

diff --git a/public/index.html b/public/index.html
index 6581742c..012587ee 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,6 +8,7 @@
 
   <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico" />
   <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=LWBBZ-TIGC3-VFP3L-YNMWH-FJB7T-JFBLO"></script>
+  <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77"></script>
   <!-- f2图表 -->
   <!-- <script src="https://gw.alipayobjects.com/os/lib/antv/f2/3.8.1/dist/f2.min.js"></script> -->
 
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
new file mode 100644
index 00000000..c43cd789
--- /dev/null
+++ b/src/views/modules/base/organization/organization.vue
@@ -0,0 +1,1288 @@
+<template>
+    <div class="app-container">
+        <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+            <el-form-item label="组织名称" prop="deptName">
+                <el-input
+                v-model="queryParams.deptName"
+                placeholder="请输入组织名称"
+                clearable
+                size="small"
+                @keyup.enter.native="handleQuery"
+                />
+            </el-form-item> -->
+            <!-- <el-form-item label="状态" prop="status">
+                <el-select v-model="queryParams.status" placeholder="部门状态" clearable size="small">
+                <el-option
+                    v-for="dict in dictList"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                />
+                </el-select>
+            </el-form-item> -->
+            <!-- <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form> -->
+
+        <!-- <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                >新增</el-button>
+            </el-col>
+        </el-row> -->
+        
+        
+        <!-- 组织列表 -->
+        <el-table height="250"
+        :data="tableData"
+        style="width: 100%">
+            <el-table-column prop="agencyName" label="组织名字" width="260"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                <el-button 
+                    size="mini"
+                    type="warning"
+                    icon="el-icon-plus"
+                    @click="entryAgency(scope.row)"
+                >进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        
+
+         <!-- 社区列表 -->
+        <el-table height="250"
+        :data="communityData"
+        style="width: 100%">
+            <el-table-column prop="departmentName" label="社区名字" width="260"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                <el-button v-if="communityOpen"
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="addCommunity(scope.row)"
+                >新增</el-button>
+
+                <el-button 
+                    size="mini"
+                    type="warning"
+                    icon="el-icon-plus"
+                    @click="entryCommunity(scope.row)"
+                >进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 网格列表 -->
+        <el-table height="250"
+        :data="gridData"
+        style="width: 100%">
+            <el-table-column prop="gridName" label="网格名字" width="260"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                <el-button v-if="gridOpen"
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="addGrid(scope.row)"
+                >新增</el-button>
+
+                <el-button 
+                    size="mini"
+                    type="warning"
+                    icon="el-icon-plus"
+                    @click="entryGrid(scope.row)"
+                >进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 本级工作人员 -->
+        <el-table 
+        :data="agencyDataPeo"
+        style="width: 100%"
+        height="250">
+            <el-table-column prop="name" label="本级工作人员名字" width="260"></el-table-column>
+            <el-table-column prop="roles" label="本级工作人员职责" width="260"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+                <template slot-scope="scope">
+                <el-button  v-if="entry"
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="addPeo(scope.row)"
+                >新增</el-button>
+                <el-button 
+                    size="mini"
+                    type="warning"
+                    icon="el-icon-plus"
+                    @click="xiuPeo(scope.row)"
+                >修改</el-button>
+                <el-button 
+                    size="mini"
+                    type="success"
+                    icon="el-icon-plus"
+                    @click="lookAngency(scope.row)"
+                >查看</el-button>
+                <el-button 
+                    size="mini"
+                    type="info"
+                    icon="el-icon-plus"
+                    @click="transfer(scope.row)"
+                >调动</el-button>
+                <el-button 
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-plus"
+                    @click="DisablePeo(scope.row)"
+                >禁用</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 社区工作人员 -->
+        <el-table height="250"
+        :data="communityDataPeo"
+        style="width: 100%">
+            <el-table-column prop="name" label="社区工作人员名字" width="260"></el-table-column>
+            <el-table-column prop="roles" label="社区工作人员职责" width="260"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                <el-button
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="addCommunityPeo(scope.row)"
+                >新增</el-button>
+                <el-button 
+                    size="mini"
+                    type="warning"
+                    icon="el-icon-plus"
+                    @click="xiuCommunityPeo(scope.row)"
+                >修改</el-button>
+                <el-button 
+                    size="mini"
+                    type="success"
+                    icon="el-icon-plus"
+                    @click="lookAngency(scope.row)"
+                >查看</el-button>
+                <el-button 
+                    size="mini"
+                    type="info"
+                    icon="el-icon-plus"
+                    @click="transfer(scope.row)"
+                >调动</el-button>
+                <el-button 
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-plus"
+                    @click="DisablePeo(scope.row)"
+                >禁用</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 网格工作人员 -->
+        <el-table 
+        :data="gridDataPeo"
+        style="width: 100%"
+        height="250">
+            <el-table-column prop="name" label="网格工作人员名字" width="260"></el-table-column>
+            <el-table-column prop="roles" label="网格工作人员职责" width="260"></el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                <el-button
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-plus"
+                    @click="addGridPeo(scope.row)"
+                >新增</el-button>
+                <el-button 
+                    size="mini"
+                    type="warning"
+                    icon="el-icon-plus"
+                    @click="xiuGridPeo(scope.row)"
+                >修改</el-button>
+                <el-button 
+                    size="mini"
+                    type="success"
+                    icon="el-icon-plus"
+                    @click="lookAngency(scope.row)"
+                >查看</el-button>
+                <el-button 
+                    size="mini"
+                    type="info"
+                    icon="el-icon-plus"
+                    @click="transfer(scope.row)"
+                >调动</el-button>
+                <el-button 
+                    size="mini"
+                    type="danger"
+                    icon="el-icon-plus"
+                    @click="DisablePeo(scope.row)"
+                >禁用</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+  
+        <!-- 新增社区 -->
+        <el-dialog 
+        title="新增社区"
+        :visible.sync="dialogVisible"
+        width="30%"
+        :before-close="handleClose">
+            <el-form :rules="rules">
+                <el-form-item label="社区名称" prop="departmentName">
+                    <el-input v-model="insertForm.departmentName" placeholder="请输入部门名称"></el-input>
+                </el-form-item>
+                <el-form-item label="组织编码" prop="code">
+                    <el-input v-model="insertForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="联系人" prop="contacts">
+                    <el-input  v-model="insertForm.contacts" placeholder="请输入联系人姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" prop="mobile">
+                    <el-input v-model="insertForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancel">取 消</el-button>
+                <el-button type="primary" @click="submit">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 新增网格 -->
+        <div v-if="dialogVisibleGrid">
+            <el-dialog 
+            title="新增网格"
+            :visible.sync="dialogVisibleGrid"
+            width="60%"
+            :before-close="handleClose">
+                <el-form :rules="rules">
+                    <el-form-item label="网格名称" prop="gridName">
+                        <el-input v-model="GridForm.gridName" placeholder="请输入部门名称"></el-input>
+                    </el-form-item>
+                    <el-form-item label="网格编码" prop="GridCode">
+                        <el-input v-model="GridForm.code" placeholder="请输入网格编码"></el-input>
+                    </el-form-item>
+
+                    <!-- 网格类型，下拉框 -->
+                    <el-form-item label="网格类型" prop="typeTag">
+                        <el-select v-model="GridForm.gridType" clearable placeholder="网格类型">
+                            <el-option v-for="item in typeList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="联系人" prop="GridContacts">
+                        <el-input  v-model="GridForm.contacts" placeholder="请输入联系人姓名"></el-input>
+                    </el-form-item>
+                    <el-form-item label="联系电话" prop="GridMobile">
+                        <el-input v-model="GridForm.mobile" placeholder="请输入联系电话"></el-input>
+                    </el-form-item>
+
+                    <!-- 组织位置 -->
+                    <el-form-item>
+                        <div id="container">当前点击坐标为：<span id="position"></span></div>
+                    </el-form-item>
+
+                </el-form>
+
+                <div slot="footer" >
+                    <el-button @click="cancelGrid">取 消</el-button>
+                    <el-button type="primary" @click="submitGrid">确 定</el-button>
+                </div>
+            </el-dialog>
+        </div>
+
+        <!-- 新增人员 -->
+        <el-dialog 
+        title="新增人员"
+        :visible.sync="dialogVisiblePeo"
+        width="30%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="姓名" prop="peoName">
+                    <el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="手机号" prop="mobile">
+                    <el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input>
+                </el-form-item>
+                <!-- 性别下拉框 -->
+                <el-form-item label="性别" prop="gender">
+                    <el-select v-model="peoForm.gender" clearable placeholder="性别">
+                        <el-option v-for="item in genderList" 
+                            :key="item.value" 
+                            :label="item.label" 
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <!-- 专兼职下拉框 -->
+                <el-form-item label="专兼职" prop="post">
+                    <el-select v-model="peoForm.post" clearable placeholder="专兼职">
+                        <el-option v-for="item in postList" 
+                            :key="item.value" 
+                            :label="item.label" 
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <!-- 职责下拉框 -->
+                <el-form-item label="职责" prop="duty">
+                    <el-select v-model="peoForm.duty" multiple placeholder="请选择">
+                        <el-option
+                        v-for="item in dutyList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                        :disabled="item.disabled">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelPeo">取 消</el-button>
+                <el-button type="primary" @click="submitPeo">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 人员修改 -->
+        <el-dialog 
+        title="人员修改"
+        :visible.sync="modifyPeo"
+        width="30%"
+        :before-close="handleClose">
+            <el-form >
+                <el-form-item label="姓名" prop="peoName">
+                    <el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="手机号" prop="mobile">
+                    <el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input>
+                </el-form-item>
+                性别下拉框
+                <el-form-item label="性别" prop="gender">
+                    <el-select v-model="peoForm.gender" clearable placeholder="性别">
+                        <el-option v-for="item in genderList" 
+                            :key="item.value" 
+                            :label="item.label" 
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                专兼职下拉框
+                <el-form-item label="专兼职" prop="post">
+                    <el-select v-model="peoForm.post" clearable placeholder="专兼职">
+                        <el-option v-for="item in postList" 
+                            :key="item.value" 
+                            :label="item.label" 
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                职责下拉框
+                <el-form-item label="职责" prop="duty">
+                    <el-select v-model="peoForm.duty" multiple placeholder="请选择">
+                        <el-option
+                        v-for="item in dutyList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                        :disabled="item.disabled">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelXiugai">取 消</el-button>
+                <el-button type="primary" @click="updatePeo">确 定</el-button>
+            </div>
+        </el-dialog>
+
+        <!-- 禁用弹窗 -->
+        <el-dialog 
+        title="确认禁用"
+        :visible.sync="Disable"
+        width="30%"
+        :before-close="handleClose"
+        >
+            <span>禁用后该用户将无法登录系统，是否继续？</span>
+            <div slot="footer" >
+                <el-button @click="cancelDisable">取 消</el-button>
+                <el-button type="primary" @click="submitDisable">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 人员查看 -->
+        <el-dialog
+        title="人员详情"
+        :visible.sync="details"
+        width="30%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="姓名" >
+                    <el-input  v-model="peoForm.name" placeholder="姓名" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="手机号" >
+                    <el-input  v-model="peoForm.mobile" placeholder="手机号" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="组织/部门" >
+                    <el-input  v-model="peoForm.zuzhi" placeholder="组织/部门" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="激活时间" >
+                    <el-input  v-model="peoForm.activeTime" placeholder="激活时间" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="职位" >
+                    <el-input  v-model="peoForm.duty" placeholder="职位" :disabled="true"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button type="primary" style="margin-right:170px" @click="cancelDetails">关 闭</el-button>
+            </div>
+        </el-dialog>
+
+        <!-- 人员调动 -->
+        <el-dialog 
+        title="人员调动"
+        :visible.sync="transferPeo"
+        width="30%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="姓名">
+                    <el-input v-model="transferForm.name" placeholder="姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="调动至">
+                    <el-cascader
+                        :props="{ checkStrictly: true }"
+                        v-model="selectValue"
+                        :options="options"
+                        @change="handleChange">
+                    </el-cascader>
+                </el-form-item>
+                <el-form-item label="调动原因">
+                    <el-input
+                    type="textarea"
+                    :rows="2"
+                    placeholder="请输入内容"
+                    maxlength="500"
+                    show-word-limit
+                    v-model="transferForm.remarks">
+                    </el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelTransfer">取 消</el-button>
+                <el-button type="primary" @click="submitTransfer">确 定</el-button>
+            </div>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+
+import { requestPost } from "@/js/dai/request";
+
+export default {
+    data(){
+        return{
+           lat:'11',
+           lng:'11',
+            // 查询参数
+            queryParams: {
+                deptName: undefined,
+                status: undefined
+            },
+            // 状态列表
+            dictList:[],
+            // 重新渲染表格状态
+            refreshTable: true,
+            // 是否展开，默认全部展开
+            isExpandAll: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 遮罩层
+            loading: true,
+            // 表格树数据
+            deptList: [],
+
+            // 社区列表
+            tableData:[],
+            // 社区列表
+            communityData:[],
+            // 网格列表
+            gridData:[],
+            // 弹窗开关
+            dialogVisible:false,
+            dialogVisibleGrid:false,
+            dialogVisiblePeo:false,
+            Disable:false,
+            details:false,
+            transferPeo:false,
+            // 社区添加表单项
+            insertForm:{
+                departmentName:'',
+                code:'',
+                contacts:'',
+                mobile:'',
+                agencyId:'',
+                departmentDuty:'123'
+            },
+            // 网格添加表单项
+            GridForm:{
+                gridName:'',
+                code:'',
+                contacts:'',
+                mobile:'',
+                agencyId:'',
+                manageDistrict:'',
+                gridType:'',
+                location: '', //坐标位置
+                longitude: '11', //经度
+                latitude: '11' ,//纬度
+                centerAddress:''
+            },
+            // 树
+            tree:[],
+            // 新增人员表单项
+            peoForm:{
+                name:'',
+                mobile:'',
+                gender:'',
+                post:'',
+                duty:[],
+                orgType:'',
+                activeTime:'',
+                zuzhi:'',
+            },
+            // 人员调动
+            transferForm:{
+                name:'',
+                remarks:'',
+                transferTo:'',
+                staffId:'',
+                orgId:'',
+                orgType:''
+            },
+            // 人员禁用
+            DisableForm:{
+                staffId:'',
+                agencyId:'',
+                customerId:''
+            },
+            keyWords: '',
+            typeList:[],
+            // 性别字典
+            genderList: [
+                {value: '1', label: '男'},
+                {value: '2', label: '女'},
+            ],
+            // 专兼职字典
+            postList:[
+                {value: 'fulltime' , label: '专职'},
+                {value: 'parttime' , label: '兼职'}
+            ],
+            // 职责字典
+            dutyList:[
+                {value: 'agency_leader' , label: '单位领导'},
+                {value: 'dept_leader' , label: '部门领导'},
+                {value: 'party_principals' , label: '党建负责人'},
+                {value: 'manager' , label: '管理员'},
+                {value: 'staff' , label: '工作人员'},
+                {value: 'grid_manager' , label: '网格长'},
+                {value: 'grid_party_director' , label: '党建宣传员'},
+                {value: 'root_manager' , label: '超级管理员'},
+                {value: 'grid_member' , label: '网格员'},
+            ],
+            // angencuId
+           agencyId: localStorage.getItem("agencyId"),
+
+           gridOpen: false,
+           communityOpen:false,
+
+           gridOrgId:'',
+           communityOrgId:'',
+           // 网格工作人员列表
+           gridDataPeo:[],
+           // 社区工作人员列表
+           communityDataPeo:[],
+           // 本级工作人员列表
+           agencyDataPeo:[],
+           anId:localStorage.getItem("agencyId"),
+           // 新增操作是否展示
+           entry:false,
+           // 修改操作是否展示
+           modifyPeo:false,
+           submitOrgid:'',
+           // 级联数据
+           options:[
+               {
+                   value:'',
+                   label:'',
+                   children:[],
+               }
+           ],
+           selectValue: [],
+
+
+            // 校验
+           rules: {
+                departmentName:[
+                    { required: true, message: '社区名称必填', trigger: 'blur' }
+                ],
+                gridName:[
+                    { required: true, message: '网格名称必填', trigger: 'blur' }
+                ]
+            }
+        }
+    },
+    created(){
+        this.getAgencyList()
+        this.getCommunityList()
+        this.getGridList()
+        this.agencyPeo()
+    },
+    
+    watch: {
+        dialogVisibleGrid(val) {
+            if (val) {
+                setTimeout(() => {
+                    let _that = this
+                    this.initMap(_that)
+                }, 1000);
+            }
+        }
+    },
+    mounted(){
+        // this.initMap()
+    },
+    methods:{
+        // 点击后获取id
+        handleChange (e) {
+            this.transferForm.orgId = e[1]
+            this.transferForm.orgType = 'dept'
+        },
+        /** 查询组织列表 */
+        async getAgencyList(){
+            const url = "/gov/org/agency/agencylist"
+            let params = {
+                agencyId: this.agencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.tableData = data
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        /** 查询社区列表 */
+        async getCommunityList(){
+            const url = "/gov/org/department/departmentlist"
+
+            let params = {
+                agencyId:this.agencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.communityData = data
+            }else{
+                this.$message.error(msg)
+                
+            }
+        },
+        /** 查询网格列表 */
+        async getGridList(){
+            const url = "/gov/org/grid/allgrids"
+
+            let params = {
+                agencyId:this.agencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.gridData = data
+            }else{
+                this.$message.error(msg)
+            }
+        },
+
+        // 查询网格人员列表
+        async GridPeo(){
+           const url = "/data/aggregator/org/stafflist"
+
+           let params = {
+               orgId:this.gridOrgId,
+               orgType:'grid',
+               pageNo:1,
+               pageSize:100
+           }
+
+           const { data, code, msg } = await requestPost(url,params)
+
+           if(code === 0){
+               this.gridDataPeo = data.staffList
+           } else {
+               this.$message.error(msg)
+           }
+        },
+        // 查询组织工作人员
+        async agencyPeo(){
+            const url = "/data/aggregator/org/stafflist"
+
+            let params = {
+                orgId:this.anId,
+                orgType:'agency',
+                pageNo:1,
+                pageSize:100
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0) {
+                this.agencyDataPeo = data.staffList
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 查询社区人员
+        async communityPeo(){
+            const url = "/data/aggregator/org/stafflist"
+
+            let params = {
+               orgId:this.communityOrgId,
+               orgType:'dept',
+               pageNo:1,
+               pageSize:100
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.communityDataPeo = data.staffList
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 添加组织
+        async submit(){
+            
+            const url = "/gov/org/department/adddepartment"
+
+            let params = {
+                agencyId:this.insertForm.agencyId,
+                departmentName:this.insertForm.departmentName,
+                departmentDuty:this.insertForm.departmentDuty,
+                contacts:this.insertForm.contacts,
+                mobile:this.insertForm.mobile,
+                code:this.insertForm.code
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("添加成功")
+                this.dialogVisible = false
+                this.insertForm = []
+                this.getAgencyList()
+                this.getCommunityList()
+                this.getGridList()
+                this.agencyPeo()
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        // 添加网格
+        async submitGrid(){
+            const url = "/gov/org/grid/addgrid"
+
+            let params = {
+                agencyId:this.GridForm.agencyId,
+                gridName:this.GridForm.gridName,
+                contacts:this.GridForm.contacts,
+                mobile:this.GridForm.mobile,
+                code:this.GridForm.code,
+                manageDistrict:this.GridForm.manageDistrict,
+                gridType:this.GridForm.gridType,
+                latitude:this.lat,
+                longitude:this.lng
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("添加成功")
+                this.dialogVisibleGrid = false
+                this.GridForm = []
+                this.getAgencyList()
+                this.getCommunityList()
+                this.getGridList()
+                this.agencyPeo()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 添加人员
+        async submitPeo(){
+            const url = "/gov/org/staff/addstaffv2"
+
+            let params = {
+                orgType:this.peoForm.orgType,
+                name:this.peoForm.name,
+                mobile:this.peoForm.mobile,
+                gender:this.peoForm.gender,
+                workType:this.peoForm.post,
+                roles:this.peoForm.duty,
+                orgId:this.submitOrgid
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                
+                this.$message.success("添加成功")
+                this.dialogVisiblePeo = false
+                this.peoForm = []
+                this.getAgencyList()
+                this.getCommunityList()
+                this.getGridList()
+                this.agencyPeo()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 人员修改
+        async updatePeo(){
+            const url = "/gov/org/staff/editstaff"
+
+            let params = {
+                orgType:this.peoForm.orgType,
+                name:this.peoForm.name,
+                mobile:this.peoForm.mobile,
+                gender:this.peoForm.gender,
+                workType:this.peoForm.post,
+                roles:this.peoForm.duty,
+                orgId:this.submitOrgid,
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0) {
+                this.$message.success("添加成功")
+                this.dialogVisiblePeo = false
+                this.peoForm = []
+                this.getAgencyList()
+                this.getCommunityList()
+                this.getGridList()
+                this.agencyPeo()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 字典
+        async getDictionaries(){
+            const url = "/sys/dict/data/dictlist"
+
+            let params = {
+                dictType:'grid_type'
+            }
+            
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.typeList = data
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        /** 搜索按钮操作 */
+        handleQuery(){
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams.deptName = undefined
+            this.queryParams.status = undefined
+            this.handleQuery();
+        },
+        /** 新增按钮操作 */
+        handleAdd(row){
+            this.dialogVisible=true
+        },
+        // 社区弹框关闭函数
+        handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            this.insertFormRest()
+            done();
+          })
+          .catch(_ => {});
+        },
+        // 社区新增弹框重置函数
+        insertFormRest(){
+            this.insertForm.name = '',
+            this.insertForm.contacts = '',
+            this.insertForm.code = '',
+            this.insertForm.phone = ''
+        },
+        // 网格新增弹框重置函数
+        GridFormRest(){
+            this.GridForm.gridName = '',
+            this.GridForm.code = '',
+            this.GridForm.centerAddress = '',
+            this.GridForm.contacts = '',
+            this.GridForm.mobile = '',
+            this.GridForm.agencyId = '',
+            this.GridForm.manageDistrict = '',
+            this.GridForm.gridType = '',
+            this.GridForm.location = '',
+            this.GridForm.longitude = '',
+            this.GridForm.latitude = ''
+        },
+        /** 人员清空 */
+        peoFormRest(){
+            this.peoForm.name = '',
+            this.peoForm.mobile = '',
+            this.peoForm.gender = '',
+            this.peoForm.post = '',
+            this.peoForm.duty = ''
+            
+        },
+        // 人员调动
+        transferRest(){
+            this.transferForm.name = '',
+            this.transferForm.remarks = '',
+            this.transferForm.transferTo = ''
+            this.transferForm.staffId = '',
+            this.transferForm.orgId = '',
+            this.transferForm.orgType = ''
+            this.selectValue = ''
+            
+        },
+        // 社区新增弹框取消按钮
+        cancel(){
+            this.dialogVisible = false
+            this.insertFormRest()
+        },
+        // 网格新增弹框取消按钮
+        cancelGrid(){
+            this.dialogVisibleGrid = false
+            this.GridFormRest()
+            
+        },
+        /** 取消按钮 */
+        cancelPeo(){
+            this.dialogVisiblePeo = false
+            this.peoFormRest()
+        },
+        // 修改取消
+        cancelXiugai(){
+            this.modifyPeo = false
+            this.peoFormRest()
+        },
+        // 查看弹窗
+        cancelDetails(){
+            this.details = false
+        },
+        /** 人员调动取消按钮 */
+        cancelTransfer(){
+            this.transferRest()
+            this.transferPeo = false
+        },
+        // 进入网格，查询网格所属人员
+        entryGrid(row){
+            this.gridDataPeo = []
+            this.communityDataPeo =[]
+            this.agencyDataPeo = []
+            this.gridOrgId = row.gridId
+            this.GridPeo()
+            
+        },
+        // 进入社区，查询社区所属人员
+        entryCommunity(row){
+            this.gridDataPeo = []
+            this.communityDataPeo = []
+            this.agencyDataPeo = []
+            this.communityOrgId = row.departmentId
+            
+            this.communityPeo()
+        },
+
+        // 进入组织，重新渲染
+        entryAgency(row){
+            this.tableData = []
+            this.communityData = []
+            this.gridData = []
+            this.gridDataPeo = []
+            this.agencyDataPeo = []
+            this.communityDataPeo = []
+            this.agencyId = row.agencyId
+            this.getCommunityList()
+            this.getGridList()
+            this.communityOpen = true
+            this.gridOpen = true
+            this.anId = row.agencyId
+            this.agencyPeo()
+            this.entry = true
+        },
+
+        // 新增组织
+        addCommunity(row){
+            
+            this.insertForm.agencyId = this.anId
+            this.dialogVisible = true
+        },
+        // 新增网格
+        addGrid(row){
+            this.GridForm.agencyId = this.anId
+            this.getDictionaries()
+            this.dialogVisibleGrid = true
+            // this.initMap()
+            
+        },
+
+        // 新增人员
+        addPeo(row){
+            
+            this.dialogVisiblePeo = true
+            this.peoForm.orgType = 'agency'
+            this.submitOrgid = this.anId
+        },
+        // 修改人员
+        xiuPeo(row){
+            this.modifyPeo = true
+            this.peoForm.orgType = 'agency'
+            this.submitOrgid = this.anId
+            this.peoForm.name = row.name
+            this.peoForm.mobile = row.mobile
+            this.peoForm.gender = row.gender
+            this.peoForm.post = row.post
+            this.peoForm.duty = row.roles
+            console.log(row)
+        },
+        // 新增社区人员
+        addCommunityPeo(){
+            this.dialogVisiblePeo = true
+            this.peoForm.orgType = 'dept'
+            this.submitOrgid = this.communityOrgId
+        },
+        // 修改社区人员
+        xiuCommunityPeo(row){
+            this.modifyPeo = true
+            this.peoForm.orgType = 'dept'
+            this.submitOrgid = this.communityOrgId
+            this.peoForm.name = row.name
+            this.peoForm.mobile = row.mobile
+            this.peoForm.gender = row.gender
+            this.peoForm.post = row.post
+            this.peoForm.duty = row.roles
+        },
+        // 新增网格人员
+        addGridPeo(){
+            this.dialogVisiblePeo = true
+            this.peoForm.orgType = 'grid'
+            this.submitOrgid = this.gridOrgId
+        },
+        // 修改网格人员
+        xiuGridPeo(row){
+            this.modifyPeo = true
+            this.peoForm.orgType = 'grid'
+            this.submitOrgid = this.gridOrgId
+            this.peoForm.name = row.name
+            this.peoForm.mobile = row.mobile
+            this.peoForm.gender = row.gender
+            this.peoForm.post = row.post
+            this.peoForm.duty = row.roles
+        },
+        // 取消禁用按钮
+        cancelDisable(){
+            this.Disable = false
+        },
+        // 人员禁用
+        DisablePeo(row){
+            console.log(row)
+            this.DisableForm.staffId = row.staffId
+            this.Disable = true
+        },
+        // 确定禁用
+        async submitDisable(){
+            const url = "/epmetuser/customerstaff/disabledstaff"
+
+            let params = {
+                staffId:this.DisableForm.staffId,
+                agencyId:this.DisableForm.agencyId,
+                customerId:this.DisableForm.customerId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("禁用成功")
+                this.Disable = false
+                this.getAgencyList()
+                this.getCommunityList()
+                this.getGridList()
+                this.agencyPeo()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 查看按钮
+        async lookAngency(row){
+            const url = "/data/aggregator/org/staffdetailv2"
+
+            let params = {
+                staffId:row.staffId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile
+                this.peoForm.activeTime = data.activeTime
+                this.peoForm.duty = data.roles
+                this.peoForm.zuzhi = data.orgName
+                console.log(row)
+            }
+
+            
+            this.details = true
+        },
+        
+        // 人员调动
+        async transfer(row){
+
+            this.transferForm.name = row.name
+            this.transferForm.staffId = row.staffId
+
+            this.transferPeo = true
+            const url = "/gov/org/customeragency/orgtree"
+
+            let params = {
+
+            }
+            
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                console.log(data)
+                this.options[0].label = data.agencyName
+                this.options[0].value = data.agencyId
+
+                let depart = Array.from(data.departmentList)
+                let gr = Array.from(data.gridList)
+
+                depart.forEach(item => {
+                    const ob = {
+                        value:item.deptId,
+                        label:item.deptName                        
+                    }
+                    this.options[0].children.push(ob)
+                })
+
+                gr.forEach(item => {
+                    const obj = {
+                        value:item.gridId,
+                        label:item.gridName                        
+                    }
+                    this.options[0].children.push(obj)
+                })
+            }else{
+                this.$message.error("树查询失败",msg)
+            }
+
+            
+        },
+        // 人员调动确定
+        async submitTransfer(){
+            const url = "/gov/org/staff/stafftransferv2"
+
+            let params = {
+                staffId:this.transferForm.staffId,
+                orgId:this.transferForm.orgId,
+                orgType:this.transferForm.orgType,
+                remarks:this.transferForm.remarks
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("调动成功")
+                this.transferRest()
+                this.transferPeo = false
+                this.getAgencyList()
+                this.getCommunityList()
+                this.getGridList()
+                this.agencyPeo()
+
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+
+       /** 地图初始化 */
+       initMap(_that) {
+           
+            var position = document.getElementById("position");
+
+            var center = new window.TMap.LatLng(39.984104, 116.307503);//设置中心点坐标
+            //初始化地图
+            var map = new window.TMap.Map("container", {
+                center: center
+            });
+            
+            //绑定点击事件
+            map.on("click",function(evt){
+                _that.lat = evt.latLng.getLat().toFixed(6);
+                _that.lng = evt.latLng.getLng().toFixed(6);
+                position.innerHTML = _that.lat + "," + _that.lng;
+            })
+        }
+        
+    }
+}
+</script>
+
+<style scoped>
+    #container {
+        width: 50%;
+        height: 50%;
+    }
+    #info{
+        left: 20px;
+        top: 20px;
+        font-size: 14px;
+        background: #fff;
+        width: 270px;
+        padding: 10px;
+        border-radius: 3px;
+    }
+</style>
\ No newline at end of file

From 9ba1c4e47f651336f825cd2705e79ea34bebd884 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Tue, 12 Apr 2022 09:58:49 +0800
Subject: [PATCH 03/23] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=94=BE=E5=9C=A8=E6=A0=87=E9=A2=98=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 61 +++++++++++--------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index c43cd789..6d5f4676 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -45,6 +45,13 @@
         style="width: 100%">
             <el-table-column prop="agencyName" label="组织名字" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini"
+                        type="primary"
+                        icon="el-icon-plus"
+                        @click="addCommunity(scope.row)"
+                    >新增</el-button>
+                </template>
                 <template slot-scope="scope">
                 <el-button 
                     size="mini"
@@ -61,22 +68,22 @@
         <el-table height="250"
         :data="communityData"
         style="width: 100%">
-            <el-table-column prop="departmentName" label="社区名字" width="260"></el-table-column>
+            <el-table-column prop="departmentName" label="下级机关单位/基层科室" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini"
+                        type="primary"
+                        icon="el-icon-plus"
+                        @click="addCommunity(scope.row)"
+                    >新增</el-button>
+                </template>
                 <template slot-scope="scope">
-                <el-button v-if="communityOpen"
-                    size="mini"
-                    type="primary"
-                    icon="el-icon-plus"
-                    @click="addCommunity(scope.row)"
-                >新增</el-button>
-
-                <el-button 
-                    size="mini"
-                    type="warning"
-                    icon="el-icon-plus"
-                    @click="entryCommunity(scope.row)"
-                >进入</el-button>
+                    <el-button 
+                        size="mini"
+                        type="warning"
+                        icon="el-icon-plus"
+                        @click="entryCommunity(scope.row)"
+                    >进入</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -87,20 +94,20 @@
         style="width: 100%">
             <el-table-column prop="gridName" label="网格名字" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot="header" slot-scope="scope">
+                    <el-button size="mini"
+                        type="primary"
+                        icon="el-icon-plus"
+                        @click="addGrid(scope.row)"
+                    >新增</el-button>
+                </template>
                 <template slot-scope="scope">
-                <el-button v-if="gridOpen"
-                    size="mini"
-                    type="primary"
-                    icon="el-icon-plus"
-                    @click="addGrid(scope.row)"
-                >新增</el-button>
-
-                <el-button 
-                    size="mini"
-                    type="warning"
-                    icon="el-icon-plus"
-                    @click="entryGrid(scope.row)"
-                >进入</el-button>
+                    <el-button 
+                        size="mini"
+                        type="warning"
+                        icon="el-icon-plus"
+                        @click="entryGrid(scope.row)"
+                    >进入</el-button>
                 </template>
             </el-table-column>
         </el-table>

From 3623fc6032899e574efc1affaf6ae7b67a9ee655 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 12 Apr 2022 14:33:30 +0800
Subject: [PATCH 04/23] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=8C=89=E9=92=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 3deef137..fc76c39c 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "throttle-debounce": "^3.0.1",
     "v-distpicker": "^1.2.2",
     "vue": "^2.6.11",
+    "vue-baidu-map": "^0.21.22",
     "vue-i18n": "^8.12.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.0.7",

From 358a450d9b83fcaa2fa53ce820217937ab94123f Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 12 Apr 2022 14:35:53 +0800
Subject: [PATCH 05/23] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 147 ++++++++++++++----
 1 file changed, 120 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 6d5f4676..c4d5f132 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -40,12 +40,13 @@
         
         
         <!-- 组织列表 -->
-        <el-table height="250"
+        <el-table v-show="OrganizationList"
+        height="250"
         :data="tableData"
         style="width: 100%">
             <el-table-column prop="agencyName" label="组织名字" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot="header" slot-scope="scope">
+                <template  slot-scope="scope">
                     <el-button size="mini"
                         type="primary"
                         icon="el-icon-plus"
@@ -64,8 +65,9 @@
         </el-table>
         
 
-         <!-- 社区列表 -->
-        <el-table height="250"
+         <!-- 下级机关单位/基层科室列表 -->
+        <el-table v-show="officeList"
+        height="250"
         :data="communityData"
         style="width: 100%">
             <el-table-column prop="departmentName" label="下级机关单位/基层科室" width="260"></el-table-column>
@@ -89,7 +91,8 @@
         </el-table>
 
         <!-- 网格列表 -->
-        <el-table height="250"
+        <el-table v-show="GridList"
+        height="250"
         :data="gridData"
         style="width: 100%">
             <el-table-column prop="gridName" label="网格名字" width="260"></el-table-column>
@@ -113,20 +116,22 @@
         </el-table>
 
         <!-- 本级工作人员 -->
-        <el-table 
+        <el-table v-show="levelWorkPeoList"
         :data="agencyDataPeo"
         style="width: 100%"
         height="250">
             <el-table-column prop="name" label="本级工作人员名字" width="260"></el-table-column>
             <el-table-column prop="roles" label="本级工作人员职责" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
-                <template slot-scope="scope">
-                <el-button  v-if="entry"
+                <template slot="header" slot-scope="scope">
+                <el-button v-if="levelPeo"
                     size="mini"
                     type="primary"
                     icon="el-icon-plus"
                     @click="addPeo(scope.row)"
                 >新增</el-button>
+                </template>
+                <template slot-scope="scope">
                 <el-button 
                     size="mini"
                     type="warning"
@@ -155,20 +160,22 @@
             </el-table-column>
         </el-table>
 
-        <!-- 社区工作人员 -->
-        <el-table height="250"
+        <!-- 下级机关单位/基层科室工作人员 -->
+        <el-table height="250" v-show="ListOfOrganPersonnel"
         :data="communityDataPeo"
         style="width: 100%">
-            <el-table-column prop="name" label="社区工作人员名字" width="260"></el-table-column>
-            <el-table-column prop="roles" label="社区工作人员职责" width="260"></el-table-column>
+            <el-table-column prop="name" label="下级机关单位/基层科室工作人员" width="260"></el-table-column>
+            <el-table-column prop="roles" label="下级机关单位/基层科室工作人员职责" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                <el-button
+                <template slot="header" slot-scope="scope">
+                <el-button v-if="deptPeo"
                     size="mini"
                     type="primary"
                     icon="el-icon-plus"
                     @click="addCommunityPeo(scope.row)"
                 >新增</el-button>
+                </template>
+                <template>
                 <el-button 
                     size="mini"
                     type="warning"
@@ -198,20 +205,22 @@
         </el-table>
 
         <!-- 网格工作人员 -->
-        <el-table 
+        <el-table v-show="GridWorkPeoList"
         :data="gridDataPeo"
         style="width: 100%"
         height="250">
             <el-table-column prop="name" label="网格工作人员名字" width="260"></el-table-column>
             <el-table-column prop="roles" label="网格工作人员职责" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                <el-button
+                <template slot="header" slot-scope="scope">
+                <el-button v-if="GridWorkPeo"
                     size="mini"
                     type="primary"
                     icon="el-icon-plus"
                     @click="addGridPeo(scope.row)"
                 >新增</el-button>
+                </template>
+                <template>
                 <el-button 
                     size="mini"
                     type="warning"
@@ -241,14 +250,14 @@
         </el-table>
 
   
-        <!-- 新增社区 -->
+        <!-- 新增下级机关单位/基层科室 -->
         <el-dialog 
-        title="新增社区"
+        title="新增部门"
         :visible.sync="dialogVisible"
         width="30%"
         :before-close="handleClose">
             <el-form :rules="rules">
-                <el-form-item label="社区名称" prop="departmentName">
+                <el-form-item label="部门名称" prop="departmentName">
                     <el-input v-model="insertForm.departmentName" placeholder="请输入部门名称"></el-input>
                 </el-form-item>
                 <el-form-item label="组织编码" prop="code">
@@ -476,7 +485,8 @@
                     <el-input v-model="transferForm.name" placeholder="姓名"></el-input>
                 </el-form-item>
                 <el-form-item label="调动至">
-                    <el-cascader
+                    <el-cascader 
+                        clearable
                         :props="{ checkStrictly: true }"
                         v-model="selectValue"
                         :options="options"
@@ -510,8 +520,28 @@ import { requestPost } from "@/js/dai/request";
 export default {
     data(){
         return{
+           // 本级人员是否显示
+           levelPeo:true,
+           // 部门人员是否显示
+           deptPeo:false,
+           // 网格人员是否显示
+           GridWorkPeo:false,
+           // 机关人员列表
+           ListOfOrganPersonnel:false,
+           // 网格人员列表
+           GridWorkPeoList:false,
+           // 组织列表
+           OrganizationList:true,
+           // 本级工作人员列表
+           levelWorkPeoList:true,
+           // 网格列表
+           GridList:true,
+           // 机关列表
+           officeList:true,
+           // 经纬度坐标
            lat:'11',
            lng:'11',
+           Navigation:'',
             // 查询参数
             queryParams: {
                 deptName: undefined,
@@ -643,7 +673,18 @@ export default {
                {
                    value:'',
                    label:'',
-                   children:[],
+                   children:[
+                       {
+                           value:'',
+                           label:'',
+                           children:[]
+                       },
+                       {
+                           value:'',
+                           label:'',
+                           children:[]
+                       }
+                   ],
                }
            ],
            selectValue: [],
@@ -665,6 +706,7 @@ export default {
         this.getCommunityList()
         this.getGridList()
         this.agencyPeo()
+        this.getNavigation()
     },
     
     watch: {
@@ -683,8 +725,22 @@ export default {
     methods:{
         // 点击后获取id
         handleChange (e) {
+            console.log(e)
             this.transferForm.orgId = e[1]
-            this.transferForm.orgType = 'dept'
+            if(this.transferForm.orgId != null || ''){
+                if(this.transferForm.orgId === 0){
+                    this.transferForm.orgId = e[2]
+                    this.transferForm.orgType = 'dept'
+                } else {
+                    this.transferForm.orgId = e[2]
+                    this.transferForm.orgType = 'grid'
+                }
+            }else{
+                this.transferForm.orgId = e[0]
+                this.transferForm.orgType = 'agency'
+            }
+            
+            
         },
         /** 查询组织列表 */
         async getAgencyList(){
@@ -1028,8 +1084,17 @@ export default {
             this.communityDataPeo =[]
             this.agencyDataPeo = []
             this.gridOrgId = row.gridId
+            this.deptPeo = false
+            this.GridWorkPeo = true
+            this.levelPeo = false
+            this.GridWorkPeoList = true
+            this.ListOfOrganPersonnel = false
+            this.levelWorkPeoList = false
+            this.OrganizationList = false
+            this.officeList = false
             this.GridPeo()
             
+            
         },
         // 进入社区，查询社区所属人员
         entryCommunity(row){
@@ -1037,7 +1102,14 @@ export default {
             this.communityDataPeo = []
             this.agencyDataPeo = []
             this.communityOrgId = row.departmentId
-            
+            this.levelPeo = false
+            this.deptPeo = true
+            this.GridWorkPeo = false
+            this.ListOfOrganPersonnel = true
+            this.levelWorkPeoList = false
+            this.GridWorkPeoList = false
+            this.GridList = false
+            this.OrganizationList = false
             this.communityPeo()
         },
 
@@ -1057,6 +1129,8 @@ export default {
             this.anId = row.agencyId
             this.agencyPeo()
             this.entry = true
+            this.levelPeo = true
+            this.OrganizationList = false
         },
 
         // 新增组织
@@ -1211,15 +1285,18 @@ export default {
                         value:item.deptId,
                         label:item.deptName                        
                     }
-                    this.options[0].children.push(ob)
+                    this.options[0].children[0].children.push(ob)
                 })
-
+                    this.options[0].children[0].value = 0
+                    this.options[0].children[0].label = "部门"
+                    this.options[0].children[1].value = 1
+                    this.options[0].children[1].label = "网格"
                 gr.forEach(item => {
                     const obj = {
                         value:item.gridId,
                         label:item.gridName                        
                     }
-                    this.options[0].children.push(obj)
+                    this.options[0].children[1].children.push(obj)
                 })
             }else{
                 this.$message.error("树查询失败",msg)
@@ -1254,6 +1331,22 @@ export default {
             }
         },
 
+        // 获取导航
+        async getNavigation(){
+
+            const url = "/gov/org/customeragency/orgtree"
+
+            let params = {
+
+            }
+            
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.Navigation = data.agencyName
+            }
+            
+        },
 
        /** 地图初始化 */
        initMap(_that) {

From 609015bceead6a0acfafe50b044bae7edbb96df7 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Tue, 12 Apr 2022 14:43:30 +0800
Subject: [PATCH 06/23] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 100 +++++++++++++++---
 1 file changed, 85 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index c4d5f132..a633bf98 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -38,7 +38,16 @@
             </el-col>
         </el-row> -->
         
-        
+        <el-row>
+            <el-col :span="24" style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
+                <el-breadcrumb separator-class="el-icon-arrow-right">
+                    <el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbArr" :key="breadcrumb.id">
+                        <el-link v-if="breadcrumb.id === currentBreadCrumbKey" type="primary" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
+                        <el-link v-else type="info" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
+                    </el-breadcrumb-item>
+                </el-breadcrumb>
+            </el-col>
+        </el-row>
         <!-- 组织列表 -->
         <el-table v-show="OrganizationList"
         height="250"
@@ -64,7 +73,6 @@
             </el-table-column>
         </el-table>
         
-
          <!-- 下级机关单位/基层科室列表 -->
         <el-table v-show="officeList"
         height="250"
@@ -689,7 +697,10 @@ export default {
            ],
            selectValue: [],
 
-
+            // 顶部 面包屑
+            breadcrumbArr: [],
+            // 面包屑 当前所属机构ID
+            currentBreadCrumbKey: '',
             // 校验
            rules: {
                 departmentName:[
@@ -706,7 +717,9 @@ export default {
         this.getCommunityList()
         this.getGridList()
         this.agencyPeo()
-        this.getNavigation()
+        // this.getNavigation()
+        // 更新顶部面包屑
+        this.assembleBreadcrumbArr(localStorage.getItem('agencyId'), 'agency')
     },
     
     watch: {
@@ -830,7 +843,7 @@ export default {
             }
         },
 
-        // 查询社区人员
+        // 查询部门人员
         async communityPeo(){
             const url = "/data/aggregator/org/stafflist"
 
@@ -1093,8 +1106,7 @@ export default {
             this.OrganizationList = false
             this.officeList = false
             this.GridPeo()
-            
-            
+            this.assembleBreadcrumbArr(row.gridId, 'grid')
         },
         // 进入社区，查询社区所属人员
         entryCommunity(row){
@@ -1111,6 +1123,7 @@ export default {
             this.GridList = false
             this.OrganizationList = false
             this.communityPeo()
+            this.assembleBreadcrumbArr(row.departmentId, 'department')
         },
 
         // 进入组织，重新渲染
@@ -1131,6 +1144,7 @@ export default {
             this.entry = true
             this.levelPeo = true
             this.OrganizationList = false
+            this.assembleBreadcrumbArr(row.agencyId, 'agency')
         },
 
         // 新增组织
@@ -1332,20 +1346,76 @@ export default {
         },
 
         // 获取导航
-        async getNavigation(){
+        // async getNavigation(){
 
-            const url = "/gov/org/customeragency/orgtree"
+        //     const url = "/gov/org/customeragency/orgtree"
 
-            let params = {
+        //     let params = {
 
-            }
+        //     }
             
-            const { data, code, msg } = await requestPost(url,params)
+        //     const { data, code, msg } = await requestPost(url,params)
 
-            if(code === 0){
-                this.Navigation = data.agencyName
-            }
+        //     if(code === 0){
+        //         this.Navigation = data.agencyName
+        //     }
             
+        async assembleBreadcrumbArr (id, orgType) {
+            this.currentBreadCrumbKey = id
+            if (orgType === 'agency') {
+                const url = '/gov/org/agency/agencydetail'
+                let params = {
+                    agencyId : id,
+                }
+                const { data, code, msg } = await requestPost(url, params)
+                if(code === 0){
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [{id: data.agencyId, name: data.agencyName, type: orgType}]
+                    } else {
+                        let breadcrumb = {id: data.agencyId, name: data.agencyName, type: orgType}
+                        this.breadcrumbArr.push(breadcrumb)
+                    }
+                } else {
+                    this.$message.error(msg)
+                }
+            } else if (orgType === 'department') {
+                const url = '/gov/org/department/departmentdetail'
+                let params = {
+                    departmentId : id,
+                }
+                const { data, code, msg } = await requestPost(url, params)
+                if(code === 0){
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [{id: data.departmentId, name: data.departmentName, type: orgType}]
+                    } else {
+                        let breadcrumb = {id: data.departmentId, name: data.departmentName, type: orgType}
+                        this.breadcrumbArr.push(breadcrumb)
+                    }
+                } else {
+                    this.$message.error(msg)
+                }
+            } else if (orgType === 'grid') {
+                const url = '/gov/org/grid/griddetail'
+                let params = {
+                    gridId : id,
+                }
+                const { data, code, msg } = await requestPost(url, params)
+                if(code === 0){
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [{id: data.grid, name: data.gridName, type: orgType}]
+                    } else {
+                        let breadcrumb = {id: data.grid, name: data.gridName, type: orgType}
+                        this.breadcrumbArr.push(breadcrumb)
+                    }
+                } else {
+                    this.$message.error(msg)
+                }
+            }
+        },
+
+        async refreshThisPage (index) {
+            console.log(this.currentBreadCrumbKey)
+            console.log(this.breadcrumbArr)
         },
 
        /** 地图初始化 */

From b7f9a2963576194377d148b2729746daf175e06b Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 12 Apr 2022 17:45:09 +0800
Subject: [PATCH 07/23] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 252 ++++++++++++++----
 1 file changed, 197 insertions(+), 55 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index a633bf98..e5e896d4 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -55,20 +55,26 @@
         style="width: 100%">
             <el-table-column prop="agencyName" label="组织名字" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template  slot-scope="scope">
+                <template slot="header" slot-scope="scope">
                     <el-button size="mini"
                         type="primary"
                         icon="el-icon-plus"
-                        @click="addCommunity(scope.row)"
+                        @click="addAgency(scope.row)"
                     >新增</el-button>
                 </template>
                 <template slot-scope="scope">
-                <el-button 
+                <el-button v-show="agenButton"
                     size="mini"
                     type="warning"
                     icon="el-icon-plus"
                     @click="entryAgency(scope.row)"
                 >进入</el-button>
+                <el-button v-show="agenButtonTwo"
+                    size="mini"
+                    type="warning"
+                    icon="el-icon-plus"
+                    @click="entryAgencyTwo(scope.row)"
+                >进入</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -333,58 +339,59 @@
         </div>
 
         <!-- 新增人员 -->
-        <el-dialog 
-        title="新增人员"
-        :visible.sync="dialogVisiblePeo"
-        width="30%"
-        :before-close="handleClose">
-            <el-form>
-                <el-form-item label="姓名" prop="peoName">
-                    <el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input>
-                </el-form-item>
-                <el-form-item label="手机号" prop="mobile">
-                    <el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input>
-                </el-form-item>
-                <!-- 性别下拉框 -->
-                <el-form-item label="性别" prop="gender">
-                    <el-select v-model="peoForm.gender" clearable placeholder="性别">
-                        <el-option v-for="item in genderList" 
-                            :key="item.value" 
-                            :label="item.label" 
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <!-- 专兼职下拉框 -->
-                <el-form-item label="专兼职" prop="post">
-                    <el-select v-model="peoForm.post" clearable placeholder="专兼职">
-                        <el-option v-for="item in postList" 
-                            :key="item.value" 
-                            :label="item.label" 
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <!-- 职责下拉框 -->
-                <el-form-item label="职责" prop="duty">
-                    <el-select v-model="peoForm.duty" multiple placeholder="请选择">
-                        <el-option
-                        v-for="item in dutyList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                        :disabled="item.disabled">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-
-            </el-form>
-            <div slot="footer" >
-                <el-button @click="cancelPeo">取 消</el-button>
-                <el-button type="primary" @click="submitPeo">确 定</el-button>
-            </div>
-        </el-dialog>
+        <div v-if="dialogVisiblePeo">
+            <el-dialog 
+            title="新增人员"
+            :visible.sync="dialogVisiblePeo"
+            width="30%"
+            :before-close="handleClose">
+                <el-form>
+                    <el-form-item label="姓名" prop="peoName">
+                        <el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input>
+                    </el-form-item>
+                    <el-form-item label="手机号" prop="mobile">
+                        <el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input>
+                    </el-form-item>
+                    <!-- 性别下拉框 -->
+                    <el-form-item label="性别" prop="gender">
+                        <el-select v-model="peoForm.gender" clearable placeholder="性别">
+                            <el-option v-for="item in genderList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- 专兼职下拉框 -->
+                    <el-form-item label="专兼职" prop="post">
+                        <el-select v-model="peoForm.post" clearable placeholder="专兼职">
+                            <el-option v-for="item in postList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- 职责下拉框 -->
+                    <el-form-item label="职责" prop="duty">
+                        <el-select v-model="peoForm.duty" multiple placeholder="请选择">
+                            <el-option
+                            v-for="item in dutyList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                            :disabled="item.disabled">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
 
+                </el-form>
+                <div slot="footer" >
+                    <el-button @click="cancelPeo">取 消</el-button>
+                    <el-button type="primary" @click="submitPeo">确 定</el-button>
+                </div>
+            </el-dialog>
+        </div>
 
         <!-- 人员修改 -->
         <el-dialog 
@@ -518,6 +525,38 @@
             </div>
         </el-dialog>
 
+        <el-dialog
+        title="新增组织"
+        :visible.sync="addNewAgency"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="组织名称">
+                    <el-input v-model="agencyForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <!-- 组织区划 -->
+
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="agencyForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="agencyForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="agencyForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="canceladdNewAgency">取 消</el-button>
+                <el-button type="primary" @click="submitaddNewAgency">确 定</el-button>
+            </div>
+        </el-dialog>
+
     </div>
 </template>
 
@@ -528,6 +567,10 @@ import { requestPost } from "@/js/dai/request";
 export default {
     data(){
         return{
+            agenButtonTwo:false,
+            agenButton:true,
+            // 新增组织弹窗
+            addNewAgency:false,
            // 本级人员是否显示
            levelPeo:true,
            // 部门人员是否显示
@@ -549,6 +592,8 @@ export default {
            // 经纬度坐标
            lat:'11',
            lng:'11',
+           latitude:'11',
+           longitude:'11',
            Navigation:'',
             // 查询参数
             queryParams: {
@@ -604,6 +649,18 @@ export default {
                 latitude: '11' ,//纬度
                 centerAddress:''
             },
+            // 新增组织
+            agencyForm:{
+                parentAgencyId:'',
+                agencyName:'',
+                level:'',
+                areaCodeSwitch:'',
+                areaCode:'',
+                areaName:'',
+                contacts:'',
+                mobile:'',
+                code:''
+            },
             // 树
             tree:[],
             // 新增人员表单项
@@ -730,6 +787,15 @@ export default {
                     this.initMap(_that)
                 }, 1000);
             }
+        },
+        addNewAgency(val) {
+            console.log('555555555555555',val)
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
         }
     },
     mounted(){
@@ -1061,6 +1127,20 @@ export default {
             this.selectValue = ''
             
         },
+        // 新增组织
+        addNewAgencyRest(){
+            this.agencyForm.parentAgencyId = '',
+            this.agencyForm.agencyName = '',
+            this.agencyForm.level = '', 
+            this.agencyForm.areaCodeSwitch = '',
+            this.agencyForm.areaCode = '',
+            this.agencyForm.areaName = '',
+            this.agencyForm.contacts = '',
+            this.agencyForm.mobile = '',
+            this.agencyForm.code = '',
+            this.latitude = '',
+            this.longitude = ''
+        },
         // 社区新增弹框取消按钮
         cancel(){
             this.dialogVisible = false
@@ -1091,6 +1171,11 @@ export default {
             this.transferRest()
             this.transferPeo = false
         },
+        // 新增组织取消按钮
+        canceladdNewAgency(){
+            this.addNewAgencyRest()
+            this.addNewAgency = false
+        },
         // 进入网格，查询网格所属人员
         entryGrid(row){
             this.gridDataPeo = []
@@ -1105,6 +1190,7 @@ export default {
             this.levelWorkPeoList = false
             this.OrganizationList = false
             this.officeList = false
+            this.GridList = false
             this.GridPeo()
             this.assembleBreadcrumbArr(row.gridId, 'grid')
         },
@@ -1122,6 +1208,7 @@ export default {
             this.GridWorkPeoList = false
             this.GridList = false
             this.OrganizationList = false
+            this.officeList = false
             this.communityPeo()
             this.assembleBreadcrumbArr(row.departmentId, 'department')
         },
@@ -1143,9 +1230,33 @@ export default {
             this.agencyPeo()
             this.entry = true
             this.levelPeo = true
-            this.OrganizationList = false
+            this.agencyId = row.agencyId
+            this.agenButton = false
+            this.agenButtonTwo = true
+            this.getAgencyList()
             this.assembleBreadcrumbArr(row.agencyId, 'agency')
         },
+        entryAgencyTwo(row){
+            this.tableData = []
+            this.communityData = []
+            this.gridData = []
+            this.gridDataPeo = []
+            this.agencyDataPeo = []
+            this.communityDataPeo = []
+            this.agencyId = row.agencyId
+            this.getCommunityList()
+            this.getGridList()
+            this.communityOpen = true
+            this.gridOpen = true
+            this.anId = row.agencyId
+            this.agencyPeo()
+            this.entry = true
+            this.levelPeo = true
+            this.agencyId = row.agencyId
+            this.getAgencyList()
+            this.assembleBreadcrumbArr(row.agencyId, 'agency')
+            this.OrganizationList = false
+        },
 
         // 新增组织
         addCommunity(row){
@@ -1418,6 +1529,14 @@ export default {
             console.log(this.breadcrumbArr)
         },
 
+        addAgency(row){
+            this.addNewAgency = true
+        },
+        // 新增组织确定按钮
+        submitaddNewAgency(){
+
+        },
+
        /** 地图初始化 */
        initMap(_that) {
            
@@ -1435,6 +1554,25 @@ export default {
                 _that.lng = evt.latLng.getLng().toFixed(6);
                 position.innerHTML = _that.lat + "," + _that.lng;
             })
+        },
+        createMap(_t){
+            document.getElementById("con").innerHTML = ''
+            document.getElementById("con").innerHTML = '当前点击坐标为：<span id="pos"></span>'
+            var position = document.getElementById("pos");
+
+            var center = new window.TMap.LatLng(39.984104, 116.307503);//设置中心点坐标
+            //初始化地图
+            var map = new window.TMap.Map("con", {
+                center: center
+            });
+            
+            //绑定点击事件
+            map.on("click",function(evt){
+                _t.latitude = evt.latLng.getLat().toFixed(6);
+                _t.longitude = evt.latLng.getLng().toFixed(6);
+                position.innerHTML = _t.latitude + "," + _t.longitude;
+            })
+
         }
         
     }
@@ -1455,4 +1593,8 @@ export default {
         padding: 10px;
         border-radius: 3px;
     }
+    #con {
+        width: 50%;
+        height: 50%;
+    }
 </style>
\ No newline at end of file

From af3b3250851c04e01653d2c1ceb03e8162e86987 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Tue, 12 Apr 2022 18:16:04 +0800
Subject: [PATCH 08/23] update

---
 .../base/organization/organization.vue        | 119 +++++++++---------
 1 file changed, 63 insertions(+), 56 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index e5e896d4..bf2591cf 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -63,17 +63,10 @@
                     >新增</el-button>
                 </template>
                 <template slot-scope="scope">
-                <el-button v-show="agenButton"
-                    size="mini"
-                    type="warning"
-                    icon="el-icon-plus"
-                    @click="entryAgency(scope.row)"
-                >进入</el-button>
-                <el-button v-show="agenButtonTwo"
-                    size="mini"
+                <el-button size="mini"
                     type="warning"
                     icon="el-icon-plus"
-                    @click="entryAgencyTwo(scope.row)"
+                    @click="entryAgency(scope.row.agencyId)"
                 >进入</el-button>
                 </template>
             </el-table-column>
@@ -98,7 +91,7 @@
                         size="mini"
                         type="warning"
                         icon="el-icon-plus"
-                        @click="entryCommunity(scope.row)"
+                        @click="entryDepartment(scope.row.departmentId)"
                     >进入</el-button>
                 </template>
             </el-table-column>
@@ -123,7 +116,7 @@
                         size="mini"
                         type="warning"
                         icon="el-icon-plus"
-                        @click="entryGrid(scope.row)"
+                        @click="entryGrid(scope.row.gridId)"
                     >进入</el-button>
                 </template>
             </el-table-column>
@@ -567,8 +560,6 @@ import { requestPost } from "@/js/dai/request";
 export default {
     data(){
         return{
-            agenButtonTwo:false,
-            agenButton:true,
             // 新增组织弹窗
             addNewAgency:false,
            // 本级人员是否显示
@@ -1177,11 +1168,11 @@ export default {
             this.addNewAgency = false
         },
         // 进入网格，查询网格所属人员
-        entryGrid(row){
+        entryGrid(gridId){
             this.gridDataPeo = []
             this.communityDataPeo =[]
             this.agencyDataPeo = []
-            this.gridOrgId = row.gridId
+            this.gridOrgId = gridId
             this.deptPeo = false
             this.GridWorkPeo = true
             this.levelPeo = false
@@ -1192,14 +1183,14 @@ export default {
             this.officeList = false
             this.GridList = false
             this.GridPeo()
-            this.assembleBreadcrumbArr(row.gridId, 'grid')
+            this.assembleBreadcrumbArr(gridId, 'grid')
         },
         // 进入社区，查询社区所属人员
-        entryCommunity(row){
+        entryDepartment(departmentId){
             this.gridDataPeo = []
             this.communityDataPeo = []
             this.agencyDataPeo = []
-            this.communityOrgId = row.departmentId
+            this.communityOrgId = departmentId
             this.levelPeo = false
             this.deptPeo = true
             this.GridWorkPeo = false
@@ -1210,54 +1201,30 @@ export default {
             this.OrganizationList = false
             this.officeList = false
             this.communityPeo()
-            this.assembleBreadcrumbArr(row.departmentId, 'department')
+            this.assembleBreadcrumbArr(departmentId, 'department')
         },
 
         // 进入组织，重新渲染
-        entryAgency(row){
-            this.tableData = []
-            this.communityData = []
-            this.gridData = []
-            this.gridDataPeo = []
-            this.agencyDataPeo = []
-            this.communityDataPeo = []
-            this.agencyId = row.agencyId
-            this.getCommunityList()
-            this.getGridList()
-            this.communityOpen = true
-            this.gridOpen = true
-            this.anId = row.agencyId
-            this.agencyPeo()
-            this.entry = true
-            this.levelPeo = true
-            this.agencyId = row.agencyId
-            this.agenButton = false
-            this.agenButtonTwo = true
-            this.getAgencyList()
-            this.assembleBreadcrumbArr(row.agencyId, 'agency')
-        },
-        entryAgencyTwo(row){
+        entryAgency(agencyId){
             this.tableData = []
             this.communityData = []
             this.gridData = []
             this.gridDataPeo = []
             this.agencyDataPeo = []
             this.communityDataPeo = []
-            this.agencyId = row.agencyId
+            this.agencyId = agencyId
             this.getCommunityList()
             this.getGridList()
             this.communityOpen = true
             this.gridOpen = true
-            this.anId = row.agencyId
+            this.anId = agencyId
             this.agencyPeo()
             this.entry = true
             this.levelPeo = true
-            this.agencyId = row.agencyId
+            this.agencyId = agencyId
             this.getAgencyList()
-            this.assembleBreadcrumbArr(row.agencyId, 'agency')
-            this.OrganizationList = false
+            this.assembleBreadcrumbArr(agencyId, 'agency')
         },
-
         // 新增组织
         addCommunity(row){
             
@@ -1480,11 +1447,24 @@ export default {
                 }
                 const { data, code, msg } = await requestPost(url, params)
                 if(code === 0){
+                    if (data.level === 'community') {
+                        this.OrganizationList = false
+                    } else {
+                        this.OrganizationList = true
+                    }
                     if (this.breadcrumbArr.length === 0) {
                         this.breadcrumbArr = [{id: data.agencyId, name: data.agencyName, type: orgType}]
                     } else {
-                        let breadcrumb = {id: data.agencyId, name: data.agencyName, type: orgType}
-                        this.breadcrumbArr.push(breadcrumb)
+                        let hasBreadcrumbArr = false
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true
+                            }
+                        })
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {id: data.agencyId, name: data.agencyName, type: orgType}
+                            this.breadcrumbArr.push(breadcrumb)
+                        } 
                     }
                 } else {
                     this.$message.error(msg)
@@ -1499,8 +1479,16 @@ export default {
                     if (this.breadcrumbArr.length === 0) {
                         this.breadcrumbArr = [{id: data.departmentId, name: data.departmentName, type: orgType}]
                     } else {
-                        let breadcrumb = {id: data.departmentId, name: data.departmentName, type: orgType}
-                        this.breadcrumbArr.push(breadcrumb)
+                        let hasBreadcrumbArr = false
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true
+                            }
+                        })
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {id: data.departmentId, name: data.departmentName, type: orgType}
+                            this.breadcrumbArr.push(breadcrumb)
+                        } 
                     }
                 } else {
                     this.$message.error(msg)
@@ -1515,8 +1503,16 @@ export default {
                     if (this.breadcrumbArr.length === 0) {
                         this.breadcrumbArr = [{id: data.grid, name: data.gridName, type: orgType}]
                     } else {
-                        let breadcrumb = {id: data.grid, name: data.gridName, type: orgType}
-                        this.breadcrumbArr.push(breadcrumb)
+                        let hasBreadcrumbArr = false
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true
+                            }
+                        })
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {id: data.grid, name: data.gridName, type: orgType}
+                            this.breadcrumbArr.push(breadcrumb)
+                        } 
                     }
                 } else {
                     this.$message.error(msg)
@@ -1525,8 +1521,19 @@ export default {
         },
 
         async refreshThisPage (index) {
-            console.log(this.currentBreadCrumbKey)
-            console.log(this.breadcrumbArr)
+            const selectOrg = this.breadcrumbArr[index]
+            this.breadcrumbArr = this.breadcrumbArr.slice(0, index + 1)
+
+            const orgId = selectOrg.id
+            const orgType = selectOrg.type
+
+            if (orgType === 'agency') {
+                this.entryAgency(orgId)
+            } else if (orgType === 'department') {
+                this.entryDepartment(orgId)
+            } else if (orgType === 'grid') {
+                this.entryGrid(orgId)
+            }
         },
 
         addAgency(row){

From a2b5c3146c692a372430bd4d33594495ee83c42d Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 13 Apr 2022 10:04:00 +0800
Subject: [PATCH 09/23] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8C=BA=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 73 +++++++++++++++++--
 1 file changed, 67 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index bf2591cf..47bab968 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -518,6 +518,7 @@
             </div>
         </el-dialog>
 
+        <!-- 新增组织 -->
         <el-dialog
         title="新增组织"
         :visible.sync="addNewAgency"
@@ -529,7 +530,16 @@
                 </el-form-item>
 
                 <!-- 组织区划 -->
-
+                <el-form-item label="组织区划">
+                    <el-select v-model="zonings.areaCode" placeholder="请选择组织区划" @change="handelZoing">
+                        <el-option 
+                        v-for="item in zonings"
+                        :key="item.areaCode"
+                        :label="item.areaName"
+                        :value="item.areaCode">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
 
                 <el-form-item label="组织编码">
                     <el-input v-model="agencyForm.code" placeholder="请输入组织编码"></el-input>
@@ -680,6 +690,12 @@ export default {
                 agencyId:'',
                 customerId:''
             },
+            // 当前用户信息,用于获取组织区划
+            userForm:{
+                areaCode:'',
+                level:'',
+                parentAgencyId:''
+            },
             keyWords: '',
             typeList:[],
             // 性别字典
@@ -749,6 +765,8 @@ export default {
             breadcrumbArr: [],
             // 面包屑 当前所属机构ID
             currentBreadCrumbKey: '',
+            // 组织区划数据
+            zonings:[],
             // 校验
            rules: {
                 departmentName:[
@@ -780,7 +798,6 @@ export default {
             }
         },
         addNewAgency(val) {
-            console.log('555555555555555',val)
             if (val) {
                 setTimeout(() => {
                     let _t = this
@@ -1535,9 +1552,53 @@ export default {
                 this.entryGrid(orgId)
             }
         },
+        // 获取当前用户信息
+        async getUser(){
+            const url = '/data/report/screen/agency/agencydetail-multic'
+
+            let params = {
+                agencyId:localStorage.getItem('agencyId')
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                console.log(data)
+                this.userForm.areaCode = data.areaCode
+                this.userForm.level = data.level
+                this.userForm.parentAgencyId = data.agencyId
+                this.getZoning()
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        // 获取组织区划信息
+        async getZoning(){
+            const url = '/data/aggregator/org/nextlevelareacodelist'
+
+            let params = {
+                areaCode:this.userForm.areaCode,
+                level:this.userForm.level,
+                parentAgencyId:this.userForm.parentAgencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.zonings = data
+            }else{
+                this.$message.error(msg)
+            }
+
+        },
+
+        handelZoing(val){
+            console.log(val)
+        },
 
         addAgency(row){
             this.addNewAgency = true
+            this.getUser()
         },
         // 新增组织确定按钮
         submitaddNewAgency(){
@@ -1588,8 +1649,8 @@ export default {
 
 <style scoped>
     #container {
-        width: 50%;
-        height: 50%;
+        width: 100%;
+        height: 100%;
     }
     #info{
         left: 20px;
@@ -1601,7 +1662,7 @@ export default {
         border-radius: 3px;
     }
     #con {
-        width: 50%;
-        height: 50%;
+        width: 100%;
+        height: 100%;
     }
 </style>
\ No newline at end of file

From 81c8b6bf814c0f9fc2b3fb53e2eaa365d78b850a Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Wed, 13 Apr 2022 10:07:51 +0800
Subject: [PATCH 10/23] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=AE=8C=E5=96=84=E9=9D=A2=E5=8C=85=E5=B1=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 271 ++++++++++--------
 1 file changed, 152 insertions(+), 119 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 47bab968..fb06c708 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -49,9 +49,9 @@
             </el-col>
         </el-row>
         <!-- 组织列表 -->
-        <el-table v-show="OrganizationList"
+        <el-table v-show="agencyTableFlag"
         height="250"
-        :data="tableData"
+        :data="agencyTableListData"
         style="width: 100%">
             <el-table-column prop="agencyName" label="组织名字" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -73,9 +73,9 @@
         </el-table>
         
          <!-- 下级机关单位/基层科室列表 -->
-        <el-table v-show="officeList"
+        <el-table v-show="departmentTableFlag"
         height="250"
-        :data="communityData"
+        :data="departmentTableListData"
         style="width: 100%">
             <el-table-column prop="departmentName" label="下级机关单位/基层科室" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -98,9 +98,9 @@
         </el-table>
 
         <!-- 网格列表 -->
-        <el-table v-show="GridList"
+        <el-table v-show="gridTableFlag"
         height="250"
-        :data="gridData"
+        :data="gridTableListData"
         style="width: 100%">
             <el-table-column prop="gridName" label="网格名字" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -123,16 +123,15 @@
         </el-table>
 
         <!-- 本级工作人员 -->
-        <el-table v-show="levelWorkPeoList"
-        :data="agencyDataPeo"
+        <el-table v-show="currentAgencyStaffTableFlag"
+        :data="agencyStaffTableListData"
         style="width: 100%"
         height="250">
             <el-table-column prop="name" label="本级工作人员名字" width="260"></el-table-column>
             <el-table-column prop="roles" label="本级工作人员职责" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
                 <template slot="header" slot-scope="scope">
-                <el-button v-if="levelPeo"
-                    size="mini"
+                <el-button size="mini"
                     type="primary"
                     icon="el-icon-plus"
                     @click="addPeo(scope.row)"
@@ -168,15 +167,14 @@
         </el-table>
 
         <!-- 下级机关单位/基层科室工作人员 -->
-        <el-table height="250" v-show="ListOfOrganPersonnel"
-        :data="communityDataPeo"
+        <el-table height="250" v-show="departmentStaffTableFlag"
+        :data="departmentStaffTableListData"
         style="width: 100%">
             <el-table-column prop="name" label="下级机关单位/基层科室工作人员" width="260"></el-table-column>
             <el-table-column prop="roles" label="下级机关单位/基层科室工作人员职责" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot="header" slot-scope="scope">
-                <el-button v-if="deptPeo"
-                    size="mini"
+                <el-button size="mini"
                     type="primary"
                     icon="el-icon-plus"
                     @click="addCommunityPeo(scope.row)"
@@ -212,16 +210,15 @@
         </el-table>
 
         <!-- 网格工作人员 -->
-        <el-table v-show="GridWorkPeoList"
-        :data="gridDataPeo"
+        <el-table v-show="gridStaffTableFlag"
+        :data="gridStaffTableListData"
         style="width: 100%"
         height="250">
             <el-table-column prop="name" label="网格工作人员名字" width="260"></el-table-column>
             <el-table-column prop="roles" label="网格工作人员职责" width="260"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot="header" slot-scope="scope">
-                <el-button v-if="GridWorkPeo"
-                    size="mini"
+                <el-button size="mini"
                     type="primary"
                     icon="el-icon-plus"
                     @click="addGridPeo(scope.row)"
@@ -521,7 +518,7 @@
         <!-- 新增组织 -->
         <el-dialog
         title="新增组织"
-        :visible.sync="addNewAgency"
+        :visible.sync="createAgencyDialogFlag"
         width="60%"
         :before-close="handleClose">
             <el-form>
@@ -571,25 +568,41 @@ export default {
     data(){
         return{
             // 新增组织弹窗
-            addNewAgency:false,
-           // 本级人员是否显示
-           levelPeo:true,
-           // 部门人员是否显示
-           deptPeo:false,
-           // 网格人员是否显示
-           GridWorkPeo:false,
-           // 机关人员列表
-           ListOfOrganPersonnel:false,
-           // 网格人员列表
-           GridWorkPeoList:false,
-           // 组织列表
-           OrganizationList:true,
-           // 本级工作人员列表
-           levelWorkPeoList:true,
-           // 网格列表
-           GridList:true,
-           // 机关列表
-           officeList:true,
+            createAgencyDialogFlag: false,
+
+            // 组织列表展示标识
+            agencyTableFlag: true,
+            // 组织工作人员列表展示标识
+            currentAgencyStaffTableFlag: true,
+            // 组织列表数据
+            agencyTableListData: [],
+            // 组织工作人员列表数据
+            agencyStaffTableListData:[],
+
+            // 部门列表（机关、科室列表）列表展示标识
+            departmentTableFlag: true,
+            // 部门人员列表展示标识
+            departmentStaffTableFlag: false,
+            // 部门列表数据
+            departmentTableListData: [],
+            // 部门工作人员列表数据
+            departmentStaffTableListData:[],
+
+            // 网格列表展示标识
+            gridTableFlag:true,
+            // 网格人员列表展示标识
+            gridStaffTableFlag: false,
+            // 网格列表数据
+            gridTableListData: [],
+            // 网格工作人员列表数据
+            gridStaffTableListData:[],
+
+            agencyId: localStorage.getItem("agencyId"),
+            gridOrgId:'',
+            departmentOrgId:'',
+
+            anId:localStorage.getItem("agencyId"),
+           
            // 经纬度坐标
            lat:'11',
            lng:'11',
@@ -614,12 +627,6 @@ export default {
             // 表格树数据
             deptList: [],
 
-            // 社区列表
-            tableData:[],
-            // 社区列表
-            communityData:[],
-            // 网格列表
-            gridData:[],
             // 弹窗开关
             dialogVisible:false,
             dialogVisibleGrid:false,
@@ -721,20 +728,7 @@ export default {
                 {value: 'grid_member' , label: '网格员'},
             ],
             // angencuId
-           agencyId: localStorage.getItem("agencyId"),
-
-           gridOpen: false,
-           communityOpen:false,
-
-           gridOrgId:'',
-           communityOrgId:'',
-           // 网格工作人员列表
-           gridDataPeo:[],
-           // 社区工作人员列表
-           communityDataPeo:[],
-           // 本级工作人员列表
-           agencyDataPeo:[],
-           anId:localStorage.getItem("agencyId"),
+           
            // 新增操作是否展示
            entry:false,
            // 修改操作是否展示
@@ -780,7 +774,7 @@ export default {
     },
     created(){
         this.getAgencyList()
-        this.getCommunityList()
+        this.getDepartmentList()
         this.getGridList()
         this.agencyPeo()
         // this.getNavigation()
@@ -797,7 +791,7 @@ export default {
                 }, 1000);
             }
         },
-        addNewAgency(val) {
+        createAgencyDialogFlag(val) {
             if (val) {
                 setTimeout(() => {
                     let _t = this
@@ -839,13 +833,13 @@ export default {
             const { data, code, msg } = await requestPost(url,params)
 
             if(code === 0){
-                this.tableData = data
+                this.agencyTableListData = data
             }else{
                 this.$message.error(msg)
             }
         },
         /** 查询社区列表 */
-        async getCommunityList(){
+        async getDepartmentList(){
             const url = "/gov/org/department/departmentlist"
 
             let params = {
@@ -855,7 +849,7 @@ export default {
             const { data, code, msg } = await requestPost(url,params)
 
             if(code === 0){
-                this.communityData = data
+                this.departmentTableListData = data
             }else{
                 this.$message.error(msg)
                 
@@ -872,7 +866,7 @@ export default {
             const { data, code, msg } = await requestPost(url,params)
 
             if(code === 0){
-                this.gridData = data
+                this.gridTableListData = data
             }else{
                 this.$message.error(msg)
             }
@@ -892,7 +886,7 @@ export default {
            const { data, code, msg } = await requestPost(url,params)
 
            if(code === 0){
-               this.gridDataPeo = data.staffList
+               this.gridStaffTableListData = data.staffList
            } else {
                this.$message.error(msg)
            }
@@ -911,7 +905,7 @@ export default {
             const { data, code, msg } = await requestPost(url,params)
 
             if(code === 0) {
-                this.agencyDataPeo = data.staffList
+                this.agencyStaffTableListData = data.staffList
             } else {
                 this.$message.error(msg)
             }
@@ -922,7 +916,7 @@ export default {
             const url = "/data/aggregator/org/stafflist"
 
             let params = {
-               orgId:this.communityOrgId,
+               orgId:this.departmentOrgId,
                orgType:'dept',
                pageNo:1,
                pageSize:100
@@ -931,7 +925,7 @@ export default {
             const { data, code, msg } = await requestPost(url,params)
 
             if(code === 0){
-                this.communityDataPeo = data.staffList
+                this.departmentStaffTableListData = data.staffList
             } else {
                 this.$message.error(msg)
             }
@@ -957,7 +951,7 @@ export default {
                 this.dialogVisible = false
                 this.insertForm = []
                 this.getAgencyList()
-                this.getCommunityList()
+                this.getDepartmentList()
                 this.getGridList()
                 this.agencyPeo()
             }else{
@@ -987,7 +981,7 @@ export default {
                 this.dialogVisibleGrid = false
                 this.GridForm = []
                 this.getAgencyList()
-                this.getCommunityList()
+                this.getDepartmentList()
                 this.getGridList()
                 this.agencyPeo()
             } else {
@@ -1017,7 +1011,7 @@ export default {
                 this.dialogVisiblePeo = false
                 this.peoForm = []
                 this.getAgencyList()
-                this.getCommunityList()
+                this.getDepartmentList()
                 this.getGridList()
                 this.agencyPeo()
             } else {
@@ -1046,7 +1040,7 @@ export default {
                 this.dialogVisiblePeo = false
                 this.peoForm = []
                 this.getAgencyList()
-                this.getCommunityList()
+                this.getDepartmentList()
                 this.getGridList()
                 this.agencyPeo()
             } else {
@@ -1182,62 +1176,53 @@ export default {
         // 新增组织取消按钮
         canceladdNewAgency(){
             this.addNewAgencyRest()
-            this.addNewAgency = false
+            this.createAgencyDialogFlag = false
         },
         // 进入网格，查询网格所属人员
         entryGrid(gridId){
-            this.gridDataPeo = []
-            this.communityDataPeo =[]
-            this.agencyDataPeo = []
+            this.gridStaffTableListData = []
+            this.departmentStaffTableListData =[]
+            this.agencyStaffTableListData = []
             this.gridOrgId = gridId
-            this.deptPeo = false
-            this.GridWorkPeo = true
-            this.levelPeo = false
-            this.GridWorkPeoList = true
-            this.ListOfOrganPersonnel = false
-            this.levelWorkPeoList = false
-            this.OrganizationList = false
-            this.officeList = false
-            this.GridList = false
+            this.gridStaffTableFlag = true
+            this.departmentStaffTableFlag = false
+            this.currentAgencyStaffTableFlag = false
+            this.agencyTableFlag = false
+            this.departmentTableFlag = false
+            this.gridTableFlag = false
             this.GridPeo()
             this.assembleBreadcrumbArr(gridId, 'grid')
         },
         // 进入社区，查询社区所属人员
         entryDepartment(departmentId){
-            this.gridDataPeo = []
-            this.communityDataPeo = []
-            this.agencyDataPeo = []
-            this.communityOrgId = departmentId
-            this.levelPeo = false
-            this.deptPeo = true
-            this.GridWorkPeo = false
-            this.ListOfOrganPersonnel = true
-            this.levelWorkPeoList = false
-            this.GridWorkPeoList = false
-            this.GridList = false
-            this.OrganizationList = false
-            this.officeList = false
+            this.gridStaffTableListData = []
+            this.departmentStaffTableListData = []
+            this.agencyStaffTableListData = []
+            this.departmentOrgId = departmentId
+            this.departmentStaffTableFlag = true
+            this.currentAgencyStaffTableFlag = false
+            this.gridStaffTableFlag = false
+            this.gridTableFlag = false
+            this.agencyTableFlag = false
+            this.departmentTableFlag = false
             this.communityPeo()
             this.assembleBreadcrumbArr(departmentId, 'department')
         },
 
         // 进入组织，重新渲染
         entryAgency(agencyId){
-            this.tableData = []
-            this.communityData = []
-            this.gridData = []
-            this.gridDataPeo = []
-            this.agencyDataPeo = []
-            this.communityDataPeo = []
+            this.agencyTableListData = []
+            this.departmentTableListData = []
+            this.gridTableListData = []
+            this.gridStaffTableListData = []
+            this.agencyStaffTableListData = []
+            this.departmentStaffTableListData = []
             this.agencyId = agencyId
-            this.getCommunityList()
+            this.getDepartmentList()
             this.getGridList()
-            this.communityOpen = true
-            this.gridOpen = true
             this.anId = agencyId
             this.agencyPeo()
             this.entry = true
-            this.levelPeo = true
             this.agencyId = agencyId
             this.getAgencyList()
             this.assembleBreadcrumbArr(agencyId, 'agency')
@@ -1280,13 +1265,13 @@ export default {
         addCommunityPeo(){
             this.dialogVisiblePeo = true
             this.peoForm.orgType = 'dept'
-            this.submitOrgid = this.communityOrgId
+            this.submitOrgid = this.departmentOrgId
         },
         // 修改社区人员
         xiuCommunityPeo(row){
             this.modifyPeo = true
             this.peoForm.orgType = 'dept'
-            this.submitOrgid = this.communityOrgId
+            this.submitOrgid = this.departmentOrgId
             this.peoForm.name = row.name
             this.peoForm.mobile = row.mobile
             this.peoForm.gender = row.gender
@@ -1336,7 +1321,7 @@ export default {
                 this.$message.success("禁用成功")
                 this.Disable = false
                 this.getAgencyList()
-                this.getCommunityList()
+                this.getDepartmentList()
                 this.getGridList()
                 this.agencyPeo()
             } else {
@@ -1387,7 +1372,7 @@ export default {
                 this.options[0].value = data.agencyId
 
                 let depart = Array.from(data.departmentList)
-                let gr = Array.from(data.gridList)
+                let gr = Array.from(data.gridTableFlag)
 
                 depart.forEach(item => {
                     const ob = {
@@ -1431,7 +1416,7 @@ export default {
                 this.transferRest()
                 this.transferPeo = false
                 this.getAgencyList()
-                this.getCommunityList()
+                this.getDepartmentList()
                 this.getGridList()
                 this.agencyPeo()
 
@@ -1465,9 +1450,9 @@ export default {
                 const { data, code, msg } = await requestPost(url, params)
                 if(code === 0){
                     if (data.level === 'community') {
-                        this.OrganizationList = false
+                        this.agencyTableFlag = false
                     } else {
-                        this.OrganizationList = true
+                        this.agencyTableFlag = true
                     }
                     if (this.breadcrumbArr.length === 0) {
                         this.breadcrumbArr = [{id: data.agencyId, name: data.agencyName, type: orgType}]
@@ -1545,11 +1530,59 @@ export default {
             const orgType = selectOrg.type
 
             if (orgType === 'agency') {
-                this.entryAgency(orgId)
+                this.agencyTableListData = []
+                this.agencyStaffTableListData = []
+                this.departmentTableListData = []
+                this.departmentStaffTableListData = []
+                this.gridTableListData = []
+                this.gridStaffTableListData = []
+                this.agencyId = orgId
+                this.anId = orgId
+
+                this.agencyTableFlag = true
+                this.currentAgencyStaffTableFlag = true
+                this.departmentTableFlag = true
+                this.departmentStaffTableFlag = false
+                this.gridTableFlag = true
+                this.gridStaffTableFlag = false
+
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+                this.entry = true
+                this.getAgencyList()
+                this.assembleBreadcrumbArr(orgId, 'agency')
             } else if (orgType === 'department') {
-                this.entryDepartment(orgId)
+                this.agencyStaffTableListData = []
+                this.departmentStaffTableListData = []
+                this.gridStaffTableListData = []
+
+                this.departmentOrgId = orgId
+
+                this.agencyTableFlag = false
+                this.currentAgencyStaffTableFlag = false
+                this.departmentTableFlag = false
+                this.departmentStaffTableFlag = true
+                this.gridTableFlag = false
+                this.gridStaffTableFlag = false
+
+                this.communityPeo()
+                this.assembleBreadcrumbArr(orgId, 'department')
             } else if (orgType === 'grid') {
-                this.entryGrid(orgId)
+                this.agencyStaffTableListData = []
+                this.departmentStaffTableListData =[]
+                this.gridStaffTableListData = []
+
+                this.gridOrgId = orgId
+
+                this.agencyTableFlag = false
+                this.currentAgencyStaffTableFlag = false
+                this.departmentTableFlag = false
+                this.departmentStaffTableFlag = false
+                this.gridTableFlag = false
+                this.gridStaffTableFlag = true
+                this.GridPeo()
+                this.assembleBreadcrumbArr(orgId, 'grid')
             }
         },
         // 获取当前用户信息
@@ -1597,7 +1630,7 @@ export default {
         },
 
         addAgency(row){
-            this.addNewAgency = true
+            this.createAgencyDialogFlag = true
             this.getUser()
         },
         // 新增组织确定按钮

From ef221e42aa362149cf7279147873d5365bb83a35 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Wed, 13 Apr 2022 10:35:36 +0800
Subject: [PATCH 11/23] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=81=8C=E8=B4=A3=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 59 ++++++-------------
 1 file changed, 18 insertions(+), 41 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index fb06c708..da401f23 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,43 +1,5 @@
 <template>
     <div class="app-container">
-        <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-            <el-form-item label="组织名称" prop="deptName">
-                <el-input
-                v-model="queryParams.deptName"
-                placeholder="请输入组织名称"
-                clearable
-                size="small"
-                @keyup.enter.native="handleQuery"
-                />
-            </el-form-item> -->
-            <!-- <el-form-item label="状态" prop="status">
-                <el-select v-model="queryParams.status" placeholder="部门状态" clearable size="small">
-                <el-option
-                    v-for="dict in dictList"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                />
-                </el-select>
-            </el-form-item> -->
-            <!-- <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-        </el-form> -->
-
-        <!-- <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                >新增</el-button>
-            </el-col>
-        </el-row> -->
-        
         <el-row>
             <el-col :span="24" style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
                 <el-breadcrumb separator-class="el-icon-arrow-right">
@@ -128,7 +90,11 @@
         style="width: 100%"
         height="250">
             <el-table-column prop="name" label="本级工作人员名字" width="260"></el-table-column>
-            <el-table-column prop="roles" label="本级工作人员职责" width="260"></el-table-column>
+            <el-table-column prop="roles" label="本级工作人员职责" width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
                 <template slot="header" slot-scope="scope">
                 <el-button size="mini"
@@ -171,7 +137,11 @@
         :data="departmentStaffTableListData"
         style="width: 100%">
             <el-table-column prop="name" label="下级机关单位/基层科室工作人员" width="260"></el-table-column>
-            <el-table-column prop="roles" label="下级机关单位/基层科室工作人员职责" width="260"></el-table-column>
+            <el-table-column prop="roles" label="下级机关单位/基层科室工作人员职责" width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot="header" slot-scope="scope">
                 <el-button size="mini"
@@ -215,7 +185,11 @@
         style="width: 100%"
         height="250">
             <el-table-column prop="name" label="网格工作人员名字" width="260"></el-table-column>
-            <el-table-column prop="roles" label="网格工作人员职责" width="260"></el-table-column>
+            <el-table-column prop="roles" label="网格工作人员职责" width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot="header" slot-scope="scope">
                 <el-button size="mini"
@@ -1698,4 +1672,7 @@ export default {
         width: 100%;
         height: 100%;
     }
+    .el-tag + .el-tag {
+        margin-left: 10px;
+    }
 </style>
\ No newline at end of file

From 313139d62d59386297d489846a4353faf5ee0d60 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 13 Apr 2022 10:40:58 +0800
Subject: [PATCH 12/23] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index da401f23..18f1f3a9 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -459,7 +459,7 @@
         :visible.sync="transferPeo"
         width="30%"
         :before-close="handleClose">
-            <el-form>
+            <el-form :model="agencyForm">
                 <el-form-item label="姓名">
                     <el-input v-model="transferForm.name" placeholder="姓名"></el-input>
                 </el-form-item>
@@ -507,7 +507,7 @@
                         v-for="item in zonings"
                         :key="item.areaCode"
                         :label="item.areaName"
-                        :value="item.areaCode">
+                        :value="item">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -1600,7 +1600,9 @@ export default {
         },
 
         handelZoing(val){
-            console.log(val)
+            this.agencyForm.level = val.level
+            this.agencyForm.areaName = val.areaName
+            this.agencyForm.areaCode = val.areaCode
         },
 
         addAgency(row){
@@ -1608,8 +1610,35 @@ export default {
             this.getUser()
         },
         // 新增组织确定按钮
-        submitaddNewAgency(){
+        async submitaddNewAgency(){
+            const url = '/gov/org/agency/addagency-v2'
+
+            let params = {
+                parentAgencyId:this.userForm.parentAgencyId,
+                agencyName:this.agencyForm.agencyName,
+                level:this.agencyForm.level,
+                areaCodeSwitch:'closed',
+                areaCode:this.agencyForm.areaCode,
+                areaName:this.agencyForm.areaName,
+                contacts:this.agencyForm.contacts,
+                mobile:this.agencyForm.mobile,
+                code:this.agencyForm.code,
+                latitude:this.latitude,
+                longitude:this.longitude
+            }
 
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("添加成功")
+                this.createAgencyDialogFlag = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            }else {
+                this.$message.error(msg)
+            }
         },
 
        /** 地图初始化 */

From 333845c4e04fa665f3b91a6130b5791f359fbe09 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Wed, 13 Apr 2022 11:09:16 +0800
Subject: [PATCH 13/23] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 18f1f3a9..6da2c672 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -15,7 +15,9 @@
         height="250"
         :data="agencyTableListData"
         style="width: 100%">
-            <el-table-column prop="agencyName" label="组织名字" width="260"></el-table-column>
+            <el-table-column prop="agencyName" label="下级组织"></el-table-column>
+            <el-table-column prop="contacts" label="联系人"></el-table-column>
+            <el-table-column prop="mobile" label="联系人电话"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot="header" slot-scope="scope">
                     <el-button size="mini"
@@ -27,7 +29,7 @@
                 <template slot-scope="scope">
                 <el-button size="mini"
                     type="warning"
-                    icon="el-icon-plus"
+                    icon="el-icon-arrow-right"
                     @click="entryAgency(scope.row.agencyId)"
                 >进入</el-button>
                 </template>
@@ -39,7 +41,9 @@
         height="250"
         :data="departmentTableListData"
         style="width: 100%">
-            <el-table-column prop="departmentName" label="下级机关单位/基层科室" width="260"></el-table-column>
+            <el-table-column prop="departmentName" label="下级机关单位/基层科室"></el-table-column>
+            <el-table-column prop="contacts" label="联系人"></el-table-column>
+            <el-table-column prop="mobile" label="联系人电话"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot="header" slot-scope="scope">
                     <el-button size="mini"
@@ -52,7 +56,7 @@
                     <el-button 
                         size="mini"
                         type="warning"
-                        icon="el-icon-plus"
+                        icon="el-icon-arrow-right"
                         @click="entryDepartment(scope.row.departmentId)"
                     >进入</el-button>
                 </template>
@@ -64,7 +68,10 @@
         height="250"
         :data="gridTableListData"
         style="width: 100%">
-            <el-table-column prop="gridName" label="网格名字" width="260"></el-table-column>
+            <el-table-column prop="gridName" label="直属网格"></el-table-column>
+            <el-table-column prop="gridTypeName" label="网格类型"></el-table-column>
+            <el-table-column prop="contacts" label="联系人"></el-table-column>
+            <el-table-column prop="mobile" label="联系人电话"></el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot="header" slot-scope="scope">
                     <el-button size="mini"
@@ -77,7 +84,7 @@
                     <el-button 
                         size="mini"
                         type="warning"
-                        icon="el-icon-plus"
+                        icon="el-icon-arrow-right"
                         @click="entryGrid(scope.row.gridId)"
                     >进入</el-button>
                 </template>
@@ -107,25 +114,25 @@
                 <el-button 
                     size="mini"
                     type="warning"
-                    icon="el-icon-plus"
+                    icon="el-icon-edit"
                     @click="xiuPeo(scope.row)"
                 >修改</el-button>
                 <el-button 
                     size="mini"
                     type="success"
-                    icon="el-icon-plus"
+                    icon="el-icon-view"
                     @click="lookAngency(scope.row)"
                 >查看</el-button>
                 <el-button 
                     size="mini"
                     type="info"
-                    icon="el-icon-plus"
+                    icon="el-icon-rank"
                     @click="transfer(scope.row)"
                 >调动</el-button>
                 <el-button 
                     size="mini"
                     type="danger"
-                    icon="el-icon-plus"
+                    icon="el-icon-circle-close"
                     @click="DisablePeo(scope.row)"
                 >禁用</el-button>
                 </template>
@@ -154,25 +161,25 @@
                 <el-button 
                     size="mini"
                     type="warning"
-                    icon="el-icon-plus"
+                    icon="el-icon-edit"
                     @click="xiuCommunityPeo(scope.row)"
                 >修改</el-button>
                 <el-button 
                     size="mini"
                     type="success"
-                    icon="el-icon-plus"
+                    icon="el-icon-view"
                     @click="lookAngency(scope.row)"
                 >查看</el-button>
                 <el-button 
                     size="mini"
                     type="info"
-                    icon="el-icon-plus"
+                    icon="el-icon-rank"
                     @click="transfer(scope.row)"
                 >调动</el-button>
                 <el-button 
                     size="mini"
                     type="danger"
-                    icon="el-icon-plus"
+                    icon="el-icon-circle-close"
                     @click="DisablePeo(scope.row)"
                 >禁用</el-button>
                 </template>
@@ -202,25 +209,25 @@
                 <el-button 
                     size="mini"
                     type="warning"
-                    icon="el-icon-plus"
+                    icon="el-icon-edit"
                     @click="xiuGridPeo(scope.row)"
                 >修改</el-button>
                 <el-button 
                     size="mini"
                     type="success"
-                    icon="el-icon-plus"
+                    icon="el-icon-view"
                     @click="lookAngency(scope.row)"
                 >查看</el-button>
                 <el-button 
                     size="mini"
                     type="info"
-                    icon="el-icon-plus"
+                    icon="el-icon-rank"
                     @click="transfer(scope.row)"
                 >调动</el-button>
                 <el-button 
                     size="mini"
                     type="danger"
-                    icon="el-icon-plus"
+                    icon="el-icon-circle-close"
                     @click="DisablePeo(scope.row)"
                 >禁用</el-button>
                 </template>

From e2bd3e15d116fe44c0daba046569f7372428980b Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 13 Apr 2022 13:23:42 +0800
Subject: [PATCH 14/23] =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/organization/organization.vue  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 6da2c672..55df43c2 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,14 +1,21 @@
 <template>
     <div class="app-container">
-        <el-row>
-            <el-col :span="24" style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
+        <el-row :gutter="20">
+            <el-col :span="16" style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
                 <el-breadcrumb separator-class="el-icon-arrow-right">
                     <el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbArr" :key="breadcrumb.id">
                         <el-link v-if="breadcrumb.id === currentBreadCrumbKey" type="primary" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
                         <el-link v-else type="info" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
                     </el-breadcrumb-item>
+                    <el-button 
+                        type="primary" 
+                        size="mini" 
+                        style="margin-left:10px;margin-top:0px"
+                        @click="modifyOrgInfo">
+                        修改</el-button>
                 </el-breadcrumb>
             </el-col>
+            
         </el-row>
         <!-- 组织列表 -->
         <el-table v-show="agencyTableFlag"
@@ -1648,6 +1655,12 @@ export default {
             }
         },
 
+        // 修改面包屑
+        modifyOrgInfo(){
+            orgInfo = this.breadcrumbArr[this.breadcrumbArr.length-1]
+            console.log(orgInfo)
+        },
+
        /** 地图初始化 */
        initMap(_that) {
            

From a9173165ca9549b3169482db3e2885358ba5ece9 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Wed, 13 Apr 2022 14:14:56 +0800
Subject: [PATCH 15/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=B3=A8=E9=87=8A=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 55df43c2..6b792b37 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,18 +1,13 @@
 <template>
     <div class="app-container">
-        <el-row :gutter="20">
-            <el-col :span="16" style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
+        <el-row>
+            <el-col :span="24" style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
                 <el-breadcrumb separator-class="el-icon-arrow-right">
                     <el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbArr" :key="breadcrumb.id">
                         <el-link v-if="breadcrumb.id === currentBreadCrumbKey" type="primary" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
                         <el-link v-else type="info" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
+                        <el-link v-if="index === breadcrumbArr.length - 1" type="primary" @click.native="modifyOrgInfo" style="margin-left:10px;margin-top:0px;color:#3E8EF7;cursor:pointer" icon="el-icon-edit">编辑</el-link>
                     </el-breadcrumb-item>
-                    <el-button 
-                        type="primary" 
-                        size="mini" 
-                        style="margin-left:10px;margin-top:0px"
-                        @click="modifyOrgInfo">
-                        修改</el-button>
                 </el-breadcrumb>
             </el-col>
             
@@ -1511,6 +1506,12 @@ export default {
         },
 
         async refreshThisPage (index) {
+
+            // 点击最后一级不触发响应
+            if (index === this.breadcrumbArr.length - 1) {
+                return
+            }
+
             const selectOrg = this.breadcrumbArr[index]
             this.breadcrumbArr = this.breadcrumbArr.slice(0, index + 1)
 
@@ -1540,7 +1541,11 @@ export default {
                 this.entry = true
                 this.getAgencyList()
                 this.assembleBreadcrumbArr(orgId, 'agency')
-            } else if (orgType === 'department') {
+            } 
+            // 当点击最后一级不触发响应
+            // 其父级及以上，只可能属于组织，而非部门或网格，注释以下代码即可
+            // 若需要点击最后一级触发刷新，可释放以下代码
+            /* else if (orgType === 'department') {
                 this.agencyStaffTableListData = []
                 this.departmentStaffTableListData = []
                 this.gridStaffTableListData = []
@@ -1571,7 +1576,7 @@ export default {
                 this.gridStaffTableFlag = true
                 this.GridPeo()
                 this.assembleBreadcrumbArr(orgId, 'grid')
-            }
+            } */
         },
         // 获取当前用户信息
         async getUser(){
@@ -1657,7 +1662,7 @@ export default {
 
         // 修改面包屑
         modifyOrgInfo(){
-            orgInfo = this.breadcrumbArr[this.breadcrumbArr.length-1]
+            let orgInfo = this.breadcrumbArr[this.breadcrumbArr.length-1]
             console.log(orgInfo)
         },
 

From 54089ead80b5e59cd2753565bde7640cb8cb5dfd Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 13 Apr 2022 17:30:51 +0800
Subject: [PATCH 16/23] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 460 +++++++++++++++++-
 1 file changed, 452 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 6b792b37..09970092 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -159,7 +159,7 @@
                     @click="addCommunityPeo(scope.row)"
                 >新增</el-button>
                 </template>
-                <template>
+                <template slot-scope="scope">
                 <el-button 
                     size="mini"
                     type="warning"
@@ -540,6 +540,154 @@
             </div>
         </el-dialog>
 
+
+        <!-- 修改市区级组织 -->
+        <el-dialog
+        title="修改组织"
+        :visible.sync="modifyCityOrgPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="组织名称">
+                    <el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelModifyCityOrgPop">取 消</el-button>
+                <el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改街道/社区级组织 -->
+        <el-dialog
+        title="修改组织"
+        :visible.sync="streetOrCommunity"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="组织名称">
+                    <el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                 <!-- 组织区划 -->
+                <el-form-item label="组织区划">
+                    <el-select v-model="zonings.areaCode" placeholder="请选择组织区划" @change="handelZoing">
+                        <el-option 
+                        v-for="item in zonings"
+                        :key="item.areaCode"
+                        :label="item.areaName"
+                        :value="item">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelstreetOrCommunity">取 消</el-button>
+                <el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改下级机关单位 -->
+        <el-dialog
+        title="修改部门"
+        :visible.sync="OrgUnitPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="部门名称">
+                    <el-input v-model="OrgUnitDetailsForm.departmentName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="OrgUnitDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model="OrgUnitDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="OrgUnitDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelOrgUnitPop">取 消</el-button>
+                <el-button type="primary" @click="sunmitOrgUnitForm">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <!-- 修改网格 -->
+        <el-dialog
+        title="修改网格"
+        :visible.sync="modifyGridPop"
+        width="60%"
+        :before-close="handleClose">
+            <el-form>
+                <el-form-item label="网格名称">
+                    <el-input v-model="modifyGridFrom.gridName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model="modifyGridFrom.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+
+                <!-- 网格类型下拉框 -->
+                <el-form-item label="网格类型" prop="typeTag">
+                        <el-select v-model="modifyGridFrom.gridType" clearable placeholder="网格类型">
+                            <el-option v-for="item in typeList" 
+                                :key="item.value" 
+                                :label="item.label" 
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                <el-form-item label="负责人">
+                    <el-input v-model="modifyGridFrom.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model="modifyGridFrom.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+
+                <!-- 组织位置,地图 -->
+                <el-form-item>
+                    <div id="con"></div>
+                </el-form-item>
+
+            </el-form>
+            <div slot="footer" >
+                <el-button @click="cancelModifyGridPop">取 消</el-button>
+                <el-button type="primary" @click="submitModifyGrid">确 定</el-button>
+            </div>
+        </el-dialog>
+
     </div>
 </template>
 
@@ -552,7 +700,14 @@ export default {
         return{
             // 新增组织弹窗
             createAgencyDialogFlag: false,
-
+            // 修改市区级组织弹窗
+            modifyCityOrgPop:false,
+            // 修改街道/社区级组织弹窗
+            streetOrCommunity:false,
+            // 修改下级机关单位弹窗
+            OrgUnitPop:false,
+            // 修改网格弹窗
+            modifyGridPop:false,
             // 组织列表展示标识
             agencyTableFlag: true,
             // 组织工作人员列表展示标识
@@ -589,8 +744,8 @@ export default {
            // 经纬度坐标
            lat:'11',
            lng:'11',
-           latitude:'11',
-           longitude:'11',
+           latitude:'39.984104',
+           longitude:'116.307503',
            Navigation:'',
             // 查询参数
             queryParams: {
@@ -686,6 +841,40 @@ export default {
                 level:'',
                 parentAgencyId:''
             },
+            // 组织详细信息
+            OrgDetailsForm:{
+                level:'',
+                agencyName:'',
+                code:'',
+                contacts:'',
+                mobile:'',
+                centerAddress:'',
+                areaCode:'',
+                agencyId:''
+            },
+            // 下级机关单位
+            OrgUnitDetailsForm:{
+                code:'',
+                contacts:'',
+                departmentId:'',
+                departmentName:'',
+                mobile:''
+            },
+            // 网格修改表单
+            modifyGridFrom:{
+                gridName:'',
+                code:'',
+                gridTypeName:'',
+                contacts:'',
+                mobile:'',
+                latitude:'',
+                longitude:'',
+                agencyId:'',
+                gridType:'',
+                manageDistrict:'',
+                griId:''
+            },
+            judgeOrgInfoLevel:[],
             keyWords: '',
             typeList:[],
             // 性别字典
@@ -781,6 +970,30 @@ export default {
                     this.createMap(_t)
                 }, 1000);
             }
+        },
+        modifyCityOrgPop(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
+        },
+        streetOrCommunity(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
+        },
+        modifyGridPop(val){
+            if (val) {
+                setTimeout(() => {
+                    let _t = this
+                    this.createMap(_t)
+                }, 1000);
+            }
         }
     },
     mounted(){
@@ -1126,6 +1339,41 @@ export default {
             this.latitude = '',
             this.longitude = ''
         },
+        // 修改市级组织
+        cancelModifyCityOrgPopRest(){
+            this.OrgDetailsForm.level = '',
+            this.OrgDetailsForm.agencyName = '',
+            this.OrgDetailsForm.code = '',
+            this.OrgDetailsForm.contacts = '',
+            this.OrgDetailsForm.mobile = '',
+            this.OrgDetailsForm.centerAddress = '',
+            this.OrgDetailsForm.areaCode = ''
+            this.OrgDetailsForm.agencyId = ''
+            this.latitude = '',
+            this.longitude = ''
+        },
+        // 修改下级机关单位
+        OrgUnitDetailsRest(){
+            this.OrgUnitDetailsForm.code = '',
+            this.OrgUnitDetailsForm.contacts = '',
+            this.OrgUnitDetailsForm.departmentId = '',
+            this.OrgUnitDetailsForm.departmentName = '',
+            this.OrgUnitDetailsForm.mobile = ''
+        },
+        // 修改网格清空
+        ModifyGridPopRest(){
+            this.modifyGridFrom.gridName = '',
+            this.modifyGridFrom.code = '',
+            this.modifyGridFrom.gridTypeName = '',
+            this.modifyGridFrom.contacts = '',
+            this.modifyGridFrom.mobile = '',
+            this.latitude = '',
+            this.longitude = '',
+            this.modifyGridFrom.agencyId = '',
+            this.modifyGridFrom.gridType = '',
+            this.modifyGridFrom.manageDistrict = '',
+            this.modifyGridFrom.griId = ''
+        },
         // 社区新增弹框取消按钮
         cancel(){
             this.dialogVisible = false
@@ -1161,6 +1409,26 @@ export default {
             this.addNewAgencyRest()
             this.createAgencyDialogFlag = false
         },
+        // 修改市级组织取消按钮
+        cancelModifyCityOrgPop(){
+            this.cancelModifyCityOrgPopRest()
+            this.modifyCityOrgPop = false
+        },
+        // 修改街道/社区级取消按钮
+        cancelstreetOrCommunity(){
+            this.cancelModifyCityOrgPopRest()
+            this.streetOrCommunity = false
+        },
+        // 取消修改下级机关单位按钮
+        cancelOrgUnitPop(){
+            this.OrgUnitPop = false
+            this.OrgUnitDetailsRest()
+        },
+        // 取消修改网格按钮
+        cancelModifyGridPop(){
+            this.modifyGridPop = false
+            this.ModifyGridPopRest()
+        },
         // 进入网格，查询网格所属人员
         entryGrid(gridId){
             this.gridStaffTableListData = []
@@ -1354,8 +1622,9 @@ export default {
                 this.options[0].label = data.agencyName
                 this.options[0].value = data.agencyId
 
+                    console.log('--------',this.options)
                 let depart = Array.from(data.departmentList)
-                let gr = Array.from(data.gridTableFlag)
+                let gr = Array.from(data.gridList)
 
                 depart.forEach(item => {
                     const ob = {
@@ -1662,8 +1931,183 @@ export default {
 
         // 修改面包屑
         modifyOrgInfo(){
-            let orgInfo = this.breadcrumbArr[this.breadcrumbArr.length-1]
-            console.log(orgInfo)
+            this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length-1]
+            console.log(this.judgeOrgInfoLevel)
+            if(this.judgeOrgInfoLevel.type === "agency"){
+                this.getOrgDetailsById()
+                setTimeout(() => {
+                    if(this.OrgDetailsForm.level === "district"){
+                    /** 修改市区级弹窗 */
+                    this.modifyCityOrgPop = true
+                    }else {
+                        /** 街道级和社区级弹窗 */
+                        this.getUser()
+                        this.streetOrCommunity = true
+                    }
+                }, 1000);
+            } else if(this.judgeOrgInfoLevel.type === "department"){
+                /** 下级机关单位修改 */
+                this.OrgUnitPop = true
+                this.getOrgUnitDetailsById()
+            } else {
+                /** 网格修改 */
+                this.getDictionaries()
+                this.modifyGridPop = true
+                this.getGridDetailsById()
+            }
+        },
+
+        // 根据id获取组织机构详细信息
+        async getOrgDetailsById(){
+            const url = '/gov/org/agency/agencydetail'
+
+            let params = {
+                agencyId:this.judgeOrgInfoLevel.id
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.OrgDetailsForm.level = data.level
+                this.OrgDetailsForm.agencyName = data.agencyName
+                this.OrgDetailsForm.code = data.code
+                this.OrgDetailsForm.contacts = data.contacts
+                this.OrgDetailsForm.centerAddress = data.centerAddress
+                this.OrgDetailsForm.areaCode = data.areaCode
+                this.OrgDetailsForm.mobile = data.mobile
+                this.latitude = data.latitude
+                this.longitude = data.longitude
+                this.OrgDetailsForm.agencyId = data.agencyId
+            }else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 根据id获取下级机关单位详情
+        async getOrgUnitDetailsById(){
+            const url = '/gov/org/department/departmentdetail'
+
+            let params = {
+                departmentId:this.judgeOrgInfoLevel.id
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.OrgUnitDetailsForm.code = data.code
+                this.OrgUnitDetailsForm.contacts = data.contacts
+                this.OrgUnitDetailsForm.departmentId = data.departmentId
+                this.OrgUnitDetailsForm.departmentName = data.departmentName
+                this.OrgUnitDetailsForm.mobile = data.mobile
+            }else {
+                this.$message.error(msg)
+            }
+        },
+
+        // 根据id获取网格详情
+        async getGridDetailsById(){
+            const url = '/gov/org/grid/griddetail'
+
+            let params = {
+                gridId: this.judgeOrgInfoLevel.id
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.modifyGridFrom.gridName = data.gridName
+                this.modifyGridFrom.code = data.code
+                this.modifyGridFrom.gridTypeName = data.gridTypeName
+                this.modifyGridFrom.contacts = data.contacts
+                this.modifyGridFrom.mobile = data.mobile
+                this.modifyGridFrom.agencyId = data.agencyId
+                this.modifyGridFrom.gridType = data.gridType
+                this.modifyGridFrom.manageDistrict = data.manageDistrict
+                this.modifyGridFrom.griId = data.griId
+            }else {
+                this.$message.error(msg)
+            }
+        },  
+
+        // 市级/街道/社区级组织修改确定按钮
+        async sunmitModifyCityOrgPop(){
+            const url = '/gov/org/agency/editagency'
+
+            let params = {
+                agencyId: this.OrgDetailsForm.agencyId,
+                agencyName: this.OrgDetailsForm.agencyName,
+                contacts: this.OrgDetailsForm.contacts,
+                mobile: this.OrgDetailsForm.mobile,
+                code: this.OrgDetailsForm.code,
+                latitude: this.latitude,
+                longitude: this.longitude
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.modifyCityOrgPop = false
+                this.streetOrCommunity = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        // 修改下级机关单位确定按钮
+        async sunmitOrgUnitForm(){
+            const url = '/gov/org/department/editdepartment'
+
+            let params = {
+                code: this.OrgUnitDetailsForm.code,
+                contacts: this.OrgUnitDetailsForm.contacts,
+                departmentId: this.OrgUnitDetailsForm.departmentId,
+                departmentName: this.OrgUnitDetailsForm.departmentName,
+                mobile: this.OrgUnitDetailsForm.mobile
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.OrgUnitPop = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        // 修改网格确定按钮
+        async submitModifyGrid(){
+            const url = '/gov/org/grid/editgrid'
+
+            let params = {
+                gridId: this.modifyGridFrom.griId,
+                gridName: this.modifyGridFrom.gridName,
+                manageDistrict: this.modifyGridFrom.manageDistrict,
+                contacts: this.modifyGridFrom.contacts,
+                mobile: this.modifyGridFrom.mobile,
+                code: this.modifyGridFrom.code,
+                gridType: this.modifyGridFrom.gridType
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.modifyGridPop = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+                this.agencyPeo()
+            }else {
+                this.$message.error(msg)
+            }
         },
 
        /** 地图初始化 */
@@ -1689,7 +2133,7 @@ export default {
             document.getElementById("con").innerHTML = '当前点击坐标为：<span id="pos"></span>'
             var position = document.getElementById("pos");
 
-            var center = new window.TMap.LatLng(39.984104, 116.307503);//设置中心点坐标
+            var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
             //初始化地图
             var map = new window.TMap.Map("con", {
                 center: center

From abc70a2fd4ab7d50182d833e4095360b6aa35a29 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Wed, 13 Apr 2022 17:39:57 +0800
Subject: [PATCH 17/23] update

---
 .../base/organization/organization.vue        | 349 ++++++++----------
 1 file changed, 152 insertions(+), 197 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 09970092..a581f2d4 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -4,9 +4,9 @@
             <el-col :span="24" style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
                 <el-breadcrumb separator-class="el-icon-arrow-right">
                     <el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbArr" :key="breadcrumb.id">
-                        <el-link v-if="breadcrumb.id === currentBreadCrumbKey" type="primary" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
+                        <el-link v-if="breadcrumb.id === currentBreadcrumbKey" type="primary" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
                         <el-link v-else type="info" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
-                        <el-link v-if="index === breadcrumbArr.length - 1" type="primary" @click.native="modifyOrgInfo" style="margin-left:10px;margin-top:0px;color:#3E8EF7;cursor:pointer" icon="el-icon-edit">编辑</el-link>
+                        <el-link v-if="index === breadcrumbArr.length - 1" type="primary" @click.native="modifyOrgInfo" style="margin-left:10px;margin-top:0px;color:#3E8EF7;cursor:pointer" icon="el-icon-edit">修改</el-link>
                     </el-breadcrumb-item>
                 </el-breadcrumb>
             </el-col>
@@ -153,37 +153,13 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot="header" slot-scope="scope">
-                <el-button size="mini"
-                    type="primary"
-                    icon="el-icon-plus"
-                    @click="addCommunityPeo(scope.row)"
-                >新增</el-button>
+                    <el-button size="mini" type="primary" icon="el-icon-plus" @click="addCommunityPeo(scope.row)">新增</el-button>
                 </template>
                 <template slot-scope="scope">
-                <el-button 
-                    size="mini"
-                    type="warning"
-                    icon="el-icon-edit"
-                    @click="xiuCommunityPeo(scope.row)"
-                >修改</el-button>
-                <el-button 
-                    size="mini"
-                    type="success"
-                    icon="el-icon-view"
-                    @click="lookAngency(scope.row)"
-                >查看</el-button>
-                <el-button 
-                    size="mini"
-                    type="info"
-                    icon="el-icon-rank"
-                    @click="transfer(scope.row)"
-                >调动</el-button>
-                <el-button 
-                    size="mini"
-                    type="danger"
-                    icon="el-icon-circle-close"
-                    @click="DisablePeo(scope.row)"
-                >禁用</el-button>
+                    <el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuCommunityPeo(scope.row)">修改</el-button>
+                    <el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
+                    <el-button size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
+                    <el-button size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -201,37 +177,13 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot="header" slot-scope="scope">
-                <el-button size="mini"
-                    type="primary"
-                    icon="el-icon-plus"
-                    @click="addGridPeo(scope.row)"
-                >新增</el-button>
+                    <el-button size="mini" type="primary" icon="el-icon-plus" @click="addGridPeo(scope.row)">新增</el-button>
                 </template>
-                <template>
-                <el-button 
-                    size="mini"
-                    type="warning"
-                    icon="el-icon-edit"
-                    @click="xiuGridPeo(scope.row)"
-                >修改</el-button>
-                <el-button 
-                    size="mini"
-                    type="success"
-                    icon="el-icon-view"
-                    @click="lookAngency(scope.row)"
-                >查看</el-button>
-                <el-button 
-                    size="mini"
-                    type="info"
-                    icon="el-icon-rank"
-                    @click="transfer(scope.row)"
-                >调动</el-button>
-                <el-button 
-                    size="mini"
-                    type="danger"
-                    icon="el-icon-circle-close"
-                    @click="DisablePeo(scope.row)"
-                >禁用</el-button>
+                <template slot-scope="scope">
+                    <el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuGridPeo(scope.row)">修改</el-button>
+                    <el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
+                    <el-button size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
+                    <el-button size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -350,9 +302,9 @@
                         <el-select v-model="peoForm.duty" multiple placeholder="请选择">
                             <el-option
                             v-for="item in dutyList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
+                            :key="item.roleId"
+                            :label="item.roleName"
+                            :value="item.roleId"
                             :disabled="item.disabled">
                             </el-option>
                         </el-select>
@@ -379,7 +331,6 @@
                 <el-form-item label="手机号" prop="mobile">
                     <el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input>
                 </el-form-item>
-                性别下拉框
                 <el-form-item label="性别" prop="gender">
                     <el-select v-model="peoForm.gender" clearable placeholder="性别">
                         <el-option v-for="item in genderList" 
@@ -389,7 +340,6 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                专兼职下拉框
                 <el-form-item label="专兼职" prop="post">
                     <el-select v-model="peoForm.post" clearable placeholder="专兼职">
                         <el-option v-for="item in postList" 
@@ -399,14 +349,13 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                职责下拉框
                 <el-form-item label="职责" prop="duty">
                     <el-select v-model="peoForm.duty" multiple placeholder="请选择">
                         <el-option
                         v-for="item in dutyList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
+                        :key="item.roleId"
+                        :label="item.roleName"
+                        :value="item.roleId"
                         :disabled="item.disabled">
                         </el-option>
                     </el-select>
@@ -735,18 +684,21 @@ export default {
             // 网格工作人员列表数据
             gridStaffTableListData:[],
 
-            agencyId: localStorage.getItem("agencyId"),
-            gridOrgId:'',
-            departmentOrgId:'',
-
-            anId:localStorage.getItem("agencyId"),
+            // 用户所属组织ID
+            userAgencyId: localStorage.getItem("agencyId"),
+            // 当前被操作的组织的ID
+            currentAgencyId: localStorage.getItem("agencyId"),
+            // 当前被操作的部门的ID
+            currentDepartmentId:'',
+            // 当前被操作的网格的ID
+            currentGridOrgId:'',
            
-           // 经纬度坐标
-           lat:'11',
-           lng:'11',
-           latitude:'39.984104',
-           longitude:'116.307503',
-           Navigation:'',
+            // 经纬度坐标
+            lat:'11',
+            lng:'11',
+            latitude:'11',
+            longitude:'11',
+            Navigation:'',
             // 查询参数
             queryParams: {
                 deptName: undefined,
@@ -766,12 +718,12 @@ export default {
             deptList: [],
 
             // 弹窗开关
-            dialogVisible:false,
-            dialogVisibleGrid:false,
-            dialogVisiblePeo:false,
-            Disable:false,
-            details:false,
-            transferPeo:false,
+            dialogVisible: false,
+            dialogVisibleGrid: false,
+            dialogVisiblePeo: false,
+            Disable: false,
+            details: false,
+            transferPeo: false,
             // 社区添加表单项
             insertForm:{
                 departmentName:'',
@@ -888,53 +840,38 @@ export default {
                 {value: 'parttime' , label: '兼职'}
             ],
             // 职责字典
-            dutyList:[
-                {value: 'agency_leader' , label: '单位领导'},
-                {value: 'dept_leader' , label: '部门领导'},
-                {value: 'party_principals' , label: '党建负责人'},
-                {value: 'manager' , label: '管理员'},
-                {value: 'staff' , label: '工作人员'},
-                {value: 'grid_manager' , label: '网格长'},
-                {value: 'grid_party_director' , label: '党建宣传员'},
-                {value: 'root_manager' , label: '超级管理员'},
-                {value: 'grid_member' , label: '网格员'},
+            dutyList:[],
+            // 修改操作是否展示
+            modifyPeo:false,
+            submitOrgid:'',
+            // 级联数据
+            options:[
+                {
+                    value:'',
+                    label:'',
+                    children:[
+                        {
+                            value:'',
+                            label:'',
+                            children:[]
+                        },
+                        {
+                            value:'',
+                            label:'',
+                            children:[]
+                        }
+                    ],
+                }
             ],
-            // angencuId
-           
-           // 新增操作是否展示
-           entry:false,
-           // 修改操作是否展示
-           modifyPeo:false,
-           submitOrgid:'',
-           // 级联数据
-           options:[
-               {
-                   value:'',
-                   label:'',
-                   children:[
-                       {
-                           value:'',
-                           label:'',
-                           children:[]
-                       },
-                       {
-                           value:'',
-                           label:'',
-                           children:[]
-                       }
-                   ],
-               }
-           ],
-           selectValue: [],
-
+            selectValue: [],
             // 顶部 面包屑
             breadcrumbArr: [],
             // 面包屑 当前所属机构ID
-            currentBreadCrumbKey: '',
+            currentBreadcrumbKey: '',
             // 组织区划数据
             zonings:[],
             // 校验
-           rules: {
+            rules: {
                 departmentName:[
                     { required: true, message: '社区名称必填', trigger: 'blur' }
                 ],
@@ -948,7 +885,8 @@ export default {
         this.getAgencyList()
         this.getDepartmentList()
         this.getGridList()
-        this.agencyPeo()
+        this.getAgencyStaffListData()
+        this.getRoleList()
         // this.getNavigation()
         // 更新顶部面包屑
         this.assembleBreadcrumbArr(localStorage.getItem('agencyId'), 'agency')
@@ -1002,7 +940,6 @@ export default {
     methods:{
         // 点击后获取id
         handleChange (e) {
-            console.log(e)
             this.transferForm.orgId = e[1]
             if(this.transferForm.orgId != null || ''){
                 if(this.transferForm.orgId === 0){
@@ -1016,14 +953,25 @@ export default {
                 this.transferForm.orgId = e[0]
                 this.transferForm.orgType = 'agency'
             }
-            
-            
+        },
+        /** 查询系统工作人员角色（职责） */
+        async getRoleList () {
+            const url = "/gov/org/staff/rolelist"
+            let params = {
+                agencyId: this.currentAgencyId
+            }
+            const { data, code, msg } = await requestPost(url,params)
+            if(code === 0){
+                this.dutyList = data
+            }else{
+                this.$message.error(msg)
+            }
         },
         /** 查询组织列表 */
         async getAgencyList(){
             const url = "/gov/org/agency/agencylist"
             let params = {
-                agencyId: this.agencyId
+                agencyId: this.currentAgencyId
             }
 
             const { data, code, msg } = await requestPost(url,params)
@@ -1039,7 +987,7 @@ export default {
             const url = "/gov/org/department/departmentlist"
 
             let params = {
-                agencyId:this.agencyId
+                agencyId: this.currentAgencyId
             }
 
             const { data, code, msg } = await requestPost(url,params)
@@ -1056,7 +1004,7 @@ export default {
             const url = "/gov/org/grid/allgrids"
 
             let params = {
-                agencyId:this.agencyId
+                agencyId: this.currentAgencyId
             }
 
             const { data, code, msg } = await requestPost(url,params)
@@ -1069,11 +1017,11 @@ export default {
         },
 
         // 查询网格人员列表
-        async GridPeo(){
+        async getGridStaffListData(){
            const url = "/data/aggregator/org/stafflist"
 
            let params = {
-               orgId:this.gridOrgId,
+               orgId:this.currentGridOrgId,
                orgType:'grid',
                pageNo:1,
                pageSize:100
@@ -1088,11 +1036,11 @@ export default {
            }
         },
         // 查询组织工作人员
-        async agencyPeo(){
+        async getAgencyStaffListData(){
             const url = "/data/aggregator/org/stafflist"
 
             let params = {
-                orgId:this.anId,
+                orgId: this.currentAgencyId,
                 orgType:'agency',
                 pageNo:1,
                 pageSize:100
@@ -1108,11 +1056,11 @@ export default {
         },
 
         // 查询部门人员
-        async communityPeo(){
+        async getDepartmentStaffListData(){
             const url = "/data/aggregator/org/stafflist"
 
             let params = {
-               orgId:this.departmentOrgId,
+               orgId:this.currentDepartmentId,
                orgType:'dept',
                pageNo:1,
                pageSize:100
@@ -1149,7 +1097,7 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                this.agencyPeo()
+                this.getAgencyStaffListData()
             }else{
                 this.$message.error(msg)
             }
@@ -1179,7 +1127,7 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                this.agencyPeo()
+                this.getAgencyStaffListData()
             } else {
                 this.$message.error(msg)
             }
@@ -1209,7 +1157,7 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                this.agencyPeo()
+                this.getAgencyStaffListData()
             } else {
                 this.$message.error(msg)
             }
@@ -1238,7 +1186,7 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                this.agencyPeo()
+                this.getAgencyStaffListData()
             } else {
                 this.$message.error(msg)
             }
@@ -1434,95 +1382,90 @@ export default {
             this.gridStaffTableListData = []
             this.departmentStaffTableListData =[]
             this.agencyStaffTableListData = []
-            this.gridOrgId = gridId
+            this.currentGridOrgId = gridId
             this.gridStaffTableFlag = true
             this.departmentStaffTableFlag = false
             this.currentAgencyStaffTableFlag = false
             this.agencyTableFlag = false
             this.departmentTableFlag = false
             this.gridTableFlag = false
-            this.GridPeo()
+            this.getGridStaffListData()
             this.assembleBreadcrumbArr(gridId, 'grid')
         },
-        // 进入社区，查询社区所属人员
+        // 进入部门，查询部门所属人员
         entryDepartment(departmentId){
             this.gridStaffTableListData = []
             this.departmentStaffTableListData = []
             this.agencyStaffTableListData = []
-            this.departmentOrgId = departmentId
+            this.currentDepartmentId = departmentId
             this.departmentStaffTableFlag = true
             this.currentAgencyStaffTableFlag = false
             this.gridStaffTableFlag = false
             this.gridTableFlag = false
             this.agencyTableFlag = false
             this.departmentTableFlag = false
-            this.communityPeo()
+            this.getDepartmentStaffListData()
             this.assembleBreadcrumbArr(departmentId, 'department')
         },
 
         // 进入组织，重新渲染
         entryAgency(agencyId){
+
+            this.currentAgencyId = agencyId
+
             this.agencyTableListData = []
             this.departmentTableListData = []
             this.gridTableListData = []
             this.gridStaffTableListData = []
             this.agencyStaffTableListData = []
             this.departmentStaffTableListData = []
-            this.agencyId = agencyId
+
             this.getDepartmentList()
             this.getGridList()
-            this.anId = agencyId
-            this.agencyPeo()
-            this.entry = true
-            this.agencyId = agencyId
+            this.getAgencyStaffListData()
             this.getAgencyList()
             this.assembleBreadcrumbArr(agencyId, 'agency')
         },
         // 新增组织
         addCommunity(row){
-            
-            this.insertForm.agencyId = this.anId
+            this.insertForm.agencyId = this.currentAgencyId
             this.dialogVisible = true
         },
         // 新增网格
         addGrid(row){
-            this.GridForm.agencyId = this.anId
+            this.GridForm.agencyId = this.currentAgencyId
             this.getDictionaries()
             this.dialogVisibleGrid = true
-            // this.initMap()
-            
         },
 
         // 新增人员
         addPeo(row){
-            
             this.dialogVisiblePeo = true
             this.peoForm.orgType = 'agency'
-            this.submitOrgid = this.anId
+            this.submitOrgid = this.currentAgencyId
         },
         // 修改人员
         xiuPeo(row){
             this.modifyPeo = true
             this.peoForm.orgType = 'agency'
-            this.submitOrgid = this.anId
+            this.submitOrgid = this.currentAgencyId
             this.peoForm.name = row.name
             this.peoForm.mobile = row.mobile
             this.peoForm.gender = row.gender
             this.peoForm.post = row.post
             this.peoForm.duty = row.roles
-            console.log(row)
         },
         // 新增社区人员
         addCommunityPeo(){
             this.dialogVisiblePeo = true
             this.peoForm.orgType = 'dept'
-            this.submitOrgid = this.departmentOrgId
+            this.submitOrgid = this.currentDepartmentId
         },
         // 修改社区人员
         xiuCommunityPeo(row){
             this.modifyPeo = true
             this.peoForm.orgType = 'dept'
-            this.submitOrgid = this.departmentOrgId
+            this.submitOrgid = this.currentDepartmentId
             this.peoForm.name = row.name
             this.peoForm.mobile = row.mobile
             this.peoForm.gender = row.gender
@@ -1533,18 +1476,37 @@ export default {
         addGridPeo(){
             this.dialogVisiblePeo = true
             this.peoForm.orgType = 'grid'
-            this.submitOrgid = this.gridOrgId
+            this.submitOrgid = this.currentGridOrgId
         },
         // 修改网格人员
-        xiuGridPeo(row){
+        async xiuGridPeo(row){
             this.modifyPeo = true
             this.peoForm.orgType = 'grid'
-            this.submitOrgid = this.gridOrgId
-            this.peoForm.name = row.name
-            this.peoForm.mobile = row.mobile
-            this.peoForm.gender = row.gender
-            this.peoForm.post = row.post
-            this.peoForm.duty = row.roles
+            this.submitOrgid = this.currentGridOrgId
+
+            const url = "/gov/org/staff/editstaffinit"
+            let params = {
+                staffId: row.staffId,
+                agencyId: this.currentAgencyId
+            }
+            const { data, code, msg } = await requestPost(url,params)
+            if(code === 0){
+                
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile
+                this.peoForm.gender = data.gender
+                this.peoForm.post = data.workType
+                // 已有的权限（职责）
+                let existedRoleArr = []
+                data.roleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId)
+                    }
+                })
+                this.peoForm.duty = existedRoleArr
+            } else {
+                this.$message.error(msg)
+            }
         },
         // 取消禁用按钮
         cancelDisable(){
@@ -1552,7 +1514,6 @@ export default {
         },
         // 人员禁用
         DisablePeo(row){
-            console.log(row)
             this.DisableForm.staffId = row.staffId
             this.Disable = true
         },
@@ -1574,7 +1535,7 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                this.agencyPeo()
+                this.getAgencyStaffListData()
             } else {
                 this.$message.error(msg)
             }
@@ -1595,10 +1556,7 @@ export default {
                 this.peoForm.activeTime = data.activeTime
                 this.peoForm.duty = data.roles
                 this.peoForm.zuzhi = data.orgName
-                console.log(row)
             }
-
-            
             this.details = true
         },
         
@@ -1618,7 +1576,6 @@ export default {
             const { data, code, msg } = await requestPost(url,params)
 
             if(code === 0){
-                console.log(data)
                 this.options[0].label = data.agencyName
                 this.options[0].value = data.agencyId
 
@@ -1647,7 +1604,6 @@ export default {
             }else{
                 this.$message.error("树查询失败",msg)
             }
-
             
         },
         // 人员调动确定
@@ -1670,7 +1626,7 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                this.agencyPeo()
+                this.getAgencyStaffListData()
 
             } else {
                 this.$message.error(msg)
@@ -1691,9 +1647,9 @@ export default {
         //     if(code === 0){
         //         this.Navigation = data.agencyName
         //     }
-            
+        // 组装顶部面包屑数组
         async assembleBreadcrumbArr (id, orgType) {
-            this.currentBreadCrumbKey = id
+            this.currentBreadcrumbKey = id
             if (orgType === 'agency') {
                 const url = '/gov/org/agency/agencydetail'
                 let params = {
@@ -1701,6 +1657,7 @@ export default {
                 }
                 const { data, code, msg } = await requestPost(url, params)
                 if(code === 0){
+                    // 社区级为最低级组织，不展示下级组织列表
                     if (data.level === 'community') {
                         this.agencyTableFlag = false
                     } else {
@@ -1794,8 +1751,8 @@ export default {
                 this.departmentStaffTableListData = []
                 this.gridTableListData = []
                 this.gridStaffTableListData = []
-                this.agencyId = orgId
-                this.anId = orgId
+                this.userAgencyId = orgId
+                this.currentAgencyId = orgId
 
                 this.agencyTableFlag = true
                 this.currentAgencyStaffTableFlag = true
@@ -1804,12 +1761,11 @@ export default {
                 this.gridTableFlag = true
                 this.gridStaffTableFlag = false
 
+                this.assembleBreadcrumbArr(orgId, 'agency')
+                this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                this.agencyPeo()
-                this.entry = true
-                this.getAgencyList()
-                this.assembleBreadcrumbArr(orgId, 'agency')
+                this.getAgencyStaffListData()
             } 
             // 当点击最后一级不触发响应
             // 其父级及以上，只可能属于组织，而非部门或网格，注释以下代码即可
@@ -1819,7 +1775,7 @@ export default {
                 this.departmentStaffTableListData = []
                 this.gridStaffTableListData = []
 
-                this.departmentOrgId = orgId
+                this.currentDepartmentId = orgId
 
                 this.agencyTableFlag = false
                 this.currentAgencyStaffTableFlag = false
@@ -1828,14 +1784,14 @@ export default {
                 this.gridTableFlag = false
                 this.gridStaffTableFlag = false
 
-                this.communityPeo()
+                this.getDepartmentStaffListData()
                 this.assembleBreadcrumbArr(orgId, 'department')
             } else if (orgType === 'grid') {
                 this.agencyStaffTableListData = []
                 this.departmentStaffTableListData =[]
                 this.gridStaffTableListData = []
 
-                this.gridOrgId = orgId
+                this.currentGridOrgId = orgId
 
                 this.agencyTableFlag = false
                 this.currentAgencyStaffTableFlag = false
@@ -1843,22 +1799,21 @@ export default {
                 this.departmentStaffTableFlag = false
                 this.gridTableFlag = false
                 this.gridStaffTableFlag = true
-                this.GridPeo()
+                this.getGridStaffListData()
                 this.assembleBreadcrumbArr(orgId, 'grid')
             } */
         },
         // 获取当前用户信息
         async getUser(){
-            const url = '/data/report/screen/agency/agencydetail-multic'
+            const url = '/gov/org/agency/agencydetail'
 
             let params = {
-                agencyId:localStorage.getItem('agencyId')
+                agencyId: localStorage.getItem('agencyId')
             }
 
             const { data, code, msg } = await requestPost(url,params)
 
             if(code === 0){
-                console.log(data)
                 this.userForm.areaCode = data.areaCode
                 this.userForm.level = data.level
                 this.userForm.parentAgencyId = data.agencyId
@@ -1923,7 +1878,7 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                this.agencyPeo()
+                this.getAgencyStaffListData()
             }else {
                 this.$message.error(msg)
             }

From 7de09c97a46e7e3f3ef38870b89249e72233ed61 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 13 Apr 2022 18:00:11 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index a581f2d4..af4cddae 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -534,7 +534,7 @@
 
                  <!-- 组织区划 -->
                 <el-form-item label="组织区划">
-                    <el-select v-model="zonings.areaCode" placeholder="请选择组织区划" @change="handelZoing">
+                    <el-select v-model="OrgDetailsForm.areaName" placeholder="请选择组织区划" @change="handelStreeOrCommunityZoing">
                         <el-option 
                         v-for="item in zonings"
                         :key="item.areaCode"
@@ -802,7 +802,8 @@ export default {
                 mobile:'',
                 centerAddress:'',
                 areaCode:'',
-                agencyId:''
+                agencyId:'',
+                areaName:''
             },
             // 下级机关单位
             OrgUnitDetailsForm:{
@@ -1846,6 +1847,13 @@ export default {
             this.agencyForm.level = val.level
             this.agencyForm.areaName = val.areaName
             this.agencyForm.areaCode = val.areaCode
+            
+        },
+        handelStreeOrCommunityZoing(val){
+            console.log(val)
+            this.OrgDetailsForm.level = val.level
+            this.OrgDetailsForm.areaName = val.areaName
+            this.OrgDetailsForm.areaCode = val.areaCode
         },
 
         addAgency(row){

From f25fdbea5923b214ca55e730b1dc0148ae72cd91 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 14 Apr 2022 10:27:23 +0800
Subject: [PATCH 19/23] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 118 +++++++++++++-----
 1 file changed, 87 insertions(+), 31 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index af4cddae..0e42a655 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -686,12 +686,14 @@ export default {
 
             // 用户所属组织ID
             userAgencyId: localStorage.getItem("agencyId"),
+            // 修改时操作的用户staffId
+            userStaffId: '',
             // 当前被操作的组织的ID
             currentAgencyId: localStorage.getItem("agencyId"),
             // 当前被操作的部门的ID
-            currentDepartmentId:'',
+            currentDepartmentId:'14f572e724eecf7668b655505d789cab',
             // 当前被操作的网格的ID
-            currentGridOrgId:'',
+            currentGridOrgId:'63d5ff92ea981b1c58e4914ac894c610',
            
             // 经纬度坐标
             lat:'11',
@@ -1169,25 +1171,28 @@ export default {
             const url = "/gov/org/staff/editstaff"
 
             let params = {
-                orgType:this.peoForm.orgType,
+                staffId:this.userStaffId,
                 name:this.peoForm.name,
                 mobile:this.peoForm.mobile,
-                gender:this.peoForm.gender,
+                gender:this.peoForm.gender === '男' ? 1 : 0,
                 workType:this.peoForm.post,
                 roles:this.peoForm.duty,
-                orgId:this.submitOrgid,
+                agencyId:this.userAgencyId,
             }
 
             const { data, code, msg } = await requestPost(url,params)
 
             if(code === 0) {
-                this.$message.success("添加成功")
-                this.dialogVisiblePeo = false
-                this.peoForm = []
+                this.$message.success("修改成功")
+                this.modifyPeo = false
+                
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
                 this.getAgencyStaffListData()
+                this.getDepartmentStaffListData()
+                this.getGridStaffListData()
+                
             } else {
                 this.$message.error(msg)
             }
@@ -1445,34 +1450,14 @@ export default {
             this.peoForm.orgType = 'agency'
             this.submitOrgid = this.currentAgencyId
         },
-        // 修改人员
-        xiuPeo(row){
-            this.modifyPeo = true
-            this.peoForm.orgType = 'agency'
-            this.submitOrgid = this.currentAgencyId
-            this.peoForm.name = row.name
-            this.peoForm.mobile = row.mobile
-            this.peoForm.gender = row.gender
-            this.peoForm.post = row.post
-            this.peoForm.duty = row.roles
-        },
+        
         // 新增社区人员
         addCommunityPeo(){
             this.dialogVisiblePeo = true
             this.peoForm.orgType = 'dept'
             this.submitOrgid = this.currentDepartmentId
         },
-        // 修改社区人员
-        xiuCommunityPeo(row){
-            this.modifyPeo = true
-            this.peoForm.orgType = 'dept'
-            this.submitOrgid = this.currentDepartmentId
-            this.peoForm.name = row.name
-            this.peoForm.mobile = row.mobile
-            this.peoForm.gender = row.gender
-            this.peoForm.post = row.post
-            this.peoForm.duty = row.roles
-        },
+
         // 新增网格人员
         addGridPeo(){
             this.dialogVisiblePeo = true
@@ -1484,6 +1469,7 @@ export default {
             this.modifyPeo = true
             this.peoForm.orgType = 'grid'
             this.submitOrgid = this.currentGridOrgId
+            this.userStaffId = row.staffId
 
             const url = "/gov/org/staff/editstaffinit"
             let params = {
@@ -1495,7 +1481,7 @@ export default {
                 
                 this.peoForm.name = data.name
                 this.peoForm.mobile = data.mobile
-                this.peoForm.gender = data.gender
+                this.peoForm.gender = data.gender === 1 ? '男' : '女'
                 this.peoForm.post = data.workType
                 // 已有的权限（职责）
                 let existedRoleArr = []
@@ -1508,6 +1494,76 @@ export default {
             } else {
                 this.$message.error(msg)
             }
+        },
+        // 修改人员
+        async xiuPeo(row){
+            this.modifyPeo = true
+            this.peoForm.orgType = 'agency'
+            this.submitOrgid = this.currentAgencyId
+            this.userStaffId = row.staffId
+
+            const url = "/gov/org/staff/editstaffinit"
+
+            let params = {
+                staffId:row.staffId,
+                agencyId:this.currentAgencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile
+                this.peoForm.post = data.workType
+                this.peoForm.gender = data.gender === 1 ? '男' : '女'
+                // 已有的权限（职责）
+                let existedRoleArr = []
+                data.roleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId)
+                    }
+                })
+                this.peoForm.duty = existedRoleArr
+            } else {
+                this.$message.error(msg)
+            }
+
+            
+        },
+        // 修改社区人员
+        async xiuCommunityPeo(row){
+            this.modifyPeo = true
+            this.peoForm.orgType = 'dept'
+            this.submitOrgid = this.currentDepartmentId
+            this.userStaffId = row.staffId
+
+            const url = '/gov/org/staff/editstaffinit'
+
+            let params = {
+                staffId:row.staffId,
+                agencyId:this.currentAgencyId
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.peoForm.name = data.name
+                this.peoForm.mobile = data.mobile
+                this.peoForm.gender = data.gender === 1 ? '男' : '女'
+                this.peoForm.post = data.workType
+                // 已有的权限（职责）
+                let existedRoleArr = []
+                data.roleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId)
+                    }
+                })
+                this.peoForm.duty = existedRoleArr
+            }else {
+                this.$message.error(msg)
+            }
+
+            
         },
         // 取消禁用按钮
         cancelDisable(){

From a0332ecfa9896401c253dd10cee3b89169877ef2 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 18 Apr 2022 17:16:24 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/caiji.vue        | 11 +++++++++++
 src/views/pages/caijisuccess.vue | 25 -------------------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue
index dbc9e5f3..66bd2462 100644
--- a/src/views/pages/caiji.vue
+++ b/src/views/pages/caiji.vue
@@ -912,9 +912,20 @@ export default {
 }
 
 /deep/ .mint-popup-bottom {
+  height: 350px;
   width: 100vw;
 }
 
+// /deep/ .picker {
+//   height: 300px;
+// }
+/deep/ .picker-items {
+  height: 300px;
+}
+/deep/ .picker-center-highlight {
+  top: 30%;
+}
+
 .picker-toolbar-title {
   display: flex;
   flex-direction: row;
diff --git a/src/views/pages/caijisuccess.vue b/src/views/pages/caijisuccess.vue
index 8bf80bfc..82fa267b 100644
--- a/src/views/pages/caijisuccess.vue
+++ b/src/views/pages/caijisuccess.vue
@@ -122,29 +122,4 @@ export default {
 
 <style lang="scss" scoped >
 @import "@/assets/scss/pages/caiji.scss";
-
-.my-field /deep/ .mint-field-core {
-  text-align: right;
-  margin-right: 20px;
-}
-
-/deep/ .mint-popup-bottom {
-  width: 100vw;
-}
-
-.picker-toolbar-title {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  align-items: center;
-  background-color: #eee;
-  height: 44px;
-  line-height: 44px;
-  font-size: 16px;
-  .usi-btn-cancel,
-  .usi-btn-sure {
-    color: #26a2ff;
-    font-size: 16px;
-  }
-}
 </style>

From 4702bd6c0e7430a46035ac5cb143489f9531927c Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 18 Apr 2022 17:25:40 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E9=87=87=E9=9B=86=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/caiji.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue
index 66bd2462..21fafcba 100644
--- a/src/views/pages/caiji.vue
+++ b/src/views/pages/caiji.vue
@@ -912,7 +912,7 @@ export default {
 }
 
 /deep/ .mint-popup-bottom {
-  height: 350px;
+  height: 300px;
   width: 100vw;
 }
 
@@ -920,10 +920,14 @@ export default {
 //   height: 300px;
 // }
 /deep/ .picker-items {
-  height: 300px;
+  height: 250px;
+  width: 100vw;
+}
+/deep/ .picker-slot-center {
+  width: 100vw;
 }
 /deep/ .picker-center-highlight {
-  top: 30%;
+  top: 35%;
 }
 
 .picker-toolbar-title {

From c0c77c1bbd9a93e8f4f8e7dbe44139266cf88b57 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 22 Apr 2022 09:41:38 +0800
Subject: [PATCH 22/23] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/shuju/measure/jijin.png        | Bin 0 -> 1507 bytes
 src/assets/img/shuju/measure/minban.png       | Bin 0 -> 1510 bytes
 src/assets/img/shuju/measure/other.png        | Bin 0 -> 1523 bytes
 .../visual/communityParty/community.vue       |  25 ++++++++++++++++--
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/img/shuju/measure/jijin.png
 create mode 100644 src/assets/img/shuju/measure/minban.png
 create mode 100644 src/assets/img/shuju/measure/other.png

diff --git a/src/assets/img/shuju/measure/jijin.png b/src/assets/img/shuju/measure/jijin.png
new file mode 100644
index 0000000000000000000000000000000000000000..78cdcf288bee341eba32c5c6b759fc5a2fdb7503
GIT binary patch
literal 1507
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVxeGesb^?r
zVqk2hqhMrUXsK^tp>JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj
z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>+}F%q>h@%q*M@T^tP!U7elGo!#8r%$+Ta
z%q@)#O<iGnUGkGlb5rw5V0u#!dM$D41*L`D0-((<sYRJ(sVQzn`MC;UKU-zuc8eKK
z^PqZDaJ$7Er(S)aWAs5Wixkr^Az<<WG2!VJ$bqN))I4BvF9N3P78}R!3=B+Ro-U3d
z6}Q$*-k*QjLFD*-%f7j8hJPKoav4QcGy(#-l6oW}1(F!9Eaa|dh!u#HY?zuirFEvN
z2ggD$k5mVaQU@LnRz(f3Xr+nIreFTEO7?c=+3$<Ei+pbBMf|$){oTF2zxS1&Kl9n<
zmwf-7;<7Z&rth%@(sLLpKXBPBda|`<y{^uR6T3fJz1n$i)5bWD8JTmV+TMDuI&<YB
zW0$YYIghS63Hs~v->qJedW&Cc{$<YPTRwj`xSlm>XQYaCxa{lwCjVj-z22-mv2#*N
zKwy5#slcQqldt=|SGHiU7X0Q>q2RUAc(MB7{PdvRT3M!Z6qhHtE%lf&d-KObe>O!#
zY4h1X+xnA1e$%I`r$5}VoiJ0+@Ct)f=as~@597P#`me98;dT8|aaXDOn#L7zy@$!n
zORr|AWe1;sX7G>Yobp=NHRUnk|5jcM`;mCP#mw?si^T57TVs}V&Cts_A;A~e(W<g8
zW9v6v<G1&XlkTf)O58jZDz0K0GSPJEa(6Eqw^xe2J7ix?j=i3F?(OvnQae&#f6Y8!
zIz4H!d)iDE&3{t=F5Q0|mY-B1wTEHqxhVHQ`yK3hA4=xtI-3XW6!n~_Au{oH#LZ7q
zO*IR@g<cSu!R~y}A^hNi_aB18wynClFU`nj(uo@y)5`0f`JVCrQN!0!8@p1LcZrS0
zt5A)7zw>sKZNB`Bow@F@qiZxH`#=4iH4nHCz3pwd|9-(D^9MQ|oU_Y6ZVOn@aqrca
zi06h!_UXA=MKIXc^zof&+VbO9^OBbOb=SXs7M|a=N53igQP_|737w^KC8BHCf4}Hw
aU}k7{d_J>bd1(Zw*!6Vvb6Mw<&;$TK>OSQF

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/minban.png b/src/assets/img/shuju/measure/minban.png
new file mode 100644
index 0000000000000000000000000000000000000000..b99bb7677e51d1afb3344d16fc7e77b6cc028bc1
GIT binary patch
literal 1510
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVxeGesb^?r
zVqk2hqhMrUXsK^tp>JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj
z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>>iKj166lEZv+9T^tP!U7anRj4WK8og7V^
zT?|be&7EO-UGkGlb5rw5V0u&FdL0dL>IJ2R+ybD@E~!PCWvMA{Mftf3U_V=B;&zJ*
zPV=C8Q*gS)(iNv(eV}9XK{1OI(=Z`m@&Pg7=@!U=r~K4BU~(@4rt4GfXB8M2m?Ax0
z978H@t(km2Ti8+L`29EQbIk8vQ_Isjs>N2X5ORA?^Z$l$ThWWn4;;G{s>F^I>nGW8
z#IfjCeGCw&5`O9EGJ)$VTkzH!*Z$lvx%4ON+wm{fiC52>Z4(!_J9B2XdH%llXQPi<
zF8}{g^KZ}7)jr1yxMLWPJ8<q{`My?t&z1K)-CC<+lGzMrh3lNs@^tf2_R}-m?)F6N
zr&YOT^#{ZM+x9C>efKg`ReScO`KJ?<a~YyJ?XKzVIG=F(-O3aDPR_6rTfKVa3`SWq
zr;ac8nmE@KN63HL7IRC_q+ebB!y$W7!>K}9r%YyC3N>CEuXm0;`scUHfq}ElPjO64
z|M}eDJ*P^mxZ5+1$zL3kJ~3>y3%~Vn@3o+nev|xs3_Z5CeX-3}Ietd#=N@OF%TIRv
z+EW%jtMR9-h4#^{bJomUl%%5in0t5Dl@lB9MJ-<@XXLu`;dZGlfA>1vd8v>(HR*BY
zq(^Fn*JDe(<khN;cD{RGXS#o*p|-q7{3PG(8#6W(TyR`fki28UZ@Y4{^l#Z7FP3%3
zEw(th(|mbv+A_~cAA9O$W32z*TDvypz!#AU#yZz-Tb{gT&57&ouess(^D>jOdDkKC
zJ-4#t9PP?}cfH`*!7Oyq;rT%ikGq`f{~dlKa(}(E=+3K8XC>=zO|X~zB*}H|>yk2y
zNk!%>wr>r~tDl)&wEZr}o0A>)FRobB+tK`EdW|6`tKjSPg8R3wSQP%iM1tqqqHc3$
zR;d>aSqA_9%{sVK&ed!N>uE)I_CGAE4@&R_as282J1_pu4~-Mn%*UF;1@|8=+o0d1
h*EBUl{w;?A!|WwzuN*t@-V;>vdb;|#taD0e0s!@dK+ymI

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/other.png b/src/assets/img/shuju/measure/other.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfa3e23523450078a0531e9636cb5fba7ebdeb22
GIT binary patch
literal 1523
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVxeGesb^?r
zVqk2hqhMrUXsK^tp>JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj
z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>-jqOw3H3ja{4#T^tP!U7an=j1ApfUEM4l
z-7G8&jm%+sUGkGlb5rw5V0u#!dR=kq1*L`D0-((<sYRJ(sVQzn`MC;UKU-zuc8e2E
z^PqZDaJ$7Br(S)aWAs5Wixkr^Az<<WG2!VJ$bqN))I4BvF9N3PALrYbFfcHsdAc};
zRNPuK`E0hZqsW2#Z^F%9F57rgjaNvQQCmam>jTXWbI0|MTw9bX1fm31{&%>To#$p#
z^>L9nzmws1CEJealay{<SrTe!m}!=oGt1X(w(R|uK(pHs`g(t6ROa8?QyK5AvGjwz
zUFMugcVfc|clMuA^jy-m$4Tze^6>2B_Z7-YpLa3{Olp3aA@#+e!GGa}?VKjj3{$ft
zbF6(ghj05YJ5fpBbMr|P&aC>H=AJZ0(G_;3B>@_??y<ivbewp^6)5y^n@~SnLlCoa
z^2@!>=N8OywY2-OlRYi*H_O==y??e!k$mirCpIW>`s|9_U8r*0pKIgv-D}M96=j&x
zt%^9mEBCQ%pRl81md^^V6-tf2+LNx=Zri-?=C_4g<>hDgv|e@2Uh?w^Tj>f{mPIFo
zUvYoR$Ys3xe&UohKR3@(+T7*nz`s^*g`kb}+cdB5_R~}f_g#MJ_|ltK=k&22R}Z=V
z#$_vSY;m-UH$T7g{e_(`4zBxa@Ycsj<=!Rde-q}-I(UxXLCAHDaf9>9%Uez!+F@CA
zU8Cd9y0_oo*XEVQYcnm>x~9D1)Pw1)3BOOx+xltay`6n!<r6Mgxcltvn3MieYFTcL
z(V5Ul1!wl2{Iz+BtFK1OPh)<d^NE48S~k{sSq%S~X}7})*51<Vo^g3u;=4SPU23oV
zcjc)4+&gids*NW9+^}1J=bA4~Tb^zGJ4XKFjk6WXt15VI?0>SM_cZ6^?KWli_X_GN
zFTbHtIP<K_WcLLMVwWDge!u?k`(Bq61<91dsW;LuH`F{`ecN;5?eOEiX4M}#&;MpB
r>M3vi%V%46ZqBoblgj(*I1L!2pPipvs+*??Duz8>{an^LB{Ts5Z~j0X

literal 0
HcmV?d00001

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 26027e7b..4ca3c39e 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -352,6 +352,18 @@ export default {
           4: {
             color: 'rgba(192, 21, 195, 1)',
             icon: require('../../../../assets/img/shuju/measure/qita.png')
+          },
+          5: {
+            color: '#ee7801',
+            icon: require('../../../../assets/img/shuju/measure/minban.png')
+          },
+          6: {
+            color: '#e70683',
+            icon: require('../../../../assets/img/shuju/measure/jijin.png')
+          },
+          7: {
+            color: '#0189d5',
+            icon: require('../../../../assets/img/shuju/measure/other.png')
           }
         }
         this.partyItem = data.map((item, index) => {
@@ -511,8 +523,14 @@ export default {
             item.urlIndex = 2
           } else if (item.type === '机关直属部门') {
             item.urlIndex = 3
-          } else if (item.type === '其他') {
+          } else if (item.type === '社会团体') {
             item.urlIndex = 4
+          } else if (item.type === '民办非企业单位') {
+            item.urlIndex = 5
+          } else if (item.type === '基金会') {
+            item.urlIndex = 6
+          } else if (item.type === '其他') {
+            item.urlIndex = 7
           }
         });
 
@@ -522,7 +540,10 @@ export default {
           require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织
           require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建
           require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门
-          require('../../../../assets/img/shuju/measure/qita.png')//其他
+          require('../../../../assets/img/shuju/measure/qita.png'),//社会团体
+          require('../../../../assets/img/shuju/measure/minban.png'),//民办
+          require('../../../../assets/img/shuju/measure/jijin.png'),//基金
+          require('../../../../assets/img/shuju/measure/other.png')//其他
         ]
 
 

From 0cd130715407ab640d3bd83670499df1caf35d45 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 22 Apr 2022 09:51:49 +0800
Subject: [PATCH 23/23] dd

---
 src/assets/img/shuju/measure/jijin.png  | Bin 1507 -> 2121 bytes
 src/assets/img/shuju/measure/minban.png | Bin 1510 -> 2128 bytes
 src/assets/img/shuju/measure/other.png  | Bin 1523 -> 2136 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/assets/img/shuju/measure/jijin.png b/src/assets/img/shuju/measure/jijin.png
index 78cdcf288bee341eba32c5c6b759fc5a2fdb7503..b051139cd4feff63acabd82e288be54eb892e2f5 100644
GIT binary patch
delta 1486
zcmZ{kdo&XY9LKjYVUx$rE05-RA~ElwTx?@<?at&{Dv##fFyU?yGmo332cejdN8VcG
zQ7z`=nLG-$5$2I{F|QP1u6s`Z`s4Teo%224&-wiKn}PI5solU~9VEn$iUR-u2}cYH
zzkgx>kEqE0j);!__Eb$9bivHj6lse_!I6e2w4osyi7<xSBP?vuNDDX`2{$uQhfzbw
z&d!#oFk)1QUudKw>a_ZPqVF5zYx#>cJczwl41)g>Akhbv)L{{kct3wj-vb3m`-9kf
z210f;qk?a~0Dv&d5oLRpI$Co797zeS(ACP_NN*0p+_~T^R0N_IhNO4|O5;-jYJ7F6
z%y?==5{fP_{3iyZ9PCAPh@GY*3(f45-PB}7rE1E9aL1h)SB4KKS=zkktS+728ZerG
zj*T}MYV4XUaJgYETeXVDV~sse{5Vc6GqeTO(HAP?8a#idDvEuT3{CSpj8zVw;|eBY
zlrH~87aVG;M*gtmaBb#XR)m#a{#e|@dt+m{vHUR$mg2Y%ys%Hc+~_4{G+8}I_Lc&%
z<QZCLG^?<Y?l$~k5?t{t>A7V6k7cX(bs$>1XVlMpEAx$FhDlX)m|#|K{$?qTMo-TQ
z8MZL#-ZqL0b+u;EbV)5ToAz$Xq}S2T1KBb4U9KetZl6|RX?6D8u%WZt#s%!AZKZQC
z98jxha8$+pBE<NP99E-KuUBy$F1a=lPEAf7QZ!o2Vx(Dh@`D|LaxPC}BA(@W;z+%J
z$3dV>Noay9S&Sn(kv(TqXGbd?KE-{p6<FSzAdABcxKk85D%bUL#rVLP{Q0uB8SkTu
zHIg2=wxgGVG)Hqmy5>_^{h^<18w*G=r%)5tkC_*loVlL>v%!xU;LPI``bd8a<%+}3
ziDCjoLf2H<Dm2^F9oUWYhyZ#$NN>{w-(A+I_E&~VR1$m{rHo+`4bl+rD&^*Ja>-w^
zn%rHf*b<7HPM7x<sBwb>OFz^B?AXm;RY*g4>5=Qa0RF-T-zqsoc$qiu*)G~M8E<gD
zGO2XRoJx`4Wu@&BK@4c7mxsV#y4~iw2DGBAv5Qs2_cVOIO)dmQymP<i73oO{+Fd=(
z?2SqcN_Qz=+o65Woz!`amGua9BohVOlh-KRvR4XnLba59Ay#fpWSq~1kOiCD3~c^7
z*iBD=MEtq`sT?aqqH9$YY`f1wzv0BwN85eWurEV<XUtg+Z@}Va*}BVe{k~Uf{DH5h
zKNh#DMBaB@*T$2L8XpszbA}Uc;t6?OUG*>tYvAu@3>p|QIIp;(;Ki~g<mFqXCI)3Q
zETQf8jqoUetK-CHo(^0WWOkO`z`IKBKnJT`Bp=&kSN;pJE-Mm}Gq}_bRKE1jKxgC4
zTOEl<Y($4t%{ko;;Bn=*4>4sfw=e&JzU@?q$Z`73c!(*}R45CZF=CE6U%mrs5`}Db
z3iCE%X@HTzH_mVKOvGgqE7B0m)a1ZDV3T&siij6Pzp1M2ZUM+V>Dur~JtD*@uz5o>
z+`weRZsd)&>!i<@te-J)*TG9_YmL<U_+#8EJ8OaqC6PUSW;SD<SW<_m#vf_%d(RRs
z7w%qI^<YaSYm|T1bRTYYmAZda&S0eu);ViLBZ#KEuj{f+1zNL-ke$c+I*(E_Q*S)%
zD(SdN!+N%t?Jmj-6__JTX`p~)-U}I*DSK_+%lspInS^eB>-VZ87Cu%a6jG5(6PpqX
z2Yq-F;}*{U*iINUy&KSTKEugCx8oS3FH8c{@qj7P@9QB|dv9Du{*{+;M^AL+yK^f(
z(ir+7b}qmPRgwnl0oyLQlL0#ui#{e=wVd;9DVy?(0qIQiNokH(yz$-^LQdOByjjca
vMq;vj&WLqfZ3?L;MGrCZ)w+9Z5(EXDu;FC44wYu?zi5CX8jGs6^G^5=CDNN&

delta 867
zcmX>p@R(b%Gr-TCmrII^fq{Y7)59eQNDF~52OE$KJJ%P!QBjR4#?i^#!o<bQ!r9Qp
z(a_M<*~#45&CSi+*}}-&(%8_{RY{>Dx4_re$|XO!G&eP`#M8xA2`HkMl9^%!)oY1M
z@8rcy1~3cEa4Aw!C@u*~O|weDZGky1y_5Bso$6a`9KSO#Fok)#IEGZ*S~Gcn{$&S|
z<M%E5=DHdFb>zxr6jjj(2;@rYk%$yXVz{!9yPhFdAXc(rYTlIAnW`Qf3%xv29XLuI
zcsy7YHN2vgCO(^f`OhlZ+nr~>FXArpxuqBJ>&EwY_xAqYSAPD?XPaO0{dbDX(lndC
z#}-J>VW_PCz-6=O$<~_nx;iUP?EYx=YUjO88{<4?WX_Fhd+WLC%$19bUA{8sJi6v2
z=&#Rzw|YhDEq<-}mpPYj`TX7Bde)?!kt){Vvak1>{EJcadb9Gx&Pgc&f%z$?0+W_Z
zzV7#4*@C@V@S8`4g4agl#p;Li(}Q+vWtq-VT%P2%)MLi%%^&Lz{n-=|rOjvmZ0k=3
z`Awg$p8jydcEU_O!z&C{omUdqK8){{>%YFXhS&8=#a*T9YZ_O?^&TcOFTI+fmK}Wl
znZZAnbINO7*ObSE|66%6>__7D7BkClEfTvQZ;e^fHA64!galt;N2|)ZjIG~vjo;ok
zPP(tIDRJ{usJM!0$VAhr%j?~}Y}{Tc_U@2<H97Wr=DD}mCrIr`ef>4_eChP0$?j=0
zSv3Di{kwGkaaev*h14E~spq2H1MPRP>wPGho9k>Iv{Te`qK3%C+YvWENj23h{1$pa
zWCpwQL5J{z3*LVS4%@cs>b^81pGhZfXiO`wd**w_|3?j9M{Vp%S>7c!8m~e%%J%)v
z+flap@-ueky2p;L(Twc>^mo=g;6C)Wx8eT#1&hod=yY(-F8{bKU_r;dS6?EY8y?xG
z=V}$fU|-Y6ccN*_k6+D8TI$zb|N2>Ye%BuTrsPLqKi(&Fmdcfgu3`WEqMw18q22NM
V%!cKq5x{)I;OXk;vd$@?2>{UraKHcn

diff --git a/src/assets/img/shuju/measure/minban.png b/src/assets/img/shuju/measure/minban.png
index b99bb7677e51d1afb3344d16fc7e77b6cc028bc1..735fea832f4614cc338f2f85a067e963e80144ae 100644
GIT binary patch
delta 1493
zcmZ{kc`zFY6vh*0T&=3AvPk0A3TfO&>qs0^tcof@;=YSYokc>Wu5lGnsjFnFO4DJ{
zrdeT?if&t>bw(YfRK*czs<yj!cJ@y*?|a|OH}5y!e{V^GEe*+ab+MNcR}cpP08)+)
zNVg*g|0|Hl(Z;8w?6g8O1bmF(HYNytl$|XciGssXwx%{lh9-ul`bUF8!42%7;G`R|
z&dz4Yn85fO!O^!Ik(SV-1Qrw?WcD9xr+*w<+906+e*yBiBPbYu%Ply>Ea=z*6zVv(
zR8P=`kPWd{0|10xIU=pylcuUFyra&b<cWVzPFhx2c2#$}cBp5vg-$_`^nR*>AtfjG
zwP>pX&dCXo3_n;jPvd!^lXqmKco~nauc&!?L$6&y>7erc!nHwVot>dWldJrpl_+z|
z>Q6OXHC#wy0_^X@ZCr?0prm{Mx3RJ{5{@vT+=8{Pv6_-rq8C<KGvBVMX(nIZwgQaG
zDm}SC!cC@mrh$a8uBkNpPH;>>cRKa~pyEko1u|l;L4C5tnxN>RS?qzaCmKOJgdD`Z
zV@>eDOaZ|dO2%d1ni#oc`gbk!N>AeF;ho<1L#F!yhDbN6dKXp{V;i6;nJ3955G=6X
z{Fe;+1F3=C@%rws0!g^$VN9F%MXOcGCf@=w0=(@f7ba+UGipCVA?Hlb!MhZPE2Zz9
z7`fj(VCjnApS4wgH48GTe5`vg@zH<F2MT2MuA6^Y#Z$;G<+H-dBcvAFG3YMKV-ekS
zQrzDv#a0SHx?Y+Lbg@}27ziiKlzFEuCQ}>h_f=S{EKpp~&Ah4;Dd<P4B>*HMHkMXB
zo=<9x22(Xdn6M?$A7Z1Ox-fRwOetGLvW^}_9*4|)a(i}2>#fBPz1e7g{ZVF$2*hYC
z@XY!cmLDM9&7h?`#+O9hYR4tvtor$LD}!;mfIG_VckOG-IYFBo!tJ_9PDMwg9fWsE
zTJ?i!GkVC_)n?FmY_lIm)r}fhe##2vujR}X<I*n}?Aq2ld{vqihBCJuJWdea;vbrr
zWj-7iV|+p-S<$rrj9LOSZX))ua=QB~dOuU4Zp2>EZ){2gNAXg61{Zfrs8MK-9}H@t
z2mckGcAAPYuAd?_O<NGT@fzuF>mwGjeT;`%8(<5{D4By03F0LBwbW+Uxod5ZDe>~!
z*X0$9&WUm(FSli7uzIL*c^rp3Gwt64F`R?3wjp|IC5!4#`8nN{9IdgEMx6U>-kL7r
zwczZ#m0O}zPbVvlF7oRP@cmt;eQOIh7In6Cw?aFx1UB&(JM2P!cENi0@(;mAeI^DR
zz(lOg$RE;DuX<`J7TY>B>Q8tADJ6*|&gc6AfOyRz<xrRT6Oj8+vc%=L=HsG;tv$Q4
ziX2rVa-j^-d-xCbge(a@>l<3M?<>XiQZ#5!5L@zMS`HicP793teI#wBFBY($o)=DX
z3$r4Gp9cM^|5W-#24a{{Gx;0#eoEzaaW3!YY-J>mq~aP8+vHbAT+;z2^h;t?4PMC^
z%$w|W%m8O!erYfgxXs-Gum3KeZqGM_DI#W7%dtJxmsAkov&whCS`zTF+jr;Ug^NP4
zRk|eyynG})fZ0*5u!)?@(Lsz{%~~*s-Xgp(IhpI;KIk703%SH_1HgD+?gP;*DMyfw
zkB)jm%{{s0-PtW@-o+<v8R+Jqcin#Tp|8kU`h9R2;OuTO9}R^wHqa;=<tC<mO<^wO
zdEeqA7SX>~i-!Zj>5z_RpnELMkrEoHA15(bn-|+(#ugbGNc7X5CMh`PW3GjzmU!v4
zkR_NlG_W4T`4ok%UIbVH)xVLCldODfbWSS&{9c1YHebRcTrGOoN`5bVG2mWzAkIfi
yBuhhCE|(-)Y1eOhmh{|7T<-;#3++7A>j6BMEuTB7tpYmw)Bs163zBBzm-!DSh?<-L

delta 870
zcmca0@QhorGr-TCmrII^fq{Y7)59eQNDF~52OE$KJJ%P!QBjR4#>vds(ACJ&&Dqe!
z(a_M<+0x0#!qwTy(Zt!s(8ST)SxKQHx4_re$|XO!G&eP`#M8xA2`HkMl9^%!(d%e{
zOYh{xOa?FuTyQB;QYbD7N=>s$!D)e|D=xj0^_iXOPqm*_U|?X1^mK6yskpUf^7(9G
zN0H<A->lCuzk5wBPwS`_TfIWa?K#c=8^UcxFE&4L>{h4}J5sElWWy21qF?nfK%h$a
zrK8IPuB&XpTW?(ZbHn7)pR8}kzgQ<;J!`g2T-@%=nc3#~``(|8K4!W6|3}TgJx^Er
z953LGVLa}@xu>4x`&#uqSKjk<Ypse&W;2`>u5(Ju)6GZOPtS0>+Y_;$R^^)29}NF*
z+pjeB-OEf>?b(;+pH5KDWr*gqyQa6}e8TB>D^Kh@Im1e9_3D)~7-h|zI=<X%;#^Z4
zA^&Mx%q=~Wes%c|hwMcSrwV1AGMRBH)Oc;Y-Z}Q@pWiMA2F^A=RnIXo{pWLo_na!N
z;%?74CVz2E`oyr+F8tQRz1M<P`c3llG4$Bl_Qf_^<@gz`pL?8zE<f4vYfoADtj3?R
z7TQO*&RH{aQId-4WA5EqS59oa7qxtuoRRC!hufvL{N3wt=cPjG)TGCmlOCxRUXLyD
zl2@xX+WGE%o$3CKhT8HT@soVB>u=21P;kL<RYCHO3BT>i&C<VRd%RfI9k<xx<WBSD
zy=lulCw=UxmyNOhe{1d9m;+x#Dj4fryKQ;$nl&e`yT9g!-_OfT&gNZ*xcA)3l5?~x
z``z_|X9u&;MTh4HJv{DmuK#!VjmZ7=&Z0Z7KAn}Uzcs;L@{=UjxvxvgEG8A1uh_n|
zGAyrtW_Ho`yBu#$cHF<XVo`5L^N;B@hMcT|uh$Fi-@0N^_yZFOo@<M`&6!!HUNmGG
z{QEcS;7&PLvl*<X72VnYu&h2P!575wr~B``_&Yx|PFOP^YYrFOf4FReev@9))C~Ez
c90m-tmz=$F?7(|ZVAf&qboFyt=akR{08OfLxc~qF

diff --git a/src/assets/img/shuju/measure/other.png b/src/assets/img/shuju/measure/other.png
index bfa3e23523450078a0531e9636cb5fba7ebdeb22..d5791f0ee579ccb5e5f0de8762c6e15935c2c2d0 100644
GIT binary patch
delta 1501
zcmZ{kX*3iH7=~x;`)<-iF<go)BfGKA3`X{?(b#HcOk@x$+cnlJF~?40OUQO@gOGJB
zjgckQ4cSJavR1gVB-cHszkYn*cg}m>=RE(uZQdy%nIt<KbABE$4*&q*M_C{oPOkL-
z!^Ls3gTupjs50^_Zd$rpNHh2qC>)AFLZL{wiMFOGTwMpLZDyhYzoKIbkq#vWT3hQO
z0<d?9c>fR-!T@rTsNj5XdcRrq)7Z>X7Pa33b+gk-5b59$2fVi)?sS3LX>6t{t0_s}
zO-%p*U>imuOq@ce%W^SRlFkx?uiWkvrV{WmE|;DGsTwWWk6e7PvGl9A{}~wI6emNW
zQ0nT{Qrqs_GZ)Cy=0wdrI%jFQWvMW$GBR1LGH1dx&dqlv=)L=2U866K-xtXw;=MtW
znLl?&3Wo1@f7SmS$*ft>5%{jyS3zop%?!~JSoi)EhOy*D^Lh8WeiPSiJLZ%6)H!Xe
z<rr_R6c|-0+;bs@Fw9uztk=I_r2DH!EX_u4qG+R+`4xT_>?i75&0Uo$Dg&00D=QJ*
z=4JmV@pt^?%OZq36dP3R=R!fj!YVZI-z6eDPmcgI$ro++uJ+BGzQ3xZT><GGA635M
z7C+e{al2PEH<q3pC6#eeOr~V7TY~K8{9_XmWF1mFC#YMJIlid{nV^S^7<i1acJnZV
za=O%7FkFcp%`Kpk_^g{4?p9-8cn3tdtCsR0odNHAJzt^d0+7GEqHJ9v;<C?fHO}7>
zr(Ddj4t!keXqsc;yyh+>N9qzQi(a36V*J2CGz^_O`E3*w%CVEhcg)(!q7sL_tquVX
zO%CcQ?MAzJMhFIE%cU(=M!;J7o?@Ce?7OW~2RAD%fU7{|>f1<LwV<SB&%OJqJeL+>
z$92wYH}O2Q*+8_W&qhXp=jsx(i&0J%_+=pJVv%rO2xXD}`PK%6RJE0!lsqZ0O@w`k
zu+1vF*KG|#l-?AKcdANkE!Xo<7DgTTN8(D(X*}Nuoo6*PXHwDbA%*5nu3u^|ifpb8
zjjwtb%Tnx89+o5N^&^n2yv+tASi=Mgb8${!j7^w9xL8zISDy4w`*^Z56t;_`q{#L^
zzF++odzdkLhOtCqa%X5YuF)r7R9gf)8Wc2)RmCkVEVxa-wakMq7b|-$OBt8C+RGvx
zQ4ttf*P*2$#o`IG8)4`<>4)?b?Sl$O8)VFb`496|a+(S)O*Z<kCG43W53%U1kJoY<
zKb?`)CNBp)r`ZC5$wtu!Lbux5)2JG*lK$h_huWEonYyIlpq+A)SA+I}Qjvmne!HLn
z+ROsJy=_KEFJPzsQ|(G)45Kku<rnrRZNKYmCwKc)48K$H`A**J+L989Iz4mf{ppKn
z?jEOtrgiZYUFQa=xBU&QBMoVfS#AUl82EW4f?``A=c7Dr@uLMP{ezjxQxi0+gDv0Q
z^7GAq;?_xk`sb7FPBG>b&dz!znVlxTd>{Q?np-&Ap<jCr!D_}(J0JX1linN}mZsEU
z+>y&7$YJH{RdnZJQA0uGv6Zh{3_SfM<sLI6h%1LM8)a;?*bE3ev<v`_N<0IKR?iZ>
zrks+xS9V;%RH~+uUjVy*fq=T<R!dem4Hwg2Pr4k8`7kC*92~-a*EovD5hM9*I2ps)
zipHAVAhjF7*@djMscZ+zvSO=Ft->A>_R`aXuu!4yx~(Wdh;{!%tcA=Hcimv**ClS?
z#E&qfDYz<%EtL~78Yb^XI6HncT}&DB>JzW)Y97Y~Wz4+cf3k-u-^UtWv&YXf;@D;a
z^`bDQHM@$S;Tr66P_MR^2+X{xCRG8qX(r^)`}3uk4!gHjeu@g!cKxV0^N4qM%VNAl
zOMl8J&geK;&s*gj&dzonpOnBsX&W>oOc5#AR<D%8WZG6efEA!>`RJ7<3}<)pu>mNg
K4WiD}EA~I4G^6DJ

delta 884
zcmca1@R?h&Gr-TCmrII^fq{Y7)59eQNDF~52OE$KJJ%P!QBjR4#?r;a%+%S~#o5rs
z(a_M<*}}}&(9PA=&C=1$!otwVTuGrKx4_re$|XO!G&eP`#M8xA2`HkMl9^%!)$58&
z@8rcy1~3bpa4Aw!C@u*~O|weDZGkf`y_5Bso$7y_Z(qW|z?A0c;uunKYt7`d*}{$@
z2kyTKH+#8k<4HAMAzemo4XLjWG&{^4*FSP?QK}G#5?J});bL~4n@!cnMdJKUhTD~F
zJEl)kx^-nqsG(t|S!T{GU$fb=_gezZZb#_r{h3jje{WA^ytl^E5B7GMb0*!14J+K)
ze@4-BN!y-!C%H?@!?Tm$S12oe-pL>^srhAw)E9#W|AiN}bDBgmOwE$avG&~@zU{y4
zL?wOC%_mJbv+8S_d(s$1SJ;)71Zdd0$Nsv|apDnIpwP!{Lj7zFLCng@FZVj1TQJAf
z((cDj_O!&`EN5f%{@E%;^07aj*r34avnz6Up~`W8u8q@o*RL_lSCnB&w<_ZNuH476
zeZr24Sw1VcRwy<8YEQaeyKVEno8K00m6xB{(|Xl8d&$oyY^5t)Sr(lTe#QMMBbV{&
z`-xN5{M<ZCX>*sO1OHmN6@oU>Z_~WK+fP#|+;{n<<4bQ|ozus9Ts`Fa8<(xTvBl9Y
z-u(Q|_ZN1)IJoYw!CN1rdX;;Zoc~RjH|yXzeg`4fHO39jD=%+3d1!}a(RGcEJL}$l
ze_xwd7O%~;Q0toVic=4!vnKpLHE-*ujrVr;m6cDpVBzkwvtv&BOQ~hKHAZJbBNd$4
zd-B)jC9b|2EkBL<fzBre&T83M=VdYcXQtf_D_DC=uY1PjWr^?dOm?Zg^52zHul95A
z#C57Rn*4LaZvCBWzBFxlw)O8A`HwfwRw%Ek;JLB?$%fw3oRhcPl-=JesH?pEhDPDc
zvo4d}7bu8bdhq)F`or&gT~ZVzQx2!zNWa`r^K|uX&xyCgkNcWcf8;#>o2jU$y!9`i
nZQZ#!&n8YP@2lf9V32-xesZa9o+dCKF?h1O`njxgN@xNA{(W*M