From 1165844d0c2c125f59084ebdad2f2f1e04ba6f38 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 21 Sep 2020 17:05:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20-=20=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/deptmacode-optimize.vue | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/views/modules/sys/deptmacode-optimize.vue b/src/views/modules/sys/deptmacode-optimize.vue
index ed4996b..fcd3022 100644
--- a/src/views/modules/sys/deptmacode-optimize.vue
+++ b/src/views/modules/sys/deptmacode-optimize.vue
@@ -38,6 +38,12 @@
                      type="primary"
                      @click="createGridLeaderMaCodeHandle()">生成网格长注册码</el-button>
         </el-form-item>
+
+        <el-form-item>
+          <el-button v-if="$hasPermission('sys:deptmacode:leader')"
+                     type="primary"
+                     @click="createGridBranchparty()">生成网格党支部注册码</el-button>
+        </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
@@ -307,6 +313,37 @@ export default {
     },
     errorExceed (file, fileList) {
       this.$message.error('上传失败请重试')
+    },
+    //网格党支部小程序码生成
+    createGridBranchparty () {
+      this.$confirm(
+              this.$t('prompt.info', { handle: '生成网格党支部注册小程序码' }),
+              this.$t('生成'),
+              {
+                confirmButtonText: this.$t('confirm'),
+                cancelButtonText: this.$t('cancel'),
+                type: 'warning'
+              }
+      )
+              .then(() => {
+                this.$http
+                        .post(`/sys/optimize/deptmacode/gridBranchparty`)
+                        .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(() => { })
     }
   }
 }

From 77b7b563b7b3efc46c49e2394c66bcedb6d5088f Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 21 Sep 2020 20:06:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20-=20=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/deptmacode-optimize.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/sys/deptmacode-optimize.vue b/src/views/modules/sys/deptmacode-optimize.vue
index fcd3022..4162af4 100644
--- a/src/views/modules/sys/deptmacode-optimize.vue
+++ b/src/views/modules/sys/deptmacode-optimize.vue
@@ -146,7 +146,8 @@ export default {
       gridList: [],
       maCodeCategorys: [
         { id: '0', name: '群众注册码' },
-        { id: '1', name: '网格长注册码' }
+        { id: '1', name: '网格长注册码' },
+        { id: '2', name: '网格党支部注册码' }
       ]
     }
   },
@@ -327,7 +328,7 @@ export default {
       )
               .then(() => {
                 this.$http
-                        .post(`/sys/optimize/deptmacode/gridBranchparty`)
+                        .post(`/sys/deptmacode/createGridBranchParty`)
                         .then(({ data: res }) => {
                           if (res.code !== 0) {
                             return this.$message.error(res.msg)