Skip to content

X
xichonght
Commit e4dd8e2c authored by qddidi's avatar qddidi
Browse files
Options

123

parents 9188338f 381da95e
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 53 deletions
xichongSys/src/http/moudules/getlist.js
View file @ e4dd8e2c
...@@ -240,3 +240,11 @@ export const selectchartInfo = (params) => { ...@@ -240,3 +240,11 @@ export const selectchartInfo = (params) => {
params params
}) })
}; };
//特殊业务导出
export const seletsywdc = (data) => {
return axios({
url: '/baseInfo/getSpecialBusiness',
method: 'post',
data
})
};
xichongSys/src/views/Core/PersonalPanel.vue
View file @ e4dd8e2c
...@@ -33,12 +33,12 @@ ...@@ -33,12 +33,12 @@
<el-dialog :modal-append-to-body='false' title="修改密码" :visible.sync="updatePasswordDialogVisible" width="25%"> <el-dialog :modal-append-to-body='false' title="修改密码" :visible.sync="updatePasswordDialogVisible" width="25%">
<el-form :model="item"> <el-form :model="item">
<el-input placeholder="请输入原密码" v-model="item.password" show-password maxlength = 8 minlength = 6 ></el-input> <el-input placeholder="请输入原密码" v-model="item.password" show-password maxlength = 18 minlength = 6 ></el-input>
<div style="margin: 20px 0;"> <div style="margin: 20px 0;">
</div> </div>
<el-input placeholder="请输入新密码 6~8位" v-model="item.newpassword" show-password maxlength = 8 minlength = 6></el-input> <el-input placeholder="请输入新密码 6~18位" v-model="item.newpassword" show-password maxlength = 18 minlength = 6></el-input>
<div style="margin: 20px 0;"/> <div style="margin: 20px 0;"/>
<el-input placeholder="再次输入新密码 6~8位" v-model="item.newpasswordagain" show-password maxlength = 8 minlength = 6></el-input> <el-input placeholder="再次输入新密码 6~18位" v-model="item.newpasswordagain" show-password maxlength = 18 minlength = 6></el-input>
<div style="margin: 20px 0;"/> <div style="margin: 20px 0;"/>
</el-form> </el-form>
...@@ -69,7 +69,7 @@ export default { ...@@ -69,7 +69,7 @@ export default {
name: "admin", name: "admin",
avatar: "@/assets/user.png", avatar: "@/assets/user.png",
role: "超级管理员", role: "超级管理员",
registeInfo: "注册时间：2018-12-25 " registeInfo: "注册时间g：2018-12-25 "
} }
} }
}, },
......
xichongSys/src/views/Myvue/drtsyw.vue
View file @ e4dd8e2c
<template> <template>
<div> <div>
<el-table <el-table
v-loading.fullscreen.lock="loading" v-loading.fullscreen.lock="loading"
:data="tableData" :data="tableData"
...@@ -18,16 +17,21 @@ ...@@ -18,16 +17,21 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bankAccount" prop="bankAccount"
label="银行账号" label="人员类别"
min-width="20%"> min-width="20%">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bank" prop="bankAccount"
label="所属银行" label="缴费年限"
min-width="10%">
</el-table-column>
<el-table-column
prop="bankAccount"
label="个人账户积累额"
min-width="20%"> min-width="20%">
</el-table-column> </el-table-column>
<el-table-column label="操作" <el-table-column label="操作"
min-width="20%"> min-width="10%">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -45,9 +49,8 @@ ...@@ -45,9 +49,8 @@
:current-page.sync="PageNum" :current-page.sync="PageNum"
@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>
...@@ -98,7 +101,7 @@ ...@@ -98,7 +101,7 @@
"pageSize": 10 "pageSize": 10
} }
Loading.service(); Loading.service();
this.$api.getlist.seleyhkbgdc(data).then((res) => { this.$api.getlist.seletsywdc(data).then((res) => {
let loadingInstance = Loading.service(); let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close(); loadingInstance.close();
...@@ -112,44 +115,44 @@ ...@@ -112,44 +115,44 @@
}); });
}, },
toexcel() { // toexcel() {
this.loading = true; // this.loading = true;
axios.get(baseUrl + '/exportExcel/updateBankCard', { // axios.get(baseUrl + '/exportExcel/updateBankCard', {
headers: { // headers: {
"token": Cookies.get("token") // "token": Cookies.get("token")
}, // },
responseType: 'blob' //告诉服务器我们需要的响应格式 // responseType: 'blob' //告诉服务器我们需要的响应格式
}) // })
.then(res => { // .then(res => {
let a = document.createElement("a"); // let a = document.createElement("a");
let blob = new Blob([res.data], { // let blob = new Blob([res.data], {
type: 'application/vnd.ms-excel' //将会被放入到blob中的数组内容的MIME类型 // type: 'application/vnd.ms-excel' //将会被放入到blob中的数组内容的MIME类型
}); // });
a.href = URL.createObjectURL(blob); //生成一个url // a.href = URL.createObjectURL(blob); //生成一个url
a.download = "特殊业务表" + Date.now() + ".xlsx"; // a.download = "特殊业务表" + Date.now() + ".xlsx";
a.click(); // a.click();
// let objectUrl = URL.createObjectURL(blob); //生成一个url // // let objectUrl = URL.createObjectURL(blob); //生成一个url
// window.location.href = objectUrl; //浏览器打开这个url // // window.location.href = objectUrl; //浏览器打开这个url
this.loading = false; // this.loading = false;
}) // })
.catch(err => { // .catch(err => {
console.log(err); // console.log(err);
this.loading = false; // this.loading = false;
}); // });
// this.$api.getlist.dccc().then((res) => { // // this.$api.getlist.dccc().then((res) => {
// let loadingInstance = Loading.service(); // // let loadingInstance = Loading.service();
// this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 // // this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
// loadingInstance.close(); // // loadingInstance.close();
// }); // // });
// if(res.code==200){ // // if(res.code==200){
// this.tableData=res.data.result // // this.tableData=res.data.result
// this.totals=res.data.total // // this.totals=res.data.total
// } // // }
//
// }).catch((res) => { // // }).catch((res) => {
//
// }); // // });
} // }
}, },
created() { created() {
var data = { var data = {
...@@ -157,7 +160,7 @@ ...@@ -157,7 +160,7 @@
"pageSize": 10 "pageSize": 10
} }
Loading.service(); Loading.service();
this.$api.getlist.seleyhkbgdc(data).then((res) => { this.$api.getlist.seletsywdc(data).then((res) => {
let loadingInstance = Loading.service(); let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close(); loadingInstance.close();
......
xichongSys/src/views/Sys/User.vue
View file @ e4dd8e2c
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
], ],
password: [ password: [
{ required: true, message: '请输入密码', trigger: 'blur'}, { required: true, message: '请输入密码', trigger: 'blur'},
// { pattern: /^[\w_-]{6,18}$/, message: '密码必须为6至18位', trigger: 'blur'} { pattern: /^[\w_-]{6,18}$/, message: '密码必须为6至18位', trigger: 'blur'}
], ],
}, },
// 新增编辑界面数据 // 新增编辑界面数据
...@@ -178,6 +178,7 @@ export default { ...@@ -178,6 +178,7 @@ export default {
}, },
roles: [], roles: [],
dParentId: '', dParentId: '',
tempPassword: '',
} }
}, },
methods: { methods: {
...@@ -236,6 +237,7 @@ export default { ...@@ -236,6 +237,7 @@ export default {
status: 1, status: 1,
userRoles: [] userRoles: []
} }
this.tempPassword = "";
}, },
// 显示编辑界面 // 显示编辑界面
handleEdit: function (params) { handleEdit: function (params) {
...@@ -251,7 +253,7 @@ export default { ...@@ -251,7 +253,7 @@ export default {
if (this.dataForm.deptId !== 1) { if (this.dataForm.deptId !== 1) {
deptId.push(this.dataForm.deptId); deptId.push(this.dataForm.deptId);
} }
console.log(deptId); // console.log(deptId);
this.dataForm.deptId = deptId; this.dataForm.deptId = deptId;
// for (let i=0;i<this.list.length;i++) { // for (let i=0;i<this.list.length;i++) {
// console.log(this.list[i]); // console.log(this.list[i]);
...@@ -261,6 +263,8 @@ export default { ...@@ -261,6 +263,8 @@ export default {
userRoles.push(params.row.userRoles[i].roleId) userRoles.push(params.row.userRoles[i].roleId)
} }
this.dataForm.userRoles = userRoles this.dataForm.userRoles = userRoles
this.tempPassword = this.dataForm.password;
this.dataForm.password = "apHaSbgbiyAFWfHJAg";
}, },
// 编辑 // 编辑
submitForm: function () { submitForm: function () {
...@@ -270,6 +274,9 @@ export default { ...@@ -270,6 +274,9 @@ export default {
this.$confirm('确认提交吗？', '提示', {}).then(() => { this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.dataForm.deptId = this.dataForm.deptId[this.dataForm.deptId.length-1]; this.dataForm.deptId = this.dataForm.deptId[this.dataForm.deptId.length-1];
this.dataForm.deptName = ""; this.dataForm.deptName = "";
if (this.tempPassword !== "" && this.dataForm.password === "apHaSbgbiyAFWfHJAg") {
this.dataForm.password = this.tempPassword;
}
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++) {
......
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