Commit 23b7027b authored by miaohaoyun's avatar miaohaoyun

Merge branch 'mhy2' into 'mhy'

Mhy2

See merge request !27
parents 57c98e77 7aee102d
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -44,6 +44,13 @@ export const selectRoleinfo = (params) => { ...@@ -44,6 +44,13 @@ export const selectRoleinfo = (params) => {
params params
}) })
} }
export const selectRoleremark = (params) => {
return axios({
url: '/role/selectRoleremark2',
method: 'get',
params
})
}
export const progress = (params) => { export const progress = (params) => {
return axios({ return axios({
url: '/examine/progressView', url: '/examine/progressView',
...@@ -132,11 +139,11 @@ export const listAllBaseInfo = (data) => { ...@@ -132,11 +139,11 @@ export const listAllBaseInfo = (data) => {
}) })
} }
// //
export const selectflowState = (data) => { export const selectflowState = (params) => {
return axios({ return axios({
url: '/folw/selectflowState', url: '/folw/selectflowState',
method: 'post', method: 'get',
data params
}) })
} }
//领取人员查询 //领取人员查询
...@@ -147,3 +154,11 @@ export const getGrantList = (data) => { ...@@ -147,3 +154,11 @@ export const getGrantList = (data) => {
data data
}) })
} }
//流程详情
export const selectRoleflowNo = (params) => {
return axios({
url: 'role/selectRoleflowNo',
method: 'get',
params
})
}
import axios from '../axios' import axios from '../axios'
/* /*
* 用户管理模块 * 用户管理模块
*/ */
...@@ -15,7 +15,7 @@ export const save = (data) => { ...@@ -15,7 +15,7 @@ export const save = (data) => {
// 删除 // 删除
export const batchDelete = (data) => { export const batchDelete = (data) => {
return axios({ return axios({
url: '/user/forbiddenUser', url: '/user/updateUserStatus',
method: 'post', method: 'post',
data data
}) })
...@@ -35,4 +35,4 @@ export const findPermissions = (params) => { ...@@ -35,4 +35,4 @@ export const findPermissions = (params) => {
method: 'get', method: 'get',
params params
}) })
} }
\ No newline at end of file
...@@ -9,6 +9,10 @@ import ElementUI from 'element-ui' ...@@ -9,6 +9,10 @@ import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css' import 'element-ui/lib/theme-chalk/index.css'
import 'font-awesome/css/font-awesome.min.css' import 'font-awesome/css/font-awesome.min.css'
import '@/assets/iconfont/iconfont.css' import '@/assets/iconfont/iconfont.css'
import getType from "@/utils/type.js"
Vue.prototype.getType =getType.getType
Vue.prototype.regetType =getType.regetType
Vue.use(ElementUI) Vue.use(ElementUI)
Vue.use(api) Vue.use(api)
......
/* /*
* 用户管理模块 * 用户管理模块
*/ */
...@@ -17,7 +17,7 @@ export function save() { ...@@ -17,7 +17,7 @@ export function save() {
// 批量删除 // 批量删除
export function batchDelete() { export function batchDelete() {
return { return {
url: '/user/forbiddenUser', url: '/user/updateUserStatus',
type: 'post', type: 'post',
data: { data: {
"code": 200, "code": 200,
...@@ -114,4 +114,4 @@ export function findPermissions() { ...@@ -114,4 +114,4 @@ export function findPermissions() {
type: 'get', type: 'get',
data: permsData data: permsData
} }
} }
\ No newline at end of file
...@@ -24,6 +24,7 @@ import drdcbg from "@/views/Myvue/drdcbg"; ...@@ -24,6 +24,7 @@ import drdcbg from "@/views/Myvue/drdcbg";
import receivePersonnel from "@/views/Myvue/receivePersonnel"; import receivePersonnel from "@/views/Myvue/receivePersonnel";
import AllbaseInfo from "@/views/Myvue/allbaseInfo" import AllbaseInfo from "@/views/Myvue/allbaseInfo"
import PayInfo from "@/views/Myvue/payInfo" import PayInfo from "@/views/Myvue/payInfo"
import application from "@/views/Myvue/application"
import importByExcel from "@/views/Myvue/importByExcel" import importByExcel from "@/views/Myvue/importByExcel"
import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit" import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit"
import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit" import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit"
...@@ -120,6 +121,10 @@ const router = new Router({ ...@@ -120,6 +121,10 @@ const router = new Router({
path:"/payInfo", path:"/payInfo",
name:"缴费记录", name:"缴费记录",
component: PayInfo component: PayInfo
},{
path:"/application",
name:"待遇申请审核",
component: application
}, },
{ {
path:"/importByExcel", path:"/importByExcel",
...@@ -136,11 +141,6 @@ const router = new Router({ ...@@ -136,11 +141,6 @@ const router = new Router({
name:"参保注销审核", name:"参保注销审核",
component: insuranceCancellationAudit component: insuranceCancellationAudit
} }
,{
path:"/application",
name:"待遇申请审核",
component: application
}
] ]
}, },
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
//export const baseUrl ="http://faceauth.weface.com.cn:98" //export const baseUrl ="http://faceauth.weface.com.cn:98"
//export const baseUrl2 = 'http://faceauth.weface.com.cn:97' //export const baseUrl2 = 'http://faceauth.weface.com.cn:97'
//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:9002' export const baseUrl = 'http://172.16.10.25:9002'
export const baseUrl ="http://172.16.10.33:9002" //export const baseUrl ="http://172.16.10.33:9002"
//export const baseUrl2 = 'http://172.16.10.25:9999' //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.25:9002'
//export const baseUrl ="http://172.16.10.33:9002" //export const baseUrl ="http://172.16.10.33:9002"
......
...@@ -13,7 +13,21 @@ ...@@ -13,7 +13,21 @@
<el-table-column :label="$t('action.operation')" width="185" fixed="right" v-if="showOperation" header-align="center" align="center"> <el-table-column :label="$t('action.operation')" width="185" fixed="right" v-if="showOperation" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<kt-button icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/> <kt-button icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/>
<kt-button icon="fa fa-trash" label="禁用" :perms="permsDelete" :size="size" type="danger" @click="handleDelete(scope.$index, scope.row)" /> <el-switch
class="statusSwitch"
style="display: block"
v-model="scope.row.status==0?true:false"
active-color="#13ce66"
inactive-color="#ff4949"
active-text="启"
inactive-text="禁" @change="handleDelete(scope.$index, scope.row)">
</el-switch>
<!-- <div v-if="scope.row.status == 1">-->
<!-- <kt-button icon="fa fa-trash" label="禁用" :perms="permsDelete" :size="size" type="danger" @click="handleDelete(scope.$index, scope.row)" />-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- <kt-button icon="fa fa-check-circle" label="启用" :perms="permsDelete" :size="size" type="success" @click="handleDelete(scope.$index, scope.row)" />-->
<!-- </div>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -130,7 +144,7 @@ export default { ...@@ -130,7 +144,7 @@ export default {
}, },
// 删除操作 // 删除操作
delete: function (ids) { delete: function (ids) {
this.$confirm('确认禁用选中记录吗?', '提示', { this.$confirm('确认操作选中记录吗?', '提示', {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
let params = [] let params = []
...@@ -160,5 +174,27 @@ export default { ...@@ -160,5 +174,27 @@ export default {
</script> </script>
<style scoped> <style scoped>
.statusSwitch .el-switch__label {
position: absolute;
display: none;
color: #fff;
}
/*打开时文字位置设置*/
.statusSwitch .el-switch__label--right {
z-index: 2;
left: 92px;
bottom: 0px;
color: #000;
}
/*关闭时文字位置设置*/
.statusSwitch .el-switch__label--left {
z-index: 2;
right: 22px;
bottom: 0px;
color: #fff;
}
/*显示文字*/
.statusSwitch .el-switch__label.is-active {
display: block;
}
</style> </style>
...@@ -244,7 +244,7 @@ import defaultImg from "../../assets/defaultPicture.jpg" ...@@ -244,7 +244,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
label:"100岁以上", label:"100岁以上",
}], }],
//年龄计算方式 //年龄计算方式
agemeth:"", agemeth:"1",
agemethList:[{ agemethList:[{
value:"1", value:"1",
label:"按年计算", label:"按年计算",
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
> >
</el-pagination> </el-pagination>
<el-button type="success" @click="toexcel" style="margin:50px">全部导出</el-button> <el-button type="success" @click="toexcel" style="margin:50px">导出</el-button>
</div> </div>
</template> </template>
<script> <script>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
@current-change="current_change" @current-change="current_change"
> >
</el-pagination> </el-pagination>
<!-- <el-button type="success" @click="toexcel" style="margin:50px">导出</el-button>--> <!-- <el-button type="success" @click="toexcel" style="margin:50px">导出</el-button>-->
</div> </div>
</template> </template>
<script> <script>
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
.catch(err => { .catch(err => {
console.log(err); console.log(err);
}); });
}, },
current_change(s) { current_change(s) {
var data = { var data = {
...@@ -96,7 +97,9 @@ ...@@ -96,7 +97,9 @@
this.tableData = res.data.content this.tableData = res.data.content
this.totals = res.data.totalSize this.totals = res.data.totalSize
this.pageNum = res.data.pageNum this.pageNum = res.data.pageNum
} }
}).catch((res) => { }).catch((res) => {
}); });
...@@ -151,7 +154,6 @@ ...@@ -151,7 +154,6 @@
if (res.code == 200) { if (res.code == 200) {
this.tableData = res.data.content this.tableData = res.data.content
this.totals = res.data.totalSize this.totals = res.data.totalSize
this.pageNum = res.data.pageNum
} }
}).catch((res) => { }).catch((res) => {
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
min-width="20%"> min-width="20%">
</el-table-column> </el-table-column>
<el-table-column label="操作" <el-table-column label="操作"
min-width="8%"> min-width="8%">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -122,7 +122,6 @@ ...@@ -122,7 +122,6 @@
if (res.code == 200) { if (res.code == 200) {
this.tableData = res.data.content this.tableData = res.data.content
this.totals = res.data.totalSize this.totals = res.data.totalSize
this.pageNum = res.data.pageNum
} }
}).catch((res) => { }).catch((res) => {
...@@ -179,7 +178,6 @@ ...@@ -179,7 +178,6 @@
if (res.code == 200) { if (res.code == 200) {
this.tableData = res.data.content this.tableData = res.data.content
this.totals = res.data.totalSize this.totals = res.data.totalSize
this.pageNum = res.data.pageNum
} }
}).catch((res) => { }).catch((res) => {
......
...@@ -159,16 +159,7 @@ ...@@ -159,16 +159,7 @@
list:[], list:[],
name:"", name:"",
activities: [], activities: [],
options1: [{ options1: [],
value: '1',
label: '参保登记'
}, {
value: '2',
label: '信息变更'
}, {
value: '3',
label: '待遇申请'
}],
Page:1, Page:1,
totals:0, totals:0,
idcard:"", idcard:"",
...@@ -196,7 +187,7 @@ ...@@ -196,7 +187,7 @@
var d=new Date(res.data.list[i].createtime) var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1) 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?"信息变更":'' res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
} }
this.tableData=res.data.list this.tableData=res.data.list
this.totals=res.data.total this.totals=res.data.total
...@@ -212,7 +203,7 @@ ...@@ -212,7 +203,7 @@
this.activities=[] this.activities=[]
var data={ var data={
recordId:s.id, recordId:s.id,
type:s.recordtype=="参保登记"?1:s.recordtype=="信息变更"?2:'' type:this.regetType(s.recordtype)
} }
this.$api.getlist.progress(data).then((res)=>{ this.$api.getlist.progress(data).then((res)=>{
for(var i in res.data){ for(var i in res.data){
...@@ -278,7 +269,7 @@ ...@@ -278,7 +269,7 @@
var d=new Date(res.data.list[i].createtime) var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1) 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?"信息变更":'' res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
} }
this.tableData=res.data.list this.tableData=res.data.list
this.totals=res.data.total this.totals=res.data.total
...@@ -319,6 +310,21 @@ ...@@ -319,6 +310,21 @@
show:false show:false
} }
}) })
}else if(d.recordtype=="待遇申请"){
sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"待遇申请审核",
params:{info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:false
}
})
} }
}, },
handleDelete(g,h){ handleDelete(g,h){
...@@ -352,6 +358,12 @@ ...@@ -352,6 +358,12 @@
}, },
created(){ created(){
for(var i=1;i<=7;i++){
this.options1.push({
label:this.getType(i),
value:i
})
}
for(var i in listtown){ for(var i in listtown){
this.list.push({ this.list.push({
value:listtown[i].town_name, value:listtown[i].town_name,
...@@ -383,7 +395,7 @@ ...@@ -383,7 +395,7 @@
var d=new Date(res.data.list[i].createtime) var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1) 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?"信息变更":'' res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
} }
this.tableData=res.data.list this.tableData=res.data.list
this.totals=res.data.total this.totals=res.data.total
......
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
<el-table-column <el-table-column
prop="createby" prop="createby"
label="创建人"> label="创建人">
</el-table-column>
<el-table-column
prop="flowNo"
label="流程号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createtime" prop="createtime"
...@@ -49,16 +53,65 @@ ...@@ -49,16 +53,65 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-dialog title="已作废流程" width="70%" :visible.sync="dialogTableVisible">
<el-table
:data="detableData"
style="width: 100%"
>
<el-table-column
type="index"
:index="indexMethod">
</el-table-column>
<el-table-column
prop="flowname"
label="名称"
width="180">
</el-table-column>
<el-table-column
prop="createby"
label="创建人">
</el-table-column>
<el-table-column
prop="flowNo"
label="流程号">
</el-table-column>
<el-table-column
prop="createtime"
label="创建时间">
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-popover
placement="right"
width="200"
trigger="click">
<div class="step" style="height: 200px;">
<el-steps direction="vertical" :active="7">
<el-step v-for="index in step" :key="step[index]" :title="index.name"></el-step>
</el-steps>
</div>
<el-button
size="mini"
slot="reference"
@click="dehandle(scope.$index, scope.row)">详情</el-button>
</el-popover>
</template>
</el-table-column>
</el-table>
<el-pagination
class="pone" class="pone"
:page-size='10' :page-size='10'
layout="total, prev, pager, next, jumper" layout="total, prev, pager, next, jumper"
:total="totals" :total="totals"
:current-page.sync="Page" :current-page.sync="Page"
@current-change="current_change"
> >
</el-pagination> </el-pagination>
</el-dialog>
<el-dialog <el-dialog
:title="flowTitle" :title="flowTitle"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
...@@ -133,6 +186,7 @@ ...@@ -133,6 +186,7 @@
export default { export default {
data() { data() {
return { return {
dialogTableVisible:false,
flowTitle:"", flowTitle:"",
showiii:false, showiii:false,
//标题 //标题
...@@ -146,6 +200,7 @@ ...@@ -146,6 +200,7 @@
input:"", input:"",
info:'', info:'',
tableData: [], tableData: [],
detableData:[],
options: [], options: [],
value: [], value: [],
oldvalue:[], oldvalue:[],
...@@ -155,9 +210,14 @@ ...@@ -155,9 +210,14 @@
methods:{ methods:{
//作废 //作废
delet(){ delet(){
this.$api.getlist.selectflowState().then((res) => { var data={
this.tableData=res.data pageNum:1,
console.log(this.tableData) pageSize:10
}
this.$api.getlist.selectflowState(data).then((res) => {
this.detableData=res.data.result
this.totals=res.data.total
this.dialogTableVisible=true
}).catch((res) => { }).catch((res) => {
...@@ -174,7 +234,18 @@ this.$api.getlist.selectflowState().then((res) => { ...@@ -174,7 +234,18 @@ this.$api.getlist.selectflowState().then((res) => {
}); });
}, },
current_change(s){ current_change(s){
var data={
pageNum:s,
pageSize:10
}
this.$api.getlist.selectflowState(data).then((res) => {
this.detableData=res.data.result
this.totals=res.data.total
this.dialogTableVisible=true
}).catch((res) => {
});
}, },
toshow(s){ toshow(s){
this.showiii=s this.showiii=s
...@@ -186,20 +257,17 @@ this.$api.getlist.selectflowState().then((res) => { ...@@ -186,20 +257,17 @@ this.$api.getlist.selectflowState().then((res) => {
//获取流程 //获取流程
showadd(s,d){ showadd(s,d){
this.value=[] this.value=[]
this.titleList=[]
this.oldvalue=[] this.oldvalue=[]
console.log(d) console.log(d)
if(s==1){ if(s==1){
this.flowTitle="新增流程" this.flowTitle="新增流程"
this.titleList=[{ for(var i =1;i<=6;i++){
label:"参保登记审核流程", this.titleList.push({
value:"1,参保登记审核流程" label:this.getType(i),
},{ value:i+","+this.getType(i)
label:"信息变更审核流程", })
value:"2,信息变更审核流程" }
},{
label:"待遇申请审核流程",
value:"3,待遇申请审核流程"
}]
}else if(s==2){ }else if(s==2){
this.titleList=[{ this.titleList=[{
label:d.flowname, label:d.flowname,
...@@ -207,11 +275,10 @@ this.$api.getlist.selectflowState().then((res) => { ...@@ -207,11 +275,10 @@ this.$api.getlist.selectflowState().then((res) => {
}] }]
this.title=d.type+","+d.flowname this.title=d.type+","+d.flowname
this.flowTitle="修改流程" this.flowTitle="修改流程"
var par={ var par={
type:d.type flowNo:d.flowNo
} }
this.$api.getlist.selectRoleremark(par).then((res) => {
this.$api.getlist.selectRoleinfo(par).then((res) => {
var dd=0 var dd=0
...@@ -294,16 +361,27 @@ this.$api.getlist.selectflowState().then((res) => { ...@@ -294,16 +361,27 @@ this.$api.getlist.selectflowState().then((res) => {
}, },
handle(s,d){ handle(s,d){
var par={ var par={
type:d.type flowNo:d.flowNo
} }
this.$api.getlist.selectRoleinfo(par).then((res) => { this.$api.getlist.selectRoleremark(par).then((res) => {
this.step=res.data this.step=res.data
console.log( this.step) console.log( this.step)
}).catch((res) => { }).catch((res) => {
}); });
}, },
dehandle(s,d){
console.log(d)
var par={
flowNo:d.flowNo
}
this.$api.getlist.selectRoleflowNo(par).then((res) => {
this.step=res.data
}).catch((res) => {
});
}
}, },
created(){ created(){
......
...@@ -292,6 +292,7 @@ export default { ...@@ -292,6 +292,7 @@ export default {
this.form.special_type=this.form.org_name.org_insuranceType this.form.special_type=this.form.org_name.org_insuranceType
this.form.name=this.decrypt(this.form.org_name) this.form.name=this.decrypt(this.form.org_name)
//this.form.name=this.form.org_name
this.form.identity_number=this.decrypt(this.form.org_idNum) this.form.identity_number=this.decrypt(this.form.org_idNum)
this.form.telphoneValue=this.decrypt(this.form.telphoneValue) this.form.telphoneValue=this.decrypt(this.form.telphoneValue)
this.form.nation=this.form.nation this.form.nation=this.form.nation
...@@ -337,7 +338,7 @@ export default { ...@@ -337,7 +338,7 @@ export default {
}else if(this.form.type_son==7){ }else if(this.form.type_son==7){
this.form.old=this.form.identity_number, this.form.old=this.form.identity_number,
this.form.now=this.form.change_idNum, this.form.now=this.decrypt(this.form.change_idNum),
this.now="变更后身份证" this.now="变更后身份证"
this.old="变更前身份证" this.old="变更前身份证"
} }
...@@ -351,7 +352,6 @@ export default { ...@@ -351,7 +352,6 @@ export default {
this.itmebs="户口本" this.itmebs="户口本"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bookPic) this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bookPic)
}else if(obj.specialPhotoPic){ }else if(obj.specialPhotoPic){
console.log(123132)
this.itmebs="特殊身份证明" this.itmebs="特殊身份证明"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.specialPhotoPic) this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.specialPhotoPic)
}else{ }else{
...@@ -399,15 +399,15 @@ export default { ...@@ -399,15 +399,15 @@ export default {
overflow: hidden; overflow: hidden;
margin-bottom: 40px margin-bottom: 40px
} }
.block{
width: 23%
}
.block{ .block{
float: left; float: left;
height: 100%; height: 100%;
margin-right: 20px margin-right: 20px
} }
.block img{
width: auto;
height: 300px;
}
.imtil{ .imtil{
padding:0 0 20px 0 padding:0 0 20px 0
} }
......
...@@ -292,6 +292,7 @@ export default { ...@@ -292,6 +292,7 @@ export default {
this.form.special_type=this.form.org_name.org_insuranceType this.form.special_type=this.form.org_name.org_insuranceType
this.form.name=this.decrypt(this.form.org_name) this.form.name=this.decrypt(this.form.org_name)
//this.form.name=this.form.org_name
this.form.identity_number=this.decrypt(this.form.org_idNum) this.form.identity_number=this.decrypt(this.form.org_idNum)
this.form.telphoneValue=this.decrypt(this.form.telphoneValue) this.form.telphoneValue=this.decrypt(this.form.telphoneValue)
this.form.nation=this.form.nation this.form.nation=this.form.nation
...@@ -337,7 +338,7 @@ export default { ...@@ -337,7 +338,7 @@ export default {
}else if(this.form.type_son==7){ }else if(this.form.type_son==7){
this.form.old=this.form.identity_number, this.form.old=this.form.identity_number,
this.form.now=this.form.change_idNum, this.form.now=this.decrypt(this.form.change_idNum),
this.now="变更后身份证" this.now="变更后身份证"
this.old="变更前身份证" this.old="变更前身份证"
} }
...@@ -351,7 +352,6 @@ export default { ...@@ -351,7 +352,6 @@ export default {
this.itmebs="户口本" this.itmebs="户口本"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bookPic) this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bookPic)
}else if(obj.specialPhotoPic){ }else if(obj.specialPhotoPic){
console.log(123132)
this.itmebs="特殊身份证明" this.itmebs="特殊身份证明"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.specialPhotoPic) this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.specialPhotoPic)
}else{ }else{
...@@ -399,15 +399,15 @@ export default { ...@@ -399,15 +399,15 @@ export default {
overflow: hidden; overflow: hidden;
margin-bottom: 40px margin-bottom: 40px
} }
.block{
width: 23%
}
.block{ .block{
float: left; float: left;
height: 100%; height: 100%;
margin-right: 20px margin-right: 20px
} }
.block img{
width: auto;
height: 300px;
}
.imtil{ .imtil{
padding:0 0 20px 0 padding:0 0 20px 0
} }
......
...@@ -316,15 +316,14 @@ export default { ...@@ -316,15 +316,14 @@ export default {
overflow: hidden; overflow: hidden;
margin-bottom: 40px margin-bottom: 40px
} }
.block{
width: 23%
}
.block{ .block{
float: left; float: left;
height: 100%; height: 100%;
margin-right: 20px margin-right: 20px
} }
.block img{
width: auto;
height: 300px;
}
.imtil{ .imtil{
padding:0 0 20px 0 padding:0 0 20px 0
} }
......
<template> <template>
<div> <div>
<div class="op"> <div class="op">
<div class="idc"> <div class="idc">
<el-input v-model="idcard" size="mini" placeholder="请输入身份证号"></el-input> <el-input v-model="idcard" size="mini" placeholder="请输入身份证号"></el-input>
</div> </div>
<div class="ywtyoe"> <div class="ywtyoe">
<el-select v-model="ywtype" placeholder="请选择业务类型" size="mini"> <el-select v-model="ywtype" placeholder="请选择业务类型" size="mini">
<el-option <el-option
v-for="item in options1" v-for="item in options1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<el-button type="primary" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-search" <el-button type="primary" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-search" @click="serch">搜索</el-button>
@click="serch">搜索 </div>
</el-button> <el-table
</div> :data="tableData"
<el-table style="width: 100%"
:data="tableData" >
style="width: 100%" <el-table-column
:row-class-name="tableRowClassName"> prop="idcard"
<el-table-column label="身份证号"
prop="idcard" width="180">
label="身份证号" </el-table-column>
width="180"> <el-table-column
</el-table-column> prop="name"
<el-table-column label="姓名"
prop="name" width="180">
label="姓名" </el-table-column>
width="180"> <el-table-column
</el-table-column> prop="recordtype"
<el-table-column label="业务类型">
prop="recordtype" </el-table-column>
label="业务类型"> <el-table-column
</el-table-column> prop="createtime"
<el-table-column label="创建时间">
prop="createtime" </el-table-column>
label="创建时间"> <el-table-column
</el-table-column> prop="townname"
<el-table-column label="镇">
prop="townname" </el-table-column>
label="镇"> <el-table-column
</el-table-column> prop="villagename"
<el-table-column label="村">
prop="villagename" </el-table-column>
label="村"> <el-table-column
</el-table-column> prop="nowExamine"
<el-table-column label="当前状态">
prop="nowExamine" </el-table-column>
label="当前状态">
</el-table-column> <el-table-column
width="180"
<el-table-column label="操作">
width="180" <template slot-scope="scope">
label="操作"> <el-button
<template slot-scope="scope"> type="primary"
<el-button size="mini"
type="primary" icon="el-icon-s-check"
size="mini" @click="handle(scope.$index, scope.row)">审核</el-button>
icon="el-icon-s-check"
@click="handle(scope.$index, scope.row)">审核
</el-button>
<el-popover <el-popover
placement="right" placement="right"
width="180" width="180"
trigger="click"> trigger="click">
<el-timeline> <el-timeline>
<el-timeline-item <el-timeline-item
v-for="(activity, index) in activities" v-for="(activity, index) in activities"
:key="index" :key="index"
:icon="activity.icon" :icon="activity.icon"
:type="activity.type" :type="activity.type"
:color="activity.color" :color="activity.color"
:size="activity.size" :size="activity.size"
:timestamp="activity.timestamp" :timestamp="activity.timestamp"
:timestamp2="123"> :timestamp2="123">
{{activity.content}} {{activity.content}}
<p style="font-size:13px;color:#909399" v-show="activity.timestamp">审核人:{{activity.name}}</p> <p style="font-size:13px;color:#909399" v-show="activity.timestamp">审核人:{{activity.name}}</p>
<p style="font-size:13px;color:#909399" v-show="activity.examineRemark"> <p style="font-size:13px;color:#909399" v-show="activity.examineRemark">原因:{{activity.examineRemark}}</p>
原因:{{activity.examineRemark}}</p> </el-timeline-item>
</el-timeline-item> </el-timeline>
</el-timeline> <el-button
<el-button @click="progress(scope.$index, scope.row)"
@click="progress(scope.$index, scope.row)" size="mini"
size="mini" slot="reference"
slot="reference" type="success"
type="success" >流程</el-button>
>流程
</el-button>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
class="pone" class="pone"
:page-size='10' :page-size='10'
layout="total, prev, pager, next, jumper" layout="total, prev, pager, next, jumper"
:total="totals" :total="totals"
:current-page.sync="Page" :current-page.sync="Page"
@current-change="current_change" @current-change="current_change"
> >
</el-pagination> </el-pagination>
</div> </div>
</template> </template>
<style> <style>
.op { .op{
display: flex; display: flex;
align-items: center; align-items: center;
} }
.idc{
.idc {
width: 200px width: 200px
} }
.ywtyoe{
.ywtyoe {
width: 200px; width: 200px;
margin-left: 20px margin-left: 20px
} }
.el-table .warning-row { .el-table .warning-row {
background: oldlace; background: oldlace;
} }
...@@ -131,295 +123,247 @@ ...@@ -131,295 +123,247 @@
.el-table .success-row { .el-table .success-row {
background: #f0f9eb; background: #f0f9eb;
} }
.pone{
.pone {
margin-top: 40px margin-top: 40px
} }
</style> </style>
<script> <script>
import CryptoJS from 'crypto-js' import CryptoJS from 'crypto-js'
import {Loading} from 'element-ui'; import { Loading } from 'element-ui';
// import baseUrl from "../../globe/globeUrl" // import baseUrl from "../../globe/globeUrl"
export default { export default {
data() { data() {
return { return {
activities: [], activities: [],
options1: [{ options1: [{
value: '1', value: '1',
label: '参保登记' label: '参保登记'
}, { }, {
value: '2', value: '2',
label: '信息变更' label: '信息变更'
}, { }, {
value: '3', value: '3',
label: '待遇申请' label: '待遇申请'
}, { }],
value: '4', Page:1,
label: '参保注销' totals:0,
}, { idcard:"",
value: '5', ywtype:"",
label: '补缴保费' info:'',
}], ywtype:'',
Page: 1,
totals: 0,
idcard: "",
ywtype: "",
info: '',
tableData: [] tableData: []
} }
}, },
methods: { methods: {
//搜索 //搜索
serch() { serch(){
var data = { var data={
idcard: this.idcard ? this.Encrypt(this.idcard) : "", idcard:this.idcard?this.Encrypt(this.idcard):"",
recordType: this.ywtype ? parseInt(this.ywtype) : "" recordType:this.ywtype?parseInt(this.ywtype):""
} }
this.$api.getlist.getlist(data).then((res) => { this.$api.getlist.getlist(data).then((res) => {
for (var i in res.data.list) { for(var i in res.data.list){
res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard) res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
res.data.list[i].name = this.decrypt(res.data.list[i].name) res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d = new Date(res.data.list[i].createtime) var d=new Date(res.data.list[i].createtime)
var mon = (parseInt(d.getMonth()) + 1) 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 ? "信息变更" : res.data.list[i].recordtype == 3 ? "待遇申请" : res.data.list[i].recordtype == 4 ? "参保注销" : "" 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.tableData=res.data.list
this.totals = res.data.total this.totals=res.data.total
this.page = res.data.total.pageNum this.page=res.data.total.pageNum
}).catch((res) => { }).catch((res) => {
}); });
}, },
//流程 //流程
progress(d, s) { progress(d,s){
console.log(s) console.log(s)
this.activities = [] this.activities=[]
var data = { var data={
recordId: s.id, recordId:s.id,
type: s.recordtype == "参保登记" ? 1 : s.recordtype == "信息变更" ? 2 : s.recordtype == "待遇申请" ? 3 : s.recordtype == "参保注销" ? 4 : '' type:s.recordtype=="参保登记"?1:s.recordtype=="信息变更"?2:s.recordtype=="待遇申请"?3:s.recordtype=="参保注销"?4:''
} }
this.$api.getlist.progress(data).then((res) => { this.$api.getlist.progress(data).then((res)=>{
for (var i in res.data) { for(var i in res.data){
if (res.data[i].examineState == "进行中") { if(res.data[i].examineState=="进行中"){
this.activities.push({ this.activities.push({
content: res.data[i].role, content:res.data[i].role,
//timestamp:res.data[i].examinePerson+"审核于"+res.data[i].examineTime, //timestamp:res.data[i].examinePerson+"审核于"+res.data[i].examineTime,
color: '#0bbd87', color:'#0bbd87',
size: 'large' size: 'large'
}) })
} else { }else{
this.activities.push({ this.activities.push({
content: res.data[i].role, content:res.data[i].role,
timestamp: res.data[i].examinePerson ? res.data[i].examineTime : "", timestamp:res.data[i].examinePerson?res.data[i].examineTime:"",
name: res.data[i].examinePerson ? res.data[i].examinePerson : "", name:res.data[i].examinePerson?res.data[i].examinePerson:"",
examineRemark: res.data[i].examineRemark ? res.data[i].examineRemark : '', examineRemark:res.data[i].examineRemark?res.data[i].examineRemark:'',
color: res.data[i].nowNode ? "#97E5CE" : "lightgray" color:res.data[i].nowNode?"#97E5CE":"lightgray"
})
if(res.data[i].examineState=="审核失败"){
this.activities.push({
content:"审核失败",
timestamp:res.data[i].examinePerson?res.data[i].examineTime:"",
name:res.data[i].examinePerson?res.data[i].examinePerson:"",
examineRemark:res.data[i].examineRemark?res.data[i].examineRemark:'',
color:'black'
}) })
if (res.data[i].examineState == "审核失败") {
this.activities.push({
content: "审核失败",
timestamp: res.data[i].examinePerson ? res.data[i].examineTime : "",
name: res.data[i].examinePerson ? res.data[i].examinePerson : "",
examineRemark: res.data[i].examineRemark ? res.data[i].examineRemark : '',
color: 'black'
})
return return
} }
} }
} }
}).catch((res) => { }).catch((res)=>{
}) })
}, },
tableRowClassName({row, rowIndex}) {
if (rowIndex === 1) { current_change(ss){
return 'warning-row'; var data={
} else if (rowIndex === 3) { pageNum:ss,
return 'success-row'; pageSize:10,
idcard:this.idcard,
type:this.ywtype
} }
return ''; Loading.service();
}, this.$api.getlist.getlist(data).then((res) => {
current_change(ss) { let loadingInstance = Loading.service();
var data = { this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
pageNum: ss, loadingInstance.close();
pageSize: 10, });
idcard: this.idcard, for(var i in res.data.list){
type: this.ywtype res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
} res.data.list[i].name=this.decrypt(res.data.list[i].name)
Loading.service(); var d=new Date(res.data.list[i].createtime)
this.$api.getlist.getlist(data).then((res) => { res.data.list[i].createtime=d.getFullYear()+"-"+d.getMonth() + 1+"-"+d.getDate()+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
let loadingInstance = Loading.service(); res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
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)
res.data.list[i].createtime = d.getFullYear() + "-" + d.getMonth() + 1 + "-" + d.getDate() + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
} }
this.tableData = res.data.list this.tableData=res.data.list
this.totals = res.data.total this.totals=res.data.total
this.page = res.data.total.pageNum this.page=res.data.total.pageNum
}).catch((res) => { }).catch((res) => {
let loadingInstance = Loading.service(); let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close(); loadingInstance.close();
}); });
}); });
}, },
//审核 //审核
handle(s, d) { handle(s,d){
if (d.recordtype == "参保登记") { if(d.recordtype=="参保登记"){
sessionStorage.setItem("recordId", this.tableData[s].recordId) sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({ this.$router.push({
name: "参保登记审核", name:"参保登记审核",
params: { params:{info:this.tableData[s].info,
info: this.tableData[s].info, bankpic:this.tableData[s].bankpic,
bankpic: this.tableData[s].bankpic, idcardbackpic:this.tableData[s].idcardbackpic,
idcardbackpic: this.tableData[s].idcardbackpic, idcardfrontpic:this.tableData[s].idcardfrontpic,
idcardfrontpic: this.tableData[s].idcardfrontpic, signpic:this.tableData[s].signpic,
signpic: this.tableData[s].signpic,
show:true
show: true
} }
}) })
} else if (d.recordtype == "信息变更") { }else if(d.recordtype=="信息变更"){
sessionStorage.setItem("recordId", this.tableData[s].recordId) sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({ this.$router.push({
name: "信息变更审核", name:"信息变更审核",
params: { params:{info:this.tableData[s].info,
info: this.tableData[s].info, bankpic:this.tableData[s].bankpic,
bankpic: this.tableData[s].bankpic, idcardbackpic:this.tableData[s].idcardbackpic,
idcardbackpic: this.tableData[s].idcardbackpic, idcardfrontpic:this.tableData[s].idcardfrontpic,
idcardfrontpic: this.tableData[s].idcardfrontpic, signpic:this.tableData[s].signpic,
signpic: this.tableData[s].signpic, specialPhotoPic:this.tableData[s].specialPhotoPic,
specialPhotoPic: this.tableData[s].specialPhotoPic, bookPic:this.tableData[s].bookPic,
bookPic: this.tableData[s].bookPic, show:true
show: true
} }
}) })
} else if (d.recordtype == "待遇申请") { }else if(d.recordtype=="待遇申请"){
sessionStorage.setItem("recordId", this.tableData[s].recordId)
sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({ this.$router.push({
name: "待遇申请审核", name:"待遇申请审核",
params: { params:{info:this.tableData[s].info,
info: this.tableData[s].info, bankpic:this.tableData[s].bankpic,
bankpic: this.tableData[s].bankpic, idcardbackpic:this.tableData[s].idcardbackpic,
idcardbackpic: this.tableData[s].idcardbackpic, idcardfrontpic:this.tableData[s].idcardfrontpic,
idcardfrontpic: this.tableData[s].idcardfrontpic, signpic:this.tableData[s].signpic,
signpic: this.tableData[s].signpic, specialPhotoPic:this.tableData[s].specialPhotoPic,
specialPhotoPic: this.tableData[s].specialPhotoPic, bookPic:this.tableData[s].bookPic,
bookPic: this.tableData[s].bookPic, show:true
show: true
} }
}) })
} else if (d.recordtype == "参保注销") { }
sessionStorage.setItem("recordId", this.tableData[s].recordId) },
this.$router.push({ handleDelete(g,h){
name: "参保注销审核", console.log(g)
params: { console.log(h)
info: this.tableData[s].info, },
bankpic: this.tableData[s].bankpic, Encrypt(word) { //aes加密
idcardbackpic: this.tableData[s].idcardbackpic, var key = CryptoJS.enc.Utf8.parse("KkweInfo23255625");
idcardfrontpic: this.tableData[s].idcardfrontpic, let srcs = CryptoJS.enc.Utf8.parse(word);
signpic: this.tableData[s].signpic, let encrypted = CryptoJS.AES.encrypt(srcs, key, {
specialPhotoPic: this.tableData[s].specialPhotoPic, mode: CryptoJS.mode.ECB,
bookPic: this.tableData[s].bookPic, padding: CryptoJS.pad.Pkcs7
show: true });
} return encrypted.toString();
}) },
} decrypt(word){
}, var key = CryptoJS.enc.Utf8.parse("KkweInfo23255625");
handleDelete(g, h) { var decrypt = CryptoJS.AES.decrypt(word, key, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7});
console.log(g) return CryptoJS.enc.Utf8.stringify(decrypt).toString();
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) { decryptByDES(ciphertext) {
var keyHex = CryptoJS.enc.Utf8.parse("KkweFace95271124"); var keyHex = CryptoJS.enc.Utf8.parse("KkweFace95271124");
var decrypted = CryptoJS.DES.decrypt({ var decrypted = CryptoJS.DES.decrypt({
ciphertext: CryptoJS.enc.Base64.parse(ciphertext) ciphertext: CryptoJS.enc.Base64.parse(ciphertext)
}, keyHex, { }, keyHex, {
mode: CryptoJS.mode.ECB, mode: CryptoJS.mode.ECB,
padding: CryptoJS.pad.Pkcs7 padding: CryptoJS.pad.Pkcs7
}); });
return decrypted.toString(CryptoJS.enc.Utf8); return decrypted.toString(CryptoJS.enc.Utf8);
} }
}, },
created() { created(){
Loading.service();
var data = { Loading.service();
idcard: '', var data={
recordType: '' idcard:'',
recordType:''
}
this.$api.getlist.getlist(data).then((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
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].recordtype == 3 ? "待遇申请" : res.data.list[i].recordtype == 4 ? "参保注销" : ""
} }
this.tableData = res.data.list this.$api.getlist.getlist(data).then((res) => {
this.totals = res.data.total let loadingInstance = Loading.service();
this.page = res.data.total.pageNum this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
}).catch((res) => { });
let loadingInstance = Loading.service(); for(var i in res.data.list){
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
loadingInstance.close(); 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)
// var that=this res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
// baseUrl.setToken() res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
// $.ajax({ }
// url:baseUrl.baseUrl+"examine/listExamining", console.log(12312312)
// type:'post', this.tableData=res.data.list
// data:{ this.totals=res.data.total
// userId:1 this.page=res.data.total.pageNum
// },
// success(res){
// for(var i in res.data.list){ }).catch((res) => {
// res.data.list[i].idcard=that.decrypt(res.data.list[i].idcard) let loadingInstance = Loading.service();
// res.data.list[i].name=that.decrypt(res.data.list[i].name) this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
// res.data.list[i].recordtype=res.data.list[i].recordtype==1?"参保登记":"" loadingInstance.close();
// } });
// that.tableData=res.data.list })
// that.totals=res.data.total
// that.page=res.data.total.pageNum
// }
// })
} }
} }
</script> </script>
...@@ -292,6 +292,7 @@ export default { ...@@ -292,6 +292,7 @@ export default {
this.form.special_type=this.form.org_name.org_insuranceType this.form.special_type=this.form.org_name.org_insuranceType
this.form.name=this.decrypt(this.form.org_name) this.form.name=this.decrypt(this.form.org_name)
//this.form.name=this.form.org_name
this.form.identity_number=this.decrypt(this.form.org_idNum) this.form.identity_number=this.decrypt(this.form.org_idNum)
this.form.telphoneValue=this.decrypt(this.form.telphoneValue) this.form.telphoneValue=this.decrypt(this.form.telphoneValue)
this.form.nation=this.form.nation this.form.nation=this.form.nation
...@@ -337,7 +338,7 @@ export default { ...@@ -337,7 +338,7 @@ export default {
}else if(this.form.type_son==7){ }else if(this.form.type_son==7){
this.form.old=this.form.identity_number, this.form.old=this.form.identity_number,
this.form.now=this.form.change_idNum, this.form.now=this.decrypt(this.form.change_idNum),
this.now="变更后身份证" this.now="变更后身份证"
this.old="变更前身份证" this.old="变更前身份证"
} }
...@@ -351,7 +352,6 @@ export default { ...@@ -351,7 +352,6 @@ export default {
this.itmebs="户口本" this.itmebs="户口本"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bookPic) this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bookPic)
}else if(obj.specialPhotoPic){ }else if(obj.specialPhotoPic){
console.log(123132)
this.itmebs="特殊身份证明" this.itmebs="特殊身份证明"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.specialPhotoPic) this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.specialPhotoPic)
}else{ }else{
...@@ -399,15 +399,15 @@ export default { ...@@ -399,15 +399,15 @@ export default {
overflow: hidden; overflow: hidden;
margin-bottom: 40px margin-bottom: 40px
} }
.block{
width: 23%
}
.block{ .block{
float: left; float: left;
height: 100%; height: 100%;
margin-right: 20px margin-right: 20px
} }
.block img{
width: auto;
height: 300px;
}
.imtil{ .imtil{
padding:0 0 20px 0 padding:0 0 20px 0
} }
......
<template> <template>
<div class="page-container"> <div class="page-container">
<!--工具栏--> <!--工具栏-->
<div class="toolbar" style="float:left;padding-top:10px;padding-left:15px;"> <div class="toolbar" style="float:left;padding-top:10px;padding-left:15px;">
<el-form :inline="true" :model="filters" :size="size"> <el-form :inline="true" :model="filters" :size="size">
<el-form-item> <el-form-item>
<el-input v-model="filters.name" placeholder="用户名"></el-input> <el-input v-model="filters.name" placeholder="用户名"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<kt-button icon="fa fa-search" :label="$t('action.search')" perms="sys:role:view" type="primary" <kt-button icon="fa fa-search" :label="$t('action.search')" perms="sys:role:view" type="primary" @click="findPage(null)"/>
@click="findPage(null)"/> </el-form-item>
</el-form-item> <el-form-item>
<el-form-item> <kt-button icon="fa fa-plus" :label="$t('action.add')" perms="sys:user:add" type="primary" @click="handleAdd" />
<kt-button icon="fa fa-plus" :label="$t('action.add')" perms="sys:user:add" type="primary" </el-form-item>
@click="handleAdd"/> </el-form>
</el-form-item> </div>
</el-form> <div class="toolbar" style="float:right;padding-top:10px;padding-right:15px;">
</div> <el-form :inline="true" :size="size">
<div class="toolbar" style="float:right;padding-top:10px;padding-right:15px;"> <el-form-item>
<el-form :inline="true" :size="size"> <el-button-group>
<el-form-item> <el-tooltip content="刷新" placement="top">
<el-button-group> <el-button icon="fa fa-refresh" @click="findPage(null)"></el-button>
<el-tooltip content="刷新" placement="top"> </el-tooltip>
<el-button icon="fa fa-refresh" @click="findPage(null)"></el-button> <el-tooltip content="列显示" placement="top">
</el-tooltip> <el-button icon="fa fa-filter" @click="displayFilterColumnsDialog"></el-button>
<el-tooltip content="列显示" placement="top"> </el-tooltip>
<el-button icon="fa fa-filter" @click="displayFilterColumnsDialog"></el-button> <el-tooltip content="导出" placement="top">
</el-tooltip> <el-button icon="fa fa-file-excel-o"></el-button>
<el-tooltip content="导出" placement="top"> </el-tooltip>
<el-button icon="fa fa-file-excel-o"></el-button> </el-button-group>
</el-tooltip> </el-form-item>
</el-button-group> </el-form>
</el-form-item> <!--表格显示列界面-->
</el-form> <table-column-filter-dialog ref="tableColumnFilterDialog" :columns="columns"
<!--表格显示列界面--> @handleFilterColumns="handleFilterColumns">
<table-column-filter-dialog ref="tableColumnFilterDialog" :columns="columns" </table-column-filter-dialog>
@handleFilterColumns="handleFilterColumns"> </div>
</table-column-filter-dialog> <!--表格内容栏-->
</div> <kt-table :height="350" permsEdit="sys:user:edit" permsDelete="sys:user:delete"
<!--表格内容栏--> :data="pageResult" :columns="filterColumns"
<kt-table :height="350" permsEdit="sys:user:edit" permsDelete="sys:user:delete" @findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete">
:data="pageResult" :columns="filterColumns" </kt-table>
@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete"> <!--新增编辑界面-->
</kt-table> <el-dialog :title="operation?'新增':'编辑'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false">
<!--新增编辑界面--> <el-form :model="dataForm" label-width="80px" :rules="dataFormRules" ref="dataForm" :size="size"
<el-dialog :title="operation?'新增':'编辑'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false"> label-position="right">
<el-form :model="dataForm" label-width="80px" :rules="dataFormRules" ref="dataForm" :size="size" <el-form-item label="ID" prop="id" v-if="false">
label-position="right"> <el-input v-model="dataForm.id" :disabled="true" auto-complete="off"></el-input>
<el-form-item label="ID" prop="id" v-if="false"> </el-form-item>
<el-input v-model="dataForm.id" :disabled="true" auto-complete="off"></el-input> <el-form-item label="用户名" prop="name">
</el-form-item> <el-input v-model="dataForm.name" auto-complete="off"></el-input>
<el-form-item label="用户名" prop="name"> </el-form-item>
<el-input v-model="dataForm.name" auto-complete="off"></el-input> <el-form-item label="真实姓名" prop="truename">
</el-form-item> <el-input v-model="dataForm.truename" auto-complete="off"></el-input>
<el-form-item label="真实姓名" prop="truename"> </el-form-item>
<el-input v-model="dataForm.truename" auto-complete="off"></el-input> <el-form-item label="密码" prop="password">
</el-form-item> <el-input v-model="dataForm.password" type="password" auto-complete="off"></el-input>
<el-form-item label="密码" prop="password"> </el-form-item>
<el-input v-model="dataForm.password" type="password" auto-complete="off"></el-input> <el-form-item label="机构" prop="deptName">
</el-form-item> <el-cascader
<el-form-item label="机构" prop="deptName"> v-model="dataForm.deptName"
<el-cascader size="medium"
v-model="dataForm.deptName" :options="list"
size="medium" :props="{ checkStrictly: true }"
:options="list" style="width:100%"
:props="{ checkStrictly: true }" clearable></el-cascader>
style="width:100%" <!-- <popup-tree-input
clearable></el-cascader> :data="deptData"
<!-- <popup-tree-input :props="deptTreeProps"
:data="deptData" :prop="dataForm.deptName"
:props="deptTreeProps" :nodeKey="''+dataForm.deptId"
:prop="dataForm.deptName" :currentChangeHandle="deptTreeCurrentChangeHandle">
:nodeKey="''+dataForm.deptId" </popup-tree-input> -->
:currentChangeHandle="deptTreeCurrentChangeHandle"> </el-form-item>
</popup-tree-input> --> <!-- <el-form-item label="邮箱" prop="email">
</el-form-item> <el-input v-model="dataForm.email" auto-complete="off"></el-input>
<el-form-item label="职务" prop="job"> </el-form-item> -->
<el-input v-model="dataForm.job" auto-complete="off"></el-input> <el-form-item label="手机" prop="mobile">
</el-form-item> <el-input v-model="dataForm.mobile" auto-complete="off"></el-input>
<el-form-item label="手机" prop="mobile"> </el-form-item>
<el-input v-model="dataForm.mobile" auto-complete="off"></el-input> <el-form-item label="角色" prop="userRoles" v-if="!operation">
</el-form-item> <el-select v-model="dataForm.userRoles" multiple placeholder="请选择"
<el-form-item label="角色" prop="userRoles" v-if="!operation"> style="width: 100%;">
<el-select v-model="dataForm.userRoles" multiple placeholder="请选择" <el-option v-for="item in roles" :key="item.id"
style="width: 100%;"> :label="item.remark" :value="item.id">
<el-option v-for="item in roles" :key="item.id" </el-option>
:label="item.remark" :value="item.id"> </el-select>
</el-option> </el-form-item>
</el-select> </el-form>
</el-form-item> <div slot="footer" class="dialog-footer">
</el-form> <el-button :size="size" @click.native="dialogVisible = false">{{$t('action.cancel')}}</el-button>
<div slot="footer" class="dialog-footer" style="width: 10%"> <el-button :size="size" type="primary" @click.native="submitForm" :loading="editLoading">{{$t('action.submit')}}</el-button>
<el-button :size="size" @click.native="dialogVisible = false">{{$t('action.cancel')}}</el-button> </div>
<el-button :size="size" type="primary" @click.native="submitForm" :loading="editLoading"> </el-dialog>
{{$t('action.submit')}}
</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import PopupTreeInput from "@/components/PopupTreeInput" import PopupTreeInput from "@/components/PopupTreeInput"
import KtTable from "@/views/Core/KtTable" import KtTable from "@/views/Core/KtTable"
import KtButton from "@/views/Core/KtButton" import KtButton from "@/views/Core/KtButton"
import TableColumnFilterDialog from "@/views/Core/TableColumnFilterDialog" import TableColumnFilterDialog from "@/views/Core/TableColumnFilterDialog"
import {format} from "@/utils/datetime" import { format } from "@/utils/datetime"
export default {
components:{
PopupTreeInput,
KtTable,
KtButton,
TableColumnFilterDialog
},
data() {
return {
list:[],
address:"",
size: 'small',
filters: {
name: ''
},
columns: [],
filterColumns: [],
pageRequest: { pageNum: 1, pageSize: 10 },
pageResult: {},
export default { operation: false, // true:新增, false:编辑
components: { dialogVisible: false, // 新增编辑界面是否显示
PopupTreeInput, editLoading: false,
KtTable, dataFormRules: {
KtButton, name: [
TableColumnFilterDialog { required: true, message: '请输入用户名', trigger: 'blur' }
}, ]
data() { },
return { // 新增编辑界面数据
list: [], dataForm: {
address: "", id: 0,
size: 'small', name: '',
filters: { truename:'',
name: '' password: '',
}, deptId: 1,
columns: [], deptName: '',
filterColumns: [], //email: 'test@qq.com',
pageRequest: {pageNum: 1, pageSize: 10}, mobile: '13889700023',
pageResult: {}, status: 1,
userRoles: []
operation: false, // true:新增, false:编辑 },
dialogVisible: false, // 新增编辑界面是否显示 deptData: [],
editLoading: false, deptTreeProps: {
dataFormRules: { label: 'name',
name: [ children: 'children'
{required: true, message: '请输入用户名', trigger: 'blur'} },
] roles: []
}, }
// 新增编辑界面数据 },
dataForm: { methods: {
id: 0, // 获取分页数据
name: '', findPage: function (data) {
truename: '', if(data !== null) {
password: '', this.pageRequest = data.pageRequest
deptId: 1, }
deptName: '', this.pageRequest.columnFilters = {name: {name:'name', value:this.filters.name}}
job: '', this.$api.user.findPage(this.pageRequest).then((res) => {
//email: 'test@qq.com', console.log(res.data)
mobile: '13889700023', this.pageResult = res.data
status: 1, this.findUserRoles()
userRoles: [] }).then(data!=null?data.callback:'')
}, },
deptData: [], // 加载用户角色信息
deptTreeProps: { findUserRoles: function () {
label: 'name', this.$api.role.findAll().then((res) => {
children: 'children' // 加载角色集合
}, this.roles = res.data
roles: [] })
} },
}, // 批量删除
methods: { handleDelete: function (data) {
// 获取分页数据 this.$api.user.batchDelete(data.params).then(data!=null?data.callback:'')
findPage: function (data) { },
if (data !== null) { // 显示新增界面
this.pageRequest = data.pageRequest handleAdd: function () {
} this.dialogVisible = true
this.pageRequest.columnFilters = {name: {name: 'name', value: this.filters.name}} this.operation = true
this.$api.user.findPage(this.pageRequest).then((res) => { this.dataForm = {
console.log(res.data) id: 0,
this.pageResult = res.data name: '',
this.findUserRoles() password: '',
}).then(data != null ? data.callback : '') deptId: 1,
}, deptName: '',
// 加载用户角色信息 email: 'test@qq.com',
findUserRoles: function () { mobile: '13889700023',
this.$api.role.findAll().then((res) => { status: 1,
// 加载角色集合 userRoles: []
this.roles = res.data }
}) },
}, // 显示编辑界面
// 批量删除 handleEdit: function (params) {
handleDelete: function (data) { this.dialogVisible = true
this.$api.user.batchDelete(data.params).then(data != null ? data.callback : '') this.operation = false
}, this.dataForm = Object.assign({}, params.row)
// 显示新增界面 let userRoles = []
handleAdd: function () { for(let i=0,len=params.row.userRoles.length; i<len; i++) {
this.dialogVisible = true userRoles.push(params.row.userRoles[i].roleId)
this.operation = true }
this.dataForm = { this.dataForm.userRoles = userRoles
id: 0, },
name: '', // 编辑
password: '', submitForm: function () {
deptId: 1, this.$refs.dataForm.validate((valid) => {
deptName: '', if (valid) {
job: '', this.$confirm('确认提交吗?', '提示', {}).then(() => {
email: 'test@qq.com', this.dataForm.deptName=this.dataForm.deptName[this.dataForm.deptName.length-1]
mobile: '13889700023', this.editLoading = true
status: 1, let params = Object.assign({}, this.dataForm)
userRoles: [] let userRoles = []
} for(let i=0,len=params.userRoles.length; i<len; i++) {
}, let userRole = {
// 显示编辑界面 userId: params.id,
handleEdit: function (params) { roleId: params.userRoles[i]
this.dialogVisible = true }
this.operation = false userRoles.push(userRole)
this.dataForm = Object.assign({}, params.row) }
let userRoles = [] params.userRoles = userRoles
for (let i = 0, len = params.row.userRoles.length; i < len; i++) { this.$api.user.save(params).then((res) => {
userRoles.push(params.row.userRoles[i].roleId) this.editLoading = false
} if(res.code == 200) {
this.dataForm.userRoles = userRoles this.$message({ message: '操作成功', type: 'success' })
}, this.dialogVisible = false
// 编辑 this.$refs['dataForm'].resetFields()
submitForm: function () { } else {
this.$refs.dataForm.validate((valid) => { this.$message({message: '操作失败, ' + res.msg, type: 'error'})
if (valid) { }
this.$confirm('确认提交吗?', '提示', {}).then(() => { this.findPage(null)
this.dataForm.deptName = this.dataForm.deptName[this.dataForm.deptName.length - 1] })
this.editLoading = true })
let params = Object.assign({}, this.dataForm) }
let userRoles = [] })
for (let i = 0, len = params.userRoles.length; i < len; i++) { },
let userRole = { // 获取部门列表
userId: params.id, findDeptTree: function () {
roleId: params.userRoles[i] this.$api.dept.findDeptTree().then((res) => {
} for(var i in res.data){
userRoles.push(userRole) res.data[i].value=res.data[i].name
} res.data[i].label=res.data[i].name
params.userRoles = userRoles for(var j in res.data[i].children){
this.$api.user.save(params).then((res) => { res.data[i].children[j].value=res.data[i].children[j].name
this.editLoading = false res.data[i].children[j].label=res.data[i].children[j].name
if (res.code == 200) { for(var n in res.data[i].children[j].children){
this.$message({message: '操作成功', type: 'success'}) res.data[i].children[j].children[n].value=res.data[i].children[j].children[n].name
this.dialogVisible = false res.data[i].children[j].children[n].label=res.data[i].children[j].children[n].name
this.$refs['dataForm'].resetFields() }
} else { }
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) }
}
this.findPage(null) this.list=res.data
})
}) //this.deptData = res.data
} })
}) },
}, // 菜单树选中
// 获取部门列表 deptTreeCurrentChangeHandle (data, node) {
findDeptTree: function () { this.dataForm.deptId = data.id
this.$api.dept.findDeptTree().then((res) => { //this.dataForm.deptName = data.name
for (var i in res.data) { this.dataForm.deptName = data.name
res.data[i].value = res.data[i].name },
res.data[i].label = res.data[i].name // 时间格式化
for (var j in res.data[i].children) {        dateFormat: function (row, column, cellValue, index){
res.data[i].children[j].value = res.data[i].children[j].name            return format(row[column.property])
res.data[i].children[j].label = res.data[i].children[j].name        },
for (var n in res.data[i].children[j].children) { // 处理表格列过滤显示
res.data[i].children[j].children[n].value = res.data[i].children[j].children[n].name        displayFilterColumnsDialog: function () {
res.data[i].children[j].children[n].label = res.data[i].children[j].children[n].name this.$refs.tableColumnFilterDialog.setDialogVisible(true)
}        },
} // 处理表格列过滤显示
}        handleFilterColumns: function (data) {
this.filterColumns = data.filterColumns
this.list = res.data this.$refs.tableColumnFilterDialog.setDialogVisible(false)
       },
//this.deptData = res.data // 处理表格列过滤显示
})        initColumns: function () {
}, this.columns = [
// 菜单树选中 {prop:"id", label:"ID", minWidth:50},
deptTreeCurrentChangeHandle(data, node) { {prop:"name", label:"用户名", minWidth:120},
this.dataForm.deptId = data.id {prop:"truename", label:"真实姓名", minWidth:100},
//this.dataForm.deptName = data.name {prop:"deptName", label:"机构", minWidth:120},
this.dataForm.deptName = data.name {prop:"roleNames", label:"角色", minWidth:100},
},
// 时间格式化 {prop:"mobile", label:"手机", minWidth:100},
dateFormat: function (row, column, cellValue, index) { {prop:"status", label:"状态", minWidth:70},
return format(row[column.property])
}, // {prop:"createBy", label:"创建人", minWidth:120},
// 处理表格列过滤显示 // {prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat}
displayFilterColumnsDialog: function () { // {prop:"lastUpdateBy", label:"更新人", minWidth:100},
this.$refs.tableColumnFilterDialog.setDialogVisible(true) // {prop:"lastUpdateTime", label:"更新时间", minWidth:120, formatter:this.dateFormat}
}, ]
// 处理表格列过滤显示 this.filterColumns = JSON.parse(JSON.stringify(this.columns));
handleFilterColumns: function (data) {        }
this.filterColumns = data.filterColumns },
this.$refs.tableColumnFilterDialog.setDialogVisible(false) mounted() {
}, this.findDeptTree()
// 处理表格列过滤显示 this.initColumns()
initColumns: function () { }
this.columns = [ }
{prop: "id", label: "ID", minWidth: 50},
{prop: "name", label: "用户名", minWidth: 100},
{prop: "truename", label: "真实姓名", minWidth: 100},
{prop: "deptName", label: "机构", minWidth: 100},
{prop: "job", label: "职务", minWidth: 100},
{prop: "roleNames", label: "角色", minWidth: 100},
{prop: "mobile", label: "手机", minWidth: 100},
{prop: "status", label: "状态", minWidth: 70},
// {prop:"createBy", label:"创建人", minWidth:120},
// {prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat}
// {prop:"lastUpdateBy", label:"更新人", minWidth:100},
// {prop:"lastUpdateTime", label:"更新时间", minWidth:120, formatter:this.dateFormat}
]
this.filterColumns = JSON.parse(JSON.stringify(this.columns));
}
},
mounted() {
this.findDeptTree()
this.initColumns()
}
}
</script> </script>
<style scoped> <style scoped>
.el-tree-node__children { .el-tree-node__children{
overflow: scroll overflow: scroll
} }
</style> </style>
\ No newline at end of file
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