Commit 0d245311 authored by lc@weface.com.cn's avatar lc@weface.com.cn

修改密码

parents 3a0fa14c 4399d297
......@@ -170,3 +170,10 @@ export const selectRoleflowNo = (params) => {
params
})
}
export const updatePassword = (data)=>{
return axios({
url: 'user/updatePassword',
method: 'post',
data
})
}
......@@ -121,21 +121,22 @@ const router = new Router({
path:"/payInfo",
name:"缴费记录",
component: PayInfo
},{
path:"/application",
name:"待遇申请审核",
component: application
},
// {
// path:"/application",
// name:"待遇申请审核",
// component: application
// },
{
path:"/importByExcel",
name:"数据导入",
component: importByExcel
},
// {
// path:"/treatmentApplicationAudit",
// name:"待遇申请审核",
// component: treatmentApplicationAudit
// },
{
path:"/treatmentApplicationAudit",
name:"待遇申请审核",
component: treatmentApplicationAudit
},
{
path:"/insuranceCancellationAudit",
name:"参保注销审核",
......
......@@ -5,24 +5,9 @@
*/
// 后台管理系统服务器地址
//export const baseUrl = 'http://172.16.10.33:9002'
//export const baseUrl = 'http://172.16.10.25:9009'
//export const baseUrl ="http://faceauth.weface.com.cn:98"
export const baseUrl2 = 'http://faceauth.weface.com.cn:97'
export const baseUrl2 = 'http://xclc.rensheju.com'
//export const baseUrl = 'http://xc.rensheju.com'
export const baseUrl = 'http://172.16.10.33:9002'
//export const 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 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"
//export const baseUrl2 = 'http://172.16.10.25:9007'
// 系统数据备份还原服务器地址
//export const backupBaseUrl = 'http://localhost:8002'
//export const baseUrl = 'http://faceauth.weface.com.cn:98'
//export const baseUrl2 = 'http://172.16.10.163:9002'
export default {
baseUrl,
......
......@@ -12,8 +12,9 @@
</el-table-column>
<el-table-column :label="$t('action.operation')" width="185" fixed="right" v-if="showOperation" header-align="center" align="center">
<template slot-scope="scope">
<kt-button icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/>
<kt-button v-if="scope.row.name!=='admin'" icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/>
<el-switch
v-if="scope.row.name!=='admin'"
class="statusSwitch"
style="display: block;float: left;margin-left: 20px;width: 50px"
v-model="scope.row.status==0?true:false"
......
......@@ -20,7 +20,7 @@
<el-button size="small" icon="fa fa-male"> 个人中心</el-button>
</span>
<span class="main-operation-item">
<el-button size="small" icon="fa fa-key"> 修改密码</el-button>
<el-button size="small" icon="fa fa-key" @click=openPasswordDialog()> 修改密码</el-button>
</span>
</div>
......@@ -30,11 +30,32 @@
</div>
<!--备份还原界面-->
<!-- <backup ref="backupDialog" @afterRestore="afterRestore"></backup> -->
<el-dialog :modal-append-to-body='false' title="修改密码" :visible.sync="updatePasswordDialogVisible" width="25%">
<el-form :model="item">
<el-input placeholder="请输入原密码" v-model="item.password" show-password maxlength = 8 minlength = 6 ></el-input>
<div style="margin: 20px 0;">
</div>
<el-input placeholder="请输入新密码 6~8位" v-model="item.newpassword" show-password maxlength = 8 minlength = 6></el-input>
<div style="margin: 20px 0;"/>
<el-input placeholder="再次输入新密码 6~8位" v-model="item.newpasswordagain" show-password maxlength = 8 minlength = 6></el-input>
<div style="margin: 20px 0;"/>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="updatePasswordDialogVisible = false">取 消</el-button>
<el-button type="primary" @click = updatePassword() >确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import Cookies from "js-cookie"
import router from '@/router'
//import Backup from "@/views/Backup/Backup"
export default {
name: 'PersonalPanel',
......@@ -54,7 +75,14 @@ export default {
},
data() {
return {
updatePasswordDialogVisible : false,
item :{
newpassword : "",
newpasswordagain : "",
password : ""
}
}
},
methods: {
// 退出登录
......@@ -89,10 +117,52 @@ export default {
this.$api.login.logout().then((res) => {
}).catch(function(res) {
})
},
openPasswordDialog:function () {
this.updatePasswordDialogVisible = true;
this.item = {
newpassword: "",
newpasswordagain: "",
password: ""
}
},
updatePassword: function () {
var rex = /^[\w_-]{6,8}$/
if(this.item.password == ''){
this.$message({message: '请输入原密码', type: 'error'})
return;
}
if(this.item.newpassword == ''){
this.$message({message: '请输入新密码 ', type: 'error'})
return;
}
if(!rex.test(this.item.newpassword)){
this.$message({message: '新密码不规范', type: 'error'})
return;
}
if(this.item.newpassword == this.item.password){
this.$message({message: '新旧密码一致', type: 'error'})
return;
}
if(this.item.newpassword != this.item.newpasswordagain){
this.$message({message: '新密码不一致', type: 'error'})
return;
}
this.$api.getlist.updatePassword(this.item).then((res) => {
if(res.code == 200) {
this.$message({ message: '操作成功', type: 'success' })
this.updatePasswordDialogVisible = false;
//this.$refs['item'].resetFields()
Cookies.remove("token")
router.push('/login')
}else {
this.$message({message: '操作失败, ' + res.message, type: 'error'})
}
});
},
mounted() {
}
}
}
</script>
......
......@@ -2,6 +2,7 @@
<div>
<el-table
v-loading.fullscreen.lock="loading"
:data="tableData"
style="width: 100%"
>
......@@ -75,7 +76,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>
......@@ -88,11 +89,13 @@ export default {
return {
Page:1,
totals:0,
tableData: []
tableData: [],
loading: false
}
},
methods:{
toPdf(s,d){
this.loading = true;
console.log(d)
axios.get(baseUrl+'/exportPdf/insuredRegistration?id='+d.eventId,{
headers: {
......@@ -108,11 +111,13 @@ export default {
a.href = URL.createObjectURL(blob); //生成一个url
a.download = "西充县城乡居民社会养老保险参保登记表.pdf";
a.click();
this.loading = false;
// let objectUrl = URL.createObjectURL(blob); //生成一个url
// window.location.href = objectUrl; //浏览器打开这个url
})
.catch(err => {
console.log(err);
this.loading = false;
});
},
current_change(s){
......@@ -136,6 +141,7 @@ export default {
});
},
toexcel(){
this.loading = true;
axios.get(baseUrl+'/exportExcel/insuredRegistration',{
headers: {
"token":Cookies.get("token")
......@@ -150,11 +156,13 @@ export default {
a.href = URL.createObjectURL(blob); //生成一个url
a.download = "居民养老保险表.xlsx";
a.click();
this.loading = false;
// let objectUrl = URL.createObjectURL(blob); //生成一个url
// window.location.href = objectUrl; //浏览器打开这个url
})
.catch(err => {
console.log(err);
this.loading = false;
});
// this.$api.getlist.dccc().then((res) => {
// let loadingInstance = Loading.service();
......
......@@ -2,6 +2,7 @@
<div>
<el-table
v-loading.fullscreen.lock="loading"
:data="tableData"
style="width: 100%"
>
......@@ -46,7 +47,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>
......@@ -60,11 +61,13 @@
return {
PageNum: 1,
totals: 0,
tableData: []
tableData: [],
loading: false
}
},
methods: {
toPdf(s, d) {
this.loading = true;
console.log(d)
axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, {
headers: {
......@@ -82,9 +85,11 @@
a.click();
// let objectUrl = URL.createObjectURL(blob); //生成一个url
// window.location.href = objectUrl; //浏览器打开这个url
this.loading = false;
})
.catch(err => {
console.log(err);
this.loading = false;
});
},
current_change(s) {
......@@ -99,7 +104,7 @@
loadingInstance.close();
});
if (res.code == 200) {
this.tableData = res.data.result
this.tableData = res.data.content
this.totals = res.data.totalSize
}
......@@ -108,6 +113,7 @@
});
},
toexcel() {
this.loading = true;
axios.get(baseUrl + '/exportExcel/modifyPayGrade', {
headers: {
"token": Cookies.get("token")
......@@ -124,9 +130,11 @@
a.click();
// let objectUrl = URL.createObjectURL(blob); //生成一个url
// window.location.href = objectUrl; //浏览器打开这个url
this.loading = false;
})
.catch(err => {
console.log(err);
this.loading = false;
});
// this.$api.getlist.dccc().then((res) => {
// let loadingInstance = Loading.service();
......
......@@ -2,6 +2,7 @@
<div>
<el-table
v-loading.fullscreen.lock="loading"
:data="tableData"
style="width: 100%"
>
......@@ -81,11 +82,13 @@
return {
PageNum: 1,
totals: 0,
tableData: []
tableData: [],
loading: false
}
},
methods: {
toPdf(s, d) {
this.loading = true;
console.log(d)
axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, {
headers: {
......@@ -103,9 +106,11 @@
a.click();
// let objectUrl = URL.createObjectURL(blob); //生成一个url
// window.location.href = objectUrl; //浏览器打开这个url
this.loading = false;
})
.catch(err => {
console.log(err);
this.loading = false;
});
},
current_change(s) {
......@@ -129,6 +134,7 @@
});
},
toexcel() {
this.loading = true;
axios.get(baseUrl + '/exportExcel/updateBaseInfo', {
headers: {
"token": Cookies.get("token")
......@@ -145,9 +151,11 @@
a.click();
// let objectUrl = URL.createObjectURL(blob); //生成一个url
// window.location.href = objectUrl; //浏览器打开这个url
this.loading = false;
})
.catch(err => {
console.log(err);
this.loading = false;
});
// this.$api.getlist.dccc().then((res) => {
// let loadingInstance = Loading.service();
......
......@@ -2,6 +2,7 @@
<div>
<el-table
v-loading.fullscreen.lock="loading"
:data="tableData"
style="width: 100%"
>
......@@ -60,11 +61,13 @@
return {
PageNum: 1,
totals: 0,
tableData: []
tableData: [],
loading: false
}
},
methods: {
toPdf(s, d) {
this.loading = true;
console.log(d)
axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, {
headers: {
......@@ -82,9 +85,11 @@
a.click();
// let objectUrl = URL.createObjectURL(blob); //生成一个url
// window.location.href = objectUrl; //浏览器打开这个url
this.loading = false;
})
.catch(err => {
console.log(err);
this.loading = false;
});
},
current_change(s) {
......@@ -99,7 +104,7 @@
loadingInstance.close();
});
if (res.code == 200) {
this.tableData = res.data.result
this.tableData = res.data.content
this.totals = res.data.totalSize
}
......@@ -108,6 +113,7 @@
});
},
toexcel() {
this.loading = true;
axios.get(baseUrl + '/exportExcel/updateBankCard', {
headers: {
"token": Cookies.get("token")
......@@ -124,9 +130,11 @@
a.click();
// let objectUrl = URL.createObjectURL(blob); //生成一个url
// window.location.href = objectUrl; //浏览器打开这个url
this.loading = false;
})
.catch(err => {
console.log(err);
this.loading = false;
});
// this.$api.getlist.dccc().then((res) => {
// let loadingInstance = Loading.service();
......
......@@ -262,7 +262,7 @@ this.$api.getlist.selectflowState(data).then((res) => {
console.log(d)
if(s==1){
this.flowTitle="新增流程"
for(var i =1;i<=7;i++){
for(var i =1;i<=6;i++){
this.titleList.push({
label:this.getType(i),
value:i+","+this.getType(i)
......
<template>
<div>
<el-tabs type="border-card">
<el-tabs
type="border-card"
:v-loading="loading">
<el-tab-pane label="参保覆盖人员" v-loading="loading">
<div style="width: 25%;float: left">
<el-alert
align="left"
title="请上传格式完全相同的excel,格式如下:"
type="warning"
show-icon>
</el-alert>
<table style="text-align: center;border-collapse: collapse" cellspacing="0px" cellpadding="0px">
<tr>
<td style="border: 1px solid black">&nbsp;统筹区&nbsp;</td>
<td style="border: 1px solid black">&nbsp;街道或乡镇名称&nbsp;</td>
<td style="border: 1px solid black">&nbsp;社区名称&nbsp;</td>
<td style="border: 1px solid black">&nbsp;所属组&nbsp;</td>
<td style="border: 1px solid black">&nbsp;户口所在地&nbsp;</td>
<td style="border: 1px solid black">&nbsp;户口性质&nbsp;</td>
<td style="border: 1px solid black">&nbsp;个人编号&nbsp;</td>
<td style="border: 1px solid black">&nbsp;证件号码&nbsp;</td>
<td style="border: 1px solid black">&nbsp;姓名&nbsp;</td>
<td style="border: 1px solid black">&nbsp;性别&nbsp;</td>
<td style="border: 1px solid black">&nbsp;民族&nbsp;</td>
<td style="border: 1px solid black">&nbsp;出生日期&nbsp;</td>
<td style="border: 1px solid black">&nbsp;险种类型&nbsp;</td>
<td style="border: 1px solid black">&nbsp;参保状态&nbsp;</td>
<td style="border: 1px solid black">&nbsp;是否老农保&nbsp;</td>
<td style="border: 1px solid black">&nbsp;缴费状态&nbsp;</td>
<td style="border: 1px solid black">&nbsp;缴费档次&nbsp;</td>
<td style="border: 1px solid black">&nbsp;人员类别&nbsp;</td>
<td style="border: 1px solid black">&nbsp;离退休标志&nbsp;</td>
<td style="border: 1px solid black">&nbsp;个人身份&nbsp;</td>
<td style="border: 1px solid black">&nbsp;参保日期&nbsp;</td>
<td style="border: 1px solid black">&nbsp;档案编号&nbsp;</td>
</tr>
</table>
<el-upload
style="margin-top: 10px"
class="upload-demo"
ref="upload1"
:action="baseInfoUrl"
......@@ -22,16 +56,6 @@
<div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div>
</el-upload>
<el-button style="margin-top: 10px" size="small" type="success" @click="submitUpload1">数据导入</el-button>
</div>
<div style="width: 75%;float: left">
<el-alert
align="left"
title="请上传格式完全相同的excel,格式如下:"
type="warning"
description="统筹区,街道或乡镇名称,社区名称,所属组,户口所在地,户口性质,个人编号,证件号码,姓名,性别,民族,出生日期,险种类型,参保状态,是否老农保,缴费状态,缴费档次,人员类别,离退休标志,个人身份,参保日期,档案编号"
show-icon>
</el-alert>
</div>
</el-tab-pane>
<el-tab-pane label="缴费情况明细">
<el-upload
......@@ -70,6 +94,13 @@
</el-upload>
</el-tab-pane>
</el-tabs>
<el-dialog
ref="dialog"
:title="dialogTitle"
width="30%"
:visible.sync="dialogVisible">
<span v-text="dialogContent" style="font-size: 16px"></span>
</el-dialog>
</div>
</template>
......@@ -86,7 +117,11 @@
myHeader: {
token: Cookies.get("token")
},
fileList: []
fileList: [],
dialogTitle: "",
dialogVisible: false,
dialogContent: "",
loading: false
};
},
methods: {
......@@ -103,6 +138,7 @@
this.$message.warning("当前限制选择 1 个文件,请删除后继续上传");
},
handleBeforeUpload(file) {
this.loading = true;
if (!file.name.endsWith(".xls") && !file.name.endsWith(".xlsx")) {
this.$message.warning(file.name + "不是excel文件");
return false;
......@@ -114,22 +150,21 @@
// uploadedList.push(file.name);
},
uploadSuccess(response) {
console.log(response)
this.$alert(response.data, '导入结果', {
confirmButtonText: '确定',
callback: action => {
// this.$message({
// type: 'info',
// message: `action: ${ action }`
this.dialogTitle = "导入结果";
this.dialogContent = response.data;
this.dialogVisible = true;
this.loading = false;
// console.log(response);
// this.$alert(response.data, '导入结果', {
// confirmButtonText: '确定',
// callback: action => {
// // this.$message({
// // type: 'info',
// // message: `action: ${ action }`
// // });
// }
// });
}
});
// this.$message.success({
// message: response.data,
// duration: 0,
// showClose: true
// })
}
}
}
</script>
......
......@@ -48,12 +48,11 @@
<el-input v-model="dataForm.id" :disabled="true" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="用户名" prop="name">
<el-input v-if="!operation" v-model="dataForm.name" auto-complete="off" :disabled="true"></el-input>
<el-input v-if="!operation" v-model="dataForm.name" auto-complete="off" readonly="true"></el-input>
<el-input v-if="operation" v-model="dataForm.name" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="真实姓名" prop="truename">
<el-input v-if="!operation" v-model="dataForm.truename" auto-complete="off" :disabled="true"></el-input>
<el-input v-if="operation" v-model="dataForm.truename" auto-complete="off"></el-input>
<el-input v-model="dataForm.truename" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="密码" prop="password">
<el-input v-model="dataForm.password" type="password" auto-complete="off"></el-input>
......@@ -91,7 +90,7 @@
</el-form-item>
</el-form>
<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" @click="cancelRules('dataForm')">{{$t('action.cancel')}}</el-button>
<el-button :size="size" type="primary" @click.native="submitForm" :loading="editLoading">{{$t('action.submit')}}</el-button>
</div>
</el-dialog>
......@@ -118,7 +117,6 @@ export default {
size: 'small',
filters: {
name: '',
truename: ''
},
columns: [],
filterColumns: [],
......@@ -131,6 +129,9 @@ export default {
dataFormRules: {
name: [
{ required: true, message: '请输入用户名', trigger: 'blur' }
],
truename: [
{ required: true, message: '请输入真实姓名', trigger: 'blur' }
]
},
// 新增编辑界面数据
......@@ -296,7 +297,10 @@ export default {
// {prop:"lastUpdateTime", label:"更新时间", minWidth:120, formatter:this.dateFormat}
]
this.filterColumns = JSON.parse(JSON.stringify(this.columns));
       }
       },
cancelRules: function (formName) {
this.$refs[formName].resetFields();
}
},
mounted() {
this.findDeptTree()
......
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