Commit 73aef843 authored by qddidi's avatar qddidi

213

parents eab871f7 4e201c5f
...@@ -4,7 +4,7 @@ node_modules/ ...@@ -4,7 +4,7 @@ node_modules/
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
/src/utils/global.js
# Editor directories and files # Editor directories and files
.idea .idea
.vscode .vscode
......
...@@ -114,7 +114,7 @@ export const seleyhkbgdc = (data) => { ...@@ -114,7 +114,7 @@ export const seleyhkbgdc = (data) => {
data data
}) })
} }
//银行卡变更导出 //档次变更导出
export const seledcbgdc = (data) => { export const seledcbgdc = (data) => {
return axios({ return axios({
url: '/baseInfo/getUpdateGrade', url: '/baseInfo/getUpdateGrade',
...@@ -146,6 +146,14 @@ export const listAllBaseInfo = (data) => { ...@@ -146,6 +146,14 @@ export const listAllBaseInfo = (data) => {
params params
}) })
} }
//缴费信息查询
export const listPayInfo = (data) => {
return axios({
url: '/payInfo/getPayInfo',
method: 'post',
data
})
}
//领取人员查询 //领取人员查询
export const getGrantList = (data) => { export const getGrantList = (data) => {
return axios({ return axios({
...@@ -162,11 +170,34 @@ export const selectRoleflowNo = (params) => { ...@@ -162,11 +170,34 @@ export const selectRoleflowNo = (params) => {
params params
}) })
} }
export const updatePassword = (data)=>{
return axios({
url: 'user/updatePassword',
method: 'post',
data
})
}
export const getTown = () => { export const getTown = () => {
return axios({ return axios({
url: '/dept/findTreeByUser', url: '/dept/findTreeByUser',
method: 'get', method: 'get',
}) })
} }
// //
\ No newline at end of file //参保注销导出
export const selecbzxdc = (data) => {
return axios({
url: '/baseInfo/getInsuranceCancel',
method: 'post',
data
})
};
//补缴保费导出
export const selebjbfdc = (data) => {
return axios({
url: '/baseInfo/getSupPayment',
method: 'post',
data
})
};
...@@ -25,6 +25,7 @@ import receivePersonnel from "@/views/Myvue/receivePersonnel"; ...@@ -25,6 +25,7 @@ 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 application from "@/views/Myvue/application"
<<<<<<< HEAD
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"
...@@ -32,6 +33,19 @@ import supPaymentAudit from "@/views/Myvue/supPaymentAudit" ...@@ -32,6 +33,19 @@ import supPaymentAudit from "@/views/Myvue/supPaymentAudit"
import traRelationsAudit from "@/views/Myvue/traRelationsAudit" import traRelationsAudit from "@/views/Myvue/traRelationsAudit"
import upgradeReoAudit from "@/views/Myvue/upgradeReoAudit" import upgradeReoAudit from "@/views/Myvue/upgradeReoAudit"
import authRecordphone from "@/views/Myvue/authRecordphone" import authRecordphone from "@/views/Myvue/authRecordphone"
=======
import importByExcel from "@/views/Myvue/importByExcel";
import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit";
import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit";
import supPaymentAudit from "@/views/Myvue/supPaymentAudit";
import traRelationsAudit from "@/views/Myvue/traRelationsAudit";
import upgradeReoAudit from "@/views/Myvue/upgradeReoAudit";
import drcbzx from "@/views/Myvue/drcbzx";
import drbjbf from "@/views/Myvue/drbjbf";
import drtsyw from "@/views/Myvue/drtsyw";
>>>>>>> 4e201c5fbe015e3f7e92292d7a21d0239a5d74d1
Vue.use(Router) Vue.use(Router)
const router = new Router({ const router = new Router({
...@@ -77,27 +91,27 @@ const router = new Router({ ...@@ -77,27 +91,27 @@ const router = new Router({
}, },
{ {
path:"/Output_1", path:"/Output_1",
name:"参保登记", name:"参保登记导出",
component: drcbdj component: drcbdj
}, },
{ {
path:"/modifyall", path:"/modifyAllExport",
name:"所有变更", name:"所有变更导出",
component: drxxbg component: drxxbg
}, },
{ {
path:"/modifybankcard", path:"/modifyBanExport",
name:"银行卡变更", name:"银行卡变更导出",
component: dryhkbg component: dryhkbg
}, },
{ {
path:"/modifygrade", path:"/modifyGraExport",
name:"档次变更", name:"档次变更导出",
component: drdcbg component: drdcbg
}, },
{ {
path:"/treatmentApplication", path:"/treatmentAppExport",
name:"待遇申请", name:"待遇申请导出",
component: drdysq component: drdysq
}, },
{ {
...@@ -160,6 +174,21 @@ const router = new Router({ ...@@ -160,6 +174,21 @@ const router = new Router({
name:"关系转移审核", name:"关系转移审核",
component: traRelationsAudit component: traRelationsAudit
}, },
{
path:"/insCanExport",
name:"参保注销导出",
component: drcbzx
},
{
path:"/supPayExport",
name:"补缴保费导出",
component: drbjbf
},
{
path:"/speBusExport",
name:"特殊业务导出",
component: drtsyw
},
] ]
}, },
{ {
......
...@@ -5,25 +5,10 @@ ...@@ -5,25 +5,10 @@
*/ */
// 后台管理系统服务器地址 // 后台管理系统服务器地址
//export const baseUrl = 'http://172.16.10.33:9002' export const baseUrl2 = 'http://xclc.rensheju.com'
//export const baseUrl = 'http://172.16.10.25:9009' //export const baseUrl = 'http://xc.rensheju.com'
//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.33: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 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 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 backupBaseUrl = 'http://localhost:8002'
//export const baseUrl = 'http://faceauth.weface.com.cn:98'
//export const baseUrl2 = 'http://172.16.10.163:9002'
export default { export default {
baseUrl, baseUrl,
......
...@@ -3,25 +3,25 @@ ...@@ -3,25 +3,25 @@
<div class="personal-desc" :style="{'background':this.$store.state.app.themeColor}"> <div class="personal-desc" :style="{'background':this.$store.state.app.themeColor}">
<div class="avatar-container"> <div class="avatar-container">
<img class="avatar" :src="require('@/assets/user.png')" /> <img class="avatar" :src="require('@/assets/user.png')" />
</div> </div>
<div class="name-role"> <div class="name-role">
<span class="sender">{{ user.name }} - {{ user.role }}</span> <span class="sender">{{ user.name }} - {{ user.role }}</span>
</div> </div>
<div class="registe-info"> <div class="registe-info">
<span class="registe-info"> <span class="registe-info">
<li class="fa fa-clock-o"></li> <li class="fa fa-clock-o"></li>
{{ user.registeInfo }} {{ user.registeInfo }}
</span> </span>
</div> </div>
</div> </div>
<div class="main-operation"> <div class="main-operation">
<span class="main-operation-item"> <span class="main-operation-item">
<el-button size="small" icon="fa fa-male"> 个人中心</el-button> <el-button size="small" icon="fa fa-male"> 个人中心</el-button>
</span> </span>
<span class="main-operation-item"> <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> </span>
</div> </div>
<div class="personal-footer" @click="logout"> <div class="personal-footer" @click="logout">
...@@ -30,16 +30,37 @@ ...@@ -30,16 +30,37 @@
</div> </div>
<!--备份还原界面--> <!--备份还原界面-->
<!-- <backup ref="backupDialog" @afterRestore="afterRestore"></backup> --> <!-- <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> </div>
</template> </template>
<script> <script>
import Cookies from "js-cookie" import Cookies from "js-cookie"
import router from '@/router'
//import Backup from "@/views/Backup/Backup" //import Backup from "@/views/Backup/Backup"
export default { export default {
name: 'PersonalPanel', name: 'PersonalPanel',
components:{ components:{
}, },
props: { props: {
user: { user: {
...@@ -54,7 +75,14 @@ export default { ...@@ -54,7 +75,14 @@ export default {
}, },
data() { data() {
return { return {
updatePasswordDialogVisible : false,
item :{
newpassword : "",
newpasswordagain : "",
password : ""
}
} }
}, },
methods: { methods: {
// 退出登录 // 退出登录
...@@ -73,7 +101,7 @@ export default { ...@@ -73,7 +101,7 @@ export default {
.catch(() => {}) .catch(() => {})
}, },
// 删除cookie // 删除cookie
deleteCookie: function(name) { deleteCookie: function(name) {
Cookies.remove(name) Cookies.remove(name)
}, },
// 打开备份还原界面 // 打开备份还原界面
...@@ -89,10 +117,52 @@ export default { ...@@ -89,10 +117,52 @@ export default {
this.$api.login.logout().then((res) => { this.$api.login.logout().then((res) => {
}).catch(function(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() { mounted() {
} }
}
} }
</script> </script>
...@@ -175,4 +245,4 @@ export default { ...@@ -175,4 +245,4 @@ export default {
color: rgb(19, 138, 156); color: rgb(19, 138, 156);
background: #b1a6a61e; background: #b1a6a61e;
} }
</style> </style>
\ No newline at end of file
<template> <template>
<div> <div>
<div class="op"> <div class="op">
<Candode v-on:childByValue="childByValue"></Candode>
<div class="nam"> <div class="nam">
<el-input v-model="personName" size="mini" placeholder="请输入姓名"></el-input> <el-input v-model="personName" size="mini" placeholder="请输入姓名"></el-input>
</div> </div>
...@@ -229,7 +231,12 @@ ...@@ -229,7 +231,12 @@
import CryptoJS from 'crypto-js' import CryptoJS from 'crypto-js'
import { Loading } from 'element-ui'; import { Loading } from 'element-ui';
import {formatDate} from '../../utils/datetime' import {formatDate} from '../../utils/datetime'
import Candode from "../Core/candode"
export default { export default {
components:{
Candode
},
data() { data() {
return { return {
Page: 1, Page: 1,
...@@ -240,9 +247,13 @@ ...@@ -240,9 +247,13 @@
dialogFormVisible:false, dialogFormVisible:false,
form:{}, form:{},
tableData: [], tableData: [],
townList:'',
} }
}, },
methods: { methods: {
childByValue(val){
this.townList=val
},
showDetail(index,row){ showDetail(index,row){
this.dialogFormVisible = true; this.dialogFormVisible = true;
this.form = row; this.form = row;
...@@ -253,6 +264,8 @@ ...@@ -253,6 +264,8 @@
var data={ var data={
idcard:this.idcard?this.Encrypt(this.idcard):"", idcard:this.idcard?this.Encrypt(this.idcard):"",
personName:this.personName?this.Encrypt(this.personName):"", personName:this.personName?this.Encrypt(this.personName):"",
townName: this.townList?this.townList[0]:'',
villageName:this.townList?this.townList[1]:''
} }
Loading.service(); Loading.service();
this.$api.getlist.listAllBaseInfo(data).then((res) => { this.$api.getlist.listAllBaseInfo(data).then((res) => {
......
<template> <template>
<div> <div>
<div class="op"> <div class="op">
<Candode v-on:childByValue="childByValue"></Candode>
<div class="add" style="margin-left:0">
<!--<div class="add" style="margin-left:0">
<el-select clearable size="mini" @change="handleChange" v-model="town" placeholder="请选择乡/镇"> <el-select clearable size="mini" @change="handleChange" v-model="town" placeholder="请选择乡/镇">
<el-option <el-option
v-for="item in list" v-for="item in list"
...@@ -22,7 +23,7 @@ ...@@ -22,7 +23,7 @@
:value="item2.village_id+','+item2.village_name"> :value="item2.village_id+','+item2.village_name">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>-->
<div class="nam"> <div class="nam">
<el-input v-model="name" clearable size="mini" placeholder="请输入姓名"></el-input> <el-input v-model="name" clearable size="mini" placeholder="请输入姓名"></el-input>
</div> </div>
...@@ -48,9 +49,9 @@ ...@@ -48,9 +49,9 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
<div class="op" style="margin-top:10px"> <div class="op" style="margin-top:10px">
<div class="add" style="margin-left:0"> <div class="add" style="margin-left:0">
...@@ -132,7 +133,7 @@ ...@@ -132,7 +133,7 @@
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
class="pone" class="pone"
...@@ -151,10 +152,10 @@ ...@@ -151,10 +152,10 @@
.op{ .op{
display: flex; display: flex;
align-items: center; align-items: center;
} }
.idc{ .idc{
width: 200px width: 200px
} }
.nam{ .nam{
...@@ -190,20 +191,25 @@ import Cookies from "js-cookie"; ...@@ -190,20 +191,25 @@ import Cookies from "js-cookie";
import {listtown} from '../../utils/address' import {listtown} from '../../utils/address'
import {baseUrl2} from "../../utils/global" import {baseUrl2} from "../../utils/global"
import defaultImg from "../../assets/defaultPicture.jpg" import defaultImg from "../../assets/defaultPicture.jpg"
import Candode from "../Core/candode"
export default { export default {
components:{
Candode
},
data() { data() {
return { return {
list:[], list:[],
name:"", name:"",
town:"", town:"",
village:"", village:"",
defaultImg: defaultImg, defaultImg: defaultImg,
townList:"",
cit:"", cit:"",
Page:1, Page:1,
totals:0, totals:0,
idcard:"", idcard:"",
ywtype:"",
info:'', info:'',
ywtype:'', ywtype:'',
tableData: [], tableData: [],
...@@ -267,13 +273,16 @@ import defaultImg from "../../assets/defaultPicture.jpg" ...@@ -267,13 +273,16 @@ import defaultImg from "../../assets/defaultPicture.jpg"
} }
}, },
methods: { methods: {
childByValue(val){
this.townList=val
},
//搜索 //搜索
serch(){ serch(){
Loading.service(); Loading.service();
this.serchs(1) this.serchs(1)
}, },
serchs(p){ serchs(p){
var start="" var start=""
var end="" var end=""
if(this.time){ if(this.time){
...@@ -283,9 +292,9 @@ import defaultImg from "../../assets/defaultPicture.jpg" ...@@ -283,9 +292,9 @@ import defaultImg from "../../assets/defaultPicture.jpg"
var mon=(parseInt(d.getMonth()) + 1) var mon=(parseInt(d.getMonth()) + 1)
var emon=(parseInt(s.getMonth()) + 1) var emon=(parseInt(s.getMonth()) + 1)
start = d.getFullYear()+"-"+mon+"-"+d.getDate() start = d.getFullYear()+"-"+mon+"-"+d.getDate()
end=s.getFullYear()+"-"+emon+"-"+s.getDate() end=s.getFullYear()+"-"+emon+"-"+s.getDate()
} }
var data={ var data={
province_name:"四川省", province_name:"四川省",
...@@ -293,8 +302,10 @@ import defaultImg from "../../assets/defaultPicture.jpg" ...@@ -293,8 +302,10 @@ import defaultImg from "../../assets/defaultPicture.jpg"
county_name:"西充县", county_name:"西充县",
pageSize:10, pageSize:10,
page:p, page:p,
town_name:this.town.split(",")[1], // town_name:this.town.split(",")[1],
village_name:this.village.split(",")[1], // village_name:this.village.split(",")[1],
town_name: this.townList?this.townList[0]:'',
village_name:this.townList?this.townList[1]:'',
iDCard:this.idcard, iDCard:this.idcard,
match_state:this.state, match_state:this.state,
begin_time:start, begin_time:start,
...@@ -303,7 +314,7 @@ import defaultImg from "../../assets/defaultPicture.jpg" ...@@ -303,7 +314,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
personName:this.name, personName:this.name,
address:this.agemeth, address:this.agemeth,
birthday:this.age birthday:this.age
} }
Axios.get(baseUrl2+'/search/authentication.do',{ Axios.get(baseUrl2+'/search/authentication.do',{
params:data params:data
}) })
...@@ -321,20 +332,20 @@ import defaultImg from "../../assets/defaultPicture.jpg" ...@@ -321,20 +332,20 @@ import defaultImg from "../../assets/defaultPicture.jpg"
loadingInstance.close(); loadingInstance.close();
}); });
}); });
}, },
//流程 //流程
progress(d,s){ progress(d,s){
}, },
current_change(ss){ current_change(ss){
this.serchs(ss) this.serchs(ss)
}, },
// //
handleChange(){ handleChange(){
Axios.get(baseUrl2+'/show/getVillageList.do?town_id='+this.town.split(",")[0],{ Axios.get(baseUrl2+'/show/getVillageList.do?town_id='+this.town.split(",")[0],{
}) })
.then(res => { .then(res => {
this.list2=res.data this.list2=res.data
...@@ -348,7 +359,7 @@ import defaultImg from "../../assets/defaultPicture.jpg" ...@@ -348,7 +359,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
}, },
//查看 //查看
handle(s,d){ handle(s,d){
}, },
handleDelete(g,h){ handleDelete(g,h){
console.log(g) console.log(g)
...@@ -379,7 +390,7 @@ import defaultImg from "../../assets/defaultPicture.jpg" ...@@ -379,7 +390,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
return decrypted.toString(CryptoJS.enc.Utf8); return decrypted.toString(CryptoJS.enc.Utf8);
} }
}, },
created(){ created(){
// for(var i in listtown){ // for(var i in listtown){
// this.list.push({ // this.list.push({
...@@ -397,7 +408,7 @@ import defaultImg from "../../assets/defaultPicture.jpg" ...@@ -397,7 +408,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
// console.log(this.list) // console.log(this.list)
Axios.get(baseUrl2+'/show/getTownList.do?county_id=511325000000',{ Axios.get(baseUrl2+'/show/getTownList.do?county_id=511325000000',{
}) })
.then(res => { .then(res => {
this.list=res.data this.list=res.data
...@@ -405,8 +416,8 @@ Axios.get(baseUrl2+'/show/getTownList.do?county_id=511325000000',{ ...@@ -405,8 +416,8 @@ Axios.get(baseUrl2+'/show/getTownList.do?county_id=511325000000',{
.catch(err => { .catch(err => {
console.log(err); console.log(err);
}); });
} }
} }
</script> </script>
<template>
<div>
<el-table
v-loading.fullscreen.lock="loading"
:data="tableData"
style="width: 100%"
>
<el-table-column
prop="idcard"
label="身份证号码"
min-width="20%">
</el-table-column>
<el-table-column
prop="name"
label="姓名"
min-width="20%">
</el-table-column>
<el-table-column
prop="bankAccount"
label="银行账号"
min-width="20%">
</el-table-column>
<el-table-column
prop="bank"
label="所属银行"
min-width="20%">
</el-table-column>
<el-table-column label="操作"
min-width="20%">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="toPdf(scope.$index, scope.row)">导出pdf
</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
class="pone"
:page-size='10'
layout="total, prev, pager, next, jumper"
:total="totals"
:current-page.sync="PageNum"
@current-change="current_change"
>
</el-pagination>
<!-- <el-button type="success" @click="toexcel" style="margin:50px">全部导出</el-button>-->
</div>
</template>
<script>
import {Loading} from 'element-ui';
import {baseUrl} from "../../utils/global"
import axios from "axios"
import Cookies from "js-cookie";
export default {
data() {
return {
PageNum: 1,
totals: 0,
tableData: [],
loading: false
}
},
methods: {
toPdf(s, d) {
this.loading = true;
console.log(d)
axios.get(baseUrl + '/exportPdf/supPayment?id=' + d.eventId, {
headers: {
"token": Cookies.get("token")
},
responseType: 'blob' //告诉服务器我们需要的响应格式
})
.then(res => {
let a = document.createElement("a");
let blob = new Blob([res.data], {
type: 'application/vnd.ms-excel' //将会被放入到blob中的数组内容的MIME类型
});
a.href = URL.createObjectURL(blob); //生成一个url
a.download = "西充县城乡居民社会养老保险补缴申请表" + Date.now() + ".pdf";
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) {
var data = {
"pageNum": s,
"pageSize": 10
}
Loading.service();
this.$api.getlist.selebjbfdc(data).then((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
if (res.code == 200) {
this.tableData = res.data.content
this.totals = res.data.totalSize
}
}).catch((res) => {
});
},
// toexcel() {
// this.loading = true;
// axios.get(baseUrl + '/exportExcel/updateBankCard', {
// headers: {
// "token": Cookies.get("token")
// },
// responseType: 'blob' //告诉服务器我们需要的响应格式
// })
// .then(res => {
// let a = document.createElement("a");
// let blob = new Blob([res.data], {
// type: 'application/vnd.ms-excel' //将会被放入到blob中的数组内容的MIME类型
// });
// a.href = URL.createObjectURL(blob); //生成一个url
// a.download = "补缴保费表" + Date.now() + ".xlsx";
// 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();
// // this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
// // loadingInstance.close();
// // });
// // if(res.code==200){
// // this.tableData=res.data.result
// // this.totals=res.data.total
// // }
//
// // }).catch((res) => {
//
// // });
// }
},
created() {
var data = {
"pageNum": 1,
"pageSize": 10
}
Loading.service();
this.$api.getlist.selebjbfdc(data).then((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
if (res.code == 200) {
this.tableData = res.data.content
this.totals = res.data.totalSize
}
}).catch((res) => {
});
},
}
</script>
<template>
<div>
<el-table
v-loading.fullscreen.lock="loading"
:data="tableData"
style="width: 100%"
>
<el-table-column
prop="idcard"
label="身份证号码"
min-width="15%">
</el-table-column>
<el-table-column
prop="name"
label="姓名"
min-width="10%">
</el-table-column>
<el-table-column
prop="bankAccount"
label="终止原因"
min-width="10%">
</el-table-column>
<el-table-column
prop="bank"
label="个人账户余额"
min-width="10%">
</el-table-column>
<el-table-column
prop="bank"
label="合计发放金额"
min-width="15%">
</el-table-column>
<el-table-column
prop="bank"
label="发放账户"
min-width="15%">
</el-table-column>
<el-table-column
prop="bank"
label="指定受益人或法定继承人"
min-width="15%">
</el-table-column>
<el-table-column
prop="bank"
label="与终止人关系"
min-width="10%">
</el-table-column>
<el-table-column label="操作"
min-width="15%">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="toPdf(scope.$index, scope.row)">导出pdf
</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
class="pone"
:page-size='10'
layout="total, prev, pager, next, jumper"
:total="totals"
:current-page.sync="PageNum"
@current-change="current_change"
>
</el-pagination>
<!-- <el-button type="success" @click="toexcel" style="margin:50px">全部导出</el-button>-->
</div>
</template>
<script>
import {Loading} from 'element-ui';
import {baseUrl} from "../../utils/global"
import axios from "axios"
import Cookies from "js-cookie";
export default {
data() {
return {
PageNum: 1,
totals: 0,
tableData: [],
loading: false
}
},
methods: {
toPdf(s, d) {
this.loading = true;
console.log(d)
axios.get(baseUrl + '/exportPdf/insuranceCancel?id=' + d.eventId, {
headers: {
"token": Cookies.get("token")
},
responseType: 'blob' //告诉服务器我们需要的响应格式
})
.then(res => {
let a = document.createElement("a");
let blob = new Blob([res.data], {
type: 'application/vnd.ms-excel' //将会被放入到blob中的数组内容的MIME类型
});
a.href = URL.createObjectURL(blob); //生成一个url
a.download = "西充县城乡居民社会养老保险终止注销登记表" + Date.now() + ".pdf";
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) {
var data = {
"pageNum": s,
"pageSize": 10
}
Loading.service();
this.$api.getlist.selecbzxdc(data).then((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
if (res.code == 200) {
this.tableData = res.data.content
this.totals = res.data.totalSize
}
}).catch((res) => {
});
},
// toexcel() {
// this.loading = true;
// axios.get(baseUrl + '/exportExcel/updateBankCard', {
// headers: {
// "token": Cookies.get("token")
// },
// responseType: 'blob' //告诉服务器我们需要的响应格式
// })
// .then(res => {
// let a = document.createElement("a");
// let blob = new Blob([res.data], {
// type: 'application/vnd.ms-excel' //将会被放入到blob中的数组内容的MIME类型
// });
// a.href = URL.createObjectURL(blob); //生成一个url
// a.download = "参保注销表" + Date.now() + ".xlsx";
// 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();
// // this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
// // loadingInstance.close();
// // });
// // if(res.code==200){
// // this.tableData=res.data.result
// // this.totals=res.data.total
// // }
//
// // }).catch((res) => {
//
// // });
// }
},
created() {
var data = {
"pageNum": 1,
"pageSize": 10
}
Loading.service();
this.$api.getlist.selecbzxdc(data).then((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
if (res.code == 200) {
this.tableData = res.data.content
this.totals = res.data.totalSize
}
}).catch((res) => {
});
},
}
</script>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
methods: { methods: {
toPdf(s, d) { toPdf(s, d) {
console.log(d) console.log(d)
axios.get(baseUrl + '/exportPdf/specialAudit?id=' + d.eventId, { axios.get(baseUrl + '/exportPdf/receivingAudit?id=' + d.eventId, {
headers: { headers: {
"token": Cookies.get("token") "token": Cookies.get("token")
}, },
......
<template>
<div>
<el-table
v-loading.fullscreen.lock="loading"
:data="tableData"
style="width: 100%"
>
<el-table-column
prop="idcard"
label="身份证号码"
min-width="20%">
</el-table-column>
<el-table-column
prop="name"
label="姓名"
min-width="20%">
</el-table-column>
<el-table-column
prop="bankAccount"
label="银行账号"
min-width="20%">
</el-table-column>
<el-table-column
prop="bank"
label="所属银行"
min-width="20%">
</el-table-column>
<el-table-column label="操作"
min-width="20%">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="toPdf(scope.$index, scope.row)">导出pdf
</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
class="pone"
:page-size='10'
layout="total, prev, pager, next, jumper"
:total="totals"
:current-page.sync="PageNum"
@current-change="current_change"
>
</el-pagination>
<!-- <el-button type="success" @click="toexcel" style="margin:50px">全部导出</el-button>-->
</div>
</template>
<script>
import {Loading} from 'element-ui';
import {baseUrl} from "../../utils/global"
import axios from "axios"
import Cookies from "js-cookie";
export default {
data() {
return {
PageNum: 1,
totals: 0,
tableData: [],
loading: false
}
},
methods: {
toPdf(s, d) {
this.loading = true;
console.log(d)
axios.get(baseUrl + '/exportPdf/specialAudit?id=' + d.eventId, {
headers: {
"token": Cookies.get("token")
},
responseType: 'blob' //告诉服务器我们需要的响应格式
})
.then(res => {
let a = document.createElement("a");
let blob = new Blob([res.data], {
type: 'application/vnd.ms-excel' //将会被放入到blob中的数组内容的MIME类型
});
a.href = URL.createObjectURL(blob); //生成一个url
a.download = "西充县城乡居民社会养老保险特殊人群待遇审核表" + Date.now() + ".pdf";
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) {
var data = {
"pageNum": s,
"pageSize": 10
}
Loading.service();
this.$api.getlist.seleyhkbgdc(data).then((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
if (res.code == 200) {
this.tableData = res.data.content
this.totals = res.data.totalSize
}
}).catch((res) => {
});
},
toexcel() {
this.loading = true;
axios.get(baseUrl + '/exportExcel/updateBankCard', {
headers: {
"token": Cookies.get("token")
},
responseType: 'blob' //告诉服务器我们需要的响应格式
})
.then(res => {
let a = document.createElement("a");
let blob = new Blob([res.data], {
type: 'application/vnd.ms-excel' //将会被放入到blob中的数组内容的MIME类型
});
a.href = URL.createObjectURL(blob); //生成一个url
a.download = "特殊业务表" + Date.now() + ".xlsx";
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();
// this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
// loadingInstance.close();
// });
// if(res.code==200){
// this.tableData=res.data.result
// this.totals=res.data.total
// }
// }).catch((res) => {
// });
}
},
created() {
var data = {
"pageNum": 1,
"pageSize": 10
}
Loading.service();
this.$api.getlist.seleyhkbgdc(data).then((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
if (res.code == 200) {
this.tableData = res.data.content
this.totals = res.data.totalSize
}
}).catch((res) => {
});
},
}
</script>
<template> <template>
<div> <div>
<div class="op"> <div class="op">
<div class="nam"> <Candode v-on:childByValue="childByValue"></Candode>
<div class="nam">
<el-input v-model="name" size="mini" placeholder="请输入姓名"></el-input> <el-input v-model="name" size="mini" placeholder="请输入姓名"></el-input>
</div> </div>
<div class="idc"> <div class="idc">
<el-input v-model="idcard" size="mini" placeholder="请输入身份证号"></el-input> <el-input v-model="idcard" size="mini" placeholder="请输入身份证号"></el-input>
</div> </div>
...@@ -151,8 +153,13 @@ ...@@ -151,8 +153,13 @@
import CryptoJS from 'crypto-js' import CryptoJS from 'crypto-js'
import { Loading } from 'element-ui'; import { Loading } from 'element-ui';
import {listtown} from '../../utils/address' import {listtown} from '../../utils/address'
// import baseUrl from "../../globe/globeUrl" import Candode from "../Core/candode"
// import baseUrl from "../../globe/globeUrl"
export default { export default {
components:{
Candode
},
data() { data() {
return { return {
...@@ -165,19 +172,23 @@ ...@@ -165,19 +172,23 @@
idcard:"", idcard:"",
ywtype:"", ywtype:"",
info:'', info:'',
ywtype:'', tableData: [],
tableData: [] townList:""
} }
}, },
methods: { methods: {
childByValue(val){
this.townList=val
},
//搜索 //搜索
serch(){ serch(){
var data={ var data={
name:this.name?this.Encrypt(this.name):"",
idcard:this.idcard?this.Encrypt(this.idcard):"", idcard:this.idcard?this.Encrypt(this.idcard):"",
recordType:this.ywtype?parseInt(this.ywtype):"", recordType:this.ywtype?parseInt(this.ywtype):"",
townName:'', townName: this.townList?this.townList[0]:'',
villageName:'' villageName:this.townList?this.townList[1]:''
} }
this.$api.getlist.record(data).then((res) => { this.$api.getlist.record(data).then((res) => {
......
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
// 关闭当前标签 // 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close"); let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) { for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "参保注销审核 ") { if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "参保注销审核 ") {
closeAll[j].click(); closeAll[j].click();
return; return;
} }
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
// 关闭当前标签 // 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close"); let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) { for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "参保注销审核 ") { if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "参保注销审核 ") {
closeAll[j].click(); closeAll[j].click();
return; return;
} }
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
<el-form-item label="户籍所在地"> <el-form-item label="户籍所在地">
<el-input v-model="form.townName"></el-input> <el-input v-model="form.townName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系电话"> <el-form-item label="联系电话">
<el-input v-model="form.telphoneValue"></el-input> <el-input v-model="form.telphoneValue"></el-input>
</el-form-item> </el-form-item>
...@@ -115,11 +115,11 @@ export default { ...@@ -115,11 +115,11 @@ export default {
"wuserId":'' "wuserId":''
}, },
urls: [ urls: [
], ],
show:"" show:""
} }
}, },
methods:{ methods:{
//审核通过 //审核通过
...@@ -127,7 +127,7 @@ export default { ...@@ -127,7 +127,7 @@ export default {
this.$confirm('是否审核通过?', '提示', { this.$confirm('是否审核通过?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
}).then(() => { }).then(() => {
Loading.service(); Loading.service();
var data={ var data={
...@@ -155,7 +155,14 @@ export default { ...@@ -155,7 +155,14 @@ export default {
message: res.message message: res.message
}); });
} }
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "参保登记审核 ") {
closeAll[j].click();
return;
}
}
}).catch((res) => { }).catch((res) => {
let loadingInstance = Loading.service(); let loadingInstance = Loading.service();
that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
...@@ -166,12 +173,12 @@ export default { ...@@ -166,12 +173,12 @@ export default {
message: '操作失败!'+res message: '操作失败!'+res
}); });
}); });
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消操作' message: '已取消操作'
}); });
}); });
}, },
//审核不通过 //审核不通过
...@@ -180,7 +187,7 @@ export default { ...@@ -180,7 +187,7 @@ export default {
this.$prompt('请输入原因', '提示', { this.$prompt('请输入原因', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
}).then(({ value }) => { }).then(({ value }) => {
if(value){ if(value){
Loading.service(); Loading.service();
...@@ -209,7 +216,14 @@ export default { ...@@ -209,7 +216,14 @@ export default {
message: res.message message: res.message
}); });
} }
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "参保登记审核 ") {
closeAll[j].click();
return;
}
}
}).catch((res) => { }).catch((res) => {
let loadingInstance = Loading.service(); let loadingInstance = Loading.service();
that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
...@@ -220,7 +234,7 @@ export default { ...@@ -220,7 +234,7 @@ export default {
message: '操作失败!'+res message: '操作失败!'+res
}); });
}); });
}else{ }else{
let loadingInstance = Loading.service(); let loadingInstance = Loading.service();
that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
...@@ -235,7 +249,7 @@ export default { ...@@ -235,7 +249,7 @@ export default {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '取消输入' message: '取消输入'
}); });
}); });
}, },
decrypt(word){ decrypt(word){
...@@ -259,30 +273,30 @@ export default { ...@@ -259,30 +273,30 @@ export default {
if(this.$route.params.info){ if(this.$route.params.info){
sessionStorage.setItem("info",this.$route.params.info) sessionStorage.setItem("info",this.$route.params.info)
} }
if(this.$route.params.info){ if(this.$route.params.info){
var a=JSON.stringify(this.$route.params) var a=JSON.stringify(this.$route.params)
sessionStorage.setItem("items",a) sessionStorage.setItem("items",a)
} }
this.form =JSON.parse(sessionStorage.getItem("info")) this.form =JSON.parse(sessionStorage.getItem("info"))
this.form.name=this.decrypt(this.form.name) this.form.name=this.decrypt(this.form.name)
this.form.identity_number=this.decrypt(this.form.identity_number) this.form.identity_number=this.decrypt(this.form.identity_number)
this.form.telphoneValue=this.decrypt(this.form.telphoneValue) this.form.telphoneValue=this.decrypt(this.form.telphoneValue)
var obj=JSON.parse(sessionStorage.getItem("items")) var obj=JSON.parse(sessionStorage.getItem("items"))
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bankpic) this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.bankpic)
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.signpic) this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.signpic)
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.idcardfrontpic) this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.idcardfrontpic)
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.idcardbackpic) this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/"+obj.idcardbackpic)
console.log(this.form) console.log(this.form)
this.form.sex= this.form.sex==1?"男":"女" this.form.sex= this.form.sex==1?"男":"女"
} }
......
<template> <template>
<div> <div>
<div class="op"> <div class="op">
<Candode v-on:childByValue="childByValue"></Candode>
<div class="nam"> <div class="nam">
<el-input v-model="personName" size="mini" placeholder="请输入姓名"></el-input> <el-input v-model="personName" size="mini" placeholder="请输入姓名"></el-input>
</div> </div>
...@@ -132,7 +134,12 @@ ...@@ -132,7 +134,12 @@
import CryptoJS from 'crypto-js' import CryptoJS from 'crypto-js'
import { Loading } from 'element-ui'; import { Loading } from 'element-ui';
import {formatDate} from '../../utils/datetime' import {formatDate} from '../../utils/datetime'
import Candode from "../Core/candode"
export default { export default {
components:{
Candode
},
data() { data() {
return { return {
Page: 1, Page: 1,
...@@ -143,13 +150,19 @@ ...@@ -143,13 +150,19 @@
dialogFormVisible:false, dialogFormVisible:false,
form:{}, form:{},
tableData: [], tableData: [],
townList:'',
} }
}, },
methods: { methods: {
childByValue(val){
this.townList=val
},
serch(){ serch(){
var data={ var data={
idcard:this.idcard?this.Encrypt(this.idcard):"", idcard:this.idcard?this.Encrypt(this.idcard):"",
personName:this.personName?this.Encrypt(this.personName):"", personName:this.personName?this.Encrypt(this.personName):"",
townName: this.townList?this.townList[0]:'',
villageName:this.townList?this.townList[1]:''
} }
Loading.service(); Loading.service();
this.$api.getlist.listPayInfo(data).then((res) => { this.$api.getlist.listPayInfo(data).then((res) => {
......
<template> <template>
<div> <div>
<div class="op"> <div class="op">
<Candode v-on:childByValue="childByValue"></Candode>
<div class="nam"> <div class="nam">
<el-input v-model="name" size="mini" placeholder="请输入姓名" clearable></el-input> <el-input v-model="name" size="mini" placeholder="请输入姓名" clearable></el-input>
</div> </div>
...@@ -13,7 +14,7 @@ ...@@ -13,7 +14,7 @@
v-for="item in options1" v-for="item in options1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.label">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
...@@ -37,9 +38,19 @@ ...@@ -37,9 +38,19 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="grantState" prop="grantState"
min-width="15%" min-width="10%"
label="待遇发放状态"> label="待遇发放状态">
</el-table-column> </el-table-column>
<el-table-column
prop="townName"
min-width="10%"
label="乡镇">
</el-table-column>
<el-table-column
prop="villageName"
min-width="10%"
label="村(社区)">
</el-table-column>
<el-table-column <el-table-column
prop="lastGrantMonth" prop="lastGrantMonth"
min-width="10%" min-width="10%"
...@@ -57,7 +68,7 @@ ...@@ -57,7 +68,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="presentBenchmark" prop="presentBenchmark"
min-width="15%" min-width="10%"
label="当前月领取标准"> label="当前月领取标准">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -81,7 +92,6 @@ ...@@ -81,7 +92,6 @@
@current-change="current_change" @current-change="current_change"
> >
</el-pagination> </el-pagination>
<div> <div>
<el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1200px"> <el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1200px">
<el-form :model="data" label-width="auto"> <el-form :model="data" label-width="auto">
...@@ -212,16 +222,18 @@ ...@@ -212,16 +222,18 @@
} }
.idc { .idc {
min-width: 200px margin-left: 20px;
/*min-width: 200px;*/
} }
.nam { .nam {
margin-right: 20px margin-left: 20px;
/*min-width: 200px;*/
} }
.grantState { .grantState {
min-width: 200px; margin-left: 20px;
margin-left: 20px /*min-width: 200px;*/
} }
.el-table .warning-row { .el-table .warning-row {
...@@ -244,9 +256,12 @@ ...@@ -244,9 +256,12 @@
<script> <script>
import CryptoJS from 'crypto-js' import CryptoJS from 'crypto-js'
import {Loading} from 'element-ui'; import {Loading} from 'element-ui';
import {listtown} from '../../utils/address' import Candode from "../Core/candode"
export default { export default {
components:{
Candode
},
data() { data() {
return { return {
list: [], list: [],
...@@ -269,7 +284,8 @@ ...@@ -269,7 +284,8 @@
info: '', info: '',
tableData: [], tableData: [],
dialogTableVisible: false, dialogTableVisible: false,
data: {} data: {},
townList: "",
} }
}, },
methods: { methods: {
...@@ -278,7 +294,9 @@ ...@@ -278,7 +294,9 @@
let data = { let data = {
idCard: this.idCard ? this.Encrypt(this.idCard) : "", idCard: this.idCard ? this.Encrypt(this.idCard) : "",
name: this.name ? this.Encrypt(this.name) : "", name: this.name ? this.Encrypt(this.name) : "",
grantState: this.grantState grantState: this.grantState,
townName: this.townList?this.townList[0]:"",
villageName:this.townList?this.townList[1]:"",
}; };
this.$api.getlist.getGrantList(data).then((res) => { this.$api.getlist.getGrantList(data).then((res) => {
for (var i in res.data.list) { for (var i in res.data.list) {
...@@ -302,7 +320,9 @@ ...@@ -302,7 +320,9 @@
pageSize: 10, pageSize: 10,
idCard: this.idCard ? this.Encrypt(this.idCard) : "", idCard: this.idCard ? this.Encrypt(this.idCard) : "",
name: this.name ? this.Encrypt(this.name) : "", name: this.name ? this.Encrypt(this.name) : "",
grantState: this.grantState grantState: this.grantState,
townName: this.townList?this.townList[0]:"",
villageName:this.townList?this.townList[1]:"",
}; };
Loading.service(); Loading.service();
this.$api.getlist.getGrantList(data).then((res) => { this.$api.getlist.getGrantList(data).then((res) => {
...@@ -370,23 +390,12 @@ ...@@ -370,23 +390,12 @@
done(); done();
}) })
.catch(_ => {}); .catch(_ => {});
} },
childByValue(val){
this.townList = val;
},
}, },
created() { created() {
for (var i in listtown) {
this.list.push({
value: listtown[i].town_name,
label: listtown[i].town_name,
children: []
})
for (var j in listtown[i].chirld) {
this.list[i].children.push({
value: listtown[i].chirld[j].village_name,
label: listtown[i].chirld[j].village_name
})
}
}
console.log(this.list)
Loading.service(); Loading.service();
let data = {}; let data = {};
this.$api.getlist.getGrantList(data).then((res) => { this.$api.getlist.getGrantList(data).then((res) => {
......
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
// 关闭当前标签 // 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close"); let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) { for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "补缴保费审核 ") { if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "补缴保费审核 ") {
closeAll[j].click(); closeAll[j].click();
return; return;
} }
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
// 关闭当前标签 // 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close"); let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) { for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "补缴保费审核 ") { if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "补缴保费审核 ") {
closeAll[j].click(); closeAll[j].click();
return; return;
} }
......
...@@ -136,10 +136,9 @@ ...@@ -136,10 +136,9 @@
// import baseUrl from "../../globe/globeUrl" // import baseUrl from "../../globe/globeUrl"
export default { export default {
components:{ components:{
Candode Candode
}, },
data() { data() {
return { return {
townList:'', townList:'',
activities: [], activities: [],
......
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
// 关闭当前标签 // 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close"); let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) { for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "关系转移审核 ") { if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "关系转移审核 ") {
closeAll[j].click(); closeAll[j].click();
return; return;
} }
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
// 关闭当前标签 // 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close"); let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) { for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "关系转移审核 ") { if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "关系转移审核 ") {
closeAll[j].click(); closeAll[j].click();
return; return;
} }
......
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
// 关闭当前标签 // 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close"); let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) { for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "待遇申请审核 ") { if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "待遇申请审核 ") {
closeAll[j].click(); closeAll[j].click();
return; return;
} }
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
// 关闭当前标签 // 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close"); let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) { for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "待遇申请审核 ") { if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "待遇申请审核 ") {
closeAll[j].click(); closeAll[j].click();
return; return;
} }
...@@ -292,9 +292,9 @@ ...@@ -292,9 +292,9 @@
sessionStorage.setItem("treAppItems", JSON.stringify(this.$route.params.treApp)); sessionStorage.setItem("treAppItems", JSON.stringify(this.$route.params.treApp));
} }
this.form = JSON.parse(sessionStorage.getItem("treAppInfo")); this.form = JSON.parse(sessionStorage.getItem("treAppInfo"));
this.form.name = this.decrypt(this.form.name); this.form.name = this.form.name ? this.decrypt(this.form.name) : "";
this.form.identity_number = this.decrypt(this.form.identity_number); this.form.identity_number = this.form.identity_number ? this.decrypt(this.form.identity_number) : "";
this.form.telphoneValue = this.decrypt(this.form.telphoneValue); this.form.telphoneValue = this.form.telphoneValue ? this.decrypt(this.form.telphoneValue) : "";
var obj = JSON.parse(sessionStorage.getItem("treAppItems")); var obj = JSON.parse(sessionStorage.getItem("treAppItems"));
if (obj.bankpic) { if (obj.bankpic) {
this.bb = true; this.bb = true;
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
// 关闭当前标签 // 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close"); let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) { for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "升档改办审核 ") { if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "升档改办审核 ") {
closeAll[j].click(); closeAll[j].click();
return; return;
} }
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
// 关闭当前标签 // 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close"); let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) { for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "升档改办审核 ") { if (closeAll[j].previousSibling != null && closeAll[j].previousSibling.innerText === "升档改办审核 ") {
closeAll[j].click(); closeAll[j].click();
return; return;
} }
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<el-table-column <el-table-column
prop="id" header-align="center" align="center" width="80" label="ID"> prop="id" header-align="center" align="center" width="80" label="ID">
</el-table-column> </el-table-column>
<table-tree-column <table-tree-column
prop="name" header-align="center" treeKey="id" width="150" label="名称"> prop="name" header-align="center" treeKey="id" width="150" label="名称">
</table-tree-column> </table-tree-column>
<el-table-column <el-table-column
prop="parentName" header-align="center" align="center" width="120" label="上级机构"> prop="parentName" header-align="center" align="center" width="120" label="上级机构">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -45,14 +45,14 @@ ...@@ -45,14 +45,14 @@
</el-table> </el-table>
<!-- 新增修改界面 --> <!-- 新增修改界面 -->
<el-dialog :title="!dataForm.id ? '新增' : '修改'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false"> <el-dialog :title="!dataForm.id ? '新增' : '修改'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()" <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()"
label-width="80px" :size="size" style="text-align:left;"> label-width="80px" :size="size" style="text-align:left;">
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="dataForm.name" placeholder="名称"></el-input> <el-input v-model="dataForm.name" placeholder="名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上级机构" prop="parentName"> <el-form-item label="上级机构" prop="parentName">
<popup-tree-input <popup-tree-input
:data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null?'顶级菜单':dataForm.parentName" :data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null?'顶级菜单':dataForm.parentName"
:nodeKey="''+dataForm.parentId" :currentChangeHandle="handleTreeSelectChange"> :nodeKey="''+dataForm.parentId" :currentChangeHandle="handleTreeSelectChange">
</popup-tree-input> </popup-tree-input>
</el-form-item> </el-form-item>
...@@ -188,7 +188,7 @@ export default { ...@@ -188,7 +188,7 @@ export default {
this.dialogVisible = false this.dialogVisible = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.findTreeData() this.findTreeData()
}) })
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
dateFormat: function (row, column, cellValue, index){ dateFormat: function (row, column, cellValue, index){
return format(row[column.property]) return format(row[column.property])
} }
}, },
mounted() { mounted() {
this.findTreeData() this.findTreeData()
...@@ -210,4 +210,4 @@ export default { ...@@ -210,4 +210,4 @@ export default {
<style scoped> <style scoped>
</style> </style>
\ No newline at end of file
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</div> </div>
<!--表格内容栏--> <!--表格内容栏-->
<kt-table :height="350" permsEdit="sys:dict:edit" permsDelete="sys:dict:delete" <kt-table :height="350" permsEdit="sys:dict:edit" permsDelete="sys:dict:delete"
:data="pageResult" :columns="columns" :data="pageResult" :columns="columns"
@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete"> @findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete">
</kt-table> </kt-table>
<!--新增编辑界面--> <!--新增编辑界面-->
...@@ -149,7 +149,7 @@ export default { ...@@ -149,7 +149,7 @@ export default {
if(res.code == 200) { if(res.code == 200) {
this.$message({ message: '操作成功', type: 'success' }) this.$message({ message: '操作成功', type: 'success' })
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.editLoading = false this.editLoading = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
...@@ -172,4 +172,4 @@ export default { ...@@ -172,4 +172,4 @@ export default {
<style scoped> <style scoped>
</style> </style>
\ No newline at end of file
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<el-table-column <el-table-column
prop="id" header-align="center" align="center" width="80" label="ID"> prop="id" header-align="center" align="center" width="80" label="ID">
</el-table-column> </el-table-column>
<table-tree-column <table-tree-column
prop="name" header-align="center" treeKey="id" width="150" label="名称"> prop="name" header-align="center" treeKey="id" width="150" label="名称">
</table-tree-column> </table-tree-column>
<el-table-column header-align="center" align="center" label="图标"> <el-table-column header-align="center" align="center" label="图标">
...@@ -35,15 +35,15 @@ ...@@ -35,15 +35,15 @@
<el-tag v-else-if="scope.row.type === 2" size="small" type="info">按钮</el-tag> <el-tag v-else-if="scope.row.type === 2" size="small" type="info">按钮</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="parentName" header-align="center" align="center" width="120" label="上级菜单"> prop="parentName" header-align="center" align="center" width="120" label="上级菜单">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="url" header-align="center" align="center" width="150" prop="url" header-align="center" align="center" width="150"
:show-overflow-tooltip="true" label="菜单URL"> :show-overflow-tooltip="true" label="菜单URL">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="perms" header-align="center" align="center" width="150" prop="perms" header-align="center" align="center" width="150"
:show-overflow-tooltip="true" label="授权标识"> :show-overflow-tooltip="true" label="授权标识">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</el-table> </el-table>
<!-- 新增修改界面 --> <!-- 新增修改界面 -->
<el-dialog :title="!dataForm.id ? '新增' : '修改'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false"> <el-dialog :title="!dataForm.id ? '新增' : '修改'" width="40%" :visible.sync="dialogVisible" :close-on-click-modal="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()" <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()"
label-width="80px" :size="size" style="text-align:left;"> label-width="80px" :size="size" style="text-align:left;">
<el-form-item label="菜单类型" prop="type"> <el-form-item label="菜单类型" prop="type">
<el-radio-group v-model="dataForm.type"> <el-radio-group v-model="dataForm.type">
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
<el-input v-model="dataForm.name" :placeholder="menuTypeList[dataForm.type] + '名称'"></el-input> <el-input v-model="dataForm.name" :placeholder="menuTypeList[dataForm.type] + '名称'"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上级菜单" prop="parentName"> <el-form-item label="上级菜单" prop="parentName">
<popup-tree-input <popup-tree-input
:data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null||dataForm.parentName==''?'顶级菜单':dataForm.parentName" :data="popupTreeData" :props="popupTreeProps" :prop="dataForm.parentName==null||dataForm.parentName==''?'顶级菜单':dataForm.parentName"
:nodeKey="''+dataForm.parentId" :currentChangeHandle="handleTreeSelectChange"> :nodeKey="''+dataForm.parentId" :currentChangeHandle="handleTreeSelectChange">
</popup-tree-input> </popup-tree-input>
</el-form-item> </el-form-item>
...@@ -263,7 +263,7 @@ export default { ...@@ -263,7 +263,7 @@ export default {
this.dialogVisible = false; this.dialogVisible = false;
} else { } else {
this.$message({ this.$message({
message: "操作失败, " + res.msg, message: "操作失败, " + res.message,
type: "error" type: "error"
}); });
} }
...@@ -281,4 +281,4 @@ export default { ...@@ -281,4 +281,4 @@ export default {
</script> </script>
<style scoped> <style scoped>
</style> </style>
\ No newline at end of file
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-form-item label="备注 " prop="remark"> <el-form-item label="备注 " prop="remark">
<el-input v-model="dataForm.remark" auto-complete="off" type="textarea"></el-input> <el-input v-model="dataForm.remark" auto-complete="off" type="textarea"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <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>
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
<el-checkbox v-model="checkAll" @change="handleCheckAll" :disabled="this.selectRole.id == null"><b>全选</b></el-checkbox> <el-checkbox v-model="checkAll" @change="handleCheckAll" :disabled="this.selectRole.id == null"><b>全选</b></el-checkbox>
</div> </div>
<div style="float:right;padding-right:15px;padding-top:4px;padding-bottom:4px;"> <div style="float:right;padding-right:15px;padding-top:4px;padding-bottom:4px;">
<kt-button :label="$t('action.reset')" perms="sys:role:edit" type="primary" @click="resetSelection" <kt-button :label="$t('action.reset')" perms="sys:role:edit" type="primary" @click="resetSelection"
:disabled="this.selectRole.id == null"/> :disabled="this.selectRole.id == null"/>
<kt-button :label="$t('action.submit')" perms="sys:role:edit" type="primary" @click="submitAuthForm" <kt-button :label="$t('action.submit')" perms="sys:role:edit" type="primary" @click="submitAuthForm"
:disabled="this.selectRole.id == null" :loading="authLoading"/> :disabled="this.selectRole.id == null" :loading="authLoading"/>
</div> </div>
</div> </div>
...@@ -164,7 +164,7 @@ export default { ...@@ -164,7 +164,7 @@ export default {
this.dialogVisible = false this.dialogVisible = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.findPage(null) this.findPage(null)
}) })
...@@ -248,7 +248,7 @@ export default { ...@@ -248,7 +248,7 @@ export default {
if(res.code == 200) { if(res.code == 200) {
this.$message({ message: '操作成功', type: 'success' }) this.$message({ message: '操作成功', type: 'success' })
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.authLoading = false this.authLoading = false
}) })
...@@ -271,7 +271,7 @@ export default { ...@@ -271,7 +271,7 @@ export default {
       dateFormat: function (row, column, cellValue, index){        dateFormat: function (row, column, cellValue, index){
           return format(row[column.property])            return format(row[column.property])
       }        }
}, },
mounted() { mounted() {
} }
...@@ -287,6 +287,6 @@ export default { ...@@ -287,6 +287,6 @@ export default {
text-align: left; text-align: left;
font-size: 16px; font-size: 16px;
color: rgb(20, 89, 121); color: rgb(20, 89, 121);
} }
</style> </style>
\ No newline at end of file
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
<!--工具栏--> <!--工具栏-->
<div class="toolbar" style="float:left;padding-top:10px;padding-left:15px;"> <div class="toolbar" style="float:left;padding-top:10px;padding-left:15px;">
<el-form :inline="true" :model="filters" :size="size"> <el-form :inline="true" :model="filters" :size="size">
<el-form-item>
<Candode v-on:childByValue="childByValue"></Candode>
</el-form-item>
<el-form-item> <el-form-item>
<el-input v-model="filters.name" placeholder="用户名"></el-input> <el-input v-model="filters.name" placeholder="用户名"></el-input>
</el-form-item> </el-form-item>
...@@ -68,9 +71,7 @@ ...@@ -68,9 +71,7 @@
:options="list" :options="list"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
style="width:100%" style="width:100%"
clearable clearable></el-cascader>
@change="deptTreeCurrentChangeHandle"
></el-cascader>
<!-- <popup-tree-input <!-- <popup-tree-input
:data="deptData" :data="deptData"
:props="deptTreeProps" :props="deptTreeProps"
...@@ -111,20 +112,26 @@ import KtTable from "@/views/Core/KtTable" ...@@ -111,20 +112,26 @@ 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"
import Candode from "../Core/candode"
export default { export default {
components:{ components:{
PopupTreeInput, PopupTreeInput,
KtTable, KtTable,
KtButton, KtButton,
TableColumnFilterDialog TableColumnFilterDialog,
}, Candode
},
data() { data() {
return { return {
list:[], townList:"",
list:[],
address:"", address:"",
size: 'small', size: 'small',
filters: { filters: {
name: '', name: '',
townName:'',
villageName:''
}, },
columns: [], columns: [],
filterColumns: [], filterColumns: [],
...@@ -170,14 +177,22 @@ export default { ...@@ -170,14 +177,22 @@ export default {
} }
}, },
methods: { methods: {
childByValue(val){
this.townList=val
},
// 获取分页数据 // 获取分页数据
findPage: function (data) { findPage: function (data) {
if(data !== null) {
this.pageRequest = data.pageRequest if(data == null) {
} this.pageRequest = { pageNum: 1, pageSize: 10 }
this.pageRequest.columnFilters = {name: {name:'name', value:this.filters.name}} }else {
this.pageRequest = data.pageRequest
}
this.pageRequest.columnFilters = {name: {name:'name', value:this.filters.name},
townName: {townName: 'townName',value: this.townList?this.townList[0]:'',},
villageName: {villageName: 'villageName',value: this.townList?this.townList[1]:''}
}
this.$api.user.findPage(this.pageRequest).then((res) => { this.$api.user.findPage(this.pageRequest).then((res) => {
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:'')
...@@ -261,7 +276,7 @@ export default { ...@@ -261,7 +276,7 @@ export default {
this.dialogVisible = false this.dialogVisible = false
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
} else { } else {
this.$message({message: '操作失败, ' + res.msg, type: 'error'}) this.$message({message: '操作失败, ' + res.message, type: 'error'})
} }
this.findPage(null) this.findPage(null)
}) })
...@@ -321,7 +336,6 @@ export default { ...@@ -321,7 +336,6 @@ export default {
{prop:"deptName", label:"机构", minWidth:100}, {prop:"deptName", label:"机构", minWidth:100},
{prop:"roleNames", label:"角色", minWidth:80}, {prop:"roleNames", label:"角色", minWidth:80},
{prop:"job", label:"职务", minWidth:80}, {prop:"job", label:"职务", minWidth:80},
{prop:"mobile", label:"手机", minWidth:80}, {prop:"mobile", label:"手机", minWidth:80},
// {prop:"createBy", label:"创建人", minWidth:120}, // {prop:"createBy", label:"创建人", minWidth:120},
......
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