Skip to content

X
xichonght
Commit 4078f9fa authored by miaohaoyun's avatar miaohaoyun
Browse files
Options

Merge branch 'master' into 'mhy' 

Master

See merge request !13
parents 9a37a642 1d7cdaf1
Show whitespace changes
Inline Side-by-side
Showing with 2631 additions and 2508 deletions
xichongSys/package-lock.json
View file @ 4078f9fa
This source diff could not be displayed because it is too large. You can view the blob instead.
xichongSys/src/http/moudules/getlist.js
View file @ 4078f9fa
......@@ -123,8 +123,6 @@ export const seledysqdc = (data) => {
data
})
}
//覆盖人员查询
export const listAllBaseInfo = (data) => {
return axios({
......@@ -132,4 +130,5 @@ export const listAllBaseInfo = (data) => {
method: 'post',
data
})
}
}
\ No newline at end of file
xichongSys/src/router/index.js
View file @ 4078f9fa
......@@ -10,19 +10,22 @@ import api from '@/http/api'
import store from '@/store'
import { getIFramePath, getIFrameUrl } from '@/utils/iframe'
import Table from '@/views/Myvue/table'
import Cbdj from '@/views/Myvue/Cbdj'
import Cbdj from '@/views/Myvue/insuredReg'
import Flow from '@/views/Myvue/flow'
import shrecord from '@/views/Myvue/shrecord'
import shrecord from '@/views/Myvue/examRecord'
import drcbdj from "@/views/Myvue/drcbdj"
import xxbg from "@/views/Myvue/xxbg"
import Record from "@/views/Myvue/rzrecord"
import xxbg from "@/views/Myvue/infoChange"
import Record from "@/views/Myvue/authRecord"
import Newsupdata from "@/views/Myvue/newsupdata"
import drxxbg from "@/views/Myvue/drxxbg";
import drdysq from "@/views/Myvue/drdysq";
import dryhkbg from "@/views/Myvue/dryhkbg";
import drdcbg from "@/views/Myvue/drdcbg";
import receivePersonnel from "@/views/Myvue/receivePersonnel";
import AllbaseInfo from "@/views/Myvue/allbaseInfo"
Vue.use(Router)
const router = new Router({
routes: [
{
......
xichongSys/src/utils/global.js
View file @ 4078f9fa
......@@ -6,9 +6,9 @@
// 后台管理系统服务器地址
//export const baseUrl = '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 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'
// 系统数据备份还原服务器地址
//export const backupBaseUrl = 'http://localhost:8002'
//export const baseUrl = 'http://faceauth.weface.com.cn:98'
......
xichongSys/src/views/Myvue/allbaseInfo.vue
View file @ 4078f9fa
......@@ -70,34 +70,34 @@
<el-row>
<el-col :span="8">
<el-form-item label="姓名">
<el-input v-model="form.name" readonly=true></el-input>
<el-input v-model="form.name" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="身份证">
<el-input v-model="form.idcard" readonly=true></el-input>
<el-input v-model="form.idcard" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="个人编号">
<el-input v-model="form.personNum" readonly=true></el-input>
<el-input v-model="form.personNum" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="性别">
<el-input v-model="form.sex" readonly=true></el-input>
<el-input v-model="form.sex" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="民族">
<el-input v-model="form.nation" readonly=true></el-input>
<el-input v-model="form.nation" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出生日期">
<el-input v-model= "form.birthday" readonly=true></el-input>
<el-input v-model= "form.birthday" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -105,29 +105,29 @@
<el-row>
<el-col :span="8">
<el-form-item label="统筹区">
<el-input v-model="form.countryName" readonly=true></el-input>
<el-input v-model="form.countryName" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="乡镇/街道">
<el-input v-model="form.townName" readonly=true></el-input>
<el-input v-model="form.townName" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="社区名称">
<el-input v-model= "form.villageName" readonly=true></el-input>
<el-input v-model= "form.villageName" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="户口所在地">
<el-input v-model="form.adress" readonly=true></el-input>
<el-input v-model="form.adress" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="户口性质">
<el-input v-model= "form.registerType" readonly=true></el-input>
<el-input v-model= "form.registerType" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -135,17 +135,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="险种类型">
<el-input v-model="form.insuranceType" readonly=true></el-input>
<el-input v-model="form.insuranceType" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="参保状态">
<el-input v-model="form.insuredState" readonly=true></el-input>
<el-input v-model="form.insuredState" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否老农保">
<el-input v-model= "form.isOldRural" readonly=true></el-input>
<el-input v-model= "form.isOldRural" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -153,17 +153,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="缴费状态">
<el-input v-model="form.payState" readonly=true></el-input>
<el-input v-model="form.payState" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="缴费档次">
<el-input v-model="form.grade" readonly=true></el-input>
<el-input v-model="form.grade" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="人员类别">
<el-input v-model= "form.personType" readonly=true></el-input>
<el-input v-model= "form.personType" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -172,17 +172,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="离退休标志">
<el-input v-model="form.retireFlag" readonly=true></el-input>
<el-input v-model="form.retireFlag" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="个人身份">
<el-input v-model="form.grade" readonly=true></el-input>
<el-input v-model="form.grade" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="参保日期">
<el-input v-model= "form.insuredDate" readonly=true></el-input>
<el-input v-model= "form.insuredDate" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -190,7 +190,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="档案编号">
<el-input v-model="form.archivesNum" readonly=true></el-input>
<el-input v-model="form.archivesNum" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
......
xichongSys/src/views/Myvue/rzrecord.vue → xichongSys/src/views/Myvue/authRecord.vue
View file @ 4078f9fa
......@@ -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(){
......
xichongSys/src/views/Myvue/shrecord.vue → xichongSys/src/views/Myvue/examRecord.vue
View file @ 4078f9fa
......@@ -181,6 +181,7 @@
methods: {
//搜索
serch(){
var data={
idcard:this.idcard?this.Encrypt(this.idcard):"",
recordType:this.ywtype?parseInt(this.ywtype):"",
......
xichongSys/src/views/Myvue/flow.vue
View file @ 4078f9fa
......@@ -2,8 +2,8 @@
<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(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"
......@@ -45,7 +45,7 @@
slot="reference"
@click="handle(scope.$index, scope.row)">详情</el-button>
</el-popover>
<el-button type="primary" size="mini" style="background:#148A9B" icon="el-icon-edit-outline">修改</el-button>
<el-button type="primary" size="mini" style="background:#148A9B" @click="showadd(2,scope.row)" icon="el-icon-edit-outline">修改</el-button>
</template>
</el-table-column>
</el-table>
......@@ -60,22 +60,26 @@
</el-pagination>
<el-dialog
title="新增流程"
:title="flowTitle"
:visible.sync="dialogVisible"
width="30%"
width="60%"
>
<el-input
style="margin-bottom:20px"
placeholder="请输入流程标题"
v-model="flowname"
clearable>
</el-input>
<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-select
style="width:100%"
v-model="value"
multiple
filterable
@visible-change="toshow"
default-first-option
placeholder="请编辑流程">
<el-option
......@@ -86,9 +90,10 @@
: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>
<el-button type="primary" @click="addflow(1)">确 定</el-button>
</span>
</el-dialog>
</div>
......@@ -115,14 +120,24 @@
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 {
flowTitle:"",
showiii:false,
//标题
title:"",
titleList:[],
flowname:"",
dialogVisible: false,
step:'',
......@@ -130,40 +145,139 @@
totals:0,
input:"",
info:'',
tableData: [{
id:1,
name:"邹",
creattime:"2019-1-1",
person:'迪迪'
}],
options: [{
value: '初审',
label: '初审'
}, {
value: '复核',
label: '复核'
}, {
value: '稽查',
label: '稽查'
},
{
value: '领导审核',
label: '领导审核'
}],
value: []
tableData: [],
options: [],
value: [],
oldvalue:[],
flaa:""
}
},
methods:{
//加载流程列表
loadFlow(){
this.$api.getlist.selectflowlist().then((res) => {
this.tableData=res.data
console.log(this.tableData)
}).catch((res) => {
});
},
current_change(s){
},
toshow(s){
this.showiii=s
},
del(){
this.dialogVisible = false
},
//新增流程
addflow() {
//获取流程
showadd(s,d){
this.value=[]
this.oldvalue=[]
console.log(d)
if(s==1){
this.flowTitle="新增流程"
this.titleList=[{
label:"参保登记审核流程",
value:"1,参保登记审核流程"
},{
label:"信息变更审核流程",
value:"2,信息变更审核流程"
},{
label:"待遇申请审核流程",
value:"3,待遇申请审核流程"
}]
}else if(s==2){
this.titleList=[{
label:d.flowname,
value:d.type+","+d.flowname
}]
this.title=d.type+","+d.flowname
this.flowTitle="修改流程"
var par={
type:d.type
}
this.$api.getlist.selectRoleinfo(par).then((res) => {
var dd=0
for(dd in res.data){
this.oldvalue.push(res.data[dd].id)
this.value.push(res.data[dd].id)
}
}).catch((res) => {
});
}
this.flaa=s
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].id
})
}
}else{
alert(JSON.stringify(res))
}
}).catch((res) => {
});
},
//新增更新流程
addflow(){
this.addflows(this.flaa)
},
addflows(s) {
console.log(this.value)
if(s==1){
for(var d in this.tableData){
if(this.tableData[d].type==this.title.split(",")[0]){
this.$message.error('流程已存在,请选择其它流程!');
return
}
}
}else{
if(this.oldvalue.toString()==this.value.toString()){
this.$message.error('流程不能与原流程相同!');
return
}
}
var par={
type:this.title.split(",")[0],
flowName:this.title.split(",")[1],
roleIds:this.value.join(","),
state:s
}
this.$api.getlist.insertFolwCourse(par).then((res) => {
if(res.code==200){
this.loadFlow()
this.$message.success('操作成功');
}else{
this.$message.error(res.message);
}
}).catch((res) => {
this.$message.error('操作失败');
});
this.dialogVisible = false
},
indexMethod(index) {
return index +1;
......@@ -183,13 +297,8 @@
},
created(){
this.loadFlow()
this.$api.getlist.selectflowlist().then((res) => {
this.tableData=res.data
}).catch((res) => {
});
}
}
......
xichongSys/src/views/Myvue/Cbdj.vue → xichongSys/src/views/Myvue/insuredReg.vue
View file @ 4078f9fa
......@@ -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/table.vue
View file @ 4078f9fa
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment