Skip to content

X
xichonght
Commit 8779e9d6 authored by miaohaoyun's avatar miaohaoyun
Browse files
Options

Merge branch 'mhy' into 'master' 

Mhy

See merge request !73
parents f38d1557 5e3a7847
Hide whitespace changes
Inline Side-by-side
Showing with 454 additions and 41 deletions
xichongSys/src/router/index.js
View file @ 8779e9d6
...@@ -44,6 +44,9 @@ import drcbzx from "@/views/Myvue/drcbzx"; ...@@ -44,6 +44,9 @@ import drcbzx from "@/views/Myvue/drcbzx";
import drbjbf from "@/views/Myvue/drbjbf"; import drbjbf from "@/views/Myvue/drbjbf";
import drtsyw from "@/views/Myvue/drtsyw"; import drtsyw from "@/views/Myvue/drtsyw";
import authRecordphone from "@/views/Myvue/authRecordphone"; import authRecordphone from "@/views/Myvue/authRecordphone";
import importBaseInfoByExcel from "@/views/Myvue/importBaseInfoByExcel";
import importPayInfoByExcel from "@/views/Myvue/importPayInfoByExcel";
import importGrantInfoByExcel from "@/views/Myvue/importGrantInfoByExcel";
import tablep from "@/views/Myvue/tablep"; import tablep from "@/views/Myvue/tablep";
Vue.use(Router) Vue.use(Router)
...@@ -198,6 +201,21 @@ const router = new Router({ ...@@ -198,6 +201,21 @@ const router = new Router({
name:"特殊业务导出", name:"特殊业务导出",
component: drtsyw component: drtsyw
}, },
{
path:"/importBaseInfo",
name:"参保覆盖导入",
component: importBaseInfoByExcel
},
{
path:"/importPayInfo",
name:"缴费明细导入",
component: importPayInfoByExcel
},
{
path:"/importGrantInfo",
name:"领取人员导入",
component: importGrantInfoByExcel
},
] ]
}, },
{ {
......
xichongSys/src/views/Core/KtButton.vue
View file @ 8779e9d6
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
handleClick: function () { handleClick: function () {
// 按钮操作处理函数 // 按钮操作处理函数
this.$emit('click', {}) this.$emit('click', {})
}, },
hasPerms: function (perms) { hasPerms: function (perms) {
// 根据权限标识和外部指示状态进行权限判断 // 根据权限标识和外部指示状态进行权限判断
return hasPermission(perms) & !this.disabled return hasPermission(perms) & !this.disabled
...@@ -60,4 +60,4 @@ export default { ...@@ -60,4 +60,4 @@ export default {
<style scoped> <style scoped>
</style> </style>
\ No newline at end of file
xichongSys/src/views/Core/KtTable.vue
View file @ 8779e9d6
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
:sortable="column.sortable==null?true:column.sortable"> :sortable="column.sortable==null?true:column.sortable">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center"
v-if="showSeal" v-if="showSeal"
label="签章"> label="签章">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -26,17 +27,22 @@ ...@@ -26,17 +27,22 @@
</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 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"/> <div v-if="scope.row.name!=='admin'" >
<el-switch <kt-button v-if="showBatchDelete" icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/>
v-if="scope.row.name!=='admin'" <kt-button v-else icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)"/>
class="statusSwitch" </div>
style="display: block;float: left;margin-left: 20px;width: 50px" <div v-if="scope.row.name!=='admin' && showBatchDelete">
v-model="scope.row.status==0?true:false" <el-switch
active-color="#13ce66" class="statusSwitch"
inactive-color="#ff4949" style="display: block;float: left;margin-left: 20px;width: 50px"
active-text="启" v-model="scope.row.status==0?true:false"
inactive-text="禁" @change="handleDelete(scope.$index, scope.row)"> active-color="#13ce66"
</el-switch> inactive-color="#ff4949"
active-text="启"
inactive-text="禁" @change="handleDelete(scope.$index, scope.row)">
</el-switch>
</div>
<!-- <div v-if="scope.row.status == 1">--> <!-- <div v-if="scope.row.status == 1">-->
<!-- <kt-button icon="fa fa-trash" label="禁用" :perms="permsDelete" :size="size" type="danger" @click="handleDelete(scope.$index, scope.row)" />--> <!-- <kt-button icon="fa fa-trash" label="禁用" :perms="permsDelete" :size="size" type="danger" @click="handleDelete(scope.$index, scope.row)" />-->
<!-- </div>--> <!-- </div>-->
...@@ -109,7 +115,7 @@ export default { ...@@ -109,7 +115,7 @@ export default {
type: Boolean, type: Boolean,
default: true default: true
}, },
showSeal: { // 是否显示操作组件 showSeal: { // 是否显示签章列
type: Boolean, type: Boolean,
default: false default: false
}, },
......
xichongSys/src/views/Myvue/importBaseByExcel.vue → xichongSys/src/views/Myvue/importBaseInfoByExcel.vue
View file @ 8779e9d6
...@@ -9,28 +9,28 @@ ...@@ -9,28 +9,28 @@
</el-alert> </el-alert>
<table style="text-align: center;border-collapse: collapse" cellspacing="0px" cellpadding="0px"> <table style="text-align: center;border-collapse: collapse" cellspacing="0px" cellpadding="0px">
<tr> <tr>
<td style="border: 1px solid black">&nbsp;统筹区&nbsp;</td> <td style="border: 1px solid black">统筹区</td>
<td style="border: 1px solid black">&nbsp;街道或乡镇名称&nbsp;</td> <td style="border: 1px solid black">街道或乡镇名称</td>
<td style="border: 1px solid black">&nbsp;社区名称&nbsp;</td> <td style="border: 1px solid black">社区名称</td>
<td style="border: 1px solid black">&nbsp;所属组&nbsp;</td> <td style="border: 1px solid black">所属组</td>
<td style="border: 1px solid black">&nbsp;户口所在地&nbsp;</td> <td style="border: 1px solid black">户口所在地</td>
<td style="border: 1px solid black">&nbsp;户口性质&nbsp;</td> <td style="border: 1px solid black">户口性质</td>
<td style="border: 1px solid black">&nbsp;个人编号&nbsp;</td> <td style="border: 1px solid black">个人编号</td>
<td style="border: 1px solid black">&nbsp;证件号码&nbsp;</td> <td style="border: 1px solid black">证件号码</td>
<td style="border: 1px solid black">&nbsp;姓名&nbsp;</td> <td style="border: 1px solid black">姓名</td>
<td style="border: 1px solid black">&nbsp;性别&nbsp;</td> <td style="border: 1px solid black">性别</td>
<td style="border: 1px solid black">&nbsp;民族&nbsp;</td> <td style="border: 1px solid black">民族</td>
<td style="border: 1px solid black">&nbsp;出生日期&nbsp;</td> <td style="border: 1px solid black">出生日期</td>
<td style="border: 1px solid black">&nbsp;险种类型&nbsp;</td> <td style="border: 1px solid black">险种类型</td>
<td style="border: 1px solid black">&nbsp;参保状态&nbsp;</td> <td style="border: 1px solid black">参保状态</td>
<td style="border: 1px solid black">&nbsp;是否老农保&nbsp;</td> <td style="border: 1px solid black">是否老农保</td>
<td style="border: 1px solid black">&nbsp;缴费状态&nbsp;</td> <td style="border: 1px solid black">缴费状态</td>
<td style="border: 1px solid black">&nbsp;缴费档次&nbsp;</td> <td style="border: 1px solid black">缴费档次</td>
<td style="border: 1px solid black">&nbsp;人员类别&nbsp;</td> <td style="border: 1px solid black">人员类别</td>
<td style="border: 1px solid black">&nbsp;离退休标志&nbsp;</td> <td style="border: 1px solid black">离退休标志</td>
<td style="border: 1px solid black">&nbsp;个人身份&nbsp;</td> <td style="border: 1px solid black">个人身份</td>
<td style="border: 1px solid black">&nbsp;参保日期&nbsp;</td> <td style="border: 1px solid black">参保日期</td>
<td style="border: 1px solid black">&nbsp;档案编号&nbsp;</td> <td style="border: 1px solid black">档案编号</td>
</tr> </tr>
</table> </table>
<el-upload <el-upload
...@@ -53,7 +53,12 @@ ...@@ -53,7 +53,12 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传1个文件</div> <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传1个文件</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"
v-loading.fullscreen.lock="loading">数据导入</el-button>
<el-dialog <el-dialog
ref="dialog" ref="dialog"
:title="dialogTitle" :title="dialogTitle"
...@@ -70,7 +75,7 @@ ...@@ -70,7 +75,7 @@
let uploadedList = []; let uploadedList = [];
export default { export default {
name: "importByExcel", name: "importBaseInfoByExcel",
data() { data() {
return { return {
baseInfoUrl: baseUrl + "/baseInfo/importFromNewExcel", baseInfoUrl: baseUrl + "/baseInfo/importFromNewExcel",
...@@ -110,7 +115,7 @@ ...@@ -110,7 +115,7 @@
this.dialogContent = response.data; this.dialogContent = response.data;
// this.dialogVisible = true; // this.dialogVisible = true;
this.loading = false; this.loading = false;
console.log("upload success"); // console.log("upload success");
this.$message({ this.$message({
type: "success", type: "success",
message: response.data, message: response.data,
...@@ -124,7 +129,7 @@ ...@@ -124,7 +129,7 @@
this.dialogContent = "导入失败"; this.dialogContent = "导入失败";
// this.dialogVisible = true; // this.dialogVisible = true;
this.loading = false; this.loading = false;
console.log(response); // console.log(response);
this.$alert(response.data, '导入结果', { this.$alert(response.data, '导入结果', {
confirmButtonText: '确定', confirmButtonText: '确定',
callback: action => { callback: action => {
......
xichongSys/src/views/Myvue/importGrantInfoByExcel.vue 0 → 100644
View file @ 8779e9d6
<template>
<div>
<el-alert
align="left"
title="请上传格式完全相同的excel,格式如下:"
type="warning"
:closable="false"
show-icon>
</el-alert>
<table style="text-align: center;border-collapse: collapse" cellspacing="0px" cellpadding="0px">
<tr>
<td style="border: 1px solid black">乡镇</td>
<td style="border: 1px solid black">村（社区）</td>
<td style="border: 1px solid black">村组</td>
<td style="border: 1px solid black">户籍地地址</td>
<td style="border: 1px solid black">常住地地址</td>
<td style="border: 1px solid black">个人编号</td>
<td style="border: 1px solid black">证件号码</td>
<td style="border: 1px solid black">姓名</td>
<td style="border: 1px solid black">待遇发放状态</td>
<td style="border: 1px solid black">最大发放期</td>
<td style="border: 1px solid black">银行</td>
<td style="border: 1px solid black">户名</td>
<td style="border: 1px solid black">账号</td>
<td style="border: 1px solid black">视同缴费月数</td>
<td style="border: 1px solid black">实际缴费月数</td>
<td style="border: 1px solid black">军龄折算月数</td>
<td style="border: 1px solid black">特殊工种折算月数</td>
<td style="border: 1px solid black">离退休日期</td>
<td style="border: 1px solid black">当前月领取标准</td>
<td style="border: 1px solid black">个人账户总金额</td>
<td style="border: 1px solid black">省级财政部分所占比例</td>
<td style="border: 1px solid black">市级财政部分所占比例</td>
<td style="border: 1px solid black">县级财政部分所占比例</td>
<td style="border: 1px solid black">集体补助部分所占比例</td>
<td style="border: 1px solid black">个人缴费部分所占比例</td>
</tr>
</table>
<!-- <el-table-->
<!-- border-->
<!-- style="width: 100%">-->
<!-- <el-table-column-->
<!-- label="乡镇">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="村（社区）">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="村组">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="户籍地地址">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="常住地地址">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="个人编号">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="证件号码">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="姓名">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="待遇发放状态">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="最大发放期">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="银行">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="户名">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="账号">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="视同缴费月数">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="实际缴费月数">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="军龄折算月数">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="特殊工种折算月数">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="离退休日期">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="当前月领取标准">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="个人账户总金额">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="省级财政部分所占比例">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="市级财政部分所占比例">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="县级财政部分所占比例">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="集体补助部分所占比例">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="个人缴费部分所占比例">-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<el-upload
style="margin-top: 10px"
class="upload-demo"
ref="upload3"
:action="grantInfoUrl"
multiple
drag
accept=".xls,.xlsx"
:limit="1"
:headers="myHeader"
:before-upload="handleBeforeUpload"
:file-list="fileList"
:on-exceed="handleExceed"
:on-success="uploadSuccess"
:on-error="uploadError"
: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文件,一次最多只能上传1个文件</div>
</el-upload>
<el-button
style="margin-top: 10px"
size="small"
type="success"
@click="submitUpload3"
v-loading.fullscreen.lock="loading">数据导入
</el-button>
<el-dialog
ref="dialog"
:title="dialogTitle"
width="30%"
:visible.sync="dialogVisible">
<span v-text="dialogContent" style="font-size: 16px"></span>
</el-dialog>
</div>
</template>
<script>
import {baseUrl} from "../../utils/global";
import Cookies from "js-cookie";
let uploadedList = [];
export default {
name: "importGrantInfoByExcel",
data() {
return {
grantInfoUrl: baseUrl + "/grantInfo/importFromExcel",
myHeader: {
token: Cookies.get("token")
},
fileList: [],
dialogTitle: "",
dialogVisible: false,
dialogContent: "",
loading: false
};
},
methods: {
submitUpload3() {
this.$refs.upload3.submit();
},
handleExceed() {
this.$message.warning("当前限制选择 1 个文件，请删除后继续上传");
},
handleBeforeUpload(file) {
this.loading = true;
if (!file.name.endsWith(".xls") && !file.name.endsWith(".xlsx")) {
this.$message.warning(file.name + "不是excel文件");
this.loading = false;
return false;
}
// if (uploadedList.includes(file.name)) {
// this.$message.warning(file.name + "已被选中过,请勿重复选择");
// return false;
// }
// uploadedList.push(file.name);
},
async uploadSuccess(response) {
this.fileList = [];
this.dialogTitle = "导入结果";
this.dialogContent = response.data;
// this.dialogVisible = true;
this.loading = false;
// console.log("upload success");
this.$message({
type: "success",
message: response.data,
showClose: true,
duration: 0
});
},
async uploadError(response) {
this.fileList = [];
this.dialogTitle = "导入结果";
this.dialogContent = "导入失败";
// this.dialogVisible = true;
this.loading = false;
// console.log(response);
this.$alert(response.data, '导入结果', {
confirmButtonText: '确定',
callback: action => {
// this.$message({
// type: 'info',
// message: `action: ${ action }`
// });
}
});
},
}
}
</script>
<style scoped>
</style>
xichongSys/src/views/Myvue/importPayInfoByExcel.vue 0 → 100644
View file @ 8779e9d6
<template>
<div>
<el-alert
align="left"
title="请上传格式完全相同的excel,格式如下:"
type="warning"
:closable="false"
show-icon>
</el-alert>
<table style="text-align: center;border-collapse: collapse" cellspacing="0px" cellpadding="0px">
<tr>
<td style="border: 1px solid black">个人编号</td>
<td style="border: 1px solid black">公民身份证</td>
<td style="border: 1px solid black">姓名</td>
<td style="border: 1px solid black">当前人员类别</td>
<td style="border: 1px solid black">缴费档次</td>
<td style="border: 1px solid black">应缴类型</td>
<td style="border: 1px solid black">个人应缴</td>
<td style="border: 1px solid black">个级财政补助和</td>
<td style="border: 1px solid black">代缴金额</td>
<td style="border: 1px solid black">对应费款所属期</td>
<td style="border: 1px solid black">险种类型</td>
<td style="border: 1px solid black">收缴方式</td>
<td style="border: 1px solid black">足额到账标志</td>
<td style="border: 1px solid black">足额到账年月</td>
<td style="border: 1px solid black">经办时间</td>
<td style="border: 1px solid black">经办人</td>
<td style="border: 1px solid black">征收方式</td>
<td style="border: 1px solid black">银行编号</td>
<td style="border: 1px solid black">银行账号</td>
<td style="border: 1px solid black">乡镇</td>
<td style="border: 1px solid black">村</td>
<td style="border: 1px solid black">组</td>
<td style="border: 1px solid black">地址</td>
<td style="border: 1px solid black">户口所在地</td>
</tr>
</table>
<el-upload
style="margin-top: 10px"
class="upload-demo"
ref="upload2"
:action="payInfoUrl"
multiple
drag
accept=".xls,.xlsx"
:limit="1"
:headers="myHeader"
:before-upload="handleBeforeUpload"
:file-list="fileList"
:on-exceed="handleExceed"
:on-success="uploadSuccess"
:on-error="uploadError"
: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文件,一次最多只能上传1个文件</div>
</el-upload>
<el-button
style="margin-top: 10px"
size="small"
type="success"
@click="submitUpload2"
v-loading.fullscreen.lock="loading">数据导入</el-button>
<el-dialog
ref="dialog"
:title="dialogTitle"
width="30%"
:visible.sync="dialogVisible">
<span v-text="dialogContent" style="font-size: 16px"></span>
</el-dialog>
</div>
</template>
<script>
import {baseUrl} from "../../utils/global";
import Cookies from "js-cookie";
let uploadedList = [];
export default {
name: "importPayInfoByExcel",
data() {
return {
payInfoUrl: baseUrl + "/payInfo/importFromExcel",
myHeader: {
token: Cookies.get("token")
},
fileList: [],
dialogTitle: "",
dialogVisible: false,
dialogContent: "",
loading: false
};
},
methods: {
submitUpload2() {
this.$refs.upload2.submit();
},
handleExceed() {
this.$message.warning("当前限制选择 1 个文件，请删除后继续上传");
},
handleBeforeUpload(file) {
this.loading = true;
if (!file.name.endsWith(".xls") && !file.name.endsWith(".xlsx")) {
this.$message.warning(file.name + "不是excel文件");
this.loading = false;
return false;
}
// if (uploadedList.includes(file.name)) {
// this.$message.warning(file.name + "已被选中过,请勿重复选择");
// return false;
// }
// uploadedList.push(file.name);
},
async uploadSuccess(response) {
this.fileList = [];
this.dialogTitle = "导入结果";
this.dialogContent = response.data;
// this.dialogVisible = true;
this.loading = false;
// console.log("upload success");
this.$message({
type: "success",
message: response.data,
showClose: true,
duration: 0
});
},
async uploadError(response) {
this.fileList = [];
this.dialogTitle = "导入结果";
this.dialogContent = "导入失败";
// this.dialogVisible = true;
this.loading = false;
// console.log(response);
this.$alert(response.data, '导入结果', {
confirmButtonText: '确定',
callback: action => {
// this.$message({
// type: 'info',
// message: `action: ${ action }`
// });
}
});
},
}
}
</script>
<style scoped>
</style>
xichongSys/src/views/Sys/Dict.vue
View file @ 8779e9d6
...@@ -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" :showBatchDelete="false"
@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete"> @findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete">
</kt-table> </kt-table>
<!--新增编辑界面--> <!--新增编辑界面-->
......
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