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

---
 src/views/modules/workRecord/group-user.vue   |  2 +
 .../modules/workRecord/groupfamily-add.vue    | 44 ++++++++++++++++---
 .../modules/workRecord/helpgroupDetail.vue    | 20 +++++++--
 3 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/workRecord/group-user.vue b/src/views/modules/workRecord/group-user.vue
index 53745ac7..f85cace8 100644
--- a/src/views/modules/workRecord/group-user.vue
+++ b/src/views/modules/workRecord/group-user.vue
@@ -161,6 +161,7 @@
               {groupId:this.dataForm.groupId,userList:this.responseData}).then(({ data: res }) => {
         if (res.code !== 0) {
           this.isAble = false
+          this.$refs['dataForm'].resetFields()
           return this.$message.error(res.msg)
         }
         this.$message({
@@ -168,6 +169,7 @@
           type: 'success',
           duration: 500,
           onClose: () => {
+            this.$refs['dataForm'].resetFields()
             this.backToGroupList()
           }
         })
diff --git a/src/views/modules/workRecord/groupfamily-add.vue b/src/views/modules/workRecord/groupfamily-add.vue
index 3b531648..8776b807 100644
--- a/src/views/modules/workRecord/groupfamily-add.vue
+++ b/src/views/modules/workRecord/groupfamily-add.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="visible" :title=" $t('add') " :close-on-click-modal="false" :close-on-press-escape="false">
+  <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="name">
           <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
@@ -37,11 +37,12 @@
                 </el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="所属机构" >
+        <el-form-item label="所属网格" prop="ids">
             <el-cascader
-                    v-model="ids"
+                    v-model="dataForm.ids"
                     :options="options"
                     clearable
+                    @change="changeHandle"
                     style="width:250px;"
             >
             </el-cascader>
@@ -109,9 +110,11 @@ export default {
         updatedTime: '',
         streetId: '',
         communityId: '',
-        gridId: ''
+        gridId: '',
+        ids:[]
       },
         ids:[],
+        adminIds:[],
         options: [],
         pairingReason:[],
         sexList: [
@@ -123,6 +126,9 @@ export default {
   computed: {
     dataRule () {
       return {
+          ids: [
+              { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          ],
         name: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -207,6 +213,28 @@ export default {
         }
     },
   methods: {
+      changeHandle(value){
+          if (value.length === 0) {
+              this.dataForm.streetId = ''
+              this.dataForm.communityId = ''
+              this.dataForm.gridId = ''
+          }
+          if (value.length === 1) {
+              this.dataForm.streetId = this.dataForm.ids[0]
+              this.dataForm.communityId = ''
+              this.dataForm.gridId = ''
+          }
+          if (value.length === 2) {
+              this.dataForm.streetId = this.dataForm.ids[0]
+              this.dataForm.communityId = this.dataForm.ids[1]
+              this.dataForm.gridId = ''
+          }
+          if (value.length === 3) {
+              this.dataForm.streetId = this.dataForm.ids[0]
+              this.dataForm.communityId = this.dataForm.ids[1]
+              this.dataForm.gridId = this.dataForm.ids[2]
+          }
+      },
       //获取部门信息
       getOptions() {
           this.$http
@@ -255,6 +283,10 @@ export default {
         }
         this.$http['post']('/workRecord/familyinfoacquisition/addFamilyInfo', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
+              this.dataForm.streetId = ''
+              this.dataForm.communityId = ''
+              this.dataForm.gridId = ''
+              this.dataForm.deptInfo=''
             return this.$message.error(res.msg)
           }
           this.$message({
@@ -262,8 +294,8 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
+                this.visible = false
+                this.$emit('refreshDataList')
             }
           })
         }).catch(() => {})
diff --git a/src/views/modules/workRecord/helpgroupDetail.vue b/src/views/modules/workRecord/helpgroupDetail.vue
index c656eae9..0c80a8ea 100644
--- a/src/views/modules/workRecord/helpgroupDetail.vue
+++ b/src/views/modules/workRecord/helpgroupDetail.vue
@@ -19,9 +19,10 @@
                     <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="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 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="updateFamily(scope.row.id)">{{ $t('修改') }}</el-button>
                             <el-button type="text" size="small" @click="deleteGroupFamily(scope.row.familyGroupId)">{{ $t('delete') }}</el-button>
                         </template>
                     </el-table-column>
@@ -60,13 +61,13 @@
                 <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
             </template>
 
+            <groupfamily-add v-if="familyAddVisible" ref="groupfamilyAdd" @refreshDataList="init"></groupfamily-add>
         </div>
     </el-card>
 </template>
 
 <script>
-    import debounce from 'lodash/debounce'
-    import Cookies from 'js-cookie'
+    import GroupfamilyAdd from './groupfamily-add'
     export default {
         data () {
             return {
@@ -77,15 +78,18 @@
                     familyList:[]
                 },
                 familyListLoading: false,
-                userListLoading: false
+                userListLoading: false,
+                familyAddVisible:false
             }
         },
         computed: {
 
         },
         components: {
+            GroupfamilyAdd
         },
         created: function () {
+            this.init()
         },
         mounted () {
             if (this.$route.query.id !== '' && this.$route.query.id != null) {
@@ -94,6 +98,14 @@
             }
         },
         methods: {
+            //更新家庭信息
+            updateFamily(id) {
+                this.familyAddVisible = true
+                this.$nextTick(() => {
+                    this.$refs.groupfamilyAdd.dataForm.id = id
+                    this.$refs.groupfamilyAdd.init()
+                })
+            },
             // 删除关联干部
             deleteGroupFamily (id) {
                 this.$confirm(this.$t('prompt.info', { 'handle': this.$t('delete') }), this.$t('prompt.title'), {