Merge branch 'master' into 'mhy'

Master

See merge request !2

xichongSys/src/http/moudules/getlist.js

@@ -13,6 +13,7 @@ export const shenhe = (data) => {
         data
     })
 }
+//流程
 export const selectflowlist = (data) => {
     return axios({
         url: '/folw/selectflowlist',
@@ -20,6 +21,22 @@ export const selectflowlist = (data) => {
         data
     })
 }
+export const selectRoleName = (data) => {
+    return axios({
+        url: 'role/selectRoleName',
+        method: 'post',
+        data
+    })
+}
+export const insertFolwCourse = (params) => {
+    return axios({
+        url: 'folw/insertFolwCourse',
+        method: 'get',
+        params
+    })
+}
+
+
 export const selectRoleinfo = (params) => {
     return axios({
         url: '/role/selectRoleinfo',

xichongSys/src/utils/datetime.js

@@ -9,7 +9,7 @@
  * @param datetime 国际化日期格式
  */
 export function format (datetime) {
-  return formatWithSeperator(datetime, "/", ":");
+  return formatWithSeperator(datetime, "-", ":");
 }
 
 /**

xichongSys/src/utils/global.js

@@ -5,7 +5,8 @@ gi/**
  */
 
 // 后台管理系统服务器地址
-export const baseUrl = 'http://172.16.10.33:9002'
+//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 baseUrl2 = 'http://172.16.10.25:9999'
 // 系统数据备份还原服务器地址

xichongSys/src/views/Myvue/Cbdj.vue

@@ -279,8 +279,9 @@ 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="dialogVisible = true" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-circle-plus-outline">新增</el-button>
+<el-button type="primary" @click="showadd" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-circle-plus-outline">新增</el-button>
  
 </div>
   <el-table
@@ -62,20 +62,24 @@
    <el-dialog
   title="新增流程"
   :visible.sync="dialogVisible"
-  width="30%"
+  width="60%"
+ 
+  >
+  <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-input
-  style="margin-bottom:20px"
-  placeholder="请输入流程标题"
-  v-model="flowname"
-  clearable>
-</el-input>
+    </el-option>
+  </el-select>
    <el-select
    style="width:100%"
     v-model="value"
     multiple
     filterable
-    
+     @visible-change="toshow"
     default-first-option
     placeholder="请编辑流程">
     <el-option
@@ -86,6 +90,7 @@
       :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>
@@ -115,14 +120,32 @@
    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:'',
@@ -130,40 +153,66 @@
         totals:0,
         input:"",
         info:'',
-        tableData: [{
-                id:1,
-                name:"邹",
-                creattime:"2019-1-1",
-                person:'迪迪'
-        }],
-         options: [{
-          value: '初审',
-          label: '初审'
-        }, {
-          value: '复核',
-          label: '复核'
-        }, {
-          value: '稽查',
-          label: '稽查'
-        },
-        {
-          value: '领导审核',
-          label: '领导审核'
-        }],
+        tableData: [],
+         options: [],
         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() {
-        this.dialogVisible = true
       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
+       
       },
        indexMethod(index) {
         return index +1;

xichongSys/src/views/Myvue/rzrecord.vue

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