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 Show 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) => { ...@@ -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
})
}
xichongSys/src/http/moudules/user.js
View file @ 23b7027b
...@@ -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
}) })
......
xichongSys/src/main.js
View file @ 23b7027b
...@@ -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)
......
xichongSys/src/mock/modules/user.js
View file @ 23b7027b
...@@ -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,
......
xichongSys/src/router/index.js
View file @ 23b7027b
...@@ -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
}
] ]
}, },
......
xichongSys/src/utils/global.js
View file @ 23b7027b
...@@ -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"
......
xichongSys/src/views/Core/KtTable.vue
View file @ 23b7027b
...@@ -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>
xichongSys/src/views/Myvue/authRecord.vue
View file @ 23b7027b
...@@ -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:"按年计算",
......
xichongSys/src/views/Myvue/drdcbg.vue
View file @ 23b7027b
...@@ -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>
......
xichongSys/src/views/Myvue/drdysq.vue
View file @ 23b7027b
...@@ -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) => {
......
xichongSys/src/views/Myvue/drxxbg.vue
View file @ 23b7027b
...@@ -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) => {
......
xichongSys/src/views/Myvue/examRecord.vue
View file @ 23b7027b
...@@ -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
......
xichongSys/src/views/Myvue/flow.vue
View file @ 23b7027b
...@@ -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"
...@@ -48,6 +52,54 @@ ...@@ -48,6 +52,54 @@
<el-button type="primary" size="mini" style="background:#148A9B" @click="showadd(2,scope.row)" icon="el-icon-edit-outline">修改</el-button> <el-button type="primary" size="mini" style="background:#148A9B" @click="showadd(2,scope.row)" icon="el-icon-edit-outline">修改</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table>
<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-table>
<el-pagination <el-pagination
class="pone" class="pone"
...@@ -55,10 +107,11 @@ ...@@ -55,10 +107,11 @@
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,
...@@ -208,10 +276,9 @@ this.$api.getlist.selectflowState().then((res) => { ...@@ -208,10 +276,9 @@ 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,9 +361,9 @@ this.$api.getlist.selectflowState().then((res) => { ...@@ -294,9 +361,9 @@ 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)
...@@ -304,6 +371,17 @@ this.$api.getlist.selectflowState().then((res) => { ...@@ -304,6 +371,17 @@ this.$api.getlist.selectflowState().then((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(){
......
xichongSys/src/views/Myvue/infoChange.vue
View file @ 23b7027b
...@@ -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
} }
......
xichongSys/src/views/Myvue/insuranceCancellationAudit.vue
View file @ 23b7027b
...@@ -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
} }
......
xichongSys/src/views/Myvue/insuredReg.vue
View file @ 23b7027b
...@@ -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
} }
......
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 { ...@@ -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
} }
......
xichongSys/src/views/Sys/User.vue
View file @ 23b7027b
...@@ -7,12 +7,10 @@ ...@@ -7,12 +7,10 @@
<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" <kt-button icon="fa fa-plus" :label="$t('action.add')" perms="sys:user:add" type="primary" @click="handleAdd" />
@click="handleAdd"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -74,9 +72,9 @@ ...@@ -74,9 +72,9 @@
:currentChangeHandle="deptTreeCurrentChangeHandle"> :currentChangeHandle="deptTreeCurrentChangeHandle">
</popup-tree-input> --> </popup-tree-input> -->
</el-form-item> </el-form-item>
<el-form-item label="职务" prop="job"> <!-- <el-form-item label="邮箱" prop="email">
<el-input v-model="dataForm.job" auto-complete="off"></el-input> <el-input v-model="dataForm.email" auto-complete="off"></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="手机" prop="mobile"> <el-form-item label="手机" prop="mobile">
<el-input v-model="dataForm.mobile" auto-complete="off"></el-input> <el-input v-model="dataForm.mobile" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
...@@ -89,25 +87,22 @@ ...@@ -89,25 +87,22 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="width: 10%"> <div slot="footer" class="dialog-footer">
<el-button :size="size" @click.native="dialogVisible = false">{{$t('action.cancel')}}</el-button> <el-button :size="size" @click.native="dialogVisible = false">{{$t('action.cancel')}}</el-button>
<el-button :size="size" type="primary" @click.native="submitForm" :loading="editLoading"> <el-button :size="size" type="primary" @click.native="submitForm" :loading="editLoading">{{$t('action.submit')}}</el-button>
{{$t('action.submit')}}
</el-button>
</div> </div>
</el-dialog> </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 {
export default { components:{
components: {
PopupTreeInput, PopupTreeInput,
KtTable, KtTable,
KtButton, KtButton,
...@@ -115,15 +110,15 @@ ...@@ -115,15 +110,15 @@
}, },
data() { data() {
return { return {
list: [], list:[],
address: "", address:"",
size: 'small', size: 'small',
filters: { filters: {
name: '' name: ''
}, },
columns: [], columns: [],
filterColumns: [], filterColumns: [],
pageRequest: {pageNum: 1, pageSize: 10}, pageRequest: { pageNum: 1, pageSize: 10 },
pageResult: {}, pageResult: {},
operation: false, // true:新增, false:编辑 operation: false, // true:新增, false:编辑
...@@ -131,18 +126,17 @@ ...@@ -131,18 +126,17 @@
editLoading: false, editLoading: false,
dataFormRules: { dataFormRules: {
name: [ name: [
{required: true, message: '请输入用户名', trigger: 'blur'} { required: true, message: '请输入用户名', trigger: 'blur' }
] ]
}, },
// 新增编辑界面数据 // 新增编辑界面数据
dataForm: { dataForm: {
id: 0, id: 0,
name: '', name: '',
truename: '', truename:'',
password: '', password: '',
deptId: 1, deptId: 1,
deptName: '', deptName: '',
job: '',
//email: 'test@qq.com', //email: 'test@qq.com',
mobile: '13889700023', mobile: '13889700023',
status: 1, status: 1,
...@@ -159,15 +153,15 @@ ...@@ -159,15 +153,15 @@
methods: { methods: {
// 获取分页数据 // 获取分页数据
findPage: function (data) { findPage: function (data) {
if (data !== null) { if(data !== null) {
this.pageRequest = data.pageRequest this.pageRequest = data.pageRequest
} }
this.pageRequest.columnFilters = {name: {name: 'name', value: this.filters.name}} this.pageRequest.columnFilters = {name: {name:'name', value:this.filters.name}}
this.$api.user.findPage(this.pageRequest).then((res) => { this.$api.user.findPage(this.pageRequest).then((res) => {
console.log(res.data) console.log(res.data)
this.pageResult = res.data this.pageResult = res.data
this.findUserRoles() this.findUserRoles()
}).then(data != null ? data.callback : '') }).then(data!=null?data.callback:'')
}, },
// 加载用户角色信息 // 加载用户角色信息
findUserRoles: function () { findUserRoles: function () {
...@@ -178,7 +172,7 @@ ...@@ -178,7 +172,7 @@
}, },
// 批量删除 // 批量删除
handleDelete: function (data) { handleDelete: function (data) {
this.$api.user.batchDelete(data.params).then(data != null ? data.callback : '') this.$api.user.batchDelete(data.params).then(data!=null?data.callback:'')
}, },
// 显示新增界面 // 显示新增界面
handleAdd: function () { handleAdd: function () {
...@@ -190,7 +184,6 @@ ...@@ -190,7 +184,6 @@
password: '', password: '',
deptId: 1, deptId: 1,
deptName: '', deptName: '',
job: '',
email: 'test@qq.com', email: 'test@qq.com',
mobile: '13889700023', mobile: '13889700023',
status: 1, status: 1,
...@@ -203,7 +196,7 @@ ...@@ -203,7 +196,7 @@
this.operation = false this.operation = false
this.dataForm = Object.assign({}, params.row) this.dataForm = Object.assign({}, params.row)
let userRoles = [] let userRoles = []
for (let i = 0, len = params.row.userRoles.length; i < len; i++) { for(let i=0,len=params.row.userRoles.length; i<len; i++) {
userRoles.push(params.row.userRoles[i].roleId) userRoles.push(params.row.userRoles[i].roleId)
} }
this.dataForm.userRoles = userRoles this.dataForm.userRoles = userRoles
...@@ -213,11 +206,11 @@ ...@@ -213,11 +206,11 @@
this.$refs.dataForm.validate((valid) => { this.$refs.dataForm.validate((valid) => {
if (valid) { if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => { this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.dataForm.deptName = this.dataForm.deptName[this.dataForm.deptName.length - 1] this.dataForm.deptName=this.dataForm.deptName[this.dataForm.deptName.length-1]
this.editLoading = true this.editLoading = true
let params = Object.assign({}, this.dataForm) let params = Object.assign({}, this.dataForm)
let userRoles = [] let userRoles = []
for (let i = 0, len = params.userRoles.length; i < len; i++) { for(let i=0,len=params.userRoles.length; i<len; i++) {
let userRole = { let userRole = {
userId: params.id, userId: params.id,
roleId: params.userRoles[i] roleId: params.userRoles[i]
...@@ -227,8 +220,8 @@ ...@@ -227,8 +220,8 @@
params.userRoles = userRoles params.userRoles = userRoles
this.$api.user.save(params).then((res) => { this.$api.user.save(params).then((res) => {
this.editLoading = false this.editLoading = false
if (res.code == 200) { if(res.code == 200) {
this.$message({message: '操作成功', type: 'success'}) this.$message({ message: '操作成功', type: 'success' })
this.dialogVisible = false this.dialogVisible = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
} else { } else {
...@@ -243,55 +236,54 @@ ...@@ -243,55 +236,54 @@
// 获取部门列表 // 获取部门列表
findDeptTree: function () { findDeptTree: function () {
this.$api.dept.findDeptTree().then((res) => { this.$api.dept.findDeptTree().then((res) => {
for (var i in res.data) { for(var i in res.data){
res.data[i].value = res.data[i].name res.data[i].value=res.data[i].name
res.data[i].label = res.data[i].name res.data[i].label=res.data[i].name
for (var j in res.data[i].children) { for(var j in res.data[i].children){
res.data[i].children[j].value = res.data[i].children[j].name res.data[i].children[j].value=res.data[i].children[j].name
res.data[i].children[j].label = res.data[i].children[j].name res.data[i].children[j].label=res.data[i].children[j].name
for (var n in res.data[i].children[j].children) { 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 res.data[i].children[j].children[n].value=res.data[i].children[j].children[n].name
res.data[i].children[j].children[n].label = res.data[i].children[j].children[n].name res.data[i].children[j].children[n].label=res.data[i].children[j].children[n].name
} }
} }
} }
this.list = res.data this.list=res.data
//this.deptData = res.data //this.deptData = res.data
}) })
}, },
// 菜单树选中 // 菜单树选中
deptTreeCurrentChangeHandle(data, node) { deptTreeCurrentChangeHandle (data, node) {
this.dataForm.deptId = data.id this.dataForm.deptId = data.id
//this.dataForm.deptName = data.name //this.dataForm.deptName = data.name
this.dataForm.deptName = data.name this.dataForm.deptName = data.name
}, },
// 时间格式化 // 时间格式化
dateFormat: function (row, column, cellValue, index) {        dateFormat: function (row, column, cellValue, index){
return format(row[column.property])            return format(row[column.property])
},        },
// 处理表格列过滤显示 // 处理表格列过滤显示
displayFilterColumnsDialog: function () {        displayFilterColumnsDialog: function () {
this.$refs.tableColumnFilterDialog.setDialogVisible(true) this.$refs.tableColumnFilterDialog.setDialogVisible(true)
},        },
// 处理表格列过滤显示 // 处理表格列过滤显示
handleFilterColumns: function (data) {        handleFilterColumns: function (data) {
this.filterColumns = data.filterColumns this.filterColumns = data.filterColumns
this.$refs.tableColumnFilterDialog.setDialogVisible(false) this.$refs.tableColumnFilterDialog.setDialogVisible(false)
},        },
// 处理表格列过滤显示 // 处理表格列过滤显示
initColumns: function () {        initColumns: function () {
this.columns = [ this.columns = [
{prop: "id", label: "ID", minWidth: 50}, {prop:"id", label:"ID", minWidth:50},
{prop: "name", label: "用户名", minWidth: 100}, {prop:"name", label:"用户名", minWidth:120},
{prop: "truename", label: "真实姓名", minWidth: 100}, {prop:"truename", label:"真实姓名", minWidth:100},
{prop: "deptName", label: "机构", minWidth: 100}, {prop:"deptName", label:"机构", minWidth:120},
{prop: "job", label: "职务", minWidth: 100}, {prop:"roleNames", label:"角色", minWidth:100},
{prop: "roleNames", label: "角色", minWidth: 100},
{prop: "mobile", label: "手机", minWidth: 100}, {prop:"mobile", label:"手机", minWidth:100},
{prop: "status", label: "状态", minWidth: 70}, {prop:"status", label:"状态", minWidth:70},
// {prop:"createBy", label:"创建人", minWidth:120}, // {prop:"createBy", label:"创建人", minWidth:120},
// {prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat} // {prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat}
...@@ -299,17 +291,17 @@ ...@@ -299,17 +291,17 @@
// {prop:"lastUpdateTime", label:"更新时间", minWidth:120, formatter:this.dateFormat} // {prop:"lastUpdateTime", label:"更新时间", minWidth:120, formatter:this.dateFormat}
] ]
this.filterColumns = JSON.parse(JSON.stringify(this.columns)); this.filterColumns = JSON.parse(JSON.stringify(this.columns));
}        }
}, },
mounted() { mounted() {
this.findDeptTree() this.findDeptTree()
this.initColumns() 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