Skip to content

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

Merge branch 'master' into 'dev' 

# Conflicts:
#   xichongSys/src/utils/global.js
parents a805c3d3 cf072214
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3932 additions and 86 deletions
.idea/misc.xml 0 → 100644
View file @ a6eb911b
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml 0 → 100644
View file @ a6eb911b
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/xichonght.iml" filepath="$PROJECT_DIR$/.idea/xichonght.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
View file @ a6eb911b
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/xichonght.iml 0 → 100644
View file @ a6eb911b
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
xichongSys/src/router/index.js
View file @ a6eb911b
...@@ -11,10 +11,12 @@ import store from '@/store' ...@@ -11,10 +11,12 @@ import store from '@/store'
import { getIFramePath, getIFrameUrl } from '@/utils/iframe' import { getIFramePath, getIFrameUrl } from '@/utils/iframe'
import Table from '@/views/Myvue/table' import Table from '@/views/Myvue/table'
import Cbdj from '@/views/Myvue/insuredReg' import Cbdj from '@/views/Myvue/insuredReg'
import insuredRegp from '@/views/Myvue/insuredRegp'
import Flow from '@/views/Myvue/flow' import Flow from '@/views/Myvue/flow'
import shrecord from '@/views/Myvue/examRecord' import shrecord from '@/views/Myvue/examRecord'
import drcbdj from "@/views/Myvue/drcbdj" import drcbdj from "@/views/Myvue/drcbdj"
import xxbg from "@/views/Myvue/infoChange" import xxbg from "@/views/Myvue/infoChange"
import infoChangep from "@/views/Myvue/infoChangep";
import Record from "@/views/Myvue/authRecord" import Record from "@/views/Myvue/authRecord"
import Newsupdata from "@/views/Myvue/newsupdata" import Newsupdata from "@/views/Myvue/newsupdata"
import drxxbg from "@/views/Myvue/drxxbg"; import drxxbg from "@/views/Myvue/drxxbg";
...@@ -27,16 +29,25 @@ import PayInfo from "@/views/Myvue/payInfo" ...@@ -27,16 +29,25 @@ import PayInfo from "@/views/Myvue/payInfo"
import application from "@/views/Myvue/application" import application from "@/views/Myvue/application"
import importByExcel from "@/views/Myvue/importByExcel" import importByExcel from "@/views/Myvue/importByExcel"
import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit" import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit"
import insuranceCancellationAuditp from "@/views/Myvue/insuranceCancellationAuditp"
import supPaymentAudit from "@/views/Myvue/supPaymentAudit" import supPaymentAudit from "@/views/Myvue/supPaymentAudit"
import supPaymentAuditp from "@/views/Myvue/supPaymentAuditp"
import traRelationsAudit from "@/views/Myvue/traRelationsAudit" import traRelationsAudit from "@/views/Myvue/traRelationsAudit"
import traRelationsAuditp from "@/views/Myvue/traRelationsAuditp"
import upgradeReoAudit from "@/views/Myvue/upgradeReoAudit" import upgradeReoAudit from "@/views/Myvue/upgradeReoAudit"
import upgradeReoAuditp from "@/views/Myvue/upgradeReoAuditp"
import interact from "@/views/Myvue/interact" import interact from "@/views/Myvue/interact"
import preView from "@/views/Myvue/preView" import preView from "@/views/Myvue/preView"
import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit"; import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit";
import treatmentApplicationAuditp from "@/views/Myvue/treatmentApplicationAuditp";
import drcbzx from "@/views/Myvue/drcbzx"; 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";
Vue.use(Router) Vue.use(Router)
...@@ -190,6 +201,21 @@ const router = new Router({ ...@@ -190,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
},
] ]
}, },
{ {
...@@ -201,12 +227,45 @@ const router = new Router({ ...@@ -201,12 +227,45 @@ const router = new Router({
path:"/authRecordphone", path:"/authRecordphone",
name:"认证记录", name:"认证记录",
component: authRecordphone component: authRecordphone
},{
path:"/tablep",
name:"tablep",
component: tablep
},{
path:"/insuredRegp",
name:"insuredRegp",
component: insuredRegp
},{
path:"/infoChangep",
name:"infoChangep",
component: infoChangep
},{
path:"/upgradeReoAuditp",
name:"upgradeReoAuditp",
component: upgradeReoAuditp
},
{
path:"/traRelationsAuditp",
name:"traRelationsAuditp",
component: traRelationsAuditp
},{
path:"/treatmentApplicationAuditp",
name:"treatmentApplicationAuditp",
component: treatmentApplicationAuditp
},{
path:"/insuranceCancellationAuditp",
name:"insuranceCancellationAuditp",
component: insuranceCancellationAuditp
},{
path:"/supPaymentAuditp",
name:"supPaymentAuditp",
component: supPaymentAuditp
}, },
{ {
path: '/404', path: '/404',
name: 'notFound', name: 'notFound',
component: NotFound component: NotFound
} },
] ]
}) })
......
xichongSys/src/views/Core/KtButton.vue
View file @ a6eb911b
...@@ -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 @ a6eb911b
...@@ -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/Intro/Intro.vue
View file @ a6eb911b
<template> <template>
<el-carousel :interval="100000000000000000" style="margin-top:30px;" align=center type="card" class="carousel" height="70vh" > <el-carousel :interval="3000" style="margin-top:30px;" align=center type="card" class="carousel" height="70vh" >
<el-carousel-item class="carousel-item-intro" style="width:85%; height:100%;position:absolute;left:-18%;"> <el-carousel-item class="carousel-item-intro" style="width:85%; height:100%;position:absolute;left:-18%;">
<div class="ddiv1"> <div class="ddiv1">
<div class="div1" height=100% :style="{width: '90%', height: '100%'}" id="echartContainer1"> <div class="div1" :style="{width: '90%', height: '90%'}" id="echartContainer1"></div>
</div> <div class="nextpage">
<div class="nextpage" style="margin-top:-50px">
<p style="display:none">{{count}}</p> <p style="display:none">{{count}}</p>
<el-button size="mini" class="gopagediv1" @click="goPageClick1"> 上一页</el-button> <el-button size="mini" class="gopagediv1" @click="goPageClick1"> 上一页</el-button>
<el-button size="mini" class="gopagediv1" @click="nextPageClick1"> 下一页</el-button> <el-button size="mini" class="gopagediv1" @click="nextPageClick1"> 下一页</el-button>
</div> </div>
</div> </div>
</el-carousel-item> </el-carousel-item>
<!-- <el-carousel-item class="carousel-item-func" style="width:85%;height:100%;position:absolute;left:-18%">
<el-carousel-item class="carousel-item-func" style="width:85%;height:100%;position:absolute;left:-18%">
<div class="ddiv2"> <div class="ddiv2">
<div class="div2" id="echartContainer2" ></div> <div class="div2" :style="{width: '90%', height: '90%'}" id="echartContainer2" ></div>
</div> <div class="nextpage">
<div class="nextpage"> <p style="display:none"></p>
<el-button size="mini" class="gopagediv1" @click="goPageClick2"> 上一页</el-button>
<el-button size="mini" class="gopagediv1" @click="nextPageClick2"> 下一页</el-button>
</div>
</div> </div>
</el-carousel-item> </el-carousel-item>
<el-carousel-item class="carousel-item-env" style="width:85%;height:100%;position:absolute;left:-18%;">
</el-carousel-item> -->
</el-carousel> </el-carousel>
</template> </template>
<script> <script>
import Axios from "axios"
import {baseUrl2} from "../../utils/global"
var echarts = require('echarts'); var echarts = require('echarts');
export default { export default {
components:{ components:{
...@@ -51,6 +57,7 @@ ...@@ -51,6 +57,7 @@
containLabel: true containLabel: true
}, },
xAxis: { xAxis: {
name:"数量",
type: 'value' type: 'value'
}, },
yAxis: { yAxis: {
...@@ -145,13 +152,15 @@ ...@@ -145,13 +152,15 @@
}, },
] ]
}, },
count: 1, count: 1,
chartdata:{ chartdata:{
chartnum:'', chartnum:'',
chartsize:'', chartsize:'',
}, },
total:'', total:'',
fycount:'',
fysize:10,
fynum:0,
echartrz:{ echartrz:{
title : { title : {
...@@ -167,19 +176,25 @@ ...@@ -167,19 +176,25 @@
legend: { legend: {
x:'center', x:'center',
top:'10%', top:'10%',
data: ['已认证', '未认证','认证比例'] data: ['已认证', '未认证','认证比例'],
selected: {
已认证:true,
未认证:true,
认证比例:false,
},
}, },
grid: { grid: {
top: '30%', top: '30%',
containLabel: true containLabel: true
}, },
xAxis: { xAxis: {
type: 'value' type: 'value',
name:"数量"
}, },
yAxis: { yAxis: {
type: 'category', type: 'category',
name:'乡镇名称', name:'乡镇名称',
data: ['周一','周二','周三','周四','周五','周六','周日'] data: []
}, },
series: [ series: [
{ {
...@@ -192,7 +207,7 @@ ...@@ -192,7 +207,7 @@
position: 'insideRight' position: 'insideRight'
} }
}, },
data: [320, 302, 301, 334, 390, 330, 320] data: []
}, },
{ {
name: '未认证', name: '未认证',
...@@ -204,7 +219,7 @@ ...@@ -204,7 +219,7 @@
position: 'insideRight' position: 'insideRight'
} }
}, },
data: [120, 132, 101, 134, 90, 230, 210] data: []
}, },
{ {
name: '认证比例', name: '认证比例',
...@@ -216,7 +231,7 @@ ...@@ -216,7 +231,7 @@
position: 'insideRight' position: 'insideRight'
} }
}, },
data: [0.56, 0.35, 0.91, 0.34, 0.9, 0.3, 0.31] data: []
}, },
] ]
}, },
...@@ -224,14 +239,79 @@ ...@@ -224,14 +239,79 @@
}, },
mounted(){ mounted(){
sessionStorage.setItem("zz",JSON.stringify(this.echartzz));
sessionStorage.setItem("lj",JSON.stringify(this.echartzz)); sessionStorage.setItem("rz",JSON.stringify(this.echartrz));
this.chartinfo(); this.chartinfo();
this.chart11(); this.chartCertification();
}, },
methods:{ methods:{
chart11(){ chartCertification(){
Axios.get(baseUrl2+'/chart/timingselect',{
})
.then(res => {
this.icount = res.data.obj.pagetotal;
res.data.obj.result.length=this.fysize;
for (var i = this.fynum ; i <res.data.obj.result.length ; i++) {
this.echartrz.yAxis.data.push(res.data.obj.result[i].townName+" ");
this.echartrz.series[0].data.push(res.data.obj.result[i].verified);
this.echartrz.series[1].data.push(res.data.obj.result[i].unverified);
this.echartrz.series[2].data.push(res.data.obj.result[i].rzl);
}
//console.log("分页linit"+this.fynum+","+this.fysize);
//console.log("首次=="+this.fynum+","+this.fysize+"/////"+res.data.obj.result.length+"总数"+this.icount)
let myChart1 = echarts.init(document.getElementById('echartContainer2'));
myChart1.setOption(this.echartrz);
/* myChart1.on('legendselectchanged',function (parms) {
var option = this.getOption();
alert(123)
})*/
console.log()
})
.catch(res => {
console.log('报错了');
});
},
goPageClick2(){
if(this.fynum==0){
this.$message.error('已经第一页了');
}else{
this.echartrz=JSON.parse(sessionStorage.getItem("rz"));
if(this.fysize==this.icount){
this.fysize=this.fynum;
this.fynum=this.fynum-10;
this.chartCertification();
// console.log("上一页linit"+this.fynum+","+this.fysize);
}else {
this.fysize = this.fysize-10;
this.fynum=this.fynum-10;
this.chartCertification();
// console.log("上一页linit"+this.fynum+","+this.fysize);
}
}
},
nextPageClick2(){
if(this.fysize<this.icount){
this.fysize = this.fysize+10;
this.fynum=this.fynum+10;
this.echartrz=JSON.parse(sessionStorage.getItem("rz"));
if(this.fysize>this.icount){
this.fysize=this.icount
// console.log("下一页linit"+this.fynum+","+this.fysize);
this.chartCertification();
}else{
// console.log("下一页linit"+this.fynum+","+this.fysize);
this.chartCertification();
}
}else{
this.$message.error('已经是最后一页了');
}
}, },
chartinfo(){ chartinfo(){
...@@ -250,53 +330,47 @@ ...@@ -250,53 +330,47 @@
this.total = res.data.pagetotal; this.total = res.data.pagetotal;
let myChart1 = echarts.init(document.getElementById('echartContainer1')); let myChart1 = echarts.init(document.getElementById('echartContainer1'));
myChart1.setOption(this.echartzz); myChart1.setOption(this.echartzz);
/* let myChart2 = echarts.init(document.getElementById('echartContainer2'));
myChart2.setOption(this.echartrz);*/
}).catch((res) => { }).catch((res) => {
console.log('报错了'); console.log('报错了');
}); });
}, },
nextPageClick1(){ nextPageClick1(){
this.count++; this.count++;
this.chartdata.chartnum = this.count; this.chartdata.chartnum = this.count;
this.chartdata.chartsize=10; this.chartdata.chartsize=10;
console.log(this.count); console.log(this.count);
if(this.total>(this.chartdata.chartnum-1)*this.chartdata.chartsize){ if(this.total>(this.chartdata.chartnum-1)*this.chartdata.chartsize){
this.echartzz=JSON.parse(sessionStorage.getItem("lj")); this.echartzz=JSON.parse(sessionStorage.getItem("zz"));
this.chartinfo(this.chartdata); this.chartinfo(this.chartdata);
}else { }else {
this.count--;
this.$message.error('已经是最后一页了'); this.$message.error('已经是最后一页了');
} }
}, },
goPageClick1(){ goPageClick1(){
this.count--; this.count--;
this.chartdata.chartnum = this.count; this.chartdata.chartnum = this.count;
this.chartdata.chartsize=10; this.chartdata.chartsize=10;
console.log(this.count); console.log(this.count);
if(this.count<1){ if(this.count<1){
this.count++;
this.$message.error('已经是第一页了'); this.$message.error('已经是第一页了');
}else{ }else{
this.echartzz=JSON.parse(sessionStorage.getItem("lj")); this.echartzz=JSON.parse(sessionStorage.getItem("zz"));
this.chartinfo(this.chartdata); this.chartinfo(this.chartdata);
} }
} }
}, },
} }
</script> </script>
<style> <style>
.carousel-item-intro { .carousel-item-intro {
background-color:#a3b3b965; background-color:#D9E0E1;
-webkit-border-radius: 25px; -webkit-border-radius: 25px;
border-radius: 25px; border-radius: 25px;
-moz-border-radius: 15px; -moz-border-radius: 15px;
...@@ -304,7 +378,7 @@ ...@@ -304,7 +378,7 @@
box-shadow: 0 0 25px #a3b3b965; box-shadow: 0 0 25px #a3b3b965;
} }
.carousel-item-func { .carousel-item-func {
background-color: #52c578; background-color: #D9E0E1;
-webkit-border-radius: 25px; -webkit-border-radius: 25px;
border-radius: 25px; border-radius: 25px;
-moz-border-radius: 15px; -moz-border-radius: 15px;
...@@ -312,7 +386,8 @@ ...@@ -312,7 +386,8 @@
box-shadow: 0 0 25px #a3b3b965; box-shadow: 0 0 25px #a3b3b965;
} }
.carousel-item-env { .carousel-item-env {
background-color: #41a7b9; /*background-color: #41a7b9;*/
background-color: #D9E0E1;
-webkit-border-radius: 25px; -webkit-border-radius: 25px;
border-radius: 25px; border-radius: 25px;
-moz-border-radius: 15px; -moz-border-radius: 15px;
...@@ -321,23 +396,17 @@ ...@@ -321,23 +396,17 @@
} }
.ddiv1{ .ddiv1{
margin: auto; margin: auto;
width: 90%;
height: 90%; height: 90%;
} }
.div1{ .div1{
height:65%; height:65%;
margin-top: 5%; margin-top: 5%;
} }
.ddiv2{ .ddiv2{
margin: auto; margin: auto;
height: 90%; height: 90%;
} }
.div2{ .div2{
height:65%; height:65%;
margin-top: 5%; margin-top: 5%;
} }
......
xichongSys/src/views/Login.vue
View file @ a6eb911b
...@@ -114,6 +114,7 @@ export default { ...@@ -114,6 +114,7 @@ export default {
} }
}, },
mounted() { mounted() {
this.$store.state.tab.mainTabs=[]
this.refreshCaptcha() this.refreshCaptcha()
}, },
computed:{ computed:{
......
xichongSys/src/views/Myvue/application.vue
View file @ a6eb911b
...@@ -366,10 +366,10 @@ export default { ...@@ -366,10 +366,10 @@ export default {
height: 100%; height: 100%;
margin-right: 20px margin-right: 20px
} }
.block img{ /*.block img{*/
width: auto; /* width: auto;*/
height: 300px; /* height: 300px;*/
} /*}*/
.imtil{ .imtil{
padding:0 0 20px 0 padding:0 0 20px 0
} }
......
xichongSys/src/views/Myvue/authRecordphone.vue
View file @ a6eb911b
...@@ -153,6 +153,9 @@ import Candode from "../Core/candode" ...@@ -153,6 +153,9 @@ import Candode from "../Core/candode"
},{ },{
value:"3", value:"3",
label:"未认证", label:"未认证",
},{
value:"4",
label:"今年未认证"
}], }],
//时间 //时间
time:"", time:"",
...@@ -215,20 +218,30 @@ import Candode from "../Core/candode" ...@@ -215,20 +218,30 @@ import Candode from "../Core/candode"
this.serchs(1) this.serchs(1)
}, },
serchs(p){ serchs(p){
var start=""
var start=""
var end="" var end=""
if(this.time){ var sta=""
var d=this.time[0] if(this.state==4){
var s=this.time[1] sta=3
console.log(d) start="2019-01-01"
var mon=(parseInt(d.getMonth()) + 1) end="2019-12-31"
var emon=(parseInt(s.getMonth()) + 1) }else{
start = d.getFullYear()+"-"+mon+"-"+d.getDate() start=""
end=""
}
// var start=""
// var end=""
// if(this.time){
// var d=this.time[0]
// var s=this.time[1]
// console.log(d)
// var mon=(parseInt(d.getMonth()) + 1)
// var emon=(parseInt(s.getMonth()) + 1)
// start = d.getFullYear()+"-"+mon+"-"+d.getDate()
end=s.getFullYear()+"-"+emon+"-"+s.getDate() // end=s.getFullYear()+"-"+emon+"-"+s.getDate()
} // }
console.log(this.townList) console.log(this.townList)
var data={ var data={
province_name:"四川省", province_name:"四川省",
...@@ -239,7 +252,7 @@ import Candode from "../Core/candode" ...@@ -239,7 +252,7 @@ import Candode from "../Core/candode"
town_name:this.townList[0], town_name:this.townList[0],
village_name:this.townList[1], village_name:this.townList[1],
iDCard:this.idcard, iDCard:this.idcard,
match_state:this.state, match_state:sta?sta:this.state,
begin_time:start, begin_time:start,
end_time:end, end_time:end,
siType:this.cblx, siType:this.cblx,
......
xichongSys/src/views/Myvue/examRecord.vue
View file @ a6eb911b
...@@ -107,7 +107,9 @@ ...@@ -107,7 +107,9 @@
<el-pagination <el-pagination
class="pone" class="pone"
:page-size='10' :page-size='10'
layout="total, prev, pager, next, jumper" :page-sizes="[10, 50, 100]"
@size-change="handleSizeChange"
layout="total, sizes, prev, pager, next, jumper"
:total="totals" :total="totals"
:current-page.sync="Page" :current-page.sync="Page"
@current-change="current_change" @current-change="current_change"
...@@ -164,6 +166,7 @@ ...@@ -164,6 +166,7 @@
return { return {
list:[], list:[],
pagesize:10,
name:"", name:"",
activities: [], activities: [],
options1: [], options1: [],
...@@ -177,6 +180,10 @@ ...@@ -177,6 +180,10 @@
} }
}, },
methods: { methods: {
handleSizeChange(val){
this.pagesize=val
this.serche(this.Page)
},
childByValue(val){ childByValue(val){
this.townList=val this.townList=val
}, },
...@@ -259,9 +266,13 @@ ...@@ -259,9 +266,13 @@
// return ''; // return '';
}, },
current_change(ss){ current_change(ss){
var data={ this.Page=ss
this.serche(ss)
},
serche(ss){
var data={
pageNum:ss, pageNum:ss,
pageSize:10, pageSize:this.pagesize,
idcard:this.idcard, idcard:this.idcard,
type:this.ywtype type:this.ywtype
} }
......
xichongSys/src/views/Myvue/importBaseInfoByExcel.vue 0 → 100644
View file @ a6eb911b
<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>
</tr>
</table>
<el-upload
style="margin-top: 10px"
class="upload-demo"
ref="upload1"
:action="baseInfoUrl"
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="submitUpload1"
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: "importBaseInfoByExcel",
data() {
return {
baseInfoUrl: baseUrl + "/baseInfo/importFromNewExcel",
myHeader: {
token: Cookies.get("token")
},
fileList: [],
dialogTitle: "",
dialogVisible: false,
dialogContent: "",
loading: false
};
},
methods: {
submitUpload1() {
this.$refs.upload1.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/importGrantInfoByExcel.vue 0 → 100644
View file @ a6eb911b
<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 @ a6eb911b
<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/Myvue/infoChangep.vue 0 → 100644
View file @ a6eb911b
This diff is collapsed.
xichongSys/src/views/Myvue/insuranceCancellationAuditp.vue 0 → 100644
View file @ a6eb911b
This diff is collapsed.
xichongSys/src/views/Myvue/insuredRegp.vue 0 → 100644
View file @ a6eb911b
This diff is collapsed.
xichongSys/src/views/Myvue/supPaymentAuditp.vue 0 → 100644
View file @ a6eb911b
This diff is collapsed.
xichongSys/src/views/Myvue/table.vue
View file @ a6eb911b
...@@ -20,7 +20,13 @@ ...@@ -20,7 +20,13 @@
<el-table <el-table
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange"
tooltip-effect="dark"
> >
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column <el-table-column
prop="idcard" prop="idcard"
label="身份证号" label="身份证号"
...@@ -90,16 +96,21 @@ ...@@ -90,16 +96,21 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="bottom">
<kt-button class="check" icon="el-icon-delete" label="删除已选" perms="sys:user:add" type="primary" />
<el-pagination <el-pagination
class="pone" class="pone"
:page-size='10' :page-size='10'
layout="total, prev, pager, next, jumper" :page-sizes="[10, 50, 100]"
layout="total, sizes, prev, pager, next, jumper"
:total="totals" :total="totals"
:current-page.sync="Page" :current-page.sync="Page"
@current-change="current_change" @current-change="current_change"
@size-change="handleSizeChange"
> >
</el-pagination> </el-pagination>
</div>
</div> </div>
</template> </template>
...@@ -124,8 +135,16 @@ ...@@ -124,8 +135,16 @@
.el-table .success-row { .el-table .success-row {
background: #f0f9eb; background: #f0f9eb;
} }
.bottom{
margin-top: 40px;
overflow: hidden;
}
.pone{ .pone{
margin-top: 40px margin-left: 250px;
float: left;
}
.check{
float: left;
} }
</style> </style>
...@@ -133,9 +152,11 @@ ...@@ -133,9 +152,11 @@
import CryptoJS from 'crypto-js' import CryptoJS from 'crypto-js'
import { Loading } from 'element-ui'; import { Loading } from 'element-ui';
import Candode from "../Core/candode" import Candode from "../Core/candode"
import KtButton from "@/views/Core/KtButton"
// import baseUrl from "../../globe/globeUrl" // import baseUrl from "../../globe/globeUrl"
export default { export default {
components:{ components:{
KtButton,
Candode Candode
}, },
data() { data() {
...@@ -148,10 +169,19 @@ ...@@ -148,10 +169,19 @@
idcard:"", idcard:"",
ywtype:"", ywtype:"",
info:'', info:'',
tableData: [] pageSize:10,
tableData: [],
multipleSelection: []
} }
}, },
methods: { methods: {
handleSelectionChange(val){
this.multipleSelection=val
},
handleSizeChange(val){
this.pageSize=val
this.serchh(this.Page)
},
childByValue(val){ childByValue(val){
this.townList=val this.townList=val
}, },
...@@ -223,9 +253,12 @@ ...@@ -223,9 +253,12 @@
}, },
current_change(ss){ current_change(ss){
var data={ this.serchh(ss)
},
serchh(ss){
var data={
pageNum:ss, pageNum:ss,
pageSize:10, pageSize:this.pageSize,
idcard:this.idcard, idcard:this.idcard,
type:this.ywtype type:this.ywtype
} }
......
xichongSys/src/views/Myvue/tablep.vue 0 → 100644
View file @ a6eb911b
This diff is collapsed.
xichongSys/src/views/Myvue/traRelationsAuditp.vue 0 → 100644
View file @ a6eb911b
This diff is collapsed.
xichongSys/src/views/Myvue/treatmentApplicationAuditp.vue 0 → 100644
View file @ a6eb911b
This diff is collapsed.
xichongSys/src/views/Myvue/upgradeReoAuditp.vue 0 → 100644
View file @ a6eb911b
This diff is collapsed.
xichongSys/src/views/Sys/Dict.vue
View file @ a6eb911b
...@@ -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>
<!--新增编辑界面--> <!--新增编辑界面-->
......
xichongSys/src/views/Sys/Role.vue
View file @ a6eb911b
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
<el-form-item label="角色名" prop="name"> <el-form-item label="角色名" prop="name">
<el-input v-model="dataForm.name" auto-complete="off"></el-input> <el-input v-model="dataForm.name" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
<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-item label="签章" prop="seal" align="left" style="height: 80px"> <el-form-item label="签章" prop="seal" align="left" style="height: 80px">
<el-popover <el-popover
v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr !== ''" v-if="typeof(dataForm.sealStr) !== 'undefined' && dataForm.sealStr !== null && dataForm.sealStr !== ''"
...@@ -176,7 +176,7 @@ export default { ...@@ -176,7 +176,7 @@ export default {
this.dataForm = { this.dataForm = {
id: 0, id: 0,
name: '', name: '',
remark: '', remark: this.name,
seal: '', seal: '',
sealStr: '', sealStr: '',
} }
...@@ -195,6 +195,7 @@ export default { ...@@ -195,6 +195,7 @@ export default {
if (valid) { if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => { this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.editLoading = true this.editLoading = true
this.dataForm.remark = this.dataForm.name;
console.log(this.dataForm); console.log(this.dataForm);
let params = Object.assign({}, this.dataForm) let params = Object.assign({}, this.dataForm)
this.$api.role.save(params).then((res) => { this.$api.role.save(params).then((res) => {
......
xichongSys/src/views/Sys/User.vue
View file @ a6eb911b
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
], ],
password: [ password: [
{ required: true, message: '请输入密码', trigger: 'blur'}, { required: true, message: '请输入密码', trigger: 'blur'},
{ pattern: /^[\w_-]{6,18}$/, message: '密码必须为6至18位', trigger: 'blur'} // { pattern: /^[\w_-]{6,18}$/, message: '密码必须为6至18位', trigger: 'blur'}
], ],
}, },
// 新增编辑界面数据 // 新增编辑界面数据
......
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