Commit 4751a0ee authored by liucheng's avatar liucheng

Merge branch 'master' into 'dev'

# Conflicts:
#   xichongSys/src/http/axios.js
#   xichongSys/src/main.js
#   xichongSys/src/router/index.js
#   xichongSys/src/utils/global.js
#   xichongSys/src/views/Core/candode.vue
parents a47b0f57 97866e0d
......@@ -3034,6 +3034,14 @@
"safer-buffer": "^2.1.0"
}
},
"echarts": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/echarts/-/echarts-4.2.1.tgz",
"integrity": "sha512-pw4xScRPsLegD/cqEcoXRKeA2SD4+s+Kyo0Na166NamOWhzNl2yI5RZ2rE97tBlAopNmhyMeBVpAeD5qb+ee1A==",
"requires": {
"zrender": "4.0.7"
}
},
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
......@@ -4087,14 +4095,14 @@
"dev": true
},
"fsevents": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
"integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
"version": "1.2.9",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
"integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
"dev": true,
"optional": true,
"requires": {
"nan": "^2.9.2",
"node-pre-gyp": "^0.10.0"
"nan": "^2.12.1",
"node-pre-gyp": "^0.12.0"
},
"dependencies": {
"abbrev": {
......@@ -4116,7 +4124,7 @@
"optional": true
},
"are-we-there-yet": {
"version": "1.1.4",
"version": "1.1.5",
"bundled": true,
"dev": true,
"optional": true,
......@@ -4142,7 +4150,7 @@
}
},
"chownr": {
"version": "1.0.1",
"version": "1.1.1",
"bundled": true,
"dev": true,
"optional": true
......@@ -4172,16 +4180,16 @@
"optional": true
},
"debug": {
"version": "2.6.9",
"version": "4.1.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ms": "2.0.0"
"ms": "^2.1.1"
}
},
"deep-extend": {
"version": "0.5.1",
"version": "0.6.0",
"bundled": true,
"dev": true,
"optional": true
......@@ -4230,7 +4238,7 @@
}
},
"glob": {
"version": "7.1.2",
"version": "7.1.3",
"bundled": true,
"dev": true,
"optional": true,
......@@ -4250,12 +4258,12 @@
"optional": true
},
"iconv-lite": {
"version": "0.4.21",
"version": "0.4.24",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safer-buffer": "^2.1.0"
"safer-buffer": ">= 2.1.2 < 3"
}
},
"ignore-walk": {
......@@ -4320,17 +4328,17 @@
"optional": true
},
"minipass": {
"version": "2.2.4",
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
}
},
"minizlib": {
"version": "1.1.0",
"version": "1.2.1",
"bundled": true,
"dev": true,
"optional": true,
......@@ -4348,35 +4356,35 @@
}
},
"ms": {
"version": "2.0.0",
"version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
},
"needle": {
"version": "2.2.0",
"version": "2.3.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"debug": "^2.1.2",
"debug": "^4.1.0",
"iconv-lite": "^0.4.4",
"sax": "^1.2.4"
}
},
"node-pre-gyp": {
"version": "0.10.0",
"version": "0.12.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"detect-libc": "^1.0.2",
"mkdirp": "^0.5.1",
"needle": "^2.2.0",
"needle": "^2.2.1",
"nopt": "^4.0.1",
"npm-packlist": "^1.1.6",
"npmlog": "^4.0.2",
"rc": "^1.1.7",
"rc": "^1.2.7",
"rimraf": "^2.6.1",
"semver": "^5.3.0",
"tar": "^4"
......@@ -4393,13 +4401,13 @@
}
},
"npm-bundled": {
"version": "1.0.3",
"version": "1.0.6",
"bundled": true,
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.1.10",
"version": "1.4.1",
"bundled": true,
"dev": true,
"optional": true,
......@@ -4476,12 +4484,12 @@
"optional": true
},
"rc": {
"version": "1.2.7",
"version": "1.2.8",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"deep-extend": "^0.5.1",
"deep-extend": "^0.6.0",
"ini": "~1.3.0",
"minimist": "^1.2.0",
"strip-json-comments": "~2.0.1"
......@@ -4511,16 +4519,16 @@
}
},
"rimraf": {
"version": "2.6.2",
"version": "2.6.3",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"glob": "^7.0.5"
"glob": "^7.1.3"
}
},
"safe-buffer": {
"version": "5.1.1",
"version": "5.1.2",
"bundled": true,
"dev": true,
"optional": true
......@@ -4538,7 +4546,7 @@
"optional": true
},
"semver": {
"version": "5.5.0",
"version": "5.7.0",
"bundled": true,
"dev": true,
"optional": true
......@@ -4591,17 +4599,17 @@
"optional": true
},
"tar": {
"version": "4.4.1",
"version": "4.4.8",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"chownr": "^1.0.1",
"chownr": "^1.1.1",
"fs-minipass": "^1.2.5",
"minipass": "^2.2.4",
"minizlib": "^1.1.0",
"minipass": "^2.3.4",
"minizlib": "^1.1.1",
"mkdirp": "^0.5.0",
"safe-buffer": "^5.1.1",
"safe-buffer": "^5.1.2",
"yallist": "^3.0.2"
}
},
......@@ -4612,12 +4620,12 @@
"optional": true
},
"wide-align": {
"version": "1.1.2",
"version": "1.1.3",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"string-width": "^1.0.2"
"string-width": "^1.0.2 || 2"
}
},
"wrappy": {
......@@ -4627,7 +4635,7 @@
"optional": true
},
"yallist": {
"version": "3.0.2",
"version": "3.0.3",
"bundled": true,
"dev": true,
"optional": true
......@@ -7554,9 +7562,9 @@
}
},
"nan": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
"integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
"version": "2.14.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
"dev": true,
"optional": true
},
......@@ -13729,6 +13737,11 @@
"dev": true
}
}
},
"zrender": {
"version": "4.0.7",
"resolved": "https://registry.npmjs.org/zrender/-/zrender-4.0.7.tgz",
"integrity": "sha512-TNloHe0ums6zxbHfnaCryM61J4IWDajZwNq6dHk9vfWhhysO/OeFvvR0drBs/nbXha2YxSzfQj2FiCd6RVBe+Q=="
}
}
}
......@@ -12,6 +12,7 @@
"dependencies": {
"axios": "^0.18.0",
"babel-polyfill": "^6.26.0",
"echarts": "^4.2.1",
"element-ui": "^2.4.6",
"font-awesome": "^4.7.0",
"js-cookie": "^2.2.0",
......
......@@ -17,6 +17,7 @@ export default {
-moz-osx-font-smoothing: grayscale;
text-align: center;
color: #484a4d;
/* background: #b6bbbb21; */
position: absolute;
top: 0px;
......
......@@ -18,6 +18,11 @@ export default function $axios(options) {
// request 拦截器
instance.interceptors.request.use(
config => {
if(localStorage.getItem("token")){
Cookies.set('token',localStorage.getItem("token"))
console.log(localStorage.getItem("token"))
}
let token = Cookies.get('token')
// 1. 请求开始的时候可以结合 vuex 开启全屏 loading 动画
// console.log(store.state.loading)
......@@ -25,8 +30,9 @@ export default function $axios(options) {
// 2. 带上token
if (token) {
config.headers.token = token
} else {
console.log("重定向到登录页面")
// 重定向到登录页面
router.push('/login')
}
......
......@@ -232,3 +232,11 @@ export const selebjbfdc = (data) => {
data
})
};
//柱状图数据查询
export const selectchartInfo = (params) => {
return axios({
url: 'chart/selectchartInfo',
method: 'get',
params
})
};
......@@ -37,7 +37,6 @@ import drcbzx from "@/views/Myvue/drcbzx";
import drbjbf from "@/views/Myvue/drbjbf";
import drtsyw from "@/views/Myvue/drtsyw";
Vue.use(Router)
const router = new Router({
......@@ -197,6 +196,11 @@ const router = new Router({
name: '登录',
component: Login
},
{
path:"/authRecordphone",
name:"认证记录",
component: authRecordphone
},
{
path: '/404',
name: 'notFound',
......@@ -206,8 +210,14 @@ const router = new Router({
})
router.beforeEach((to, from, next) => {
// 登录界面登录成功之后,会把用户信息保存在会话
// 存在时间为会话生命周期,页面关闭即失效。
if(localStorage.getItem("token")){
Cookies.set('token',localStorage.getItem("token"))
}
let token = Cookies.get('token')
let userName = sessionStorage.getItem('user')
if (to.path === '/login') {
......
......@@ -5,6 +5,9 @@
*/
// 后台管理系统服务器地址
// export const baseUrl2 = 'http://xclc.rensheju.com'
// //export const baseUrl = 'http://xc.rensheju.com'
export const baseUrl = 'http://172.16.10.33:9002'
export const baseUrl2 = 'http://xclc.rensheju.com'
export const baseUrl = 'http://xc.rensheju.com'
//export const baseUrl = 'http://172.16.10.33:9003'
......
function getType(s){
let a= s==1?"参保登记":s==2?"信息变更":s==3?"待遇申请":s==4?"参保注销":s==5?"补缴保费":s==6?"升档改办":s==7?"关系转移":""
let a= s==1?"参保登记":s==2?"信息变更":s==3?"待遇申请":s==4?"参保注销":s==5?"补缴保费":s==6?"升档改办":s==7?"关系转移":s==8?"特殊业务":""
return a
}
function regetType(s){
let a= s=="参保登记"?1:s=="信息变更"?2:s=="待遇申请"?3:s=="参保注销"?4:s=="补缴保费"?5:s=="升档改办"?6:s=="关系转移"?7:""
let a= s=="参保登记"?1:s=="信息变更"?2:s=="待遇申请"?3:s=="参保注销"?4:s=="补缴保费"?5:s=="升档改办"?6:s=="关系转移"?7:s==8?"特殊业务":""
return a
}
export default{
......
......@@ -10,6 +10,20 @@
:fixed="column.fixed" :key="column.prop" :type="column.type" :formatter="column.formatter"
:sortable="column.sortable==null?true:column.sortable">
</el-table-column>
<el-table-column
v-if="showSeal"
label="签章">
<template slot-scope="scope">
<el-popover
v-if="scope.row.sealStr !== null && scope.row.sealStr != ''"
placement="left"
title=""
trigger="hover">
<img slot="reference" :src="'data:image/jpg;base64,' + scope.row.sealStr" height="50px" width="50px" class="head_pic">
<img :src="'data:image/jpg;base64,' + scope.row.sealStr" height="200px" width="200px" class="head_pic"/>
</el-popover>
</template>
</el-table-column>
<el-table-column :label="$t('action.operation')" width="185" fixed="right" v-if="showOperation" header-align="center" align="center">
<template slot-scope="scope">
<kt-button v-if="scope.row.name!=='admin'" icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/>
......@@ -94,7 +108,11 @@ export default {
showBatchDelete: { // 是否显示操作组件
type: Boolean,
default: true
}
},
showSeal: { // 是否显示操作组件
type: Boolean,
default: false
},
},
data() {
return {
......
......@@ -33,6 +33,7 @@
this.options=res.data
console.log(res.data)
this.$emit('getTownlength', this.options.length)
}).catch((res) => {
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
<div>
<div class="op">
<Candode v-on:childByValue="childByValue"></Candode>
<Candode v-on:childByValue="childByValue" v-on:getTownlength="getTownlength"></Candode>
<!--<div class="add" style="margin-left:0">
<el-select clearable size="mini" @change="handleChange" v-model="town" placeholder="请选择乡/镇">
......@@ -269,71 +269,77 @@ import Candode from "../Core/candode"
},{
value:"2",
label:"企业员工",
}]
}],
townlen:1
}
},
methods: {
childByValue(val){
this.townList=val
},
getTownlength(val){
this.townlen=val
},
//搜索
serch(){
Loading.service();
this.serchs(1)
},
serchs(p){
serchs(p){
if(this.townList =='' && this.townlen == 1){
this.$message.error("请选择镇村!");
return;
}
Loading.service();
var start=""
var end=""
if(this.time){
var d=this.time[0]
var s=this.time[1]
var mon=(parseInt(d.getMonth()) + 1)
var emon=(parseInt(s.getMonth()) + 1)
start = d.getFullYear()+"-"+mon+"-"+d.getDate()
var start=""
var end=""
if(this.time){
var d=this.time[0]
var s=this.time[1]
console.log(d)
var mon=(parseInt(d.getMonth()) + 1)
var emon=(parseInt(s.getMonth()) + 1)
start = d.getFullYear()+"-"+mon+"-"+d.getDate()
end=s.getFullYear()+"-"+emon+"-"+s.getDate()
end=s.getFullYear()+"-"+emon+"-"+s.getDate()
}
var data={
province_name:"四川省",
city_name:"南充市",
county_name:"西充县",
pageSize:10,
page:p,
// town_name:this.town.split(",")[1],
// village_name:this.village.split(",")[1],
town_name: this.townList?this.townList[0]:'',
village_name:this.townList?this.townList[1]:'',
iDCard:this.idcard,
match_state:this.state,
begin_time:start,
end_time:end,
siType:this.cblx,
personName:this.name,
address:this.agemeth,
birthday:this.age
}
Axios.get(baseUrl2+'/search/authentication.do',{
params:data
})
.then(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();
});
});
}
var data={
province_name:"四川省",
city_name:"南充市",
county_name:"西充县",
pageSize:10,
page:p,
// town_name:this.town.split(",")[1],
// village_name:this.village.split(",")[1],
town_name: this.townList?this.townList[0]:'',
village_name:this.townList?this.townList[1]:'',
iDCard:this.idcard,
match_state:this.state,
begin_time:start,
end_time:end,
siType:this.cblx,
personName:this.name,
address:this.agemeth,
birthday:this.age
}
Axios.get(baseUrl2+'/search/authentication.do',{
params:data
})
.then(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();
});
});
},
},
//流程
progress(d,s){
......@@ -407,16 +413,13 @@ import Candode from "../Core/candode"
// }
// console.log(this.list)
Axios.get(baseUrl2+'/show/getTownList.do?county_id=511325000000',{
})
.then(res => {
this.list=res.data
})
.catch(err => {
console.log(err);
});
Axios.get(baseUrl2 + '/show/getTownList.do?county_id=511325000000', {})
.then(res => {
this.list = res.data
})
.catch(err => {
console.log(err);
});
}
}
......
<template>
<div>
<div class="sele">
<Candode v-on:childByValue="childByValue" style="width:30%"></Candode>
<el-input v-model="idcard" style="width:30%" size="mini" clearable placeholder="请输入身份证号"></el-input>
<div class="s" style="width:30%">
<el-select size="mini" @change="torz" clearable v-model="state" placeholder="所有状态">
<el-option
v-for="item3 in stateList"
:key="item3.value"
:label="item3.label"
:value="item3.value">
</el-option>
</el-select>
</div>
<el-button type="primary" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-search" @click="serch">搜索</el-button>
</div>
<el-table
:data="tableData"
style="width: 100%"
stripe>
<el-table-column
prop="idNumber"
label="身份证号"
>
</el-table-column>
<el-table-column
prop="userName"
label="姓名"
>
</el-table-column>
<el-table-column
prop="match_stateStr"
label="认证状态"
>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
v-if="scope.row.match_stateStr=='已认证'"
size="mini"
disabled
>去认证</el-button>
<el-button
v-else
size="mini"
type="success"
@click="toc(scope.$index, scope.row)"
>去认证</el-button>
</template>
</el-table-column>
</el-table>
<div style="width:100%;height:80px;overflow:scroll;margin-bottom:20px">
<el-pagination
class="pone"
:page-size='10'
layout="total, prev, pager, next"
:total="totals"
:current-page.sync="Page"
@current-change="current_change"
small
>
</el-pagination>
</div>
</div>
</template>
<style scoped>
.op{
display: flex;
align-items: center;
}
.idc{
width: 200px
}
.nam{
margin-right: 20px
}
.ywtyoe{
width: 200px;
margin-left: 20px
}
.el-table .warning-row {
background: oldlace;
}
.el-table .success-row {
background: #f0f9eb;
}
.pone{
margin-top: 40px
}
.el-timeline{
padding-left: 20px
}
.sele{
display: flex;
margin-top: 10px
}
</style>
<script>
import Axios from "axios"
import Cookies from "js-cookie";
import CryptoJS from 'crypto-js'
import { Loading } from 'element-ui';
import {listtown} from '../../utils/address'
import {baseUrl2} from "../../utils/global"
import defaultImg from "../../assets/defaultPicture.jpg"
import Candode from "../Core/candode"
export default {
components:{
Candode
},
data() {
return {
townList:'',
list:[],
name:"",
town:"",
village:"",
defaultImg: defaultImg,
cit:"",
Page:1,
totals:0,
idcard:"",
ywtype:"",
info:'',
ywtype:'',
tableData: [],
list2:[],
//认证状态
state:"",
stateList:[{
value:"0",
label:"认证成功",
},{
value:"2",
label:"认证失败",
},{
value:"3",
label:"未认证",
}],
//时间
time:"",
//年龄
age:"",
ageList:[{
value:"0",
label:"所有年龄段",
},{
value:"1",
label:"55岁以下",
},{
value:"2",
label:"55-59岁",
},{
value:"3",
label:"60岁以上",
},{
value:"4",
label:"90岁以上",
},{
value:"5",
label:"100岁以上",
}],
//年龄计算方式
agemeth:"1",
agemethList:[{
value:"1",
label:"按年计算",
},{
value:"2",
label:"按月计算",
}],
//参保类型
cblx:"",
cblxList:[{
value:"0",
label:"城镇居民",
},{
value:"1",
label:"机关事业",
},{
value:"2",
label:"企业员工",
}]
}
},
methods: {
//去认证
toc(s,d){
console.log(d)
window.location.replace("../own/auth/lib/nocrentry.html?idcard="+d.idNumber+"&&name="+encodeURI(d.userName))
},
childByValue(val){
this.townList=val
},
//搜索
serch(){
Loading.service();
this.serchs(1)
},
serchs(p){
var start=""
var end=""
if(this.time){
var d=this.time[0]
var s=this.time[1]
console.log(d)
var mon=(parseInt(d.getMonth()) + 1)
var emon=(parseInt(s.getMonth()) + 1)
start = d.getFullYear()+"-"+mon+"-"+d.getDate()
end=s.getFullYear()+"-"+emon+"-"+s.getDate()
}
console.log(this.townList)
var data={
province_name:"四川省",
city_name:"南充市",
county_name:"西充县",
pageSize:10,
page:p,
town_name:this.townList[0],
village_name:this.townList[1],
iDCard:this.idcard,
match_state:this.state,
begin_time:start,
end_time:end,
siType:this.cblx,
personName:this.name,
address:this.agemeth,
birthday:this.age
}
Axios.get(baseUrl2+'/search/authentication.do',{
params:data
})
.then(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();
});
});
},
//流程
progress(d,s){
},
current_change(ss){
Loading.service();
this.serchs(ss)
},
//
handleChange(){
Axios.get(baseUrl2+'/show/getVillageList.do?town_id='+this.town.split(",")[0],{
})
.then(res => {
this.list2=res.data
})
.catch(err => {
console.log(err);
});
},
torz(){
},
//查看
handle(s,d){
},
handleDelete(g,h){
console.log(g)
console.log(h)
},
Encrypt(word) { //aes加密
var key = CryptoJS.enc.Utf8.parse("KkweInfo23255625");
let srcs = CryptoJS.enc.Utf8.parse(word);
let encrypted = CryptoJS.AES.encrypt(srcs, key, {
mode: CryptoJS.mode.ECB,
padding: CryptoJS.pad.Pkcs7
});
return encrypted.toString();
},
decrypt(word){
var key = CryptoJS.enc.Utf8.parse("KkweInfo23255625");
var decrypt = CryptoJS.AES.decrypt(word, key, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7});
return CryptoJS.enc.Utf8.stringify(decrypt).toString();
},
decryptByDES(ciphertext) {
var keyHex = CryptoJS.enc.Utf8.parse("KkweFace95271124");
var decrypted = CryptoJS.DES.decrypt({
ciphertext: CryptoJS.enc.Base64.parse(ciphertext)
}, keyHex, {
mode: CryptoJS.mode.ECB,
padding: CryptoJS.pad.Pkcs7
});
return decrypted.toString(CryptoJS.enc.Utf8);
}
},
created(){
Loading.service();
this.serchs(1)
// for(var i in listtown){
// this.list.push({
// value:listtown[i].town_name,
// label:listtown[i].town_name,
// children:[]
// })
// for(var j in listtown[i].chirld){
// this.list[i].children.push({
// value: listtown[i].chirld[j].village_name,
// label: listtown[i].chirld[j].village_name
// })
// }
// }
// console.log(this.list)
// Axios.get(baseUrl2+'/show/getTownList.do?county_id=511325000000',{
// })
// .then(res => {
// this.list=res.data
// })
// .catch(err => {
// console.log(err);
// });
}
}
</script>
......@@ -9,22 +9,32 @@
<el-table-column
prop="idcard"
label="身份证号码"
min-width="20%">
min-width="15%">
</el-table-column>
<el-table-column
prop="name"
label="姓名"
min-width="20%">
min-width="10%">
</el-table-column>
<el-table-column
prop="bankAccount"
label="银行账号"
min-width="20%">
min-width="15%">
</el-table-column>
<el-table-column
prop="bank"
label="所属银行"
min-width="20%">
min-width="10%">
</el-table-column>
<el-table-column
prop="payType"
label="补缴类型"
min-width="15%">
</el-table-column>
<el-table-column
prop="payNumTol"
label="补缴合计"
min-width="15%">
</el-table-column>
<el-table-column label="操作"
min-width="20%">
......
......@@ -14,13 +14,17 @@
label="姓名">
</el-table-column>
<el-table-column
prop="socialSecurityNumber"
prop="applyWay"
label="领取方式">
</el-table-column>
<el-table-column
prop="nation"
prop="payNum"
label="缴费年限">
</el-table-column>
<el-table-column
prop="accountBalance"
label="个人账户积累额">
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
......
......@@ -322,18 +322,97 @@
}
})
}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
name:"待遇申请审核",
params:{
treApp: {
name: this.tableData[s].name,
recordId: this.tableData[s].recordId,
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
}
}
})
} else if(d.recordtype === "参保注销") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"参保注销审核",
params:{
insCan: {
name: this.tableData[s].name,
recordId: this.tableData[s].recordId,
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
}
}
})
} else if(d.recordtype === "补缴保费") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"补缴保费审核",
params:{
supPay: {
name: this.tableData[s].name,
recordId: this.tableData[s].recordId,
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
}
}
})
} else if(d.recordtype === "升档改办") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"升档改办审核",
params:{
upgReo: {
name: this.tableData[s].name,
recordId: this.tableData[s].recordId,
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
}
}
})
} else if(d.recordtype === "关系转移") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"关系转移审核",
params:{
traRel: {
name: this.tableData[s].name,
recordId: this.tableData[s].recordId,
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
}
}
})
}
......
......@@ -262,7 +262,7 @@ this.$api.getlist.selectflowState(data).then((res) => {
console.log(d)
if(s==1){
this.flowTitle="新增流程"
for(var i =1;i<=6;i++){
for(var i =1;i<=8;i++){
this.titleList.push({
label:this.getType(i),
value:i+","+this.getType(i)
......
......@@ -45,7 +45,7 @@
multiple
drag
accept=".xls,.xlsx"
:limit="5"
:limit="1"
:headers="myHeader"
:before-upload="handleBeforeUpload"
:file-list="fileList"
......@@ -55,7 +55,7 @@
:auto-upload="false">
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
<div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div>
<div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传1个文件</div>
</el-upload>
<el-button style="margin-top: 10px" size="small" type="success" @click="submitUpload1">数据导入</el-button>
</el-tab-pane>
......@@ -103,7 +103,7 @@
multiple
drag
accept=".xls,.xlsx"
:limit="5"
:limit="1"
:headers="myHeader"
:before-upload="handleBeforeUpload"
:file-list="fileList"
......@@ -113,7 +113,7 @@
:auto-upload="false">
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
<div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div>
<div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传1个文件</div>
</el-upload>
<el-button style="margin-top: 10px" size="small" type="success" @click="submitUpload2">数据导入</el-button>
</el-tab-pane>
......@@ -162,7 +162,7 @@
multiple
drag
accept=".xls,.xlsx"
:limit="5"
:limit="1"
:headers="myHeader"
:before-upload="handleBeforeUpload"
:file-list="fileList"
......@@ -172,7 +172,7 @@
:auto-upload="false">
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
<div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div>
<div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传1个文件</div>
</el-upload>
<el-button style="margin-top: 10px" size="small" type="success" @click="submitUpload3">数据导入</el-button>
</el-tab-pane>
......@@ -223,7 +223,7 @@
this.$message.warning("当前限制选择 1 个文件,请删除后继续上传");
},
handleBeforeUpload(file) {
// this.loading = true;
this.loading = true;
if (!file.name.endsWith(".xls") && !file.name.endsWith(".xlsx")) {
this.$message.warning(file.name + "不是excel文件");
this.loading = false;
......
......@@ -33,8 +33,8 @@
<el-form-item label="户籍所在地">
<el-input v-model="form.townName"></el-input>
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="form.telphoneValue"></el-input>
</el-form-item>
......@@ -138,11 +138,11 @@ export default {
"now":""
},
urls: [
],
show:""
}
},
methods:{
//审核通过
......@@ -150,7 +150,7 @@ export default {
this.$confirm('是否审核通过?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
}).then(() => {
Loading.service();
var data={
......@@ -178,7 +178,7 @@ export default {
message: res.message
});
}
}).catch((res) => {
let loadingInstance = Loading.service();
that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
......@@ -189,12 +189,12 @@ export default {
message: '操作失败!'+res
});
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消操作'
});
});
});
},
//审核不通过
......@@ -203,7 +203,7 @@ export default {
this.$prompt('请输入原因', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
}).then(({ value }) => {
if(value){
Loading.service();
......@@ -232,7 +232,7 @@ export default {
message: res.message
});
}
}).catch((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
......@@ -243,7 +243,7 @@ export default {
message: '操作失败!'+res
});
});
}else{
let loadingInstance = Loading.service();
that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
......@@ -257,8 +257,8 @@ export default {
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
});
message: '取消输入'
});
});
},
decrypt(word){
......@@ -283,14 +283,14 @@ export default {
if(this.$route.params.info){
sessionStorage.setItem("info",this.$route.params.info)
}
if(this.$route.params.info){
var a=JSON.stringify(this.$route.params)
sessionStorage.setItem("items",a)
}
this.form =JSON.parse(sessionStorage.getItem("info"))
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)
......@@ -335,7 +335,7 @@ export default {
this.form.now=this.form.change_name,
this.now="变更后姓名"
this.old="变更前姓名"
}else if(this.form.type_son==7){
this.form.old=this.form.identity_number,
this.form.now=this.decrypt(this.form.change_idNum),
......@@ -348,7 +348,7 @@ export default {
this.itmebs="银行卡"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bankpic)
}else if(obj.bookPic){
this.itmebs="户口本"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bookPic)
}else if(obj.specialPhotoPic){
......@@ -357,16 +357,16 @@ export default {
}else{
this.urls.push(" ")
}
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.signpic)
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.idcardfrontpic)
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.idcardbackpic)
this.form.sex= this.form.sex==1?"男":"女"
}
}
......
......@@ -2,7 +2,7 @@
<div>
<h2 class="imtil">基础信息</h2>
<div class="wrap">
<!-- <div class="masks"></div>-->
<div v-if="!this.show" class="masks"></div>
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="被终止人姓名姓名">
<el-input v-model="form4.name"></el-input>
......@@ -28,7 +28,7 @@
</div>
<h2 class="imtil">参保注销信息</h2>
<div class="wrap">
<!-- <div class="masks"></div>-->
<div v-if="!this.show" class="masks"></div>
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="终止原因">
<el-input v-model="form4.cancel_res"></el-input>
......@@ -54,13 +54,14 @@
<el-input v-model="form4.reback_money"></el-input>
</el-form-item>
<el-form-item label="重复地区及险种的追回金额">
<el-input placeholder="如有金额请输入"></el-input>
<el-input v-if="this.show" placeholder="如有金额请输入"></el-input>
<el-input v-if="!this.show"></el-input>
</el-form-item>
</el-form>
</div>
<h2 class="imtil">个人账户终止结算信息</h2>
<div class="wrap">
<!-- <div class="masks"></div>-->
<div v-if="!this.show" class="masks"></div>
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="个人账户余额">
<el-input v-model="form4.account_balance"></el-input>
......@@ -71,8 +72,8 @@
<el-form-item label="应抵扣重复领取其他社会保险待遇">
<el-input v-model="form4.other_overApply"></el-input>
</el-form-item>
<el-form-item label="发放账户">
<el-input placeholder="该框暂无对应字段,请联系开发人员"></el-input>
<el-form-item label="发放账户类型">
<el-input v-model="form4.provide_account"></el-input>
</el-form-item>
</el-form>
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
......@@ -86,13 +87,13 @@
<el-input v-model="form4.account_totle"></el-input>
</el-form-item>
<el-form-item label="发放账户的账号">
<el-input placeholder="该框暂无对应字段,请联系开发人员"></el-input>
<el-input v-model="form4.bankAccount"></el-input>
</el-form-item>
</el-form>
</div>
<h2 class="imtil">指定受益人或法定继承人</h2>
<div class="wrap">
<!-- <div class="masks"></div>-->
<div v-if="!this.show" class="masks"></div>
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="姓名">
<el-input v-model="form4.bailor_name"></el-input>
......@@ -156,6 +157,7 @@
import CryptoJS from 'crypto-js'
import {Loading} from 'element-ui';
import {formatDate} from "@/utils/datetime";
export default {
data() {
......@@ -206,6 +208,7 @@
wuserId: "",
address: "",
birth_day: "",
bankAccount: "",
},
urls: [],
show: ""
......@@ -239,9 +242,10 @@
this.$router.push({
name: "参保注销审核"
});
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
for (let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "参保注销审核 ") {
closeAll[j].click();
return;
......@@ -304,9 +308,10 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
for (let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "参保注销审核 ") {
closeAll[j].click();
return;
......@@ -356,15 +361,15 @@
},
},
created() {
if (typeof(this.$route.params.insCan) !== "undefined" && this.$route.params.insCan.info) {
if (typeof (this.$route.params.insCan) !== "undefined" && this.$route.params.insCan.info) {
this.show = this.$route.params.insCan.show;
sessionStorage.setItem("insCanInfo", this.$route.params.insCan.info);
sessionStorage.setItem("insCanItems", JSON.stringify(this.$route.params.insCan));
}
let obj = JSON.parse(sessionStorage.getItem("insCanItems"));
this.form4 = JSON.parse(sessionStorage.getItem("insCanInfo"));
this.form4.name = this.form4.name ? this.decrypt(this.form4.name) : "";
this.form4.name = this.form4.name ? this.decrypt(this.form4.name) : obj.name;
this.form4.identity_number = this.form4.identity_number ? this.decrypt(this.form4.identity_number) : "";
let obj = JSON.parse(sessionStorage.getItem("insCanItems"));
if (obj.bankpic) {
this.bb = true;
this.itmebs = "银行卡";
......@@ -386,7 +391,10 @@
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardbackpic);
this.form4.sex = this.form4.sex === 1 ? "男" : "女";
this.form4.bailor_sex = this.form4.bailor_sex === 1 ? "男" : "女";
}
if (this.form4.birth_day) {
this.form4.birth_day = formatDate(this.form4.birth_day.time);
}
},
}
</script>
<style>
......
......@@ -155,6 +155,7 @@ export default {
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -216,6 +217,7 @@ export default {
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -248,7 +250,7 @@ export default {
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
message: '取消输入'
});
});
},
......
<template>
<div>
<div class="op">
<Candode v-on:childByValue="childByValue"></Candode>
<Candode class="candode" v-on:childByValue="childByValue"></Candode>
<div class="nam">
<el-input v-model="name" size="mini" placeholder="请输入姓名" clearable></el-input>
</div>
......@@ -18,8 +18,13 @@
</el-option>
</el-select>
</div>
<el-button type="primary" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-search"
@click="search">搜索
<el-button
type="primary"
size="mini"
style="background:#148A9B;margin-left:10px"
icon="el-icon-search"
@click="search">
搜索
</el-button>
</div>
<el-table
......@@ -79,7 +84,8 @@
type="primary"
size="mini"
icon="el-icon-s-check"
@click="handle(scope.$index, scope.row)">详情</el-button>
@click="handle(scope.$index, scope.row)">详情
</el-button>
</template>
</el-table-column>
</el-table>
......@@ -215,26 +221,27 @@
</div>
</template>
<style>
<style scoped>
.op {
display: flex;
align-items: center;
}
.candode {
margin-right: 20px;
}
.idc {
margin-left: 20px;
/*min-width: 200px;*/
margin-right: 20px;
}
.nam {
margin-left: 20px;
/*min-width: 200px;*/
margin-right: 20px;
}
.grantState {
margin-left: 20px;
/*min-width: 200px;*/
}
/*.grantState {*/
/* margin-right: 20px;*/
/*}*/
.el-table .warning-row {
background: oldlace;
......@@ -259,7 +266,7 @@
import Candode from "../Core/candode"
export default {
components:{
components: {
Candode
},
data() {
......@@ -291,27 +298,31 @@
methods: {
//搜索
search() {
Loading.service();
let data = {
idCard: this.idCard ? this.Encrypt(this.idCard) : "",
name: this.name ? this.Encrypt(this.name) : "",
grantState: this.grantState,
townName: this.townList?this.townList[0]:"",
villageName:this.townList?this.townList[1]:"",
townName: this.townList ? this.townList[0] : "",
villageName: this.townList ? this.townList[1] : "",
};
this.$api.getlist.getGrantList(data).then((res) => {
for (var i in res.data.list) {
res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard)
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].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
res.data.list[i].idcard = res.data.list[i].idcard ? this.decrypt(res.data.list[i].idcard) : "";
res.data.list[i].name = res.data.list[i].name ? this.decrypt(res.data.list[i].name) : "";
}
this.tableData = res.data.content
this.totals = res.data.totalSize
this.pageNum = res.data.pageNum
this.tableData = res.data.content;
this.totals = res.data.totalSize;
this.pageNum = res.data.pageNum;
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
}).catch((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
});
},
current_change(ss) {
......@@ -321,8 +332,8 @@
idCard: this.idCard ? this.Encrypt(this.idCard) : "",
name: this.name ? this.Encrypt(this.name) : "",
grantState: this.grantState,
townName: this.townList?this.townList[0]:"",
villageName:this.townList?this.townList[1]:"",
townName: this.townList ? this.townList[0] : "",
villageName: this.townList ? this.townList[1] : "",
};
Loading.service();
this.$api.getlist.getGrantList(data).then((res) => {
......@@ -331,16 +342,12 @@
loadingInstance.close();
});
for (var i in res.data.list) {
res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard)
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].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard);
res.data.list[i].name = this.decrypt(res.data.list[i].name);
}
this.tableData = res.data.content
this.totals = res.data.totalSize
this.pageNum = res.data.pageNum
this.tableData = res.data.content;
this.totals = res.data.totalSize;
this.pageNum = res.data.pageNum;
}).catch((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
......@@ -357,8 +364,8 @@
this.data.retirementDate = d.getFullYear() + "-" + mon + "-" + d.getDate();
},
handleDelete(g, h) {
console.log(g)
console.log(h)
console.log(g);
console.log(h);
},
Encrypt(word) { //aes加密
var key = CryptoJS.enc.Utf8.parse("KkweInfo23255625");
......@@ -380,7 +387,7 @@
ciphertext: CryptoJS.enc.Base64.parse(ciphertext)
}, keyHex, {
mode: CryptoJS.mode.ECB,
padding: CryptoJS.pad.Pkcs7
padding: CryptoJS.pad.Pkcs7,
});
return decrypted.toString(CryptoJS.enc.Utf8);
},
......@@ -389,9 +396,10 @@
.then(_ => {
done();
})
.catch(_ => {});
.catch(_ => {
});
},
childByValue(val){
childByValue(val) {
this.townList = val;
},
},
......@@ -404,15 +412,11 @@
loadingInstance.close();
});
for (var i in res.data.list) {
res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard)
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].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard);
res.data.list[i].name = this.decrypt(res.data.list[i].name);
}
this.tableData = res.data.content
this.totals = res.data.totalSize
this.tableData = res.data.content;
this.totals = res.data.totalSize;
this.pageNum = res.data.pageNum
}).catch((res) => {
let loadingInstance = Loading.service();
......
......@@ -164,9 +164,10 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
for (let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "补缴保费审核 ") {
closeAll[j].click();
return;
......@@ -223,9 +224,10 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
for (let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "补缴保费审核 ") {
closeAll[j].click();
return;
......@@ -254,7 +256,7 @@
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
message: '取消输入'
});
});
},
......@@ -272,19 +274,19 @@
padding: CryptoJS.pad.Pkcs7
});
return decrypted.toString(CryptoJS.enc.Utf8);
}
},
},
created() {
if (typeof(this.$route.params.supPay) !== "undefined" && this.$route.params.supPay.info) {
if (typeof (this.$route.params.supPay) !== "undefined" && this.$route.params.supPay.info) {
this.show = this.$route.params.supPay.show;
sessionStorage.setItem("supPayInfo", this.$route.params.supPay.info);
sessionStorage.setItem("supPayItems", JSON.stringify(this.$route.params.supPay));
}
let obj = JSON.parse(sessionStorage.getItem("supPayItems"));
this.form = JSON.parse(sessionStorage.getItem("supPayInfo"));
this.form.name = this.form.name ? this.decrypt(this.form.name) : "";
this.form.name = this.form.name ? this.decrypt(this.form.name) : obj.name;
this.form.identity_number = this.form.identity_number ? this.decrypt(this.form.identity_number) : "";
this.form.telphoneValue = this.form.telphoneValue ? this.decrypt(this.form.telphoneValue) : "";
let obj = JSON.parse(sessionStorage.getItem("supPayItems"));
if (obj.bankpic) {
this.bb = true;
this.itmebs = "银行卡";
......@@ -305,7 +307,11 @@
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardfrontpic);
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardbackpic);
this.form.sex = this.form.sex === 1 ? "男" : "女";
}
if (this.form.address) {
const address = JSON.parse(this.form.address);
this.form.address = address.province + address.city + address.county + address.town + address.village + address.group;
}
},
}
</script>
<style>
......
......@@ -292,6 +292,7 @@
name:"待遇申请审核",
params:{
treApp: {
name: this.tableData[s].name,
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
......@@ -310,6 +311,7 @@
name:"参保注销审核",
params:{
insCan: {
name: this.tableData[s].name,
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
......@@ -328,6 +330,7 @@
name:"补缴保费审核",
params:{
supPay: {
name: this.tableData[s].name,
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
......@@ -346,6 +349,7 @@
name:"升档改办审核",
params:{
upgReo: {
name: this.tableData[s].name,
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
......@@ -364,6 +368,7 @@
name:"关系转移审核",
params:{
traRel: {
name: this.tableData[s].name,
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
......
......@@ -38,7 +38,7 @@
</el-form-item>
</el-form>
<el-form ref="form" :model="form" class="form" label-width="auto">
<el-form-item label="户籍地地址">
<el-form-item label="转移后户籍地地址">
<el-input v-model="form.new_Address"></el-input>
</el-form-item>
<el-form-item label="银行账号">
......@@ -152,6 +152,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -211,6 +212,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -242,7 +244,7 @@
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
message: '取消输入'
});
});
},
......@@ -268,11 +270,11 @@
sessionStorage.setItem("traRelInfo", this.$route.params.traRel.info);
sessionStorage.setItem("traRelItems", JSON.stringify(this.$route.params.traRel));
}
let obj = JSON.parse(sessionStorage.getItem("traRelItems"));
this.form = JSON.parse(sessionStorage.getItem("traRelInfo"));
this.form.name = this.form.name ? this.decrypt(this.form.name) : "";
this.form.name = this.form.name ? this.decrypt(this.form.name) : obj.name;
this.form.identity_number = this.form.identity_number ? this.decrypt(this.form.identity_number) : "";
this.form.telphoneValue = this.form.telphoneValue ? this.decrypt(this.form.telphoneValue) : "";
let obj = JSON.parse(sessionStorage.getItem("supPayItems"));
if (obj.bankpic) {
this.bb = true;
this.itmebs = "银行卡";
......
......@@ -86,6 +86,14 @@
</div>
</el-image>
</div>
<div class="block">
<p class="demonstration">个人照片</p>
<el-image :src="urls[4]">
<div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span>
</div>
</el-image>
</div>
</div>
</div>
<div style="text-align:center;margin-bottom:40px" v-show="show">
......@@ -174,6 +182,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -234,6 +243,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -265,7 +275,7 @@
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
message: '取消输入'
});
});
},
......@@ -291,11 +301,11 @@
sessionStorage.setItem("treAppInfo", this.$route.params.treApp.info);
sessionStorage.setItem("treAppItems", JSON.stringify(this.$route.params.treApp));
}
var obj = JSON.parse(sessionStorage.getItem("treAppItems"));
this.form = JSON.parse(sessionStorage.getItem("treAppInfo"));
this.form.name = this.form.name ? this.decrypt(this.form.name) : "";
this.form.name = this.form.name ? this.decrypt(this.form.name) : obj.name;
this.form.identity_number = this.form.identity_number ? this.decrypt(this.form.identity_number) : "";
this.form.telphoneValue = this.form.telphoneValue ? this.decrypt(this.form.telphoneValue) : "";
var obj = JSON.parse(sessionStorage.getItem("treAppItems"));
if (obj.bankpic) {
this.bb = true;
this.itmebs = "银行卡";
......@@ -315,6 +325,11 @@
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.signpic);
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardfrontpic);
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardbackpic);
if (this.form.personPhoto != null && this.form.personPhoto !== '') {
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + this.form.personPhoto);
} else {
this.urls.push("");
}
this.form.sex = this.form.sex === 1 ? "男" : "女";
}
}
......
......@@ -159,6 +159,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -218,6 +219,7 @@
message: res.message
});
}
this.$router.back();
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
......@@ -249,7 +251,7 @@
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
message: '取消输入'
});
});
},
......@@ -275,11 +277,11 @@
sessionStorage.setItem("upgReoInfo", this.$route.params.upgReo.info);
sessionStorage.setItem("upgReoItems", JSON.stringify(this.$route.params.upgReo));
}
let obj = JSON.parse(sessionStorage.getItem("upgReoItems"));
this.form = JSON.parse(sessionStorage.getItem("upgReoInfo"));
this.form.name = this.form.name ? this.decrypt(this.form.name) : "";
this.form.name = this.form.name ? this.decrypt(this.form.name) : obj.name;
this.form.identity_number = this.form.identity_number ? this.decrypt(this.form.identity_number) : "";
this.form.telphoneValue = this.form.telphoneValue ? this.decrypt(this.form.telphoneValue) : "";
let obj = JSON.parse(sessionStorage.getItem("supPayItems"));
if (obj.bankpic) {
this.bb = true;
this.itmebs = "银行卡";
......
......@@ -17,7 +17,7 @@
<!--表格内容栏-->
<kt-table :height="220" permsEdit="sys:role:edit" permsDelete="sys:role:delete" :highlightCurrentRow="true" :stripe="false"
:data="pageResult" :columns="columns" :showBatchDelete="false" @handleCurrentChange="handleRoleSelectChange"
@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete">
@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete" :showSeal="true">
</kt-table>
<!-- </el-col> -->
<!--新增编辑界面-->
......@@ -29,10 +29,39 @@
<el-form-item label="角色名" prop="name">
<el-input v-model="dataForm.name" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="备注 " prop="remark">
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" auto-complete="off" type="textarea"></el-input>
</el-form-item>
<el-form-item label="签章" prop="seal" align="left" style="height: 80px">
<el-popover
v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr !== ''"
placement="left"
title=""
trigger="hover">
<img slot="reference" :src="'data:image/jpg;base64,' + dataForm.sealStr" height="50px" width="50px" class="head_pic">
<img :src="'data:image/jpg;base64,' + dataForm.sealStr" height="200px" width="200px" class="head_pic"/>
</el-popover>
<el-upload
align="left"
class="upload-demo"
ref="upload"
action=""
accept=".png,.jpg"
:on-change="changeSeal"
:file-list="sealUrl"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button
v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr !== ''"
icon="el-icon-delete"
size="small"
type="warning"
@click="cancelSeal">
取消签章
</el-button>
<!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>-->
</el-upload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :size="size" @click.native="dialogVisible = false">{{$t('action.cancel')}}</el-button>
......@@ -84,7 +113,8 @@ export default {
{prop:"name", label:"角色名", minWidth:120},
{prop:"remark", label:"备注", minWidth:120},
{prop:"createBy", label:"创建人", minWidth:120},
{prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat}
{prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat},
// {prop:"seal", label:"签章", minWidth:120}
// {prop:"lastUpdateBy", label:"更新人", minWidth:100},
// {prop:"lastUpdateTime", label:"更新时间", minWidth:120, formatter:this.dateFormat}
],
......@@ -103,7 +133,9 @@ export default {
dataForm: {
id: 0,
name: '',
remark: ''
remark: '',
seal: '',
sealStr: ''
},
selectRole: {},
menuData: [],
......@@ -115,7 +147,10 @@ export default {
defaultProps: {
children: 'children',
label: 'name'
}
},
sealUrl: [],
sealVisible: false,
imageUrl: '',
}
},
methods: {
......@@ -141,14 +176,18 @@ export default {
this.dataForm = {
id: 0,
name: '',
remark: ''
remark: '',
seal: '',
sealStr: '',
}
this.sealUrl = [];
},
// 显示编辑界面
handleEdit: function (params) {
this.dialogVisible = true
this.operation = false
this.dataForm = Object.assign({}, params.row)
this.sealUrl = [];
},
// 编辑
submitForm: function () {
......@@ -156,7 +195,8 @@ export default {
if (valid) {
this.$confirm('确认提交吗?', '提示', {}).then(() => {
this.editLoading = true
let params = Object.assign({}, this.dataForm)
console.log(this.dataForm);
let params = Object.assign({}, this.dataForm)
this.$api.role.save(params).then((res) => {
this.editLoading = false
if(res.code == 200) {
......@@ -270,8 +310,30 @@ export default {
// 时间格式化
       dateFormat: function (row, column, cellValue, index){
           return format(row[column.property])
       }
       },
changeSeal(file) {
let This = this;
this.dataForm.sealStr = "";
this.sealUrl = [];
this.sealUrl.push(file);
if (this.sealUrl.length > 0) {
this.convertImageToBase64(function (base64) {
This.dataForm.sealStr = base64;
});
}
},
convertImageToBase64(callback) {
let reader = new FileReader();
reader.readAsDataURL(this.sealUrl[0].raw);
reader.onload = function (e) {
callback.call(this, this.result.substring(this.result.indexOf(",") + 1));
}
},
cancelSeal() {
this.sealUrl = [];
this.dataForm.sealStr = null;
this.dataForm.seal = null;
}
},
mounted() {
}
......@@ -289,4 +351,28 @@ export default {
color: rgb(20, 89, 121);
}
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409EFF;
}
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
line-height: 178px;
text-align: center;
}
.avatar {
width: 178px;
height: 178px;
display: block;
}
</style>
......@@ -150,7 +150,11 @@ export default {
],
deptId: [
{ required: true, message: '请选择机构', trigger: 'change'}
]
],
password: [
{ required: true, message: '请输入密码', trigger: 'blur'},
{ pattern: /^[\w_-]{6,18}$/, message: '密码必须为6至18位', trigger: 'blur'}
],
},
// 新增编辑界面数据
dataForm: {
......@@ -201,7 +205,14 @@ export default {
findUserRoles: function () {
this.$api.role.findAll().then((res) => {
// 加载角色集合
this.roles = res.data
this.roles = res.data;
console.log("roles:", this.roles);
for (let i = 0,len = this.roles.length;i < len;i++) {
if (this.roles[i].name === "超级管理员") {
this.roles.splice(i, 1);
break;
}
}
})
},
// 批量删除
......
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