Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front into master

# Conflicts:
#	src/views/unified/tapSwitch/childWelfare.vue
#	src/views/unified/tapSwitch/provide.vue

src/api/unified/unified.js

@@ -136,9 +136,9 @@ export const getFivesYearShjzProvideStats = data => {
 }
 
 //低保对象搜索
-export const lowIncomeSearch = data => {
+export const societyHelpSearch = data => {
     return request({
-        url: 'portal/admin/stats/lowIncomeSearch',
+        url: 'portal/admin/stats/societyHelpSearch',
         method: 'POST',
         data
 

src/views/unified/tapSwitch/marriage.vue

@@ -259,12 +259,15 @@
                 prop="manName"
                 label="名称"
                 align="center"
-                width="50px"
+                width="60px"
               >
               </el-table-column>
               <el-table-column prop="manDomicile" label="所在地" align="center">
               </el-table-column>
-              <el-table-column prop="address" label="婚姻状况" align="center">
+              <el-table-column prop="type" label="婚姻状况" align="center">
+                <template slot-scope="scope"> 
+                {{scope.row.type=='IA'?'结婚':scope.row.type=='IB'?'离婚':scope.row.type=='ICA'?'补办结婚证':scope.row.type=='ICB'?'补办离婚证':'不详'}}
+                </template>
               </el-table-column>
               <el-table-column prop="registerDate" label="时间" align="center">
               </el-table-column>

src/views/unified/tapSwitch/mechanism.vue

@@ -902,7 +902,7 @@ export default {
 }
 .children {
   width: 100%;
-  height: 100%;
+  height: 240px;
 }
 .mechanismNum {
   text-align: center;

src/views/unified/tapSwitch/socialAssistance.vue

@@ -153,21 +153,21 @@
                 <el-table-column prop="address" label="所在地" align="center" >
                 </el-table-column>
                 <!-- <el-table-column
-                  prop="name"
+                  prop="provideState"
                   label="类型"
                   align="center"
                   width="50px"
                 >
                 </el-table-column>
                 <el-table-column
-                  prop="name"
+                  prop="helpAmount"
                   label="金额"
                   align="center"
                   width="50px"
                 >
                 </el-table-column> -->
                 <el-table-column
-                  prop="createTime"
+                  prop="endProvideDate"
                   label="时间"
                   align="center"
                   width="70px"
@@ -193,7 +193,7 @@ import {
   getThreeYearShjzProvideStats,
   getFivesYearShjzAchieveStats,
   getAreaYearShjzAchieveStats,
-  lowIncomeSearch,
+  societyHelpSearch,
   getMapData,
 } from "@/api/unified/unified";
 export default {
@@ -218,7 +218,7 @@ export default {
     this.getFivesYearShjzAchieveStatsFun();
     this.getAreaYearShjzAchieveStatsFun();
     this.getMapData("g450000"); //默认展示广西 g450000
-    this.lowIncomeSearchFun();
+    this.societyHelpSearchFun();
   },
   methods: {
     rowStyle({ row, rowsIndex }) {
@@ -231,11 +231,11 @@ export default {
 
     inputBtn() {
       console.log(this.value);
-      this.lowIncomeSearchFun();
+      this.societyHelpSearchFun();
     },
 
-    lowIncomeSearchFun() {
-      lowIncomeSearch({
+    societyHelpSearchFun() {
+      societyHelpSearch({
         keyword: this.values,
       }).then((res) => {
         console.log(res, "低保对象搜索");