Merge branch 'mhy' of http://ops.weface.com.cn:8082/zhangdishen/xichonght into mhy

xichongSys/src/http/moudules/getlist.js

@@ -123,3 +123,13 @@ export const seledysqdc = (data) => {
     data
   })
 }
+
+
+//覆盖人员查询
+export const listAllBaseInfo = (data) => {
+  return axios({
+    url: '/baseInfo/getAllBaseInfo',
+    method: 'post',
+    data
+  })
+}

xichongSys/src/router/index.js

@@ -22,9 +22,7 @@ import drdysq from "@/views/Myvue/drdysq";
 import dryhkbg from "@/views/Myvue/dryhkbg";
 import drdcbg from "@/views/Myvue/drdcbg";
 import receivePersonnel from "@/views/Myvue/receivePersonnel";
-
 Vue.use(Router)
-
 const router = new Router({
   routes: [
     {
@@ -105,6 +103,11 @@ const router = new Router({
           path:"/newsupdata",
           name:"新闻发布",
           component: Newsupdata
+        },
+        {
+          path:"/AllbaseInfo",
+          name:"覆盖人员",
+          component: AllbaseInfo
         }
       ]
     },

xichongSys/src/utils/datetime.js

@@ -11,8 +11,12 @@
 export function format (datetime) {
   return formatWithSeperator(datetime, "-", ":");
 }
+export function formatDate (datetime) {
+  return formatWithSeperator(datetime, "-");
+}
 
 /**
+ *
  * 时间格式化
  * 将 2018-09-23T11:54:16.000+0000 格式化成类似 2018/09/23 11:54:16
  * 可以指定日期和时间分隔符
@@ -22,12 +26,19 @@ export function formatWithSeperator (datetime, dateSeprator, timeSeprator) {
   if (datetime != null) {
     const dateMat = new Date(datetime);
     const year = dateMat.getFullYear();
-    const month = dateMat.getMonth() + 1;
-    const day = dateMat.getDate();
-    const hh = dateMat.getHours();
-    const mm = dateMat.getMinutes();
-    const ss = dateMat.getSeconds();
+    const month = addZoo(dateMat.getMonth() + 1);
+    const day = addZoo(dateMat.getDate());
+    const hh = addZoo(dateMat.getHours());
+    const mm = addZoo(dateMat.getMinutes());
+    const ss = addZoo(dateMat.getSeconds());
+    if(!timeSeprator){
+      return year + dateSeprator + month + dateSeprator + day;
+    }
     const timeFormat = year + dateSeprator + month + dateSeprator + day + " " + hh + timeSeprator + mm + timeSeprator + ss;
     return timeFormat;
   }
 }
+function addZoo(val) {
+  return val < 9 ? 0+""+val : val;
+
+}

xichongSys/src/utils/global.js

-gi/**
+/**
  * 全局常量、方法封装模块
  * 通过原型挂载到Vue属性
  * 通过 this.Global 调用
@@ -6,8 +6,8 @@ gi/**
 
 // 后台管理系统服务器地址
 //export const baseUrl = 'http://172.16.10.33:9002'
-export const baseUrl = 'http://172.16.10.25:9009'
-//export const baseUrl2 ="http://172.16.10.33:9002"
+//export const baseUrl = 'http://172.16.10.25:9009'
+export const baseUrl ="http://172.16.10.33:9002"
 export const baseUrl2 = 'http://172.16.10.25:9999'
 // 系统数据备份还原服务器地址
 //export const backupBaseUrl = 'http://localhost:8002'

xichongSys/src/views/Myvue/Cbdj.vue

@@ -279,9 +279,8 @@ export default {
        
      
       
-        
+        this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.idcardbackpic)
          this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.idcardfrontpic)
-         this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.idcardbackpic)
      
       console.log(this.form)
          this.form.sex=  this.form.sex==1?"男":"女"

xichongSys/src/views/Myvue/flow.vue

@@ -2,7 +2,7 @@
 <div>
   <div class="op">
  
-<el-button type="primary" @click="showadd" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-circle-plus-outline">新增</el-button>
+<el-button type="primary" @click="dialogVisible = true" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-circle-plus-outline">新增</el-button>
  
 </div>
   <el-table
@@ -62,24 +62,20 @@
    <el-dialog
   title="新增流程"
   :visible.sync="dialogVisible"
-  width="60%"
- 
+  width="30%"
   >
-  <el-select v-model="title" clearable placeholder="请选择标题" style="margin-bottom:10px;width:100%">
-    <el-option
-      v-for="item in titleList"
-      :key="item.value"
-      :label="item.label"
-      :value="item.value"
-      >
-    </el-option>
-  </el-select>
+  <el-input
+  style="margin-bottom:20px"
+  placeholder="请输入流程标题"
+  v-model="flowname"
+  clearable>
+</el-input>
    <el-select
    style="width:100%"
     v-model="value"
     multiple
     filterable
-     @visible-change="toshow"
+    
     default-first-option
     placeholder="请编辑流程">
     <el-option
@@ -90,7 +86,6 @@
       :value="item.value">
     </el-option>
   </el-select>
-  <div class="iii" v-show="showiii"></div>
   <span slot="footer" class="dialog-footer">
     <el-button @click="del">取 消</el-button>
     <el-button type="primary" @click="addflow">确 定</el-button>
@@ -120,32 +115,14 @@
    margin: 0 auto;
    width:100px
   }
-  .iii{
-    height: 200px
-  }
 </style>
 
 <script>
  import CryptoJS from 'crypto-js'
- import {format} from "../../utils/datetime"
- console.log(format)
 // import baseUrl from "../../globe/globeUrl"
   export default {
        data() {
       return {
-        showiii:false,
-        //标题
-        title:"",
-        titleList:[{
-          label:"参保登记审核流程",
-          value:"1,参保登记审核流程"
-        },{
-          label:"信息变更审核流程",
-          value:"2,信息变更审核流程"
-        },{
-          label:"待遇申请审核流程",
-          value:"3,待遇申请审核流程"
-        }],
         flowname:"",
         dialogVisible: false,
         step:'',
@@ -153,66 +130,40 @@
         totals:0,
         input:"",
         info:'',
-        tableData: [],
-         options: [],
+        tableData: [{
+                id:1,
+                name:"邹",
+                creattime:"2019-1-1",
+                person:'迪迪'
+        }],
+         options: [{
+          value: '初审',
+          label: '初审'
+        }, {
+          value: '复核',
+          label: '复核'
+        }, {
+          value: '稽查',
+          label: '稽查'
+        },
+        {
+          value: '领导审核',
+          label: '领导审核'
+        }],
         value: []
       }
     },
     methods:{
       current_change(s){
 
-      },
-      toshow(s){
-        this.showiii=s
       },
       del(){
         this.dialogVisible = false
       },
-      //获取流程
-      showadd(){
-        this.options=[]
-        this.dialogVisible = true
-          this.$api.getlist.selectRoleName().then((res) => {
-            if(res.code==200){
-         for(var i in res.data){
-           this.options.push({
-             label:res.data[i].name,
-             value:res.data[i].name
-           })
-         }
-         }else{
-           alert(JSON.stringify(res))
-         }
-        
-        }).catch((res) => {
-          
-        });
-      },
       //新增流程
        addflow() {
-      console.log(this.value)
-        for(var d in this.tableData){
-          
-          
-          if(this.tableData[d].type==this.title.split(",")[0]){
-            this.$message.error('流程已存在,请选择其它流程!');
-            return
-          }
-          var par={
-            type:this.title.split(",")[0],
-            flowName:this.title.split(",")[1],
-            roleIds:"",
-            state:1
-          }
-          this.$api.getlist.insertFolwCourse(par).then((res) => {
-          
-        
-        }).catch((res) => {
-          
-        });
-        }
-        this.dialogVisible = false
-       
+        this.dialogVisible = true
+        console.log(this.value)
       },
        indexMethod(index) {
         return index +1;

xichongSys/src/views/Myvue/newsupdata.vue

@@ -19,8 +19,8 @@
       label="操作人"
       >
     </el-table-column>
-    
-    <el-table-column 
+
+    <el-table-column
       width="180"
      label="操作">
       <template slot-scope="scope">
@@ -63,10 +63,10 @@
         }
         this.$api.getlist.newsList(data).then((res) => {
            this.tableData=res.data.list
-        
+
         }).catch((res) => {
-          
-        }); 
+
+        });
         }
     },
     created(){
@@ -76,10 +76,10 @@
         }
         this.$api.getlist.newsList(data).then((res) => {
            this.tableData=res.data.list
-        
+
         }).catch((res) => {
-          
-        }); 
+
+        });
     }
   }
-</script>
+</script>
\ No newline at end of file

xichongSys/src/views/Myvue/rzrecord.vue

@@ -4,7 +4,7 @@
   
  
 <div class="add" style="margin-left:0">
-   <el-select clearable size="mini" @change="handleChange" v-model="town" placeholder="请选择乡/镇">
+   <el-select size="mini" @change="handleChange" v-model="town" placeholder="请选择乡/镇">
     <el-option
       v-for="item in list"
       :key="item.town_id"
@@ -14,7 +14,7 @@
   </el-select>
   </div>
   <div class="add">
-  <el-select size="mini" clearable @change="torz" v-model="village" placeholder="请选择村">
+  <el-select size="mini" @change="torz" v-model="village" placeholder="请选择村">
     <el-option
       v-for="item2 in list2"
       :key="item2.village_id"
@@ -24,13 +24,13 @@
   </el-select>
 </div>
 <div class="nam">
-  <el-input v-model="name" clearable size="mini" placeholder="请输入姓名"></el-input>
+  <el-input v-model="name" size="mini" placeholder="请输入姓名"></el-input>
 </div>
   <div class="idc">
-  <el-input v-model="idcard" size="mini" clearable placeholder="请输入身份证号"></el-input>
+  <el-input v-model="idcard" size="mini" placeholder="请输入身份证号"></el-input>
 </div>
  <div class="add">
-  <el-select size="mini" @change="torz" clearable  v-model="state" placeholder="所有状态">
+  <el-select size="mini" @change="torz" clearable  v-model="state" placeholder="认证状态">
     <el-option
       v-for="item3 in stateList"
       :key="item3.value"
@@ -64,7 +64,7 @@
   </el-select>
 </div>
 <div class="add">
-    <el-select size="mini" @change="torz" clearable v-model="age" placeholder="选择年龄">
+    <el-select size="mini" @change="torz" v-model="age" placeholder="选择年龄">
     <el-option
       v-for="item4 in ageList"
       :key="item4.value"
@@ -74,7 +74,7 @@
   </el-select>
 </div>
 <div class="add">
-    <el-select size="mini" @change="torz" clearable v-model="agemeth" placeholder="年龄计算方式">
+    <el-select size="mini" @change="torz" v-model="agemeth" placeholder="年龄计算方式">
     <el-option
       v-for="item5 in agemethList"
       :key="item5.value"
@@ -88,9 +88,9 @@
   <el-table
     :data="tableData"
     style="width: 100%"
-    stripe>
+    :row-class-name="tableRowClassName">
     <el-table-column
-      prop="idNumber"
+      prop="idcard"
       label="身份证号"
       width="180">
     </el-table-column>
@@ -123,13 +123,7 @@
       prop="createtime"
       label="认证照片">
       <template slot-scope="scope">
-        <el-popover
-    placement="left"
-    title=""
-    trigger="hover">
-                     <img slot="reference" :src="scope.row.recordPhotoStr||defaultImg" height="70"  class="head_pic">
-                    <img :src="scope.row.recordPhotoStr"  height="200px"  class="head_pic"/>
-                    </el-popover>
+                    <img :src="scope.row.recordPhotoStr" width="40" height="40" class="head_pic"/>
                 </template>
     </el-table-column>
     
@@ -189,7 +183,6 @@ import Cookies from "js-cookie";
  import { Loading } from 'element-ui';
  import {listtown} from '../../utils/address'
 import {baseUrl2} from "../../utils/global"
-import defaultImg from "../../assets/defaultPicture.jpg"
   export default {
        data() {
         
@@ -198,7 +191,6 @@ import defaultImg from "../../assets/defaultPicture.jpg"
          name:"",
          town:"",
          village:"",
-         defaultImg: defaultImg,
         cit:"",
         Page:1,
         totals:0,
@@ -211,6 +203,9 @@ import defaultImg from "../../assets/defaultPicture.jpg"
         //认证状态
         state:"",
         stateList:[{
+          value:"",
+          label:"所有状态",
+        },{
           value:"0",
           label:"认证成功",
         },{
@@ -268,12 +263,8 @@ import defaultImg from "../../assets/defaultPicture.jpg"
     },
     methods: {
       //搜索
+      
       serch(){
-        Loading.service();
-        this.serchs(1)
-      },
-      serchs(p){
-        
         var start=""
         var end=""
         if(this.time){
@@ -292,7 +283,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
        city_name:"南充市",
        county_name:"西充县",
        pageSize:10,
-       page:p,
+       page:1,
        town_name:this.town.split(",")[1],
        village_name:this.village.split(",")[1],
        iDCard:this.idcard,
@@ -301,25 +292,17 @@ import defaultImg from "../../assets/defaultPicture.jpg"
        end_time:end,
        siType:this.cblx,
        personName:this.name,
-       address:this.agemeth,
-       birthday:this.age
+       address:this.agemeth
      }   
      Axios.get(baseUrl2+'/search/authentication.do',{
       params:data
 })
 .then(res => {
-   let loadingInstance = Loading.service();
-              this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
-              loadingInstance.close();
-            });
+  console.log(res)
   this.tableData=res.data.obj
-  this.totals=res.data.page.total_count
 })
 .catch(err => {
-   let loadingInstance = Loading.service();
-              this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
-              loadingInstance.close();
-            });
+  
 });
        
       },
@@ -327,9 +310,16 @@ import defaultImg from "../../assets/defaultPicture.jpg"
       progress(d,s){
        
       },
-      
+      tableRowClassName({row, rowIndex}) {
+        if (rowIndex === 1) {
+          return 'warning-row';
+        } else if (rowIndex === 3) {
+          return 'success-row';
+        }
+        return '';
+      },
       current_change(ss){
-        this.serchs(ss)
+        
       },
       //
       handleChange(){

xichongSys/src/views/Myvue/shrecord.vue

@@ -64,7 +64,7 @@
       prop="nowExamine"
       label="当前状态">
     </el-table-column>
-     <el-table-column 
+     <el-table-column
       width="180"
      label="操作">
       <template slot-scope="scope">
@@ -119,10 +119,10 @@
 .op{
   display: flex;
   align-items: center;
- 
+
 }
   .idc{
-  
+
     width: 200px
   }
   .nam{
@@ -154,7 +154,7 @@
 // import baseUrl from "../../globe/globeUrl"
   export default {
        data() {
-        
+
       return {
         list:[],
          name:"",
@@ -181,13 +181,12 @@
     methods: {
       //搜索
       serch(){
-     
         var data={
           idcard:this.idcard?this.Encrypt(this.idcard):"",
           recordType:this.ywtype?parseInt(this.ywtype):"",
           townName:'',
           villageName:''
-          
+
         }
       this.$api.getlist.record(data).then((res) => {
             for(var i in res.data.list){
@@ -195,15 +194,15 @@
             res.data.list[i].name=this.decrypt(res.data.list[i].name)
             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].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?"信息变更":''
           }
                this.tableData=res.data.list
                 this.totals=res.data.total
                 this.page=res.data.total.pageNum
-        
+
         }).catch((res) => {
-          
+
         });
       },
       //流程
@@ -224,8 +223,8 @@
                 size: 'large'
               })
               }else{
-                
-            
+
+
                if(res.data[i].examineState=="审核失败"){
                  this.activities.push({
                 content:res.data[i].role+":"+"审核失败",
@@ -277,7 +276,7 @@
             res.data.list[i].name=this.decrypt(res.data.list[i].name)
             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].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?"信息变更":''
           }
                this.tableData=res.data.list
@@ -301,7 +300,7 @@
             idcardbackpic:this.tableData[s].idcardbackpic,
             idcardfrontpic:this.tableData[s].idcardfrontpic,
             signpic:this.tableData[s].signpic,
-            
+
             show:false
             }
           })
@@ -350,7 +349,7 @@
                 return decrypted.toString(CryptoJS.enc.Utf8);
             }
     },
-   
+
     created(){
       for(var i in listtown){
     this.list.push({
@@ -370,7 +369,7 @@
         var data={
           idcard:'',
           recordType:''
-          
+
         }
          this.$api.getlist.record(data).then((res) => {
            let loadingInstance = Loading.service();
@@ -382,13 +381,13 @@
             res.data.list[i].name=this.decrypt(res.data.list[i].name)
             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].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?"信息变更":''
           }
                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 需要异步关闭
@@ -412,8 +411,8 @@
     //      that.tableData=res.data.list
     //     that.totals=res.data.total
     //     that.page=res.data.total.pageNum
-       
-          
+
+
     //     }
     //   })
     }