Skip to content

X
xichonght
Commit 3a9a8cb8 authored by ytbdmhy's avatar ytbdmhy
Browse files
Options

修复审核记录，完善角色签章、用户的角色列表、密码控制等

parent 0ff4d752
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 19 deletions
xichongSys/src/views/Myvue/drdysq.vue
View file @ 3a9a8cb8
......@@ -14,13 +14,17 @@
label="姓名">
</el-table-column>
<el-table-column
prop="socialSecurityNumber"
prop="applyWay"
label="领取方式">
</el-table-column>
<el-table-column
prop="nation"
prop="payNum"
label="缴费年限">
</el-table-column>
<el-table-column
prop="accountBalance"
label="个人账户积累额">
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
......
xichongSys/src/views/Myvue/examRecord.vue
View file @ 3a9a8cb8
......@@ -322,18 +322,92 @@
}
})
}else if(d.recordtype=="待遇申请"){
sessionStorage.setItem("recordId", this.tableData[s].recordId)
this.$router.push({
name: "待遇申请审核",
params: {
info: this.tableData[s].info,
bankpic: this.tableData[s].bankpic,
idcardbackpic: this.tableData[s].idcardbackpic,
idcardfrontpic: this.tableData[s].idcardfrontpic,
signpic: this.tableData[s].signpic,
specialPhotoPic: this.tableData[s].specialPhotoPic,
bookPic: this.tableData[s].bookPic,
show: false
name:"待遇申请审核",
params:{
treApp: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:false
}
}
})
} else if(d.recordtype === "参保注销") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"参保注销审核",
params:{
insCan: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:false
}
}
})
} else if(d.recordtype === "补缴保费") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"补缴保费审核",
params:{
supPay: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:false
}
}
})
} else if(d.recordtype === "升档改办") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"升档改办审核",
params:{
upgReo: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:false
}
}
})
} else if(d.recordtype === "关系转移") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"关系转移审核",
params:{
traRel: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:false
}
}
})
}
......
xichongSys/src/views/Sys/Role.vue
View file @ 3a9a8cb8
......@@ -34,7 +34,7 @@
</el-form-item>
<el-form-item label="签章" prop="seal" align="left">
<el-popover
v-if="dataForm.sealStr !== null && dataForm.sealStr != ''"
v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr != ''"
placement="left"
title=""
trigger="hover">
......@@ -48,11 +48,18 @@
action=""
accept=".png,.jpg"
:on-change="changeSeal"
:limit="1"
:file-list="sealUrl"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
<el-button
v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr != ''"
icon="el-icon-delete"
size="small"
type="warning"
@click="cancelSeal">
取消签章
</el-button>
<!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>-->
</el-upload>
</el-form-item>
</el-form>
......@@ -170,6 +177,8 @@ export default {
id: 0,
name: '',
remark: '',
seal: '',
sealStr: '',
}
this.sealUrl = [];
},
......@@ -303,7 +312,8 @@ export default {
           return format(row[column.property])
       },
changeSeal(file) {
var This = this;
let This = this;
this.dataForm.sealStr = "";
this.sealUrl = [];
this.sealUrl.push(file);
if (this.sealUrl.length > 0) {
......@@ -318,6 +328,11 @@ export default {
reader.onload = function (e) {
callback.call(this, this.result.substring(this.result.indexOf(",") + 1));
}
},
cancelSeal() {
this.sealUrl = [];
this.dataForm.sealStr = null;
this.dataForm.seal = null;
}
},
mounted() {
......
xichongSys/src/views/Sys/User.vue
View file @ 3a9a8cb8
......@@ -150,7 +150,11 @@ export default {
],
deptId: [
{ required: true, message: '请选择机构', trigger: 'change'}
]
],
password: [
{ required: true, message: '请输入密码', trigger: 'blur'},
{ pattern: /^[\w_-]{6,18}$/, message: '密码必须为6至18位', trigger: 'blur'}
],
},
// 新增编辑界面数据
dataForm: {
......@@ -201,7 +205,14 @@ export default {
findUserRoles: function () {
this.$api.role.findAll().then((res) => {
// 加载角色集合
this.roles = res.data
this.roles = res.data;
console.log("roles:", this.roles);
for (let i = 0,len = this.roles.length;i < len;i++) {
if (this.roles[i].name === "超级管理员") {
this.roles.splice(i, 1);
break;
}
}
})
},
// 批量删除
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment