Merge branch 'master' into 'mhy'

# Conflicts:
#   xichongSys/src/router/index.js

xichongSys/src/router/index.js

@@ -11,10 +11,12 @@ import store from '@/store'
 import { getIFramePath, getIFrameUrl } from '@/utils/iframe'
 import Table from '@/views/Myvue/table'
 import Cbdj from '@/views/Myvue/insuredReg'
+import insuredRegp from '@/views/Myvue/insuredRegp'
 import Flow from '@/views/Myvue/flow'
 import shrecord from '@/views/Myvue/examRecord'
 import drcbdj from "@/views/Myvue/drcbdj"
 import xxbg from "@/views/Myvue/infoChange"
+import infoChangep from "@/views/Myvue/infoChangep";
 import Record from "@/views/Myvue/authRecord"
 import Newsupdata from "@/views/Myvue/newsupdata"
 import drxxbg from "@/views/Myvue/drxxbg";
@@ -27,19 +29,22 @@ import PayInfo from "@/views/Myvue/payInfo"
 import application from "@/views/Myvue/application"
 import importByExcel from "@/views/Myvue/importByExcel"
 import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit"
+import insuranceCancellationAuditp from "@/views/Myvue/insuranceCancellationAuditp"
 import supPaymentAudit from "@/views/Myvue/supPaymentAudit"
+import supPaymentAuditp from "@/views/Myvue/supPaymentAuditp"
 import traRelationsAudit from "@/views/Myvue/traRelationsAudit"
+import traRelationsAuditp from "@/views/Myvue/traRelationsAuditp"
 import upgradeReoAudit from "@/views/Myvue/upgradeReoAudit"
+import upgradeReoAuditp from "@/views/Myvue/upgradeReoAuditp"
 import interact from "@/views/Myvue/interact"
 import preView from "@/views/Myvue/preView"
 import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit";
+import treatmentApplicationAuditp from "@/views/Myvue/treatmentApplicationAuditp";
 import drcbzx from "@/views/Myvue/drcbzx";
 import drbjbf from "@/views/Myvue/drbjbf";
 import drtsyw from "@/views/Myvue/drtsyw";
 import authRecordphone from "@/views/Myvue/authRecordphone";
-import importBaseInfoByExcel from "@/views/Myvue/importBaseInfoByExcel";
-import importPayInfoByExcel from "@/views/Myvue/importPayInfoByExcel";
-import importGrantInfoByExcel from "@/views/Myvue/importGrantInfoByExcel";
+import tablep from "@/views/Myvue/tablep";
 
 Vue.use(Router)
 
@@ -219,12 +224,45 @@ const router = new Router({
       path:"/authRecordphone",
       name:"认证记录",
       component: authRecordphone
+    },{
+      path:"/tablep",
+      name:"tablep",
+      component: tablep
+    },{
+      path:"/insuredRegp",
+      name:"insuredRegp",
+      component: insuredRegp
+    },{
+      path:"/infoChangep",
+      name:"infoChangep",
+      component: infoChangep
+    },{
+      path:"/upgradeReoAuditp",
+      name:"upgradeReoAuditp",
+      component: upgradeReoAuditp
+    },
+    {
+      path:"/traRelationsAuditp",
+      name:"traRelationsAuditp",
+      component: traRelationsAuditp
+    },{
+      path:"/treatmentApplicationAuditp",
+      name:"treatmentApplicationAuditp",
+      component: treatmentApplicationAuditp
+    },{
+      path:"/insuranceCancellationAuditp",
+      name:"insuranceCancellationAuditp",
+      component: insuranceCancellationAuditp
+    },{
+      path:"/supPaymentAuditp",
+      name:"supPaymentAuditp",
+      component: supPaymentAuditp
     },
     {
       path: '/404',
       name: 'notFound',
       component: NotFound
-    }
+    },
   ]
 })
 

xichongSys/src/views/Login.vue

@@ -114,6 +114,7 @@ export default {
     }
   },
   mounted() {
+    this.$store.state.tab.mainTabs=[]
     this.refreshCaptcha()
   },
   computed:{

xichongSys/src/views/Myvue/authRecordphone.vue

@@ -154,7 +154,7 @@ import Candode from "../Core/candode"
           value:"3",
           label:"未认证",
         },{
-          value:"3",
+          value:"4",
           label:"今年未认证"
         }],
         //时间
@@ -220,8 +220,9 @@ import Candode from "../Core/candode"
       serchs(p){
          var start=""
         var end=""
-        if(this.state==3){
-         
+        var sta=""
+        if(this.state==4){
+         sta=3
           start="2019-01-01"
           end="2019-12-31"
         }else{
@@ -251,7 +252,7 @@ import Candode from "../Core/candode"
        town_name:this.townList[0],
        village_name:this.townList[1],
        iDCard:this.idcard,
-       match_state:this.state,
+       match_state:sta?sta:this.state,
        begin_time:start,
        end_time:end,
        siType:this.cblx,

xichongSys/src/views/Myvue/examRecord.vue

@@ -107,7 +107,9 @@
   <el-pagination
   	class="pone"
       :page-size='10'
-      layout="total, prev, pager, next, jumper"
+       :page-sizes="[10, 50, 100]"
+       @size-change="handleSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
       :total="totals"
       :current-page.sync="Page"
       @current-change="current_change"
@@ -164,6 +166,7 @@
 
       return {
         list:[],
+        pagesize:10,
          name:"",
        activities: [],
       options1: [],
@@ -177,6 +180,10 @@
       }
     },
     methods: {
+      handleSizeChange(val){
+        this.pagesize=val
+        this.serche(this.Page)
+      },
       childByValue(val){
         this.townList=val
       },
@@ -259,9 +266,13 @@
         // return '';
       },
       current_change(ss){
-        var data={
+        this.Page=ss
+       this.serche(ss)
+      },
+      serche(ss){
+         var data={
           pageNum:ss,
-          pageSize:10,
+          pageSize:this.pagesize,
           idcard:this.idcard,
           type:this.ywtype
         }

xichongSys/src/views/Myvue/table.vue

@@ -93,10 +93,12 @@
   <el-pagination
   	class="pone"
       :page-size='10'
-      layout="total, prev, pager, next, jumper"
+      :page-sizes="[10, 50, 100]"
+      layout="total, sizes, prev, pager, next, jumper"
       :total="totals"
       :current-page.sync="Page"
       @current-change="current_change"
+       @size-change="handleSizeChange"
 >
 
     </el-pagination>
@@ -148,10 +150,15 @@
         idcard:"",
         ywtype:"",
         info:'',
+        pageSize:10,
         tableData: []
       }
     },
     methods: {
+      handleSizeChange(val){
+        this.pageSize=val
+        this.serchh(this.Page)
+      },
       childByValue(val){
        this.townList=val
       },
@@ -223,9 +230,12 @@
       },
 
       current_change(ss){
-        var data={
+     this.serchh(ss)
+      },
+      serchh(ss){
+      var data={
           pageNum:ss,
-          pageSize:10,
+          pageSize:this.pageSize,
           idcard:this.idcard,
           type:this.ywtype
         }