''

xichongSys/src/utils/global.js

@@ -6,6 +6,7 @@
 
 // 后台管理系统服务器地址
 //export const baseUrl = 'http://172.16.10.33:9002'
+<<<<<<< HEAD
 //export const baseUrl = 'http://172.16.10.25:9009'
 //export const baseUrl ="http://faceauth.weface.com.cn:98"
 //export const baseUrl2 = 'http://faceauth.weface.com.cn:97'
@@ -13,6 +14,11 @@
 //export const baseUrl = 'http://172.16.10.25:9002'
 export const baseUrl ="http://172.16.10.33:9002"
 export const baseUrl2 = 'http://172.16.10.25:9999'
+=======
+export const baseUrl = 'http://172.16.10.25:9002'
+//export const baseUrl ="http://172.16.10.33:9002"
+export const baseUrl2 = 'http://172.16.10.25:9007'
+>>>>>>> 1d7cdaf1ac6c77b2cce06f7ac6a1a8792784dbe7
 // 系统数据备份还原服务器地址
 //export const backupBaseUrl = 'http://localhost:8002'
 //export const baseUrl = 'http://faceauth.weface.com.cn:98'

xichongSys/src/views/Myvue/flow.vue

@@ -3,7 +3,7 @@
   <div class="op">
  
 <el-button type="primary" @click="showadd(1)" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-circle-plus-outline">新增</el-button>
- 
+ <el-button type="danger" @click="showadd(1)" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-delete">已作废</el-button>
 </div>
   <el-table
     :data="tableData"

xichongSys/src/views/Myvue/table.vue

@@ -171,7 +171,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=res.data.list[i].recordtype==1?"参保登记":res.data.list[i].recordtype==2?"信息变更":res.data.list[i].recordtype==3?"待遇申请":res.data.list[i].recordtype==4?"参保注销":""
           }
                this.tableData=res.data.list
                 this.totals=res.data.total
@@ -187,7 +187,7 @@
         this.activities=[]
         var data={
           recordId:s.id,
-          type:s.recordtype=="参保登记"?1:s.recordtype=="信息变更"?2:''
+          type:s.recordtype=="参保登记"?1:s.recordtype=="信息变更"?2:s.recordtype=="待遇申请"?3:s.recordtype=="参保注销"?4:''
         }
         this.$api.getlist.progress(data).then((res)=>{
             for(var i in res.data){
@@ -341,7 +341,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=res.data.list[i].recordtype==1?"参保登记":res.data.list[i].recordtype==2?"信息变更":res.data.list[i].recordtype==3?"待遇申请":res.data.list[i].recordtype==4?"参保注销":""
           }
                this.tableData=res.data.list
                 this.totals=res.data.total