Skip to content

X
xichonght
Commit 4b42a08a authored by miaohaoyun's avatar miaohaoyun
Browse files
Options

Merge branch 'mhy' into 'master' 

Mhy

See merge request !17
parents fc56813e 917c3e38
Show whitespace changes
Inline Side-by-side
Showing with 220 additions and 228 deletions
xichongSys/src/http/moudules/getlist.js
View file @ 4b42a08a
...@@ -130,6 +130,14 @@ export const listAllBaseInfo = (data) => { ...@@ -130,6 +130,14 @@ export const listAllBaseInfo = (data) => {
method: 'post', method: 'post',
data data
}) })
}
//领取人员查询
export const getGrantList = (data) => {
return axios({
url: '/grantInfo/getGrantList',
method: 'post',
data
})
} }
//缴费信息查询 //缴费信息查询
export const listPayInfo = (data) => { export const listPayInfo = (data) => {
......
xichongSys/src/views/Myvue/receivePersonnel.vue
View file @ 4b42a08a
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<div> <div>
<div class="op"> <div class="op">
<div class="nam"> <div class="nam">
<el-input v-model="name" size="mini" placeholder="请输入姓名"></el-input> <el-input v-model="name" size="mini" placeholder="请输入姓名" clearable></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="请输入身份证号" clearable></el-input>
</div> </div>
<div class="ywtyoe"> <div class="grantState">
<el-select v-model="ywtype" placeholder="请选择业务类型" size="mini"> <el-select v-model="grantState" placeholder="请选择待遇发放状态" size="mini" clearable>
<el-option <el-option
v-for="item in options1" v-for="item in options1"
:key="item.value" :key="item.value"
...@@ -17,15 +17,8 @@ ...@@ -17,15 +17,8 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div>
<!-- <el-cascader
size="mini"
:options="list"
:props="{ checkStrictly: true }"
clearable></el-cascader> -->
</div>
<el-button type="primary" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-search" <el-button type="primary" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-search"
@click="serch">搜索 @click="search">搜索
</el-button> </el-button>
</div> </div>
<el-table <el-table
...@@ -36,74 +29,47 @@ ...@@ -36,74 +29,47 @@
<el-table-column <el-table-column
prop="idcard" prop="idcard"
label="身份证号" label="身份证号"
width="180"> min-width="15%">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="姓名" label="姓名"
width="100"> min-width="10%">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="recordtype" prop="grantState"
width="150" min-width="15%"
label="业务类型"> label="待遇发放状态">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createtime" prop="lastGrantMonth"
width="200" min-width="10%"
label="创建时间"> label="最大发放期">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="townname" prop="treatAsMonths"
width="150" min-width="10%"
label="镇"> label="视同缴费月数">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="villagename" prop="realMonths"
label="村"> min-width="10%"
label="实际缴费月数">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="nowExamine" prop="presentBenchmark"
label="当前状态"> min-width="15%"
label="当前月领取标准">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
width="180" min-width="10%"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
icon="el-icon-s-check" icon="el-icon-s-check"
@click="handle(scope.$index, scope.row)">查看 @click="handle(scope.$index, scope.row)">详情</el-button>
</el-button>
<el-popover
placement="right"
width="180"
trigger="click">
<el-timeline>
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
:icon="activity.icon"
:type="activity.type"
:color="activity.color"
:size="activity.size"
:timestamp="activity.timestamp"
:timestamp2="123">
{{activity.content}}
<p style="font-size:13px;color:#909399" v-show="activity.timestamp">审核人:{{activity.name}}</p>
<p style="font-size:13px;color:#909399" v-show="activity.examineRemark">
原因:{{activity.examineRemark}}</p>
</el-timeline-item>
</el-timeline>
<el-button
@click="progress(scope.$index, scope.row)"
size="mini"
slot="reference"
type="success"
>流程
</el-button>
</el-popover>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -112,11 +78,131 @@ ...@@ -112,11 +78,131 @@
:page-size='10' :page-size='10'
layout="total, prev, pager, next, jumper" layout="total, prev, pager, next, jumper"
:total="totals" :total="totals"
:current-page.sync="PageNum" :current-page.sync="pageNum"
@current-change="current_change" @current-change="current_change"
> >
</el-pagination> </el-pagination>
<div>
<el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1200px">
<el-form :model="data" label-width="auto">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="个人编号">
<el-input v-model="data.personNum" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="常住地地址">
<el-input v-model="data.permanentAddress" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="离退休日期">
<el-input v-model="data.retirementDate" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="乡镇">
<el-input v-model="data.townName" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="村（社区）">
<el-input v-model="data.villageName" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="村组">
<el-input v-model="data.groupName" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="银行">
<el-input v-model="data.bank" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="户名">
<el-input v-model="data.householdName" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="银行账号">
<el-input v-model="data.bankAccount" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="视同缴费月数">
<el-input v-model="data.treatAsMonths" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际缴费月数">
<el-input v-model="data.realMonths" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="军龄折算月数">
<el-input v-model="data.militaryMonths" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="特殊工种折算月数">
<el-input v-model="data.specialWorkMonths" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="当前月领取标准">
<el-input v-model="data.presentBenchmark" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="个人账户总金额">
<el-input v-model="data.privateAccountTotal" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="省级财政部分所占比例">
<el-input v-model="data.provicePercent" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="市级财政部分所占比例">
<el-input v-model="data.cityPercent" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="县级财政部分所占比例">
<el-input v-model="data.countyPercent" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="集体补助部分所占比例">
<el-input v-model="data.collectivePercent" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="个人缴费部分所占比例">
<el-input v-model="data.individualPercent" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div>
</div> </div>
</template> </template>
...@@ -124,20 +210,18 @@ ...@@ -124,20 +210,18 @@
.op { .op {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.idc { .idc {
min-width: 200px
width: 200px
} }
.nam { .nam {
margin-right: 20px margin-right: 20px
} }
.ywtyoe { .grantState {
width: 200px; min-width: 200px;
margin-left: 20px margin-left: 20px
} }
...@@ -162,122 +246,67 @@ ...@@ -162,122 +246,67 @@
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"
export default { export default {
data() { data() {
return { return {
list: [], list: [],
name: "", name: "",
activities: [], activities: [],
options1: [{ options1: [{
value: '1', value: '正常发放',
label: '参保登记' label: '正常发放'
}, { }, {
value: '2', value: '暂停发放',
label: '信息变更' label: '暂停发放'
}, { }, {
value: '3', value: '终止发放',
label: '待遇申请' label: '终止发放'
}], }],
PageNum: 1, pageNum: 1,
totals: 0, totals: 0,
idcard: "", idCard: "",
ywtype: "", grantState: "",
info: '', info: '',
tableData: [] tableData: [],
dialogTableVisible: false,
data: {}
} }
}, },
methods: { methods: {
//搜索 //搜索
serch() { search() {
let data = {
var data = { idCard: this.idCard ? this.Encrypt(this.idCard) : "",
idcard: this.idcard ? this.Encrypt(this.idcard) : "", name: this.name ? this.Encrypt(this.name) : "",
recordType: this.ywtype ? parseInt(this.ywtype) : "", grantState: this.grantState
townName: '', };
villageName: '' this.$api.getlist.getGrantList(data).then((res) => {
}
this.$api.getlist.record(data).then((res) => {
for (var i in res.data.list) { for (var i in res.data.list) {
res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard) res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard)
res.data.list[i].name = this.decrypt(res.data.list[i].name) res.data.list[i].name = this.decrypt(res.data.list[i].name)
var d = new Date(res.data.list[i].createtime) // var d = new Date(res.data.list[i].createtime)
var mon = (parseInt(d.getMonth()) + 1) // var mon = (parseInt(d.getMonth()) + 1)
res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds(); // res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : '' // res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
} }
this.tableData = res.data.list this.tableData = res.data.content
this.totals = res.data.total this.totals = res.data.totalSize
this.page = res.data.total.pageNum this.pageNum = res.data.pageNum
}).catch((res) => { }).catch((res) => {
}); });
}, },
//流程
progress(d, s) {
console.log(s)
this.activities = []
var data = {
recordId: s.id,
type: s.recordtype == "参保登记" ? 1 : s.recordtype == "信息变更" ? 2 : ''
}
this.$api.getlist.progress(data).then((res) => {
for (var i in res.data) {
if (res.data[i].examineState == "进行中") {
this.activities.push({
content: res.data[i].role,
//timestamp:res.data[i].examinePerson+"审核于"+res.data[i].examineTime,
color: '#0bbd87',
size: 'large'
})
} else {
if (res.data[i].examineState == "审核失败") {
this.activities.push({
content: res.data[i].role + ":" + "审核失败",
timestamp: res.data[i].examinePerson ? res.data[i].examineTime : "",
name: res.data[i].examinePerson ? res.data[i].examinePerson : "",
examineRemark: res.data[i].examineRemark ? res.data[i].examineRemark : '',
color: 'black'
})
return
} else {
this.activities.push({
content: res.data[i].role,
timestamp: res.data[i].examinePerson ? res.data[i].examineTime : "",
name: res.data[i].examinePerson ? res.data[i].examinePerson : "",
examineRemark: res.data[i].examineRemark ? res.data[i].examineRemark : '',
color: res.data[i].nowNode ? "#97E5CE" : "lightgray"
})
}
}
}
}).catch((res) => {
})
},
tableRowClassName({row, rowIndex}) {
// console.log(row)
// if (row.recordtype ==="参保登记") {
// return 'warning-row';
// } else if (row.recordtype === "信息变更") {
// return 'success-row';
// }
// return '';
},
current_change(ss) { current_change(ss) {
var data = { let data = {
pageNum: ss, pageNum: ss,
pageSize: 10, pageSize: 10,
idcard: this.idcard, idCard: this.idCard ? this.Encrypt(this.idCard) : "",
type: this.ywtype name: this.name ? this.Encrypt(this.name) : "",
} grantState: this.grantState
};
Loading.service(); Loading.service();
this.$api.getlist.record(data).then((res) => { this.$api.getlist.getGrantList(data).then((res) => {
let loadingInstance = Loading.service(); let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close(); loadingInstance.close();
...@@ -285,14 +314,14 @@ ...@@ -285,14 +314,14 @@
for (var i in res.data.list) { for (var i in res.data.list) {
res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard) res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard)
res.data.list[i].name = this.decrypt(res.data.list[i].name) res.data.list[i].name = this.decrypt(res.data.list[i].name)
var d = new Date(res.data.list[i].createtime) // var d = new Date(res.data.list[i].createtime)
var mon = (parseInt(d.getMonth()) + 1) // var mon = (parseInt(d.getMonth()) + 1)
res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds(); // res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : '' // res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
} }
this.tableData = res.data.list this.tableData = res.data.content
this.totals = res.data.total this.totals = res.data.totalSize
this.page = res.data.total.pageNum this.pageNum = res.data.pageNum
}).catch((res) => { }).catch((res) => {
let loadingInstance = Loading.service(); let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
...@@ -301,37 +330,12 @@ ...@@ -301,37 +330,12 @@
}); });
}, },
//查看 //查看
handle(s, d) { handle(index, row) {
if (d.recordtype == "参保登记") { this.dialogTableVisible = true;
sessionStorage.setItem("recordId", this.tableData[s].recordId) this.data = row;
this.$router.push({ let d = new Date(this.data.retirementDate);
name: "参保登记审核", let mon = (parseInt(d.getMonth()) + 1);
params: { this.data.retirementDate = d.getFullYear() + "-" + mon + "-" + d.getDate();
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,
show: false
}
})
} else if (d.recordtype == "信息变更") {
sessionStorage.setItem("recordId", this.tableData[s].recordId)
this.$router.push({
name: "信息变更审核",
params: {
info: this.tableData[s].info,
bankpic: this.tableData[s].bankpic,
idcardbackpic: this.tableData[s].idcardbackpic,
idcardfrontpic: this.tableData[s].idcardfrontpic,
signpic: this.tableData[s].signpic,
specialPhotoPic: this.tableData[s].specialPhotoPic,
bookPic: this.tableData[s].bookPic,
show: false
}
})
}
}, },
handleDelete(g, h) { handleDelete(g, h) {
console.log(g) console.log(g)
...@@ -360,9 +364,15 @@ ...@@ -360,9 +364,15 @@
padding: CryptoJS.pad.Pkcs7 padding: CryptoJS.pad.Pkcs7
}); });
return decrypted.toString(CryptoJS.enc.Utf8); return decrypted.toString(CryptoJS.enc.Utf8);
},
handleClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
})
.catch(_ => {});
} }
}, },
created() { created() {
for (var i in listtown) { for (var i in listtown) {
this.list.push({ this.list.push({
...@@ -379,12 +389,8 @@ ...@@ -379,12 +389,8 @@
} }
console.log(this.list) console.log(this.list)
Loading.service(); Loading.service();
var data = { let data = {};
idcard: '', this.$api.getlist.getGrantList(data).then((res) => {
recordType: '3'
}
this.$api.getlist.record(data).then((res) => {
let loadingInstance = Loading.service(); let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close(); loadingInstance.close();
...@@ -392,42 +398,20 @@ ...@@ -392,42 +398,20 @@
for (var i in res.data.list) { for (var i in res.data.list) {
res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard) res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard)
res.data.list[i].name = this.decrypt(res.data.list[i].name) res.data.list[i].name = this.decrypt(res.data.list[i].name)
var d = new Date(res.data.list[i].createtime) // var d = new Date(res.data.list[i].createtime)
var mon = (parseInt(d.getMonth()) + 1) // var mon = (parseInt(d.getMonth()) + 1)
res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds(); // res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : '' // res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
} }
this.tableData = res.data.list this.tableData = res.data.content
this.totals = res.data.total this.totals = res.data.totalSize
this.page = res.data.total.pageNum this.pageNum = res.data.pageNum
}).catch((res) => { }).catch((res) => {
let loadingInstance = Loading.service(); let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close(); loadingInstance.close();
}); });
}); });
// var that=this
// baseUrl.setToken()
// $.ajax({
// url:baseUrl.baseUrl+"examine/listExamining",
// type:'post',
// data:{
// userId:1
// },
// success(res){
// for(var i in res.data.list){
// res.data.list[i].idcard=that.decrypt(res.data.list[i].idcard)
// res.data.list[i].name=that.decrypt(res.data.list[i].name)
// res.data.list[i].recordtype=res.data.list[i].recordtype==1?"参保登记":""
// }
// that.tableData=res.data.list
// that.totals=res.data.total
// that.page=res.data.total.pageNum
// }
// })
} }
} }
</script> </script>
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