From c7ac7e24f401cb18bc47e088cb0c66059c24284f Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 16 Jul 2021 10:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../familygrouprelation-add-or-update.vue     |   4 +-
 .../workRecord/familygrouprelation.vue        |  14 +-
 .../familyinfoacquisition-add-or-update.vue   |  18 ++-
 .../workRecord/familyinfoacquisition.vue      |  16 +-
 .../workRecord/famliymember-add-or-update.vue |  11 +-
 src/views/modules/workRecord/famliymember.vue |  15 +-
 .../groupcadrerelation-add-or-update.vue      |   4 +-
 .../modules/workRecord/groupcadrerelation.vue |  14 +-
 .../workRecord/helpgroup-add-or-update.vue    |   4 +-
 src/views/modules/workRecord/helpgroup.vue    |  14 +-
 .../workRecord/helplog-add-or-update.vue      |  19 ++-
 src/views/modules/workRecord/helplog.vue      |  17 +-
 .../questioncollectioninfo-add-or-update.vue  | 152 ++++++++++++++++++
 .../workRecord/questioncollectioninfo.vue     |  76 +++++++++
 14 files changed, 319 insertions(+), 59 deletions(-)
 create mode 100644 src/views/modules/workRecord/questioncollectioninfo-add-or-update.vue
 create mode 100644 src/views/modules/workRecord/questioncollectioninfo.vue

diff --git a/src/views/modules/workRecord/familygrouprelation-add-or-update.vue b/src/views/modules/workRecord/familygrouprelation-add-or-update.vue
index 14960e0b..7f2e62c5 100644
--- a/src/views/modules/workRecord/familygrouprelation-add-or-update.vue
+++ b/src/views/modules/workRecord/familygrouprelation-add-or-update.vue
@@ -94,7 +94,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/news/familygrouprelation/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/workrecord/familygrouprelation/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -110,7 +110,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/familygrouprelation/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/workrecord/familygrouprelation/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/workRecord/familygrouprelation.vue b/src/views/modules/workRecord/familygrouprelation.vue
index a680cd85..f1c438c8 100644
--- a/src/views/modules/workRecord/familygrouprelation.vue
+++ b/src/views/modules/workRecord/familygrouprelation.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-news__familygrouprelation}">
+    <div class="mod-workrecord__familygrouprelation}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
@@ -9,10 +9,10 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:familygrouprelation:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:familygrouprelation:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:familygrouprelation:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:familygrouprelation: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" style="width: 100%;">
@@ -28,8 +28,8 @@
         <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('news:familygrouprelation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:familygrouprelation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('workrecord:familygrouprelation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('workrecord:familygrouprelation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -56,9 +56,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/familygrouprelation/page',
+        getDataListURL: '/workrecord/familygrouprelation/page',
         getDataListIsPage: true,
-        deleteURL: '/news/familygrouprelation',
+        deleteURL: '/workrecord/familygrouprelation',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/workRecord/familyinfoacquisition-add-or-update.vue b/src/views/modules/workRecord/familyinfoacquisition-add-or-update.vue
index 107bbe4c..fa835704 100644
--- a/src/views/modules/workRecord/familyinfoacquisition-add-or-update.vue
+++ b/src/views/modules/workRecord/familyinfoacquisition-add-or-update.vue
@@ -15,6 +15,12 @@
       </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>
@@ -67,6 +73,8 @@ export default {
         telPhone: '',
         age: '',
         liveAddressName: '',
+        longitude: '',
+        latitude: '',
         pairingReasons: '',
         income: '',
         difficultSituation: '',
@@ -98,6 +106,12 @@ export default {
         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' }
         ],
@@ -143,7 +157,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/news/familyinfoacquisition/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/workrecord/familyinfoacquisition/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -159,7 +173,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/familyinfoacquisition/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/workrecord/familyinfoacquisition/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/workRecord/familyinfoacquisition.vue b/src/views/modules/workRecord/familyinfoacquisition.vue
index 558cdccc..e758397a 100644
--- a/src/views/modules/workRecord/familyinfoacquisition.vue
+++ b/src/views/modules/workRecord/familyinfoacquisition.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-news__familyinfoacquisition}">
+    <div class="mod-workrecord__familyinfoacquisition}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
@@ -9,10 +9,10 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:familyinfoacquisition:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:familyinfoacquisition:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:familyinfoacquisition:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:familyinfoacquisition: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" style="width: 100%;">
@@ -23,6 +23,8 @@
         <el-table-column prop="telPhone" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="age" label="年龄" header-align="center" align="center"></el-table-column>
         <el-table-column prop="liveAddressName" label="现居地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
         <el-table-column prop="pairingReasons" label="结对原因" header-align="center" align="center"></el-table-column>
         <el-table-column prop="income" label="收入情况" header-align="center" align="center"></el-table-column>
         <el-table-column prop="difficultSituation" label="困难情况" header-align="center" align="center"></el-table-column>
@@ -35,8 +37,8 @@
         <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('news:familyinfoacquisition:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:familyinfoacquisition:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('workrecord:familyinfoacquisition:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('workrecord:familyinfoacquisition:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -63,9 +65,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/familyinfoacquisition/page',
+        getDataListURL: '/workrecord/familyinfoacquisition/page',
         getDataListIsPage: true,
-        deleteURL: '/news/familyinfoacquisition',
+        deleteURL: '/workrecord/familyinfoacquisition',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/workRecord/famliymember-add-or-update.vue b/src/views/modules/workRecord/famliymember-add-or-update.vue
index a668faff..33c72a67 100644
--- a/src/views/modules/workRecord/famliymember-add-or-update.vue
+++ b/src/views/modules/workRecord/famliymember-add-or-update.vue
@@ -9,6 +9,9 @@
       </el-form-item>
           <el-form-item label="关系" prop="relation">
           <el-input v-model="dataForm.relation" placeholder="关系"></el-input>
+      </el-form-item>
+          <el-form-item label="性别（1：男；2：女）" prop="sex">
+          <el-input v-model="dataForm.sex" placeholder="性别（1：男；2：女）"></el-input>
       </el-form-item>
           <el-form-item label="年龄" prop="age">
           <el-input v-model="dataForm.age" placeholder="年龄"></el-input>
@@ -59,6 +62,7 @@ export default {
         familyId: '',
         memberName: '',
         relation: '',
+        sex: '',
         age: '',
         liveAddressName: '',
         telPhone: '',
@@ -84,6 +88,9 @@ export default {
         relation: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        sex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         age: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -129,7 +136,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/news/famliymember/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/workrecord/famliymember/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -145,7 +152,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/famliymember/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/workrecord/famliymember/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/workRecord/famliymember.vue b/src/views/modules/workRecord/famliymember.vue
index ae8d20df..8e7343b1 100644
--- a/src/views/modules/workRecord/famliymember.vue
+++ b/src/views/modules/workRecord/famliymember.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-news__famliymember}">
+    <div class="mod-workrecord__famliymember}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
@@ -9,10 +9,10 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:famliymember:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:famliymember:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:famliymember:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:famliymember: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" style="width: 100%;">
@@ -21,6 +21,7 @@
         <el-table-column prop="familyId" label="家庭信息采集关系ID" header-align="center" align="center"></el-table-column>
         <el-table-column prop="memberName" label="成员名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="relation" label="关系" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sex" label="性别（1：男；2：女）" header-align="center" align="center"></el-table-column>
         <el-table-column prop="age" label="年龄" header-align="center" align="center"></el-table-column>
         <el-table-column prop="liveAddressName" label="现居地址" header-align="center" align="center"></el-table-column>
         <el-table-column prop="telPhone" label="联系电话" header-align="center" align="center"></el-table-column>
@@ -33,8 +34,8 @@
         <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('news:famliymember:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:famliymember:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('workrecord:famliymember:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('workrecord:famliymember:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -61,9 +62,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/famliymember/page',
+        getDataListURL: '/workrecord/famliymember/page',
         getDataListIsPage: true,
-        deleteURL: '/news/famliymember',
+        deleteURL: '/workrecord/famliymember',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/workRecord/groupcadrerelation-add-or-update.vue b/src/views/modules/workRecord/groupcadrerelation-add-or-update.vue
index d86399d5..b1b7fbf1 100644
--- a/src/views/modules/workRecord/groupcadrerelation-add-or-update.vue
+++ b/src/views/modules/workRecord/groupcadrerelation-add-or-update.vue
@@ -94,7 +94,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/news/groupcadrerelation/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/workrecord/groupcadrerelation/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -110,7 +110,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/groupcadrerelation/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/workrecord/groupcadrerelation/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/workRecord/groupcadrerelation.vue b/src/views/modules/workRecord/groupcadrerelation.vue
index f9a438d2..6051c47b 100644
--- a/src/views/modules/workRecord/groupcadrerelation.vue
+++ b/src/views/modules/workRecord/groupcadrerelation.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-news__groupcadrerelation}">
+    <div class="mod-workrecord__groupcadrerelation}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
@@ -9,10 +9,10 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:groupcadrerelation:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:groupcadrerelation:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:groupcadrerelation:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:groupcadrerelation: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" style="width: 100%;">
@@ -28,8 +28,8 @@
         <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('news:groupcadrerelation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:groupcadrerelation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('workrecord:groupcadrerelation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('workrecord:groupcadrerelation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -56,9 +56,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/groupcadrerelation/page',
+        getDataListURL: '/workrecord/groupcadrerelation/page',
         getDataListIsPage: true,
-        deleteURL: '/news/groupcadrerelation',
+        deleteURL: '/workrecord/groupcadrerelation',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/workRecord/helpgroup-add-or-update.vue b/src/views/modules/workRecord/helpgroup-add-or-update.vue
index e221482c..85b43afb 100644
--- a/src/views/modules/workRecord/helpgroup-add-or-update.vue
+++ b/src/views/modules/workRecord/helpgroup-add-or-update.vue
@@ -87,7 +87,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/news/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 +103,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/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 1757d337..7eb9570c 100644
--- a/src/views/modules/workRecord/helpgroup.vue
+++ b/src/views/modules/workRecord/helpgroup.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-news__helpgroup}">
+    <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>
@@ -9,10 +9,10 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:helpgroup:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:helpgroup:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:helpgroup:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:helpgroup: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" style="width: 100%;">
@@ -27,8 +27,8 @@
         <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('news:helpgroup:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news: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>
           </template>
         </el-table-column>
       </el-table>
@@ -55,9 +55,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/helpgroup/page',
+        getDataListURL: '/workrecord/helpgroup/page',
         getDataListIsPage: true,
-        deleteURL: '/news/helpgroup',
+        deleteURL: '/workrecord/helpgroup',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/workRecord/helplog-add-or-update.vue b/src/views/modules/workRecord/helplog-add-or-update.vue
index be36609f..3442eb7b 100644
--- a/src/views/modules/workRecord/helplog-add-or-update.vue
+++ b/src/views/modules/workRecord/helplog-add-or-update.vue
@@ -1,8 +1,11 @@
 <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="helpFamliy">
-          <el-input v-model="dataForm.helpFamliy" placeholder="帮扶家庭"></el-input>
+          <el-form-item label="帮扶家庭ID" prop="familyId">
+          <el-input v-model="dataForm.familyId" placeholder="帮扶家庭ID"></el-input>
+      </el-form-item>
+          <el-form-item label="帮扶家庭名称" prop="helpFamilyName">
+          <el-input v-model="dataForm.helpFamilyName" placeholder="帮扶家庭名称"></el-input>
       </el-form-item>
           <el-form-item label="帮扶方式" prop="helpMode">
           <el-input v-model="dataForm.helpMode" placeholder="帮扶方式"></el-input>
@@ -50,7 +53,8 @@ export default {
       visible: false,
       dataForm: {
         id: '',
-        helpFamliy: '',
+        familyId: '',
+        helpFamilyName: '',
         helpMode: '',
         handleNum: '',
         logDescribe: '',
@@ -67,7 +71,10 @@ export default {
   computed: {
     dataRule () {
       return {
-        helpFamliy: [
+        familyId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        helpFamilyName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         helpMode: [
@@ -115,7 +122,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/news/helplog/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/workrecord/helplog/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -131,7 +138,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/helplog/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/workrecord/helplog/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/workRecord/helplog.vue b/src/views/modules/workRecord/helplog.vue
index 64613859..39e26e0e 100644
--- a/src/views/modules/workRecord/helplog.vue
+++ b/src/views/modules/workRecord/helplog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-news__helplog}">
+    <div class="mod-workrecord__helplog}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
@@ -9,16 +9,17 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:helplog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:helplog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:helplog:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('workrecord:helplog: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" 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="helpFamliy" label="帮扶家庭" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="familyId" label="帮扶家庭ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="helpFamilyName" label="帮扶家庭名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="helpMode" label="帮扶方式" header-align="center" align="center"></el-table-column>
         <el-table-column prop="handleNum" label="本次解决问题数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="logDescribe" label="日志描述" header-align="center" align="center"></el-table-column>
@@ -31,8 +32,8 @@
         <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('news:helplog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:helplog:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('workrecord:helplog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('workrecord:helplog:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -59,9 +60,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/helplog/page',
+        getDataListURL: '/workrecord/helplog/page',
         getDataListIsPage: true,
-        deleteURL: '/news/helplog',
+        deleteURL: '/workrecord/helplog',
         deleteIsBatch: true
       },
       dataForm: {
diff --git a/src/views/modules/workRecord/questioncollectioninfo-add-or-update.vue b/src/views/modules/workRecord/questioncollectioninfo-add-or-update.vue
new file mode 100644
index 00000000..08104507
--- /dev/null
+++ b/src/views/modules/workRecord/questioncollectioninfo-add-or-update.vue
@@ -0,0 +1,152 @@
+<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="项目关系ID" prop="itemId">
+          <el-input v-model="dataForm.itemId" placeholder="项目关系ID"></el-input>
+      </el-form-item>
+          <el-form-item label="帮扶家庭" prop="helpFamliyName">
+          <el-input v-model="dataForm.helpFamliyName" placeholder="帮扶家庭"></el-input>
+      </el-form-item>
+          <el-form-item label="帮扶家庭ID" prop="familyId">
+          <el-input v-model="dataForm.familyId" placeholder="帮扶家庭ID"></el-input>
+      </el-form-item>
+          <el-form-item label="问题类型" prop="questionType">
+          <el-input v-model="dataForm.questionType" placeholder="问题类型"></el-input>
+      </el-form-item>
+          <el-form-item label="问题描述" prop="questionDescribe">
+          <el-input v-model="dataForm.questionDescribe" 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: '',
+        itemId: '',
+        helpFamliyName: '',
+        familyId: '',
+        questionType: '',
+        questionDescribe: '',
+        revision: '',
+        delFlag: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        itemId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        helpFamliyName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        familyId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        questionType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        questionDescribe: [
+          { 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' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/workrecord/questioncollectioninfo/${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[!this.dataForm.id ? 'post' : 'put']('/workrecord/questioncollectioninfo/', 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/workRecord/questioncollectioninfo.vue b/src/views/modules/workRecord/questioncollectioninfo.vue
new file mode 100644
index 00000000..6520f466
--- /dev/null
+++ b/src/views/modules/workRecord/questioncollectioninfo.vue
@@ -0,0 +1,76 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-workrecord__questioncollectioninfo}">
+      <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 v-if="$hasPermission('workrecord:questioncollectioninfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('workrecord:questioncollectioninfo: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" 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="itemId" label="项目关系ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="helpFamliyName" label="帮扶家庭" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="familyId" label="帮扶家庭ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="questionType" label="问题类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="questionDescribe" 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 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 v-if="$hasPermission('workrecord:questioncollectioninfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('workrecord:questioncollectioninfo: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 './questioncollectioninfo-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/workrecord/questioncollectioninfo/page',
+        getDataListIsPage: true,
+        deleteURL: '/workrecord/questioncollectioninfo',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>