Skip to content

X
xichonght
Commit 23b7027b authored by miaohaoyun's avatar miaohaoyun
Browse files
Options

Merge branch 'mhy2' into 'mhy' 

Mhy2

See merge request !27
parents 57c98e77 7aee102d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3185 additions and 3105 deletions
xichongSys/package-lock.json
View file @ 23b7027b
This diff is collapsed.
xichongSys/src/http/moudules/getlist.js
View file @ 23b7027b
......@@ -44,6 +44,13 @@ export const selectRoleinfo = (params) => {
params
})
}
export const selectRoleremark = (params) => {
return axios({
url: '/role/selectRoleremark2',
method: 'get',
params
})
}
export const progress = (params) => {
return axios({
url: '/examine/progressView',
......@@ -132,11 +139,11 @@ export const listAllBaseInfo = (data) => {
})
}
//
export const selectflowState = (data) => {
export const selectflowState = (params) => {
return axios({
url: '/folw/selectflowState',
method: 'post',
data
method: 'get',
params
})
}
//领取人员查询
......@@ -147,3 +154,11 @@ export const getGrantList = (data) => {
data
})
}
//流程详情
export const selectRoleflowNo = (params) => {
return axios({
url: 'role/selectRoleflowNo',
method: 'get',
params
})
}
xichongSys/src/http/moudules/user.js
View file @ 23b7027b
import axios from '../axios'
/*
/*
* 用户管理模块
*/
......@@ -15,7 +15,7 @@ export const save = (data) => {
// 删除
export const batchDelete = (data) => {
return axios({
url: '/user/forbiddenUser',
url: '/user/updateUserStatus',
method: 'post',
data
})
......@@ -35,4 +35,4 @@ export const findPermissions = (params) => {
method: 'get',
params
})
}
\ No newline at end of file
}
xichongSys/src/main.js
View file @ 23b7027b
......@@ -9,6 +9,10 @@ import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
import 'font-awesome/css/font-awesome.min.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(api)
......
xichongSys/src/mock/modules/user.js
View file @ 23b7027b
/*
/*
* 用户管理模块
*/
......@@ -17,7 +17,7 @@ export function save() {
// 批量删除
export function batchDelete() {
return {
url: '/user/forbiddenUser',
url: '/user/updateUserStatus',
type: 'post',
data: {
"code": 200,
......@@ -114,4 +114,4 @@ export function findPermissions() {
type: 'get',
data: permsData
}
}
\ No newline at end of file
}
xichongSys/src/router/index.js
View file @ 23b7027b
......@@ -24,6 +24,7 @@ import drdcbg from "@/views/Myvue/drdcbg";
import receivePersonnel from "@/views/Myvue/receivePersonnel";
import AllbaseInfo from "@/views/Myvue/allbaseInfo"
import PayInfo from "@/views/Myvue/payInfo"
import application from "@/views/Myvue/application"
import importByExcel from "@/views/Myvue/importByExcel"
import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit"
import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit"
......@@ -120,6 +121,10 @@ const router = new Router({
path:"/payInfo",
name:"缴费记录",
component: PayInfo
},{
path:"/application",
name:"待遇申请审核",
component: application
},
{
path:"/importByExcel",
......@@ -136,11 +141,6 @@ const router = new Router({
name:"参保注销审核",
component: insuranceCancellationAudit
}
,{
path:"/application",
name:"待遇申请审核",
component: application
}
]
},
......
xichongSys/src/utils/global.js
View file @ 23b7027b
......@@ -10,8 +10,8 @@
//export const baseUrl ="http://faceauth.weface.com.cn:98"
//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.25: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.33:9002"
//export const baseUrl2 = 'http://172.16.10.25:9999'
//export const baseUrl = 'http://172.16.10.25:9002'
//export const baseUrl ="http://172.16.10.33:9002"
......
xichongSys/src/views/Core/KtTable.vue
View file @ 23b7027b
......@@ -13,7 +13,21 @@
<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 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>
</el-table-column>
</el-table>
......@@ -130,7 +144,7 @@ export default {
},
// 删除操作
delete: function (ids) {
this.$confirm('确认禁用选中记录吗？', '提示', {
this.$confirm('确认操作选中记录吗？', '提示', {
type: 'warning'
}).then(() => {
let params = []
......@@ -160,5 +174,27 @@ export default {
</script>
<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>
xichongSys/src/views/Myvue/authRecord.vue
View file @ 23b7027b
......@@ -244,7 +244,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
label:"100岁以上",
}],
//年龄计算方式
agemeth:"",
agemeth:"1",
agemethList:[{
value:"1",
label:"按年计算",
......
xichongSys/src/views/Myvue/drdcbg.vue
View file @ 23b7027b
......@@ -46,7 +46,7 @@
>
</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>
</template>
<script>
......
xichongSys/src/views/Myvue/drdysq.vue
View file @ 23b7027b
......@@ -40,7 +40,7 @@
@current-change="current_change"
>
</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>
</template>
<script>
......@@ -80,6 +80,7 @@
.catch(err => {
console.log(err);
});
},
current_change(s) {
var data = {
......@@ -96,7 +97,9 @@
this.tableData = res.data.content
this.totals = res.data.totalSize
this.pageNum = res.data.pageNum
}
}).catch((res) => {
});
......@@ -151,7 +154,6 @@
if (res.code == 200) {
this.tableData = res.data.content
this.totals = res.data.totalSize
this.pageNum = res.data.pageNum
}
}).catch((res) => {
......
xichongSys/src/views/Myvue/drxxbg.vue
View file @ 23b7027b
......@@ -46,7 +46,7 @@
min-width="20%">
</el-table-column>
<el-table-column label="操作"
min-width="8%">
min-width="8%">
<template slot-scope="scope">
<el-button
size="mini"
......@@ -122,7 +122,6 @@
if (res.code == 200) {
this.tableData = res.data.content
this.totals = res.data.totalSize
this.pageNum = res.data.pageNum
}
}).catch((res) => {
......@@ -179,7 +178,6 @@
if (res.code == 200) {
this.tableData = res.data.content
this.totals = res.data.totalSize
this.pageNum = res.data.pageNum
}
}).catch((res) => {
......
xichongSys/src/views/Myvue/examRecord.vue
View file @ 23b7027b
......@@ -159,16 +159,7 @@
list:[],
name:"",
activities: [],
options1: [{
value: '1',
label: '参保登记'
}, {
value: '2',
label: '信息变更'
}, {
value: '3',
label: '待遇申请'
}],
options1: [],
Page:1,
totals:0,
idcard:"",
......@@ -196,7 +187,7 @@
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=res.data.list[i].recordtype==1?"参保登记":res.data.list[i].recordtype==2?"信息变更":''
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
}
this.tableData=res.data.list
this.totals=res.data.total
......@@ -212,7 +203,7 @@
this.activities=[]
var data={
recordId:s.id,
type:s.recordtype=="参保登记"?1:s.recordtype=="信息变更"?2:''
type:this.regetType(s.recordtype)
}
this.$api.getlist.progress(data).then((res)=>{
for(var i in res.data){
......@@ -278,7 +269,7 @@
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=res.data.list[i].recordtype==1?"参保登记":res.data.list[i].recordtype==2?"信息变更":''
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
}
this.tableData=res.data.list
this.totals=res.data.total
......@@ -319,6 +310,21 @@
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){
......@@ -352,6 +358,12 @@
},
created(){
for(var i=1;i<=7;i++){
this.options1.push({
label:this.getType(i),
value:i
})
}
for(var i in listtown){
this.list.push({
value:listtown[i].town_name,
......@@ -383,7 +395,7 @@
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=res.data.list[i].recordtype==1?"参保登记":res.data.list[i].recordtype==2?"信息变更":''
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
}
this.tableData=res.data.list
this.totals=res.data.total
......
xichongSys/src/views/Myvue/flow.vue
View file @ 23b7027b
......@@ -21,6 +21,10 @@
<el-table-column
prop="createby"
label="创建人">
</el-table-column>
<el-table-column
prop="flowNo"
label="流程号">
</el-table-column>
<el-table-column
prop="createtime"
......@@ -49,16 +53,65 @@
</template>
</el-table-column>
</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"
:page-size='10'
layout="total, prev, pager, next, jumper"
:total="totals"
:current-page.sync="Page"
@current-change="current_change"
>
</el-pagination>
</el-dialog>
<el-dialog
:title="flowTitle"
:visible.sync="dialogVisible"
......@@ -133,6 +186,7 @@
export default {
data() {
return {
dialogTableVisible:false,
flowTitle:"",
showiii:false,
//标题
......@@ -146,6 +200,7 @@
input:"",
info:'',
tableData: [],
detableData:[],
options: [],
value: [],
oldvalue:[],
......@@ -155,9 +210,14 @@
methods:{
//作废
delet(){
this.$api.getlist.selectflowState().then((res) => {
this.tableData=res.data
console.log(this.tableData)
var data={
pageNum:1,
pageSize:10
}
this.$api.getlist.selectflowState(data).then((res) => {
this.detableData=res.data.result
this.totals=res.data.total
this.dialogTableVisible=true
}).catch((res) => {
......@@ -174,7 +234,18 @@ this.$api.getlist.selectflowState().then((res) => {
});
},
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){
this.showiii=s
......@@ -186,20 +257,17 @@ this.$api.getlist.selectflowState().then((res) => {
//获取流程
showadd(s,d){
this.value=[]
this.titleList=[]
this.oldvalue=[]
console.log(d)
if(s==1){
this.flowTitle="新增流程"
this.titleList=[{
label:"参保登记审核流程",
value:"1,参保登记审核流程"
},{
label:"信息变更审核流程",
value:"2,信息变更审核流程"
},{
label:"待遇申请审核流程",
value:"3,待遇申请审核流程"
}]
for(var i =1;i<=6;i++){
this.titleList.push({
label:this.getType(i),
value:i+","+this.getType(i)
})
}
}else if(s==2){
this.titleList=[{
label:d.flowname,
......@@ -207,11 +275,10 @@ this.$api.getlist.selectflowState().then((res) => {
}]
this.title=d.type+","+d.flowname
this.flowTitle="修改流程"
var par={
type:d.type
var par={
flowNo:d.flowNo
}
this.$api.getlist.selectRoleinfo(par).then((res) => {
this.$api.getlist.selectRoleremark(par).then((res) => {
var dd=0
......@@ -294,16 +361,27 @@ this.$api.getlist.selectflowState().then((res) => {
},
handle(s,d){
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
console.log( this.step)
}).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(){
......
xichongSys/src/views/Myvue/infoChange.vue
View file @ 23b7027b
......@@ -292,6 +292,7 @@ export default {
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)
this.form.telphoneValue=this.decrypt(this.form.telphoneValue)
this.form.nation=this.form.nation
......@@ -337,7 +338,7 @@ export default {
}else if(this.form.type_son==7){
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.old="变更前身份证"
}
......@@ -351,7 +352,6 @@ export default {
this.itmebs="户口本"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bookPic)
}else if(obj.specialPhotoPic){
console.log(123132)
this.itmebs="特殊身份证明"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.specialPhotoPic)
}else{
......@@ -399,15 +399,15 @@ export default {
overflow: hidden;
margin-bottom: 40px
}
.block{
width: 23%
}
.block{
float: left;
height: 100%;
margin-right: 20px
}
.block img{
width: auto;
height: 300px;
}
.imtil{
padding:0 0 20px 0
}
......
xichongSys/src/views/Myvue/insuranceCancellationAudit.vue
View file @ 23b7027b
......@@ -292,6 +292,7 @@ export default {
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)
this.form.telphoneValue=this.decrypt(this.form.telphoneValue)
this.form.nation=this.form.nation
......@@ -337,7 +338,7 @@ export default {
}else if(this.form.type_son==7){
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.old="变更前身份证"
}
......@@ -351,7 +352,6 @@ export default {
this.itmebs="户口本"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bookPic)
}else if(obj.specialPhotoPic){
console.log(123132)
this.itmebs="特殊身份证明"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.specialPhotoPic)
}else{
......@@ -399,15 +399,15 @@ export default {
overflow: hidden;
margin-bottom: 40px
}
.block{
width: 23%
}
.block{
float: left;
height: 100%;
margin-right: 20px
}
.block img{
width: auto;
height: 300px;
}
.imtil{
padding:0 0 20px 0
}
......
xichongSys/src/views/Myvue/insuredReg.vue
View file @ 23b7027b
......@@ -316,15 +316,14 @@ export default {
overflow: hidden;
margin-bottom: 40px
}
.block{
width: 23%
}
.block{
float: left;
height: 100%;
margin-right: 20px
}
.block img{
width: auto;
height: 300px;
}
.imtil{
padding:0 0 20px 0
}
......
xichongSys/src/views/Myvue/table.vue
View file @ 23b7027b
This diff is collapsed.
xichongSys/src/views/Myvue/treatmentApplicationAudit.vue
View file @ 23b7027b
......@@ -292,6 +292,7 @@ export default {
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)
this.form.telphoneValue=this.decrypt(this.form.telphoneValue)
this.form.nation=this.form.nation
......@@ -337,7 +338,7 @@ export default {
}else if(this.form.type_son==7){
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.old="变更前身份证"
}
......@@ -351,7 +352,6 @@ export default {
this.itmebs="户口本"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bookPic)
}else if(obj.specialPhotoPic){
console.log(123132)
this.itmebs="特殊身份证明"
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.specialPhotoPic)
}else{
......@@ -399,15 +399,15 @@ export default {
overflow: hidden;
margin-bottom: 40px
}
.block{
width: 23%
}
.block{
float: left;
height: 100%;
margin-right: 20px
}
.block img{
width: auto;
height: 300px;
}
.imtil{
padding:0 0 20px 0
}
......
xichongSys/src/views/Sys/User.vue
View file @ 23b7027b
This diff is collapsed.
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