From 6471405cfb89a134830ab7b8f3a5d8e2488a87bd Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 19 Jul 2021 16:10:19 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E8=81=94=E6=88=B7=E7=BB=93?=
 =?UTF-8?q?=E4=BA=B2=E3=80=91-=E3=80=90=E5=85=B3=E8=81=94=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=E5=B9=B2=E9=83=A8=E3=80=91-=EF=BC=88=E7=8E=8B?=
 =?UTF-8?q?=E7=AB=A5=EF=BC=89-2021/7/19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/group-user.vue | 196 ++++++++++++++++++++
 src/views/modules/workRecord/helpgroup.vue  |  18 +-
 2 files changed, 212 insertions(+), 2 deletions(-)
 create mode 100644 src/views/modules/workRecord/group-user.vue

diff --git a/src/views/modules/workRecord/group-user.vue b/src/views/modules/workRecord/group-user.vue
new file mode 100644
index 00000000..63c3f1fd
--- /dev/null
+++ b/src/views/modules/workRecord/group-user.vue
@@ -0,0 +1,196 @@
+<template>
+  <el-dialog :visible.sync="visible"
+              title="选择干部"
+              :close-on-click-modal="false"
+              :close-on-press-escape="false"
+              width="80%"
+              height="90%">
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="用户名">
+          <el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable maxlength="10" @keyup.native="btKeyUpUserName"></el-input>
+        </el-form-item>
+        <el-form-item label="真实姓名">
+          <el-input v-model="dataForm.realname" placeholder='真实姓名' clearable maxlength="10" @keyup.native="btKeyUpRealname"></el-input>
+        </el-form-item>
+        <el-form-item label="邮箱">
+          <el-input v-model="dataForm.email" placeholder="邮箱" clearable maxlength="20" @keyup.native="btKeyUpEmail"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="dataForm.mobile" placeholder="手机号" clearable maxlength="11" @keyup.native="btKeyUpMobile"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()" type="success">{{ $t('query') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" max-height="450" style="width: 100%;" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column
+          type="index"
+          header-align="center"
+          align="center"
+          width="50"
+          label='序号'
+        ></el-table-column>
+        <el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center" width="100"></el-table-column>
+        <el-table-column prop="realName" :label="$t('user.realName')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center" min-width="120"></el-table-column>
+        <el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center" width="200"></el-table-column>
+        <el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center" align="center" width="180">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('user.status0') }}</el-tag>
+            <el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></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>
+      <el-form>
+        <el-button type="primary" @click="submitGroupUser()" style="margin-left:48%" class="end">{{"确定"}}</el-button>
+      </el-form>
+    </div>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+  import mixinViewModule from '@/mixins/view-module'
+
+  export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/sys/user/getGroupUser',
+        getDataListIsPage: true,
+        deleteURL: '/sys/user',
+        deleteIsBatch: true,
+        exportURL: '/sys/user/export'
+      },
+      visible: false,
+      dataForm: {
+        groupId:'',
+        username: '',
+        realname: '',
+        mobile: '',
+        email: '',
+        userIds:''
+      },
+      pageIndex: 1,
+      limitVal: 10,
+      userIdListl:[],
+      responseData: []
+    }
+  },
+  methods: {
+    btKeyUpUserName (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.username = e.target.value
+    },
+    btKeyUpRealname (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.realname = e.target.value
+    },
+    btKeyUpEmail (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\-+=<>?:"{}|~！#￥%……&*（）——={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.email = e.target.value
+    },
+    btKeyUpMobile (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_=<>?:"{}|·~！@#￥%……&*（）——={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.mobile = e.target.value
+    },
+    getDataListOverWrite () {
+      this.page = 1
+      this.getDataList()
+    },
+    // 获取数据列表
+    // getGroupUserList () {
+    //   this.$http
+    //       .get(`/sys/user/getGroupUser`,{
+    //         params: { username: this.dataForm.username, realname: this.dataForm.realname,
+    //           mobile: this.dataForm.mobile, email: this.dataForm.email, userIds: this.dataForm.userIds,
+    //           page: this.pageIndex, limit: this.limitVal}
+    //       })
+    //       .then(({ data: res }) => {
+    //         if (res.code !== 0) {
+    //           return this.$message.error(res.msg)
+    //         }
+    //         this.dataList = res.data
+    //       })
+    //       .catch(() => {})
+    // },
+    // 获取数据列表
+    init () {
+      this.dataForm.userIds = this.userIdListl.join(",")
+      this.visible = true
+      this.$nextTick(() => {
+        this.getDataList()
+      })
+    },
+    handleSelectionChange (val) {
+      this.responseData = val
+    },
+    // 返回主列表
+    backToGroupList () {
+      this.$emit('refreshDataList')
+      // this.$parent.selectComponent = 'Helpgroup'
+      // this.$router.push({ path: '/helpgrouproute' })
+    },
+    submitGroupUser(){
+      if (this.responseData.length === 0) {
+        this.$message({
+          message: '请选择书记！',
+          type: 'warning'
+        })
+        return false
+      }
+      this.$http.post(`/workRecord/groupcadrerelation/submitGroupUser`,
+              {groupId:this.dataForm.groupId,userList:this.responseData}).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.backToGroupList()
+          }
+        })
+        this.visible = false
+      }).catch(() => {})
+    },
+    getInfo () {
+      if (this.responseData.length === 0) {
+        this.$message({
+          message: '请选择干部！',
+          type: 'warning'
+        })
+        return false
+      }
+      this.$emit('connectResponse', this.responseData)
+      this.visible = false
+    }
+  }
+}
+</script>
+<style scoped lang='scss'>
+.el-form{
+  .end{
+    margin-top: 10px;
+  }
+}
+.el-button--success{
+  margin-top: 0px!important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/workRecord/helpgroup.vue b/src/views/modules/workRecord/helpgroup.vue
index 4ed88ba2..7a2c85b6 100644
--- a/src/views/modules/workRecord/helpgroup.vue
+++ b/src/views/modules/workRecord/helpgroup.vue
@@ -35,6 +35,7 @@
 <!--            <el-button v-if="$hasPermission('workrecord:helpgroup:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
 <!--            <el-button v-if="$hasPermission('workrecord:helpgroup:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
             <el-button type="text" size="small" @click="addFamily(scope.row.id)">{{ $t('添加家庭') }}</el-button>
+            <el-button type="text" size="small" @click="addGroupUser(scope.row.id,scope.row.userIdList)">{{ $t('关联干部') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -50,6 +51,7 @@
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
       <groupfamily-add v-if="familyAddVisible" ref="groupfamilyAdd" @refreshDataList="getDataList"></groupfamily-add>
+      <group-user v-if="groupUserVisible" ref="groupUser" @refreshDataList="getDataList"></group-user>
     </div>
   </el-card>
 </template>
@@ -58,6 +60,7 @@
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './helpgroup-add-or-update'
 import GroupfamilyAdd from './groupfamily-add'
+import GroupUser from './group-user'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -71,12 +74,14 @@ export default {
       dataForm: {
         id: ''
       },
-      familyAddVisible:false
+      familyAddVisible:false,
+      groupUserVisible:false
     }
   },
   components: {
     AddOrUpdate,
-    GroupfamilyAdd
+    GroupfamilyAdd,
+    GroupUser
   },
   created: function () {
     this.getDataList()
@@ -89,6 +94,15 @@ export default {
         this.$refs.groupfamilyAdd.init()
       })
     },
+      addGroupUser(infoId,userIdList) {
+          this.groupUserVisible = true
+          this.$nextTick(() => {
+              this.$refs.groupUser.dataForm.groupId = infoId
+              console.log(userIdList)
+              this.$refs.groupUser.userIdListl = userIdList
+              this.$refs.groupUser.init()
+          })
+      },
   }
 }
 </script>

From cbaa57c796dc43fa6205e465dfc2598332814906 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 19 Jul 2021 16:33:55 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E8=81=94=E6=88=B7=E7=BB=93?=
 =?UTF-8?q?=E4=BA=B2=E3=80=91-=E3=80=90=E5=85=B3=E8=81=94=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=E6=96=B0=E5=A2=9E=E3=80=91-=EF=BC=88=E7=8E=8B?=
 =?UTF-8?q?=E7=AB=A5=EF=BC=89-2021/7/19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workRecord/helpgroup-add-or-update.vue    | 45 ++++++++++---------
 src/views/modules/workRecord/helpgroup.vue    |  2 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/workRecord/helpgroup-add-or-update.vue b/src/views/modules/workRecord/helpgroup-add-or-update.vue
index 85b43afb..280ce76a 100644
--- a/src/views/modules/workRecord/helpgroup-add-or-update.vue
+++ b/src/views/modules/workRecord/helpgroup-add-or-update.vue
@@ -1,27 +1,28 @@
 <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="帮扶小组名称" prop="groupName">
-          <el-input v-model="dataForm.groupName" placeholder="帮扶小组名称"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+          <el-form-item label="帮扶小组名称" prop="groupName" label-width="120px">
+          <el-input v-model="dataForm.groupName" placeholder="帮扶小组名称" maxlength="50"
+                    show-word-limit clearable></el-input>
       </el-form-item>
+<!--          <el-form-item label="乐观锁" prop="revision">-->
+<!--          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">-->
+<!--          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="创建人" prop="createdBy">-->
+<!--          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="创建时间" prop="createdTime">-->
+<!--          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="更新人" prop="updatedBy">-->
+<!--          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="更新时间" prop="updatedTime">-->
+<!--          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>-->
+<!--      </el-form-item>-->
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -87,7 +88,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/workrecord/helpgroup/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/workRecord/helpgroup/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -103,7 +104,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/workrecord/helpgroup/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/helpgroup/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/workRecord/helpgroup.vue b/src/views/modules/workRecord/helpgroup.vue
index 7a2c85b6..94c78fb3 100644
--- a/src/views/modules/workRecord/helpgroup.vue
+++ b/src/views/modules/workRecord/helpgroup.vue
@@ -9,7 +9,7 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('workrecord:helpgroup:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('workrecord:helpgroup:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>

From a62db77c99430b3cd7cc4a864ac7f429f596d082 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 21 Jul 2021 10:57:39 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E8=81=94=E6=88=B7=E7=BB=93?=
 =?UTF-8?q?=E4=BA=B2=E3=80=91-=E3=80=90=E5=88=A0=E9=99=A4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2021/7/?=
 =?UTF-8?q?21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/helpgroup.vue    |   5 +
 .../modules/workRecord/helpgroupDetail.vue    | 199 ++++++++++++++++++
 .../modules/workRecord/helpgrouproute.vue     |   4 +-
 3 files changed, 207 insertions(+), 1 deletion(-)
 create mode 100644 src/views/modules/workRecord/helpgroupDetail.vue

diff --git a/src/views/modules/workRecord/helpgroup.vue b/src/views/modules/workRecord/helpgroup.vue
index 94c78fb3..ce4b9c3a 100644
--- a/src/views/modules/workRecord/helpgroup.vue
+++ b/src/views/modules/workRecord/helpgroup.vue
@@ -36,6 +36,7 @@
 <!--            <el-button v-if="$hasPermission('workrecord:helpgroup:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
             <el-button type="text" size="small" @click="addFamily(scope.row.id)">{{ $t('添加家庭') }}</el-button>
             <el-button type="text" size="small" @click="addGroupUser(scope.row.id,scope.row.userIdList)">{{ $t('关联干部') }}</el-button>
+            <el-button  type="text" size="small" @click="selectDetails(scope.row.id)">{{ '查看详情' }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -87,6 +88,10 @@ export default {
     this.getDataList()
   },
   methods: {
+      selectDetails (id) {
+          this.$parent.selectComponent = 'HelpgroupDetail'
+          this.$router.push({ path: '/workRecord-helpgrouproute', query: { id: id} })
+      },
     addFamily(infoId) {
       this.familyAddVisible = true
       this.$nextTick(() => {
diff --git a/src/views/modules/workRecord/helpgroupDetail.vue b/src/views/modules/workRecord/helpgroupDetail.vue
new file mode 100644
index 00000000..50f2a6aa
--- /dev/null
+++ b/src/views/modules/workRecord/helpgroupDetail.vue
@@ -0,0 +1,199 @@
+<template>
+    <el-card shadow="never" class="aui-card--fill">
+        <div class="mod-__masteruserrelation}">
+            <el-form :model="dataForm"  ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'" disabled>
+                <el-form-item label="小组名称：" prop="groupName" label-width="95px">
+                    <div>{{dataForm.groupName}}</div>
+                </el-form-item>
+            </el-form>
+
+            <el-form>
+                <el-form-item label=" 小组家庭信息：" label-width="120px"></el-form-item>
+                <el-table v-loading="familyListLoading" :data="dataForm.familyList" border style="width: 80%;" height="290" label-width="120px">
+                    <el-table-column label="序号" header-align="center" align="center" width="50px">
+                        <template slot-scope="scope">
+                            {{scope.$index+1}}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="name" label="姓名" header-align="center" align="center" show-overflow-tooltip width="180"></el-table-column>
+                    <el-table-column prop="telPhone" label="手机号" header-align="center" align="center" width="180"
+                                     show-overflow-tooltip></el-table-column>
+                    <el-table-column prop="pairingReasonsName" label="结对原因" header-align="center" align="center" show-overflow-tooltip width="180"></el-table-column>
+                    <el-table-column :label="$t('handle')" header-align="center" align="center" width="180">
+                        <template slot-scope="scope">
+                            <el-button type="text" size="small" @click="deleteGroupFamily(scope.row.familyGroupId)">{{ $t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-form>
+
+            <el-form>
+                <el-form-item label=" 关联干部信息：" label-width="120px"></el-form-item>
+                <el-table v-loading="userListLoading" :data="dataForm.userList" border style="width: 80%;" height="290" label-width="120px">
+                    <el-table-column label="序号" header-align="center" align="center" width="50px">
+                        <template slot-scope="scope">
+                            {{scope.$index+1}}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center" show-overflow-tooltip width="100"></el-table-column>
+                    <el-table-column prop="realName" :label="$t('user.realName')" show-overflow-tooltip header-align="center" align="center"></el-table-column>
+                    <el-table-column prop="deptName" :label="$t('user.deptName')" show-overflow-tooltip header-align="center" align="center" min-width="120"></el-table-column>
+                    <el-table-column prop="email" :label="$t('user.email')" show-overflow-tooltip header-align="center" align="center" width="180"></el-table-column>
+                    <el-table-column prop="mobile" :label="$t('user.mobile')" show-overflow-tooltip sortable="custom" header-align="center" align="center" width="120"></el-table-column>
+                    <el-table-column prop="createDate" :label="$t('user.createDate')" show-overflow-tooltip sortable="custom" header-align="center" align="center" width="160"></el-table-column>
+                    <el-table-column :label="$t('handle')" header-align="center" align="center" width="150">
+                        <template slot-scope="scope">
+                            <el-button type="text" size="small" @click="deleteGroupUser(scope.row.id)">{{ $t('delete') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-form>
+
+            <el-form>
+                <el-form-item style="margin-left:35px;margin-top: 30px">
+                    <el-button type="primary" @click="backToUserRelationList">{{"返回"}}</el-button>
+                </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>
+
+        </div>
+    </el-card>
+</template>
+
+<script>
+    import debounce from 'lodash/debounce'
+    import Cookies from 'js-cookie'
+    export default {
+        data () {
+            return {
+                visible: false,
+                dataForm: {
+                    groupName:'',
+                    id: '',
+                    familyList:[]
+                },
+                familyListLoading: false,
+                userListLoading: false
+            }
+        },
+        computed: {
+
+        },
+        components: {
+        },
+        created: function () {
+        },
+        mounted () {
+            if (this.$route.query.id !== '' && this.$route.query.id != null) {
+                this.dataForm.id = this.$route.query.id
+                this.getInfo()
+            }
+        },
+        methods: {
+            // 删除关联干部
+            deleteGroupFamily (id) {
+                this.$confirm(this.$t('prompt.info', { 'handle': this.$t('delete') }), this.$t('prompt.title'), {
+                    confirmButtonText: this.$t('confirm'),
+                    cancelButtonText: this.$t('cancel'),
+                    type: 'warning'
+                }).then(() => {
+                    this.$http.put(
+                        `/workRecord/familygrouprelation/deleteRelation/`+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.$refs['dataForm'].resetFields()
+                                if (this.dataForm.id) {
+                                    this.getInfo()
+                                }
+                            }
+                        })
+                    }).catch(() => { })
+                }).catch(() => { })
+            },
+            // 删除关联干部
+            deleteGroupUser (id) {
+                this.$confirm(this.$t('prompt.info', { 'handle': this.$t('delete') }), this.$t('prompt.title'), {
+                    confirmButtonText: this.$t('confirm'),
+                    cancelButtonText: this.$t('cancel'),
+                    type: 'warning'
+                }).then(() => {
+                    this.$http.put(
+                        `/workRecord/groupcadrerelation/deleteRelation`,
+                        {groupId:this.dataForm.id,cadreUserId: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.$refs['dataForm'].resetFields()
+                                if (this.dataForm.id) {
+                                    this.getInfo()
+                                }
+                            }
+                        })
+                    }).catch(() => { })
+                }).catch(() => { })
+            },
+
+            init () {
+                this.dataForm.id = this.$route.query.id
+                this.visible = true
+                this.$nextTick(() => {
+                    this.$refs['dataForm'].resetFields()
+                    if (this.dataForm.id) {
+                        this.getInfo()
+                    }
+                })
+            },
+            // 返回按钮点击事件
+            backToUserRelationList () {
+                this.$emit('refreshDataList')
+                this.$parent.selectComponent = 'Helpgroup'
+                this.$router.push({ path: '/workRecord-helpgrouproute' })
+            },
+            // 获取信息
+            getInfo () {
+                this.$http.get(`/workRecord/helpgroup/getGroupDetail/${this.dataForm.id}`).then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    }
+                    console.log(this.dataForm);
+                    this.dataForm = {
+                        ...this.dataForm,
+                        ...res.data
+                    }
+                    console.log(this.dataForm);
+                }).catch(() => {})
+            },
+            openHandle () {
+                this.handleVisible = true
+                this.$nextTick(() => {
+                    this.$refs.checkrecordsHandle.dataForm.id = this.dataForm.id
+                    this.$refs.checkrecordsHandle.init()
+                })
+            },
+            connectResponse () {
+                this.backToUserRelationList ()
+            }
+        }
+    }
+</script>
+<style>
+    .hide .el-upload--picture-card {
+        display: none;
+    }
+</style>
diff --git a/src/views/modules/workRecord/helpgrouproute.vue b/src/views/modules/workRecord/helpgrouproute.vue
index 3ae1b153..811af4c9 100644
--- a/src/views/modules/workRecord/helpgrouproute.vue
+++ b/src/views/modules/workRecord/helpgrouproute.vue
@@ -6,6 +6,7 @@
 <script>
     import Helpgroup from './helpgroup'
     import GroupfamilyAdd from './groupfamily-add'
+    import HelpgroupDetail from './helpgroupDetail'
     export default {
         data () {
             return {
@@ -14,7 +15,8 @@
         },
         components: {
             Helpgroup,
-            GroupfamilyAdd
+            GroupfamilyAdd,
+            HelpgroupDetail
         },
         methods: {
             init () {

From 2889bcfb7b564522790c7cb0ae0ffeff6ae4fdea Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 21 Jul 2021 14:31:42 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E8=81=94=E6=88=B7=E7=BB=93?=
 =?UTF-8?q?=E4=BA=B2=E3=80=91-=E3=80=90=E5=88=A0=E9=99=A4=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?=
 =?UTF-8?q?=EF=BC=89-2021/7/21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/helpgroup.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/workRecord/helpgroup.vue b/src/views/modules/workRecord/helpgroup.vue
index ce4b9c3a..90513e04 100644
--- a/src/views/modules/workRecord/helpgroup.vue
+++ b/src/views/modules/workRecord/helpgroup.vue
@@ -30,13 +30,13 @@
         <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">
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="180">
           <template slot-scope="scope">
-<!--            <el-button v-if="$hasPermission('workrecord:helpgroup:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
-<!--            <el-button v-if="$hasPermission('workrecord:helpgroup:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
-            <el-button type="text" size="small" @click="addFamily(scope.row.id)">{{ $t('添加家庭') }}</el-button>
-            <el-button type="text" size="small" @click="addGroupUser(scope.row.id,scope.row.userIdList)">{{ $t('关联干部') }}</el-button>
-            <el-button  type="text" size="small" @click="selectDetails(scope.row.id)">{{ '查看详情' }}</el-button>
+              <el-button type="text" size="small" @click="addFamily(scope.row.id)">{{ $t('添加家庭') }}</el-button>
+              <el-button type="text" size="small" @click="addGroupUser(scope.row.id,scope.row.userIdList)">{{ $t('关联干部') }}</el-button>
+              <el-button type="text" size="small" @click="selectDetails(scope.row.id)">{{ '查看详情' }}</el-button>
+              <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+              <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>

From 59150bd2b18a60b518964a7d87ed649df7512767 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 21 Jul 2021 17:17:23 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E8=81=94=E6=88=B7=E7=BB=93?=
 =?UTF-8?q?=E4=BA=B2=E3=80=91-=E3=80=90=E6=B7=BB=E5=8A=A0=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=BF=A1=E6=81=AF=E3=80=91-=EF=BC=88=E7=8E=8B?=
 =?UTF-8?q?=E7=AB=A5=EF=BC=89-2021/7/21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/group-user.vue   |  8 ++-
 .../modules/workRecord/groupfamily-add.vue    | 55 ++++++++++++++++++-
 .../modules/workRecord/helpgroupDetail.vue    |  9 +--
 3 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/workRecord/group-user.vue b/src/views/modules/workRecord/group-user.vue
index 63c3f1fd..53745ac7 100644
--- a/src/views/modules/workRecord/group-user.vue
+++ b/src/views/modules/workRecord/group-user.vue
@@ -56,7 +56,7 @@
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <el-form>
-        <el-button type="primary" @click="submitGroupUser()" style="margin-left:48%" class="end">{{"确定"}}</el-button>
+        <el-button type="primary" :disabled="isAble" @click="submitGroupUser()" style="margin-left:48%" class="end">{{"确定"}}</el-button>
       </el-form>
     </div>
     </el-card>
@@ -86,6 +86,7 @@
         email: '',
         userIds:''
       },
+      isAble: false,
       pageIndex: 1,
       limitVal: 10,
       userIdListl:[],
@@ -133,6 +134,7 @@
     init () {
       this.dataForm.userIds = this.userIdListl.join(",")
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.getDataList()
       })
@@ -149,14 +151,16 @@
     submitGroupUser(){
       if (this.responseData.length === 0) {
         this.$message({
-          message: '请选择书记！',
+          message: '请选择干部！',
           type: 'warning'
         })
         return false
       }
+      this.isAble = true
       this.$http.post(`/workRecord/groupcadrerelation/submitGroupUser`,
               {groupId:this.dataForm.groupId,userList:this.responseData}).then(({ data: res }) => {
         if (res.code !== 0) {
+          this.isAble = false
           return this.$message.error(res.msg)
         }
         this.$message({
diff --git a/src/views/modules/workRecord/groupfamily-add.vue b/src/views/modules/workRecord/groupfamily-add.vue
index a63e910f..3b531648 100644
--- a/src/views/modules/workRecord/groupfamily-add.vue
+++ b/src/views/modules/workRecord/groupfamily-add.vue
@@ -37,6 +37,15 @@
                 </el-option>
             </el-select>
         </el-form-item>
+        <el-form-item label="所属机构" >
+            <el-cascader
+                    v-model="ids"
+                    :options="options"
+                    clearable
+                    style="width:250px;"
+            >
+            </el-cascader>
+        </el-form-item>
 <!--          <el-form-item label="收入情况" prop="income">-->
 <!--          <el-input v-model="dataForm.income" placeholder="收入情况"></el-input>-->
 <!--      </el-form-item>-->
@@ -97,8 +106,13 @@ export default {
         createdBy: '',
         createdTime: '',
         updatedBy: '',
-        updatedTime: ''
+        updatedTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: ''
       },
+        ids:[],
+        options: [],
         pairingReason:[],
         sexList: [
             {dictValue: '1', dictName: '男'},
@@ -165,8 +179,47 @@ export default {
   },
     created: function () {
         this.getPairingReasonInfo()
+        this.getOptions()
+    },
+    watch: {
+        ids: function (val) {
+            console.log("部门树："+val);
+            if (val.length === 0) {
+                this.dataForm.streetId = ''
+                this.dataForm.communityId = ''
+                this.dataForm.gridId = ''
+            }
+            if (val.length === 1) {
+                this.dataForm.streetId = this.ids[0]
+                this.dataForm.communityId = ''
+                this.dataForm.gridId = ''
+            }
+            if (val.length === 2) {
+                this.dataForm.streetId = this.ids[0]
+                this.dataForm.communityId = this.ids[1]
+                this.dataForm.gridId = ''
+            }
+            if (val.length === 3) {
+                this.dataForm.streetId = this.ids[0]
+                this.dataForm.communityId = this.ids[1]
+                this.dataForm.gridId = this.ids[2]
+            }
+        }
     },
   methods: {
+      //获取部门信息
+      getOptions() {
+          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(() => {
+              })
+      },
       getPairingReasonInfo () {
           this.$http.get(`sys/dict/listSimple/pairing_reason`).then(({ data: res }) => {
               this.pairingReason = res.data
diff --git a/src/views/modules/workRecord/helpgroupDetail.vue b/src/views/modules/workRecord/helpgroupDetail.vue
index 50f2a6aa..c656eae9 100644
--- a/src/views/modules/workRecord/helpgroupDetail.vue
+++ b/src/views/modules/workRecord/helpgroupDetail.vue
@@ -15,11 +15,12 @@
                             {{scope.$index+1}}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="name" label="姓名" header-align="center" align="center" show-overflow-tooltip width="180"></el-table-column>
-                    <el-table-column prop="telPhone" label="手机号" header-align="center" align="center" width="180"
+                    <el-table-column prop="name" label="姓名" header-align="center" align="center" show-overflow-tooltip width="130"></el-table-column>
+                    <el-table-column prop="telPhone" label="手机号" header-align="center" align="center" width="160"
                                      show-overflow-tooltip></el-table-column>
-                    <el-table-column prop="pairingReasonsName" label="结对原因" header-align="center" align="center" show-overflow-tooltip width="180"></el-table-column>
-                    <el-table-column :label="$t('handle')" header-align="center" align="center" width="180">
+                    <el-table-column prop="pairingReasonsName" label="结对原因" header-align="center" align="center" show-overflow-tooltip width="160"></el-table-column>
+                    <el-table-column prop="allDeptNames" label="所属部门" header-align="center" align="center" show-overflow-tooltip width="305"></el-table-column>
+                    <el-table-column :label="$t('handle')" header-align="center" align="center" width="150">
                         <template slot-scope="scope">
                             <el-button type="text" size="small" @click="deleteGroupFamily(scope.row.familyGroupId)">{{ $t('delete') }}</el-button>
                         </template>