Merge branch 'master' of ssh://ops.weface.com.cn:8022/zhangdishen/xichonght into dev

xichongSys/src/main.js

@@ -11,6 +11,9 @@ import 'font-awesome/css/font-awesome.min.css'
 import '@/assets/iconfont/iconfont.css'
 import getType from "@/utils/type.js"
 Vue.prototype.getType =getType.getType
+Vue.prototype.regetType =getType.regetType
+
+
 Vue.use(ElementUI)
 Vue.use(api)
 

xichongSys/src/utils/type.js

@@ -2,6 +2,11 @@ function getType(s){
     let a= s==1?"参保登记":s==2?"信息变更":s==3?"待遇申请":s==4?"参保注销":s==5?"补缴保费":s==6?"升档改办":s==7?"关系转移":""
     return a
 }
+function regetType(s){
+    let a= s=="参保登记"?1:s=="信息变更"?2:s=="待遇申请"?3:s=="参保注销"?4:s=="补缴保费"?5:s=="升档改办"?6:s=="关系转移"?7:""
+    return a
+}
 export default{
-    getType
+    getType,
+    regetType
 }
\ No newline at end of file

xichongSys/src/views/Myvue/examRecord.vue

@@ -159,16 +159,7 @@
         list:[],
          name:"",
        activities: [],
-      options1: [{
-      value: '1',
-      label: '参保登记'
-    }, {
-      value: '2',
-      label: '信息变更'
-    }, {
-      value: '3',
-      label: '待遇申请'
-    }],
+      options1: [],
         Page:1,
         totals:0,
         idcard:"",
@@ -196,7 +187,7 @@
             var d=new Date(res.data.list[i].createtime)
             var mon=(parseInt(d.getMonth()) + 1)
             res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds(); 
-            res.data.list[i].recordtype=res.data.list[i].recordtype==1?"参保登记":res.data.list[i].recordtype==2?"信息变更":''
+            res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
           }
                this.tableData=res.data.list
                 this.totals=res.data.total
@@ -212,7 +203,7 @@
         this.activities=[]
         var data={
           recordId:s.id,
-          type:s.recordtype=="参保登记"?1:s.recordtype=="信息变更"?2:''
+          type:this.regetType(s.recordtype)
         }
         this.$api.getlist.progress(data).then((res)=>{
             for(var i in res.data){
@@ -367,6 +358,12 @@
     },
    
     created(){
+      for(var i=1;i<=7;i++){
+        this.options1.push({
+          label:this.getType(i),
+          value:i
+        })
+      }
       for(var i in listtown){
     this.list.push({
         value:listtown[i].town_name,