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

xichongSys/src/http/moudules/getlist.js

@@ -132,11 +132,11 @@ export const listAllBaseInfo = (data) => {
     })
   }
   //
-  export const selectflowState = (data) => {
+  export const selectflowState = (params) => {
     return axios({
       url: '/folw/selectflowState',
-      method: 'post',
-      data
+      method: 'get',
+      params
     })
   }
 //缴费信息查询

xichongSys/src/main.js

@@ -9,7 +9,8 @@ import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 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.use(ElementUI)
 Vue.use(api)
 

xichongSys/src/router/index.js

@@ -24,7 +24,7 @@ import drdcbg from "@/views/Myvue/drdcbg";
 import receivePersonnel from "@/views/Myvue/receivePersonnel";
 import AllbaseInfo from "@/views/Myvue/allbaseInfo"
 import PayInfo from "@/views/Myvue/payInfo"
-
+import application from "@/views/Myvue/application"
 Vue.use(Router)
 
 const router = new Router({
@@ -117,6 +117,10 @@ const router = new Router({
           path:"/payInfo",
           name:"缴费记录",
           component: PayInfo
+        },{
+          path:"/application",
+          name:"待遇申请审核",
+          component: application
         }
       ]
     },

xichongSys/src/utils/type.js

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

xichongSys/src/views/Myvue/examRecord.vue

@@ -278,7 +278,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
@@ -319,6 +319,21 @@
             show:false
             }
           })
+          }else if(d.recordtype=="待遇申请"){
+         
+             sessionStorage.setItem("recordId",this.tableData[s].recordId)
+          this.$router.push({
+            name:"待遇申请审核",
+            params:{info:this.tableData[s].info,
+            bankpic:this.tableData[s].bankpic,
+            idcardbackpic:this.tableData[s].idcardbackpic,
+            idcardfrontpic:this.tableData[s].idcardfrontpic,
+            signpic:this.tableData[s].signpic,
+            specialPhotoPic:this.tableData[s].specialPhotoPic,
+            bookPic:this.tableData[s].bookPic,
+            show:false
+            }
+          })
           }
         },
         handleDelete(g,h){
@@ -383,7 +398,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

xichongSys/src/views/Myvue/flow.vue

@@ -21,6 +21,10 @@
     <el-table-column
       prop="createby"
       label="创建人">
+    </el-table-column>
+    <el-table-column
+      prop="flowNo"
+      label="流程号">
     </el-table-column>
      <el-table-column
       prop="createtime"
@@ -49,7 +53,7 @@
       </template>
     </el-table-column>
   </el-table>
-  <el-dialog title="已作废流程" :visible.sync="dialogTableVisible">
+  <el-dialog title="已作废流程" width="70%" :visible.sync="dialogTableVisible">
   <el-table
     :data="detableData"
     style="width: 100%"
@@ -66,6 +70,10 @@
     <el-table-column
       prop="createby"
       label="创建人">
+    </el-table-column>
+    <el-table-column
+      prop="flowNo"
+      label="流程号">
     </el-table-column>
      <el-table-column
       prop="createtime"
@@ -93,17 +101,17 @@
       </template>
     </el-table-column>
   </el-table>
-</el-dialog>
-  <el-pagination
+   <el-pagination
   	class="pone"
       :page-size='10'
       layout="total, prev, pager, next, jumper"
       :total="totals"
       :current-page.sync="Page"
+       @current-change="current_change"
      
 >
     </el-pagination>
-   
+</el-dialog>
    <el-dialog
   :title="flowTitle"
   :visible.sync="dialogVisible"
@@ -202,8 +210,13 @@
     methods:{
       //作废
       delet(){
-this.$api.getlist.selectflowState().then((res) => {
-          this.detableData=res.data
+        var data={
+           pageNum:1,
+           pageSize:10
+        }
+this.$api.getlist.selectflowState(data).then((res) => {
+          this.detableData=res.data.result
+          this.totals=res.data.total
         this.dialogTableVisible=true
         
         }).catch((res) => {
@@ -221,7 +234,18 @@ this.$api.getlist.selectflowState().then((res) => {
         });
       },
       current_change(s){
-
+   var data={
+           pageNum:s,
+           pageSize:10
+        }
+this.$api.getlist.selectflowState(data).then((res) => {
+          this.detableData=res.data.result
+          this.totals=res.data.total
+        this.dialogTableVisible=true
+        
+        }).catch((res) => {
+          
+        });
       },
       toshow(s){
         this.showiii=s

xichongSys/src/views/Myvue/infoChange.vue

@@ -292,6 +292,7 @@ export default {
         this.form.special_type=this.form.org_name.org_insuranceType
     
          this.form.name=this.decrypt(this.form.org_name)
+         //this.form.name=this.form.org_name
         this.form.identity_number=this.decrypt(this.form.org_idNum)
         this.form.telphoneValue=this.decrypt(this.form.telphoneValue)
         this.form.nation=this.form.nation
@@ -337,7 +338,7 @@ export default {
            
          }else if(this.form.type_son==7){
             this.form.old=this.form.identity_number,
-            this.form.now=this.form.change_idNum,
+            this.form.now=this.decrypt(this.form.change_idNum),
             this.now="变更后身份证"
             this.old="变更前身份证"
          }
@@ -351,7 +352,6 @@ export default {
           this.itmebs="户口本"
           this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bookPic)
         }else if(obj.specialPhotoPic){
-          console.log(123132)
           this.itmebs="特殊身份证明"
             this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.specialPhotoPic)
         }else{

xichongSys/src/views/Myvue/table.vue

@@ -19,7 +19,7 @@
   <el-table
     :data="tableData"
     style="width: 100%"
-    :row-class-name="tableRowClassName">
+    >
     <el-table-column
       prop="idcard"
       label="身份证号"
@@ -223,14 +223,7 @@
 
         })
       },
-      tableRowClassName({row, rowIndex}) {
-        if (rowIndex === 1) {
-          return 'warning-row';
-        } else if (rowIndex === 3) {
-          return 'success-row';
-        }
-        return '';
-      },
+     
       current_change(ss){
         var data={
           pageNum:ss,
@@ -249,7 +242,7 @@
             res.data.list[i].name=this.decrypt(res.data.list[i].name)
             var d=new Date(res.data.list[i].createtime)
             res.data.list[i].createtime=d.getFullYear()+"-"+d.getMonth() + 1+"-"+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
@@ -291,6 +284,21 @@
             show:true
             }
           })
+          }else if(d.recordtype=="待遇申请"){
+         
+             sessionStorage.setItem("recordId",this.tableData[s].recordId)
+          this.$router.push({
+            name:"待遇申请审核",
+            params:{info:this.tableData[s].info,
+            bankpic:this.tableData[s].bankpic,
+            idcardbackpic:this.tableData[s].idcardbackpic,
+            idcardfrontpic:this.tableData[s].idcardfrontpic,
+            signpic:this.tableData[s].signpic,
+            specialPhotoPic:this.tableData[s].specialPhotoPic,
+            bookPic:this.tableData[s].bookPic,
+            show:true
+            }
+          })
           }
         },
         handleDelete(g,h){
@@ -324,6 +332,7 @@
     },
    
     created(){
+       
         Loading.service();
         var data={
           idcard:'',
@@ -341,39 +350,20 @@
             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==3?"待遇申请":res.data.list[i].recordtype==4?"参保注销":""
+             res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
           }
+          console.log(12312312)
                this.tableData=res.data.list
                 this.totals=res.data.total
                 this.page=res.data.total.pageNum
+               
         
         }).catch((res) => {
           let loadingInstance = Loading.service();
               this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
               loadingInstance.close();
             });
-        });
-    //   var that=this
-    //     baseUrl.setToken()
-    //      $.ajax({
-    //      url:baseUrl.baseUrl+"examine/listExamining",
-    //      type:'post',
-    //      data:{
-    //        userId:1
-    //      },
-    //     success(res){
-    //       for(var i in res.data.list){
-    //         res.data.list[i].idcard=that.decrypt(res.data.list[i].idcard)
-    //         res.data.list[i].name=that.decrypt(res.data.list[i].name)
-    //         res.data.list[i].recordtype=res.data.list[i].recordtype==1?"参保登记":""
-    //       }
-    //      that.tableData=res.data.list
-    //     that.totals=res.data.total
-    //     that.page=res.data.total.pageNum
-       
-          
-    //     }
-    //   })
+        })
     }
   }
 </script>