Skip to content

X
xichonght
Commit 0e1d1639 authored by liucheng's avatar liucheng
Browse files
Options

Merge branch 'master' into 'dev' 

# Conflicts:
#   xichongSys/src/utils/global.js
parents 3a0fa14c 4399d297
Expand all Show whitespace changes
Inline Side-by-side
Showing with 586 additions and 628 deletions
xichongSys/src/router/index.js
View file @ 0e1d1639
...@@ -121,21 +121,22 @@ const router = new Router({ ...@@ -121,21 +121,22 @@ const router = new Router({
path:"/payInfo", path:"/payInfo",
name:"缴费记录", name:"缴费记录",
component: PayInfo component: PayInfo
},{
path:"/application",
name:"待遇申请审核",
component: application
}, },
// {
// path:"/application",
// name:"待遇申请审核",
// component: application
// },
{ {
path:"/importByExcel", path:"/importByExcel",
name:"数据导入", name:"数据导入",
component: importByExcel component: importByExcel
}, },
// { {
// path:"/treatmentApplicationAudit", path:"/treatmentApplicationAudit",
// name:"待遇申请审核", name:"待遇申请审核",
// component: treatmentApplicationAudit component: treatmentApplicationAudit
// }, },
{ {
path:"/insuranceCancellationAudit", path:"/insuranceCancellationAudit",
name:"参保注销审核", name:"参保注销审核",
......
xichongSys/src/views/Core/KtTable.vue
View file @ 0e1d1639
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('action.operation')" width="185" fixed="right" v-if="showOperation" header-align="center" align="center"> <el-table-column :label="$t('action.operation')" width="185" fixed="right" v-if="showOperation" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<kt-button icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/> <kt-button v-if="scope.row.name!=='admin'" icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/>
<el-switch <el-switch
v-if="scope.row.name!=='admin'"
class="statusSwitch" class="statusSwitch"
style="display: block;float: left;margin-left: 20px;width: 50px" style="display: block;float: left;margin-left: 20px;width: 50px"
v-model="scope.row.status==0?true:false" v-model="scope.row.status==0?true:false"
......
xichongSys/src/views/Myvue/drcbdj.vue
View file @ 0e1d1639
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<div> <div>
<el-table <el-table
v-loading.fullscreen.lock="loading"
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
> >
...@@ -75,7 +76,7 @@ ...@@ -75,7 +76,7 @@
> >
</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>
...@@ -88,11 +89,13 @@ export default { ...@@ -88,11 +89,13 @@ export default {
return { return {
Page:1, Page:1,
totals:0, totals:0,
tableData: [] tableData: [],
loading: false
} }
}, },
methods:{ methods:{
toPdf(s,d){ toPdf(s,d){
this.loading = true;
console.log(d) console.log(d)
axios.get(baseUrl+'/exportPdf/insuredRegistration?id='+d.eventId,{ axios.get(baseUrl+'/exportPdf/insuredRegistration?id='+d.eventId,{
headers: { headers: {
...@@ -108,11 +111,13 @@ export default { ...@@ -108,11 +111,13 @@ export default {
a.href = URL.createObjectURL(blob); //生成一个url a.href = URL.createObjectURL(blob); //生成一个url
a.download = "西充县城乡居民社会养老保险参保登记表.pdf"; a.download = "西充县城乡居民社会养老保险参保登记表.pdf";
a.click(); a.click();
this.loading = false;
// let objectUrl = URL.createObjectURL(blob); //生成一个url // let objectUrl = URL.createObjectURL(blob); //生成一个url
// window.location.href = objectUrl; //浏览器打开这个url // window.location.href = objectUrl; //浏览器打开这个url
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
this.loading = false;
}); });
}, },
current_change(s){ current_change(s){
...@@ -136,6 +141,7 @@ export default { ...@@ -136,6 +141,7 @@ export default {
}); });
}, },
toexcel(){ toexcel(){
this.loading = true;
axios.get(baseUrl+'/exportExcel/insuredRegistration',{ axios.get(baseUrl+'/exportExcel/insuredRegistration',{
headers: { headers: {
"token":Cookies.get("token") "token":Cookies.get("token")
...@@ -150,11 +156,13 @@ export default { ...@@ -150,11 +156,13 @@ export default {
a.href = URL.createObjectURL(blob); //生成一个url a.href = URL.createObjectURL(blob); //生成一个url
a.download = "居民养老保险表.xlsx"; a.download = "居民养老保险表.xlsx";
a.click(); a.click();
this.loading = false;
// let objectUrl = URL.createObjectURL(blob); //生成一个url // let objectUrl = URL.createObjectURL(blob); //生成一个url
// window.location.href = objectUrl; //浏览器打开这个url // window.location.href = objectUrl; //浏览器打开这个url
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
this.loading = false;
}); });
// this.$api.getlist.dccc().then((res) => { // this.$api.getlist.dccc().then((res) => {
// let loadingInstance = Loading.service(); // let loadingInstance = Loading.service();
......
xichongSys/src/views/Myvue/drdcbg.vue
View file @ 0e1d1639
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<div> <div>
<el-table <el-table
v-loading.fullscreen.lock="loading"
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
> >
...@@ -46,7 +47,7 @@ ...@@ -46,7 +47,7 @@
> >
</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>
...@@ -60,11 +61,13 @@ ...@@ -60,11 +61,13 @@
return { return {
PageNum: 1, PageNum: 1,
totals: 0, totals: 0,
tableData: [] tableData: [],
loading: false
} }
}, },
methods: { methods: {
toPdf(s, d) { toPdf(s, d) {
this.loading = true;
console.log(d) console.log(d)
axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, { axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, {
headers: { headers: {
...@@ -82,9 +85,11 @@ ...@@ -82,9 +85,11 @@
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;
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
this.loading = false;
}); });
}, },
current_change(s) { current_change(s) {
...@@ -99,7 +104,7 @@ ...@@ -99,7 +104,7 @@
loadingInstance.close(); loadingInstance.close();
}); });
if (res.code == 200) { if (res.code == 200) {
this.tableData = res.data.result this.tableData = res.data.content
this.totals = res.data.totalSize this.totals = res.data.totalSize
} }
...@@ -108,6 +113,7 @@ ...@@ -108,6 +113,7 @@
}); });
}, },
toexcel() { toexcel() {
this.loading = true;
axios.get(baseUrl + '/exportExcel/modifyPayGrade', { axios.get(baseUrl + '/exportExcel/modifyPayGrade', {
headers: { headers: {
"token": Cookies.get("token") "token": Cookies.get("token")
...@@ -124,9 +130,11 @@ ...@@ -124,9 +130,11 @@
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;
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
this.loading = false;
}); });
// this.$api.getlist.dccc().then((res) => { // this.$api.getlist.dccc().then((res) => {
// let loadingInstance = Loading.service(); // let loadingInstance = Loading.service();
......
xichongSys/src/views/Myvue/drxxbg.vue
View file @ 0e1d1639
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<div> <div>
<el-table <el-table
v-loading.fullscreen.lock="loading"
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
> >
...@@ -81,11 +82,13 @@ ...@@ -81,11 +82,13 @@
return { return {
PageNum: 1, PageNum: 1,
totals: 0, totals: 0,
tableData: [] tableData: [],
loading: false
} }
}, },
methods: { methods: {
toPdf(s, d) { toPdf(s, d) {
this.loading = true;
console.log(d) console.log(d)
axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, { axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, {
headers: { headers: {
...@@ -103,9 +106,11 @@ ...@@ -103,9 +106,11 @@
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;
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
this.loading = false;
}); });
}, },
current_change(s) { current_change(s) {
...@@ -129,6 +134,7 @@ ...@@ -129,6 +134,7 @@
}); });
}, },
toexcel() { toexcel() {
this.loading = true;
axios.get(baseUrl + '/exportExcel/updateBaseInfo', { axios.get(baseUrl + '/exportExcel/updateBaseInfo', {
headers: { headers: {
"token": Cookies.get("token") "token": Cookies.get("token")
...@@ -145,9 +151,11 @@ ...@@ -145,9 +151,11 @@
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;
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
this.loading = false;
}); });
// this.$api.getlist.dccc().then((res) => { // this.$api.getlist.dccc().then((res) => {
// let loadingInstance = Loading.service(); // let loadingInstance = Loading.service();
......
xichongSys/src/views/Myvue/dryhkbg.vue
View file @ 0e1d1639
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<div> <div>
<el-table <el-table
v-loading.fullscreen.lock="loading"
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
> >
...@@ -60,11 +61,13 @@ ...@@ -60,11 +61,13 @@
return { return {
PageNum: 1, PageNum: 1,
totals: 0, totals: 0,
tableData: [] tableData: [],
loading: false
} }
}, },
methods: { methods: {
toPdf(s, d) { toPdf(s, d) {
this.loading = true;
console.log(d) console.log(d)
axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, { axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, {
headers: { headers: {
...@@ -82,9 +85,11 @@ ...@@ -82,9 +85,11 @@
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;
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
this.loading = false;
}); });
}, },
current_change(s) { current_change(s) {
...@@ -99,7 +104,7 @@ ...@@ -99,7 +104,7 @@
loadingInstance.close(); loadingInstance.close();
}); });
if (res.code == 200) { if (res.code == 200) {
this.tableData = res.data.result this.tableData = res.data.content
this.totals = res.data.totalSize this.totals = res.data.totalSize
} }
...@@ -108,6 +113,7 @@ ...@@ -108,6 +113,7 @@
}); });
}, },
toexcel() { toexcel() {
this.loading = true;
axios.get(baseUrl + '/exportExcel/updateBankCard', { axios.get(baseUrl + '/exportExcel/updateBankCard', {
headers: { headers: {
"token": Cookies.get("token") "token": Cookies.get("token")
...@@ -124,9 +130,11 @@ ...@@ -124,9 +130,11 @@
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;
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
this.loading = false;
}); });
// this.$api.getlist.dccc().then((res) => { // this.$api.getlist.dccc().then((res) => {
// let loadingInstance = Loading.service(); // let loadingInstance = Loading.service();
......
xichongSys/src/views/Myvue/flow.vue
View file @ 0e1d1639
...@@ -262,7 +262,7 @@ this.$api.getlist.selectflowState(data).then((res) => { ...@@ -262,7 +262,7 @@ this.$api.getlist.selectflowState(data).then((res) => {
console.log(d) console.log(d)
if(s==1){ if(s==1){
this.flowTitle="新增流程" this.flowTitle="新增流程"
for(var i =1;i<=7;i++){ for(var i =1;i<=6;i++){
this.titleList.push({ this.titleList.push({
label:this.getType(i), label:this.getType(i),
value:i+","+this.getType(i) value:i+","+this.getType(i)
......
xichongSys/src/views/Myvue/importByExcel.vue
View file @ 0e1d1639
<template> <template>
<div> <div>
<el-tabs type="border-card"> <el-tabs
type="border-card"
:v-loading="loading">
<el-tab-pane label="参保覆盖人员" v-loading="loading"> <el-tab-pane label="参保覆盖人员" v-loading="loading">
<div style="width: 25%;float: left"> <el-alert
align="left"
title="请上传格式完全相同的excel,格式如下:"
type="warning"
show-icon>
</el-alert>
<table style="text-align: center;border-collapse: collapse" cellspacing="0px" cellpadding="0px">
<tr>
<td style="border: 1px solid black">&nbsp;统筹区&nbsp;</td>
<td style="border: 1px solid black">&nbsp;街道或乡镇名称&nbsp;</td>
<td style="border: 1px solid black">&nbsp;社区名称&nbsp;</td>
<td style="border: 1px solid black">&nbsp;所属组&nbsp;</td>
<td style="border: 1px solid black">&nbsp;户口所在地&nbsp;</td>
<td style="border: 1px solid black">&nbsp;户口性质&nbsp;</td>
<td style="border: 1px solid black">&nbsp;个人编号&nbsp;</td>
<td style="border: 1px solid black">&nbsp;证件号码&nbsp;</td>
<td style="border: 1px solid black">&nbsp;姓名&nbsp;</td>
<td style="border: 1px solid black">&nbsp;性别&nbsp;</td>
<td style="border: 1px solid black">&nbsp;民族&nbsp;</td>
<td style="border: 1px solid black">&nbsp;出生日期&nbsp;</td>
<td style="border: 1px solid black">&nbsp;险种类型&nbsp;</td>
<td style="border: 1px solid black">&nbsp;参保状态&nbsp;</td>
<td style="border: 1px solid black">&nbsp;是否老农保&nbsp;</td>
<td style="border: 1px solid black">&nbsp;缴费状态&nbsp;</td>
<td style="border: 1px solid black">&nbsp;缴费档次&nbsp;</td>
<td style="border: 1px solid black">&nbsp;人员类别&nbsp;</td>
<td style="border: 1px solid black">&nbsp;离退休标志&nbsp;</td>
<td style="border: 1px solid black">&nbsp;个人身份&nbsp;</td>
<td style="border: 1px solid black">&nbsp;参保日期&nbsp;</td>
<td style="border: 1px solid black">&nbsp;档案编号&nbsp;</td>
</tr>
</table>
<el-upload <el-upload
style="margin-top: 10px"
class="upload-demo" class="upload-demo"
ref="upload1" ref="upload1"
:action="baseInfoUrl" :action="baseInfoUrl"
...@@ -22,16 +56,6 @@ ...@@ -22,16 +56,6 @@
<div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div> <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div>
</el-upload> </el-upload>
<el-button style="margin-top: 10px" size="small" type="success" @click="submitUpload1">数据导入</el-button> <el-button style="margin-top: 10px" size="small" type="success" @click="submitUpload1">数据导入</el-button>
</div>
<div style="width: 75%;float: left">
<el-alert
align="left"
title="请上传格式完全相同的excel,格式如下:"
type="warning"
description="统筹区,街道或乡镇名称,社区名称,所属组,户口所在地,户口性质,个人编号,证件号码,姓名,性别,民族,出生日期,险种类型,参保状态,是否老农保,缴费状态,缴费档次,人员类别,离退休标志,个人身份,参保日期,档案编号"
show-icon>
</el-alert>
</div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="缴费情况明细"> <el-tab-pane label="缴费情况明细">
<el-upload <el-upload
...@@ -70,6 +94,13 @@ ...@@ -70,6 +94,13 @@
</el-upload> </el-upload>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog
ref="dialog"
:title="dialogTitle"
width="30%"
:visible.sync="dialogVisible">
<span v-text="dialogContent" style="font-size: 16px"></span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -86,7 +117,11 @@ ...@@ -86,7 +117,11 @@
myHeader: { myHeader: {
token: Cookies.get("token") token: Cookies.get("token")
}, },
fileList: [] fileList: [],
dialogTitle: "",
dialogVisible: false,
dialogContent: "",
loading: false
}; };
}, },
methods: { methods: {
...@@ -103,6 +138,7 @@ ...@@ -103,6 +138,7 @@
this.$message.warning("当前限制选择 1 个文件，请删除后继续上传"); this.$message.warning("当前限制选择 1 个文件，请删除后继续上传");
}, },
handleBeforeUpload(file) { handleBeforeUpload(file) {
this.loading = true;
if (!file.name.endsWith(".xls") && !file.name.endsWith(".xlsx")) { if (!file.name.endsWith(".xls") && !file.name.endsWith(".xlsx")) {
this.$message.warning(file.name + "不是excel文件"); this.$message.warning(file.name + "不是excel文件");
return false; return false;
...@@ -114,22 +150,21 @@ ...@@ -114,22 +150,21 @@
// uploadedList.push(file.name); // uploadedList.push(file.name);
}, },
uploadSuccess(response) { uploadSuccess(response) {
console.log(response) this.dialogTitle = "导入结果";
this.$alert(response.data, '导入结果', { this.dialogContent = response.data;
confirmButtonText: '确定', this.dialogVisible = true;
callback: action => { this.loading = false;
// this.$message({ // console.log(response);
// type: 'info', // this.$alert(response.data, '导入结果', {
// message: `action: ${ action }` // confirmButtonText: '确定',
// callback: action => {
// // this.$message({
// // type: 'info',
// // message: `action: ${ action }`
// // });
// }
// }); // });
} }
});
// this.$message.success({
// message: response.data,
// duration: 0,
// showClose: true
// })
}
} }
} }
</script> </script>
......
xichongSys/src/views/Sys/User.vue
View file @ 0e1d1639
...@@ -48,12 +48,11 @@ ...@@ -48,12 +48,11 @@
<el-input v-model="dataForm.id" :disabled="true" auto-complete="off"></el-input> <el-input v-model="dataForm.id" :disabled="true" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="用户名" prop="name"> <el-form-item label="用户名" prop="name">
<el-input v-if="!operation" v-model="dataForm.name" auto-complete="off" :disabled="true"></el-input> <el-input v-if="!operation" v-model="dataForm.name" auto-complete="off" readonly="true"></el-input>
<el-input v-if="operation" v-model="dataForm.name" auto-complete="off"></el-input> <el-input v-if="operation" v-model="dataForm.name" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="真实姓名" prop="truename"> <el-form-item label="真实姓名" prop="truename">
<el-input v-if="!operation" v-model="dataForm.truename" auto-complete="off" :disabled="true"></el-input> <el-input v-model="dataForm.truename" auto-complete="off"></el-input>
<el-input v-if="operation" v-model="dataForm.truename" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="密码" prop="password"> <el-form-item label="密码" prop="password">
<el-input v-model="dataForm.password" type="password" auto-complete="off"></el-input> <el-input v-model="dataForm.password" type="password" auto-complete="off"></el-input>
...@@ -91,7 +90,7 @@ ...@@ -91,7 +90,7 @@
</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" @click="cancelRules('dataForm')">{{$t('action.cancel')}}</el-button>
<el-button :size="size" type="primary" @click.native="submitForm" :loading="editLoading">{{$t('action.submit')}}</el-button> <el-button :size="size" type="primary" @click.native="submitForm" :loading="editLoading">{{$t('action.submit')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -118,7 +117,6 @@ export default { ...@@ -118,7 +117,6 @@ export default {
size: 'small', size: 'small',
filters: { filters: {
name: '', name: '',
truename: ''
}, },
columns: [], columns: [],
filterColumns: [], filterColumns: [],
...@@ -131,6 +129,9 @@ export default { ...@@ -131,6 +129,9 @@ export default {
dataFormRules: { dataFormRules: {
name: [ name: [
{ required: true, message: '请输入用户名', trigger: 'blur' } { required: true, message: '请输入用户名', trigger: 'blur' }
],
truename: [
{ required: true, message: '请输入真实姓名', trigger: 'blur' }
] ]
}, },
// 新增编辑界面数据 // 新增编辑界面数据
...@@ -296,7 +297,10 @@ export default { ...@@ -296,7 +297,10 @@ export default {
// {prop:"lastUpdateTime", label:"更新时间", minWidth:120, formatter:this.dateFormat} // {prop:"lastUpdateTime", label:"更新时间", minWidth:120, formatter:this.dateFormat}
] ]
this.filterColumns = JSON.parse(JSON.stringify(this.columns)); this.filterColumns = JSON.parse(JSON.stringify(this.columns));
       }        },
cancelRules: function (formName) {
this.$refs[formName].resetFields();
}
}, },
mounted() { mounted() {
this.findDeptTree() this.findDeptTree()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment