【联户结亲】-【后台管理】-（王童）-2021/7/19

src/views/modules/workRecord/groupfamily-add.vue

@@ -0,0 +1,221 @@
+<template>
+  <el-dialog :visible.sync="visible" :title=" $t('add') " :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>
+      </el-form-item>
+<!--          <el-form-item label="性别" prop="sex">-->
+<!--          <el-input v-model="dataForm.sex" placeholder="性别"></el-input>-->
+<!--      </el-form-item>-->
+<!--        <el-form-item label="性别" prop="sex">-->
+<!--            <el-select v-model="dataForm.sexList" clearable placeholder="性别">-->
+<!--                <el-option v-for="item in sexList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">-->
+<!--                </el-option>-->
+<!--            </el-select>-->
+<!--        </el-form-item>-->
+          <el-form-item label="联系电话" prop="telPhone">
+          <el-input v-model="dataForm.telPhone" placeholder="联系电话"></el-input>
+      </el-form-item>
+<!--          <el-form-item label="年龄" prop="age">-->
+<!--          <el-input v-model="dataForm.age" placeholder="年龄"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="现居地址" prop="liveAddressName">-->
+<!--          <el-input v-model="dataForm.liveAddressName" placeholder="现居地址"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="经度" prop="longitude">-->
+<!--          <el-input v-model="dataForm.longitude" placeholder="经度"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="纬度" prop="latitude">-->
+<!--          <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="结对原因" prop="pairingReasons">-->
+<!--          <el-input v-model="dataForm.pairingReasons" placeholder="结对原因"></el-input>-->
+<!--      </el-form-item>-->
+        <el-form-item label="结对原因" prop="pairingReasons">
+            <el-select v-model="dataForm.pairingReasons" clearable placeholder="结对原因">
+                <el-option v-for="item in pairingReason" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                </el-option>
+            </el-select>
+        </el-form-item>
+<!--          <el-form-item label="收入情况" prop="income">-->
+<!--          <el-input v-model="dataForm.income" placeholder="收入情况"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="困难情况" prop="difficultSituation">-->
+<!--          <el-input v-model="dataForm.difficultSituation" placeholder="困难情况"></el-input>-->
+<!--      </el-form-item>-->
+<!--          <el-form-item label="关怀标签" prop="label">-->
+<!--          <el-input v-model="dataForm.label" 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>-->
+      </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: '',
+        groupId:'',
+        name: '',
+        sex: '',
+        telPhone: '',
+        age: '',
+        liveAddressName: '',
+        longitude: '',
+        latitude: '',
+        pairingReasons: '',
+        income: '',
+        difficultSituation: '',
+        label: '',
+        revision: '',
+        delFlag: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      },
+        pairingReason:[],
+        sexList: [
+            {dictValue: '1', dictName: '男'},
+            {dictValue: '2', dictName: '女'},
+        ]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        // sex: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        telPhone: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        // age: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // liveAddressName: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // longitude: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // latitude: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        pairingReasons: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        // income: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // difficultSituation: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // label: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // revision: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // delFlag: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // createdBy: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // createdTime: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // updatedBy: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // updatedTime: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ]
+      }
+    }
+  },
+    created: function () {
+        this.getPairingReasonInfo()
+    },
+  methods: {
+      getPairingReasonInfo () {
+          this.$http.get(`sys/dict/listSimple/pairing_reason`).then(({ data: res }) => {
+              this.pairingReason = res.data
+          }).catch(() => {})
+      },
+      init () {
+      this.getPairingReasonInfo()
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/workRecord/familyinfoacquisition/${this.dataForm.id}`).then(({ data: res }) => {
+        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['post']('/workRecord/familyinfoacquisition/addFamilyInfo', 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>

src/views/modules/workRecord/helpgroup.vue

@@ -2,8 +2,8 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-workrecord__helpgroup}">
       <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 label="小组名称" prop="groupName" label-width="90px">
+          <el-input v-model="dataForm.groupName" placeholder="小组名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@@ -16,19 +16,25 @@
         </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="groupName" label="帮扶小组名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" 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 type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column>
+<!--        <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="groupName" label="帮扶小组名称" show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="cadreName" label="关联干部" show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="family" label="小组家庭" show-overflow-tooltip header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="revision" label="乐观锁" 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 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 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 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>
           </template>
         </el-table-column>
       </el-table>
@@ -43,6 +49,7 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <groupfamily-add v-if="familyAddVisible" ref="groupfamilyAdd" @refreshDataList="getDataList"></groupfamily-add>
     </div>
   </el-card>
 </template>
@@ -50,23 +57,38 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './helpgroup-add-or-update'
+import GroupfamilyAdd from './groupfamily-add'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/workrecord/helpgroup/page',
+        getDataListURL: '/workRecord/helpgroup/page',
         getDataListIsPage: true,
-        deleteURL: '/workrecord/helpgroup',
+        deleteURL: '/workRecord/helpgroup',
         deleteIsBatch: true
       },
       dataForm: {
         id: ''
-      }
+      },
+      familyAddVisible:false
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    GroupfamilyAdd
+  },
+  created: function () {
+    this.getDataList()
+  },
+  methods: {
+    addFamily(infoId) {
+      this.familyAddVisible = true
+      this.$nextTick(() => {
+        this.$refs.groupfamilyAdd.dataForm.groupId = infoId
+        this.$refs.groupfamilyAdd.init()
+      })
+    },
   }
 }
 </script>

src/views/modules/workRecord/helpgrouproute.vue

@@ -0,0 +1,29 @@
+<template>
+    <keep-alive include="helpgroup">
+        <component :is="selectComponent"></component>
+    </keep-alive>
+</template>
+<script>
+    import Helpgroup from './helpgroup'
+    import GroupfamilyAdd from './groupfamily-add'
+    export default {
+        data () {
+            return {
+                selectComponent: Helpgroup
+            }
+        },
+        components: {
+            Helpgroup,
+            GroupfamilyAdd
+        },
+        methods: {
+            init () {
+                this.selectComponent = Helpgroup
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>