diff --git a/src/views/modules/sys/deptmacode.vue b/src/views/modules/sys/deptmacode.vue
index d493a7f4..f0838cb5 100644
--- a/src/views/modules/sys/deptmacode.vue
+++ b/src/views/modules/sys/deptmacode.vue
@@ -1,50 +1,27 @@
 <template>
-  <el-card shadow="never"
-           class="aui-card--fill">
+  <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__deptmacode}">
-      <el-form :inline="true"
-               :model="dataForm"
-               @keyup.enter.native="getDataList()">
-        <el-form-item label="所属街道"
-                      prop="deptId">
-          <el-select v-model="dataForm.streetId"
-                     @change="changeStreet"
-                     placeholder="所属街道">
-            <el-option v-for="item in streetList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属社区">
-          <el-select v-model="dataForm.communityId"
-                     @change="changeCommunity"
-                     placeholder="所属社区">
-            <el-option v-for="item in communityList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属网格">
-          <el-select v-model="dataForm.gridId"
-                     placeholder="所属网格">
-            <el-option v-for="item in gridList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item label="所属机构">
+          <el-cascader
+            v-model="dataForm.deptIdList"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
         </el-form-item>
         <el-form-item label="小程序码类别">
-          <el-select v-model="dataForm.leaderFlag"
-                     placeholder="小程序码类别">
-            <el-option v-for="item in maCodeCategorys"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
+          <el-select v-model="dataForm.leaderFlag" placeholder="小程序码类别">
+            <el-option
+              v-for="item in maCodeCategorys"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -52,8 +29,7 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info"
-                     @click="clearDataForm()">清空</el-button>
+          <el-button type="info" @click="clearDataForm()">清空</el-button>
         </el-form-item>
         <!-- <el-form-item>
           <el-button v-if="$hasPermission('sys:deptmacode:delete') && dataForm.leaderFlag === '0'"
@@ -61,87 +37,117 @@
                      @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item> -->
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:deptmacode:init')"
-                     type="primary"
-                     @click="initDeptMaCodeHandle()">初始化</el-button>
+          <el-button
+            v-if="$hasPermission('sys:deptmacode:init')"
+            type="primary"
+            @click="initDeptMaCodeHandle()"
+            >初始化</el-button
+          >
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:deptmacode:leader')"
-                     type="primary"
-                     @click="createGridLeaderMaCodeHandle()">生成网格长注册码</el-button>
+          <el-button
+            v-if="$hasPermission('sys:deptmacode:leader')"
+            type="primary"
+            @click="createGridLeaderMaCodeHandle()"
+            >生成网格长注册码</el-button
+          >
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading"
-                :data="dataList"
-                border
-                @selection-change="dataListSelectionChangeHandle"
-                style="width: 100%;">
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;"
+      >
         <!-- <el-table-column type="selection"
                          header-align="center"
                          align="center"
                          width="50"></el-table-column> -->
-        <el-table-column prop="street"
-                         label="街道"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="community"
-                         label="社区"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="grid"
-                         label="网格"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column align="center"
-                         label="小程序码"
-                         :show-overflow-tooltip="true"
-                         prop="codeUrl">
+        <el-table-column
+          prop="street"
+          label="街道"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="community"
+          label="社区"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="grid"
+          label="网格"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="小程序码"
+          :show-overflow-tooltip="true"
+          prop="codeUrl"
+        >
           <template slot-scope="scope">
-            <el-popover placement="right"
-                        title=""
-                        trigger="click">
-              <el-image slot="reference"
-                        min-width="70"
-                        height="70"
-                        v-if="scope.row.codeUrl"
-                        :src="scope.row.codeUrl"
-                        :alt="scope.row.codeUrl"></el-image>
+            <el-popover placement="right" title="" trigger="click">
+              <el-image
+                slot="reference"
+                min-width="70"
+                height="70"
+                v-if="scope.row.codeUrl"
+                :src="scope.row.codeUrl"
+                :alt="scope.row.codeUrl"
+              ></el-image>
               <el-image :src="scope.row.codeUrl"></el-image>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column prop="createdTime"
-                         label="创建时间"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column :label="$t('handle')"
-                         fixed="right"
-                         header-align="center"
-                         align="center"
-                         width="150">
+        <el-table-column
+          prop="createdTime"
+          label="创建时间"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
           <template slot-scope="scope">
             <!-- <el-button v-if="$hasPermission('sys:deptmacode:delete') && scope.row.codeUrl && scope.row.leaderFlag === '0'"
                        type="danger"
                        size="mini"
                        @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button> -->
-            <el-button v-if="scope.row.codeUrl"
-                       type="danger"
-                       size="mini"
-                       @click="downloadHandle(scope.row.codeUrl)">下载</el-button>
-            <el-button v-if="$hasPermission('sys:deptmacode:create') && !scope.row.codeUrl"
-                       type="primary"
-                       size="mini"
-                       @click="createDeptMaCodeHandle(scope.row.gridId)">生成</el-button>
+            <el-button
+              v-if="scope.row.codeUrl"
+              type="danger"
+              size="mini"
+              @click="downloadHandle(scope.row.codeUrl)"
+              >下载</el-button
+            >
+            <el-button
+              v-if="
+                $hasPermission('sys:deptmacode:create') && !scope.row.codeUrl
+              "
+              type="primary"
+              size="mini"
+              @click="createDeptMaCodeHandle(scope.row.gridId)"
+              >生成</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination :current-page="page"
-                     :page-sizes="[10, 20, 50, 100]"
-                     :page-size="limit"
-                     :total="total"
-                     layout="total, sizes, prev, pager, next, jumper"
-                     @size-change="pageSizeChangeHandle"
-                     @current-change="pageCurrentChangeHandle">
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
       </el-pagination>
     </div>
   </el-card>
@@ -160,120 +166,124 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        streetId: null,
-        communityId: null,
-        gridId: null,
-        leaderFlag: '0'
+        leaderFlag: '0',
+        deptIdList: []
       },
+      options: [],
       streetList: [],
       communityList: [],
       gridList: [],
-      maCodeCategorys: [{ id: '0', name: '群众注册码' }, { id: '1', name: '网格长注册码' }]
+      maCodeCategorys: [
+        { id: '0', name: '群众注册码' },
+        { id: '1', name: '网格长注册码' }
+      ]
     }
   },
-  components: {
-  },
+  components: {},
   created () {
-    this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
   },
   methods: {
     createDeptMaCodeHandle (id) {
-      this.$confirm(this.$t('prompt.info', { 'handle': '生成小程序码' }), this.$t('生成'), {
-        confirmButtonText: this.$t('confirm'),
-        cancelButtonText: this.$t('cancel'),
-        type: 'warning'
-      }).then(() => {
-        this.$http.post(`/sys/deptmacode/create/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.getDataList()
-            }
-          })
-        }).catch(() => { })
-      }).catch(() => { })
+      this.$confirm(
+        this.$t('prompt.info', { handle: '生成小程序码' }),
+        this.$t('生成'),
+        {
+          confirmButtonText: this.$t('confirm'),
+          cancelButtonText: this.$t('cancel'),
+          type: 'warning'
+        }
+      )
+        .then(() => {
+          this.$http
+            .post(`/sys/deptmacode/create/${id}`)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg)
+              }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            })
+            .catch(() => {})
+        })
+        .catch(() => {})
     },
     createGridLeaderMaCodeHandle () {
-      this.$confirm(this.$t('prompt.info', { 'handle': '生成网格长注册小程序码' }), this.$t('生成'), {
-        confirmButtonText: this.$t('confirm'),
-        cancelButtonText: this.$t('cancel'),
-        type: 'warning'
-      }).then(() => {
-        this.$http.post(`/sys/deptmacode/gridLeader`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.getDataList()
-            }
-          })
-        }).catch(() => { })
-      }).catch(() => { })
+      this.$confirm(
+        this.$t('prompt.info', { handle: '生成网格长注册小程序码' }),
+        this.$t('生成'),
+        {
+          confirmButtonText: this.$t('confirm'),
+          cancelButtonText: this.$t('cancel'),
+          type: 'warning'
+        }
+      )
+        .then(() => {
+          this.$http
+            .post(`/sys/deptmacode/gridLeader`)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg)
+              }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            })
+            .catch(() => {})
+        })
+        .catch(() => {})
     },
     initDeptMaCodeHandle () {
       this.$confirm('初始化所有网格的小程序码', this.$t('初始化'), {
         confirmButtonText: this.$t('confirm'),
         cancelButtonText: this.$t('cancel'),
         type: 'warning'
-      }).then(() => {
-        let loading = this.$loading({
-          lock: true,
-          text: '正在进行初始化...',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-        this.$http.post(`/sys/deptmacode/init`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          loading.close()
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.getDataList()
-            }
+      })
+        .then(() => {
+          let loading = this.$loading({
+            lock: true,
+            text: '正在进行初始化...',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
           })
-        }).catch(() => { })
-      }).catch(() => { })
-    },
-    getDeptInfoList (dataReceiver, faDeptId) {
-      this.$http.get(`/sys/dept/sublist/` + faDeptId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        if (dataReceiver === 'street') {
-          this.streetList = res.data
-        } else if (dataReceiver === 'community') {
-          this.communityList = res.data
-        } else if (dataReceiver === 'grid') {
-          this.gridList = res.data
-        }
-      }).catch(() => { })
-    },
-    changeStreet () {
-      // 清空社区与网格的变量值
-      this.dataForm.communityId = this.dataForm.gridId = null
-      this.communityList = this.gridList = []
-      // 获取街道下属社区
-      this.getDeptInfoList('community', this.dataForm.streetId)
-    },
-    changeCommunity () {
-      // 情况网格的变量值
-      this.dataForm.gridId = null
-      this.gridList = []
-      // 获取社区下属网格
-      this.getDeptInfoList('grid', this.dataForm.communityId)
+          this.$http
+            .post(`/sys/deptmacode/init`)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg)
+              }
+              loading.close()
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            })
+            .catch(() => {})
+        })
+        .catch(() => {})
     },
     clearDataForm () {
       this.dataForm.streetId = this.dataForm.communityId = this.dataForm.gridId = null