From 4d4a12db83bc6364c8bd87c2c9d732e9d11a0680 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Thu, 10 Oct 2019 15:38:53 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/api/scanswitch-add-or-update.vue  | 113 +++++++++++++++++
 src/views/modules/api/scanswitch.vue          | 116 ++++++++++++++++++
 2 files changed, 229 insertions(+)
 create mode 100644 src/views/modules/api/scanswitch-add-or-update.vue
 create mode 100644 src/views/modules/api/scanswitch.vue

diff --git a/src/views/modules/api/scanswitch-add-or-update.vue b/src/views/modules/api/scanswitch-add-or-update.vue
new file mode 100644
index 00000000..03ca7d84
--- /dev/null
+++ b/src/views/modules/api/scanswitch-add-or-update.vue
@@ -0,0 +1,113 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="!dataForm.id ? $t('add') : $t('update')"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="扫码开关 0关1开"
+                    prop="scanSwitch">
+        <el-input v-model="dataForm.scanSwitch"
+                  placeholder="扫码开关 0关1开"></el-input>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        scanSwitch: '',
+        delFlag: '',
+        creator: '',
+        createdTime: '',
+        updater: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        scanSwitch: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        creator: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updater: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updateTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/api/ma/${this.dataForm.id}`).then(({ data: res }) => {
+        console.log(1111111)
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/api/ma/', this.dataForm).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.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/api/scanswitch.vue b/src/views/modules/api/scanswitch.vue
new file mode 100644
index 00000000..55799795
--- /dev/null
+++ b/src/views/modules/api/scanswitch.vue
@@ -0,0 +1,116 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-api__scanswitch}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id"
+                    placeholder="id"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger"
+                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <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="id"
+                         label="id"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="scanSwitch"
+                         label="扫码开关 0关1开"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="delFlag"
+                         label="删除标识  0：未删除    1：删除"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdBy"
+                         label="创建者"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="创建时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="updatedBy"
+                         label="更新者"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="updatedTime"
+                         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 type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('api:scanswitch:delete')"
+                       type="text"
+                       size="small"
+                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './scanswitch-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/api/ma/page',
+        getDataListIsPage: true,
+        deleteURL: '/api/ma',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From 9c357df319b98ea4dfec0d8128a621c2ecbbe86c Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Thu, 10 Oct 2019 15:50:29 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/index.html b/public/index.html
index 52b45c98..7a0b95e6 100644
--- a/public/index.html
+++ b/public/index.html
@@ -32,7 +32,7 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
   <script>
-    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.20:9094'
+    window.SITE_CONFIG['apiURL'] = 'http://localhost:9094'
   </script>
   <% } %>
   <!-- 集成测试环境 -->
@@ -59,4 +59,4 @@
   <div id="app"></div>
 </body>
 
-</html>
+</html>
\ No newline at end of file

From 8cd95b47b1c19385b1d991c5db099350e4e45be0 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Mon, 21 Oct 2019 14:57:19 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                           | 3 ++-
 src/views/modules/api/scanswitch.vue | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d98e58c2..3796783a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@
 hs_err_pid*
 node_modules
 dist
-epdc-admin
\ No newline at end of file
+epdc-admin
+.idea/
\ No newline at end of file
diff --git a/src/views/modules/api/scanswitch.vue b/src/views/modules/api/scanswitch.vue
index 55799795..d1469515 100644
--- a/src/views/modules/api/scanswitch.vue
+++ b/src/views/modules/api/scanswitch.vue
@@ -36,11 +36,7 @@
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="scanSwitch"
-                         label="扫码开关 0关1开"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="delFlag"
-                         label="删除标识  0：未删除    1：删除"
+                         label="开关状态：0-需要扫码；1-不需要扫码"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="createdBy"

From a66394120a1d55822a09605ab239b0e5a645cd81 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Tue, 22 Oct 2019 14:01:37 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/deptmacode.vue | 46 +++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/sys/deptmacode.vue b/src/views/modules/sys/deptmacode.vue
index 896031b8..818bf549 100644
--- a/src/views/modules/sys/deptmacode.vue
+++ b/src/views/modules/sys/deptmacode.vue
@@ -38,6 +38,16 @@
             </el-option>
           </el-select>
         </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-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -46,7 +56,7 @@
                      @click="clearDataForm()">清空</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:deptmacode:delete')"
+          <el-button v-if="$hasPermission('sys:deptmacode:delete') && dataForm.leaderFlag === '0'"
                      type="danger"
                      @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
@@ -55,6 +65,11 @@
                      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-form-item>
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
@@ -98,7 +113,7 @@
                          align="center"
                          width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:deptmacode:delete') && scope.row.codeUrl"
+            <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>
@@ -136,11 +151,13 @@ export default {
       dataForm: {
         streetId: null,
         communityId: null,
-        gridId: null
+        gridId: null,
+        leaderFlag: '0'
       },
       streetList: [],
       communityList: [],
-      gridList: []
+      gridList: [],
+      maCodeCategorys: [{ id: '0', name: '群众注册码' }, { id: '1', name: '网格长注册码' }]
     }
   },
   components: {
@@ -170,6 +187,27 @@ export default {
         }).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(() => { })
+    },
     initDeptMaCodeHandle () {
       this.$confirm('初始化所有网格的小程序码', this.$t('初始化'), {
         confirmButtonText: this.$t('confirm'),

From 2224cc6ad334a2b9321d0984b4405833a1ab5675 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Tue, 22 Oct 2019 17:19:47 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/role-add-or-update.vue | 71 +++++++++------
 src/views/modules/sys/role.vue               | 93 ++++++++++++++------
 2 files changed, 109 insertions(+), 55 deletions(-)

diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index fec69086..f43c3d0b 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -1,34 +1,50 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item prop="name" :label="$t('role.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('role.name')"></el-input>
+  <el-dialog :visible.sync="visible"
+             :title="!dataForm.id ? $t('add') : $t('update')"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             label-width="120px">
+      <el-form-item prop="name"
+                    :label="$t('role.name')">
+        <el-input v-model="dataForm.name"
+                  :placeholder="$t('role.name')"></el-input>
       </el-form-item>
-      <el-form-item prop="remark" :label="$t('role.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('role.remark')"></el-input>
+      <el-form-item prop="code"
+                    label="角色编码">
+        <el-input v-model="dataForm.code"
+                  placeholder="角色编码"></el-input>
+      </el-form-item>
+      <el-form-item prop="remark"
+                    :label="$t('role.remark')">
+        <el-input v-model="dataForm.remark"
+                  :placeholder="$t('role.remark')"></el-input>
       </el-form-item>
       <el-row>
         <el-col :span="12">
-          <el-form-item size="mini" :label="$t('role.menuList')">
-            <el-tree
-              :data="menuList"
-              :props="{ label: 'name', children: 'children' }"
-              node-key="id"
-              ref="menuListTree"
-              accordion
-              show-checkbox>
+          <el-form-item size="mini"
+                        :label="$t('role.menuList')">
+            <el-tree :data="menuList"
+                     :props="{ label: 'name', children: 'children' }"
+                     node-key="id"
+                     ref="menuListTree"
+                     accordion
+                     show-checkbox>
             </el-tree>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item size="mini" :label="$t('role.deptList')">
-            <el-tree
-              :data="deptList"
-              :props="{ label: 'name', children: 'children' }"
-              node-key="id"
-              ref="deptListTree"
-              accordion
-              show-checkbox>
+          <el-form-item size="mini"
+                        :label="$t('role.deptList')">
+            <el-tree :data="deptList"
+                     :props="{ label: 'name', children: 'children' }"
+                     node-key="id"
+                     ref="deptListTree"
+                     accordion
+                     show-checkbox>
             </el-tree>
           </el-form-item>
         </el-col>
@@ -36,7 +52,8 @@
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
@@ -91,7 +108,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.menuList = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 获取部门列表
     getDeptList () {
@@ -100,7 +117,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.deptList = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 获取信息
     getInfo () {
@@ -114,7 +131,7 @@ export default {
         }
         this.dataForm.menuIdList.forEach(item => this.$refs.menuListTree.setChecked(item, true))
         this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
@@ -140,7 +157,7 @@ export default {
               this.$emit('refreshDataList')
             }
           })
-        }).catch(() => {})
+        }).catch(() => { })
       })
     }, 1000, { 'leading': true, 'trailing': false })
   }
diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue
index 6b301693..9f7c017d 100644
--- a/src/views/modules/sys/role.vue
+++ b/src/views/modules/sys/role.vue
@@ -1,49 +1,86 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-sys__role">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.name" :placeholder="$t('role.name')" clearable></el-input>
+          <el-input v-model="dataForm.name"
+                    :placeholder="$t('role.name')"
+                    clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:role:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('sys:role:save')"
+                     type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:role:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('sys:role:delete')"
+                     type="danger"
+                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="name" :label="$t('role.name')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="remark" :label="$t('role.remark')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('role.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                @sort-change="dataListSortChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="name"
+                         :label="$t('role.name')"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="code"
+                         label="角色编码"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="remark"
+                         :label="$t('role.remark')"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createDate"
+                         :label="$t('role.createDate')"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"
+                         width="180"></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:role:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:role:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('sys:role:update')"
+                       type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('sys:role:delete')"
+                       type="text"
+                       size="small"
+                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
     </div>
   </el-card>
 </template>

From 2e466aacfaa8c530dbabe524aeda572cca60060b Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Tue, 22 Oct 2019 17:24:42 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/events/item-detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/events/item-detail.vue b/src/views/modules/events/item-detail.vue
index 7d17ae5d..ea396500 100644
--- a/src/views/modules/events/item-detail.vue
+++ b/src/views/modules/events/item-detail.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '160px' : '120px'">
+    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '180px' : '140px'">
       <el-form-item label="发布人:">
         <div>{{dataForm.nickName}}</div>
       </el-form-item>

From 6ae9a584e8f18eb4212f1b7eae09397f032c884e Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Thu, 24 Oct 2019 14:17:01 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/partymembers-add-or-update.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/modules/user/partymembers-add-or-update.vue b/src/views/modules/user/partymembers-add-or-update.vue
index abbad9ea..5ca185da 100755
--- a/src/views/modules/user/partymembers-add-or-update.vue
+++ b/src/views/modules/user/partymembers-add-or-update.vue
@@ -24,6 +24,7 @@
                   placeholder="身份证号"></el-input>
       </el-form-item>
       <el-form-item label="街道党工委"
+                    label-width='auto'
                     prop="streetId">
         <el-select v-model="dataForm.streetId"
                    placeholder="请选择"
@@ -48,6 +49,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="网格党支部"
+                    label-width='auto'
                     prop="gridId">
         <el-select v-model="dataForm.gridId"
                    placeholder="请选择"

From 59b3f6459fb81eb8f94e5dd8e5333740043c6b87 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Thu, 24 Oct 2019 14:45:58 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B=E5=A4=A7?=
 =?UTF-8?q?=E5=9B=BE=E5=8A=9F=E8=83=BD=E5=92=8C=E4=B8=8B=E8=BD=BD=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/deptmacode.vue | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/sys/deptmacode.vue b/src/views/modules/sys/deptmacode.vue
index 818bf549..c394c994 100644
--- a/src/views/modules/sys/deptmacode.vue
+++ b/src/views/modules/sys/deptmacode.vue
@@ -92,16 +92,35 @@
                          label="网格"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="codeUrl"
+        <!-- <el-table-column prop="codeUrl"
                          label="小程序码"
                          header-align="center"
                          align="center">
           <template slot-scope="scope">
             <img v-if="scope.row.codeUrl"
                  :src="scope.row.codeUrl"
+                 :preview-src-list="[scope.row.codeUrl]"
                  min-width="70"
                  height="70" />
           </template>
+        </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-image :src="scope.row.codeUrl"></el-image>
+            </el-popover>
+          </template>
         </el-table-column>
         <el-table-column prop="createdTime"
                          label="创建时间"
@@ -117,6 +136,10 @@
                        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"
@@ -267,6 +290,9 @@ export default {
     clearDataForm () {
       this.dataForm.streetId = this.dataForm.communityId = this.dataForm.gridId = null
       this.communityList = this.gridList = []
+    },
+    downloadHandle (codeUrl) {
+      window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${codeUrl}`
     }
   }
 }

From f886c8b28173f92921c6b53bc2f5a9f7e3171cf9 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Thu, 24 Oct 2019 14:55:16 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=95=BF=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/role-add-or-update.vue | 30 ++++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index f43c3d0b..8f46b883 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -13,10 +13,15 @@
         <el-input v-model="dataForm.name"
                   :placeholder="$t('role.name')"></el-input>
       </el-form-item>
-      <el-form-item prop="code"
-                    label="角色编码">
-        <el-input v-model="dataForm.code"
-                  placeholder="角色编码"></el-input>
+      <el-form-item label="角色编码">
+        <el-select v-model="dataForm.code"
+                   placeholder="角色编码">
+          <el-option v-for="item in roleCodeList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item prop="remark"
                     :label="$t('role.remark')">
@@ -66,12 +71,14 @@ export default {
       visible: false,
       menuList: [],
       deptList: [],
+      roleCodeList: [],
       dataForm: {
         id: '',
         name: '',
         menuIdList: [],
         deptIdList: [],
-        remark: ''
+        remark: '',
+        code: ''
       }
     }
   },
@@ -84,6 +91,9 @@ export default {
       }
     }
   },
+  created () {
+    this.getRoleCodeList()
+  },
   methods: {
     init () {
       this.visible = true
@@ -159,7 +169,15 @@ export default {
           })
         }).catch(() => { })
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    getRoleCodeList () {
+      this.$http.get(`/sys/dict/listSimple/sysRoleCode`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.roleCodeList = res.data
+      }).catch(() => { })
+    }
   }
 }
 </script>