Skip to content

X
xichonght
Commit 4399d297 authored by miaohaoyun's avatar miaohaoyun
Browse files
Options

Merge branch 'mhy' into 'master' 

Mhy

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