Skip to content

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

Merge branch 'master' into 'dev' 

# Conflicts:
#   xichongSys/src/http/moudules/getlist.js
#   xichongSys/src/utils/global.js
#   xichongSys/src/views/Sys/User.vue
parents de06992f 47149dc8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1548 additions and 186 deletions
xichongSys/src/http/moudules/getlist.js
View file @ bc8b5c35
......@@ -177,3 +177,11 @@ export const updatePassword = (data)=>{
data
})
}
export const getTown = () => {
return axios({
url: '/dept/findTreeByUser',
method: 'get',
})
}
//
xichongSys/src/router/index.js
View file @ bc8b5c35
......@@ -28,6 +28,9 @@ import application from "@/views/Myvue/application"
import importByExcel from "@/views/Myvue/importByExcel"
import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit"
import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit"
import supPaymentAudit from "@/views/Myvue/supPaymentAudit"
import traRelationsAudit from "@/views/Myvue/traRelationsAudit"
import upgradeReoAudit from "@/views/Myvue/upgradeReoAudit"
Vue.use(Router)
......@@ -141,7 +144,22 @@ const router = new Router({
path:"/insuranceCancellationAudit",
name:"参保注销审核",
component: insuranceCancellationAudit
}
},
{
path:"/supPaymentAudit",
name:"补缴保费审核",
component: supPaymentAudit
},
{
path:"/upgradeReoAudit",
name:"升档改办审核",
component: upgradeReoAudit
},
{
path:"/traRelationsAudit",
name:"关系转移审核",
component: traRelationsAudit
},
]
},
{
......
xichongSys/src/views/Core/KtTable.vue
View file @ bc8b5c35
......@@ -65,11 +65,11 @@ export default {
},
maxHeight: { // 表格最大高度
type: Number,
default: 420
default: 620
},
height: { // 表格最大高度
type: Number,
default: 250
default: 450
},
showOperation: { // 是否显示操作组件
type: Boolean,
......
xichongSys/src/views/Core/candode.vue 0 → 100644
View file @ bc8b5c35
<template>
<div>
<div class="block">
<el-cascader
:props="{ checkStrictly: true }"
clearable
placeholder="请选择镇村"
v-model="value"
:options="options"
size="mini"
@change="handleChange"></el-cascader>
</div>
</div>
</template>
<script>
export default {
data() {
return {
value: [],
options:[]
};
},
methods: {
handleChange(value) {
this.$emit('childByValue', value)
},
},
created(){
this.$api.getlist.getTown().then((res) => {
this.options=res.data
console.log(res.data)
}).catch((res) => {
})
}
};
</script>
\ No newline at end of file
xichongSys/src/views/Myvue/examRecord.vue
View file @ bc8b5c35
......@@ -64,7 +64,7 @@
prop="nowExamine"
label="当前状态">
</el-table-column>
<el-table-column
<el-table-column
width="180"
label="操作">
<template slot-scope="scope">
......@@ -119,10 +119,10 @@
.op{
display: flex;
align-items: center;
}
.idc{
width: 200px
}
.nam{
......@@ -154,7 +154,7 @@
// import baseUrl from "../../globe/globeUrl"
export default {
data() {
return {
list:[],
name:"",
......@@ -172,13 +172,13 @@
methods: {
//搜索
serch(){
var data={
idcard:this.idcard?this.Encrypt(this.idcard):"",
recordType:this.ywtype?parseInt(this.ywtype):"",
townName:'',
villageName:''
}
this.$api.getlist.record(data).then((res) => {
for(var i in res.data.list){
......@@ -186,15 +186,15 @@
res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
}
this.tableData=res.data.list
this.totals=res.data.total
this.page=res.data.total.pageNum
}).catch((res) => {
});
},
//流程
......@@ -215,8 +215,8 @@
size: 'large'
})
}else{
if(res.data[i].examineState=="审核失败"){
this.activities.push({
content:res.data[i].role+":"+"审核失败",
......@@ -268,7 +268,7 @@
res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
}
this.tableData=res.data.list
......@@ -292,7 +292,7 @@
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
show:false
}
})
......@@ -311,21 +311,21 @@
}
})
}else if(d.recordtype=="待遇申请"){
sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"待遇申请审核",
params:{info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:false
}
})
}
sessionStorage.setItem("recordId", this.tableData[s].recordId)
this.$router.push({
name: "待遇申请审核",
params: {
info: this.tableData[s].info,
bankpic: this.tableData[s].bankpic,
idcardbackpic: this.tableData[s].idcardbackpic,
idcardfrontpic: this.tableData[s].idcardfrontpic,
signpic: this.tableData[s].signpic,
specialPhotoPic: this.tableData[s].specialPhotoPic,
bookPic: this.tableData[s].bookPic,
show: false
}
})
}
},
handleDelete(g,h){
console.log(g)
......@@ -356,7 +356,7 @@
return decrypted.toString(CryptoJS.enc.Utf8);
}
},
created(){
for(var i=1;i<=7;i++){
this.options1.push({
......@@ -382,7 +382,7 @@
var data={
idcard:'',
recordType:''
}
this.$api.getlist.record(data).then((res) => {
let loadingInstance = Loading.service();
......@@ -394,13 +394,13 @@
res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
}
this.tableData=res.data.list
this.totals=res.data.total
this.page=res.data.total.pageNum
}).catch((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
......@@ -424,8 +424,8 @@
// that.tableData=res.data.list
// that.totals=res.data.total
// that.page=res.data.total.pageNum
// }
// })
}
......
xichongSys/src/views/Myvue/supPaymentAudit.vue 0 → 100644
View file @ bc8b5c35
This diff is collapsed.
xichongSys/src/views/Myvue/table.vue
View file @ bc8b5c35
......@@ -4,6 +4,7 @@
<div class="idc">
<el-input v-model="idcard" size="mini" placeholder="请输入身份证号"></el-input>
</div>
<Candode v-on:childByValue="childByValue"></Candode>
<div class="ywtyoe">
<el-select v-model="ywtype" placeholder="请选择业务类型" size="mini">
<el-option
......@@ -131,37 +132,38 @@
<script>
import CryptoJS from 'crypto-js'
import { Loading } from 'element-ui';
import Candode from "../Core/candode"
// import baseUrl from "../../globe/globeUrl"
export default {
components:{
Candode
},
data() {
return {
townList:'',
activities: [],
options1: [{
value: '1',
label: '参保登记'
}, {
value: '2',
label: '信息变更'
}, {
value: '3',
label: '待遇申请'
}],
options1: [],
Page:1,
totals:0,
idcard:"",
ywtype:"",
info:'',
ywtype:'',
tableData: []
}
},
methods: {
childByValue(val){
this.townList=val
},
//搜索
serch(){
var data={
idcard:this.idcard?this.Encrypt(this.idcard):"",
recordType:this.ywtype?parseInt(this.ywtype):""
recordType:this.ywtype?parseInt(this.ywtype):"",
townName: this.townList?this.townList[0]:'',
villageName:this.townList?this.townList[1]:'',
}
this.$api.getlist.getlist(data).then((res) => {
......@@ -171,7 +173,7 @@
var d=new Date(res.data.list[i].createtime)
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+" "+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=res.data.list[i].recordtype==1?"参保登记":res.data.list[i].recordtype==2?"信息变更":res.data.list[i].recordtype==3?"待遇申请":res.data.list[i].recordtype==4?"参保注销":""
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
}
this.tableData=res.data.list
this.totals=res.data.total
......@@ -187,7 +189,7 @@
this.activities=[]
var data={
recordId:s.id,
type:s.recordtype=="参保登记"?1:s.recordtype=="信息变更"?2:s.recordtype=="待遇申请"?3:s.recordtype=="参保注销"?4:''
type:this.regetType(s.recordtype)
}
this.$api.getlist.progress(data).then((res)=>{
for(var i in res.data){
......@@ -241,7 +243,8 @@
res.data.list[i].idcard=this.decrypt(res.data.list[i].idcard)
res.data.list[i].name=this.decrypt(res.data.list[i].name)
var d=new Date(res.data.list[i].createtime)
res.data.list[i].createtime=d.getFullYear()+"-"+d.getMonth() + 1+"-"+d.getDate()+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
var mon=(parseInt(d.getMonth()) + 1)
res.data.list[i].createtime=d.getFullYear()+"-"+mon+"-"+d.getDate()+d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
res.data.list[i].recordtype=this.getType(res.data.list[i].recordtype)
}
this.tableData=res.data.list
......@@ -284,34 +287,94 @@
show:true
}
})
}else if(d.recordtype=="待遇申请"){
sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"待遇申请审核",
params:{info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:true
}
})
} else if(d.recordtype=="参保注销") {
sessionStorage.setItem("recordId",this.tableData[s].recordId)
}else if(d.recordtype === "待遇申请"){
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"待遇申请审核",
params:{
treApp: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:true
}
}
})
} else if(d.recordtype === "参保注销") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"参保注销审核",
params:{
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:true
insCan: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:true
}
}
})
} else if(d.recordtype === "补缴保费") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"补缴保费审核",
params:{
supPay: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:true
}
}
})
} else if(d.recordtype === "升档改办") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"升档改办审核",
params:{
upgReo: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:true
}
}
})
} else if(d.recordtype === "关系转移") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"关系转移审核",
params:{
traRel: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:true
}
}
})
}
......@@ -347,8 +410,13 @@
},
created(){
Loading.service();
for(var i=1;i<=7;i++){
this.options1.push({
label:this.getType(i),
value:i
})
}
var data={
idcard:'',
recordType:''
......
xichongSys/src/views/Myvue/traRelationsAudit.vue 0 → 100644
View file @ bc8b5c35
This diff is collapsed.
xichongSys/src/views/Myvue/treatmentApplicationAudit.vue
View file @ bc8b5c35
......@@ -11,10 +11,10 @@
<el-input v-model="form.identity_number"></el-input>
</el-form-item>
<el-form-item label="领取账号">
<el-input placeholder="该框暂无对应字段，请联系开发人员"></el-input>
<el-input v-model="form.bank_Account"></el-input>
</el-form-item>
<el-form-item label="户籍地地址">
<el-input placeholder="该框暂无对应字段，请联系开发人员"></el-input>
<el-input v-model="form.address"></el-input>
</el-form-item>
</el-form>
<el-form ref="form" :model="form" class="form" label-width="auto">
......@@ -22,7 +22,7 @@
<el-input v-model="form.sex"></el-input>
</el-form-item>
<el-form-item label="缴费年限">
<el-input placeholder="该框暂无对应字段，请联系开发人员"></el-input>
<el-input v-model="form.payNum"></el-input>
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="form.telphoneValue"></el-input>
......@@ -37,18 +37,18 @@
<div class="masks"></div>
<el-form ref="form" :model="form" class="form" label-width="auto">
<el-form-item label="个人缴费">
<el-input v-model="form.mon_annuityPre"></el-input>
<el-input v-model="form.payTotalMoney"></el-input>
</el-form-item>
<el-form-item label="财政补贴">
<el-input v-model="form.mon_annuityGov"></el-input>
<el-input v-model="form.benefits"></el-input>
</el-form-item>
<el-form-item label="个人账户积累额">
<el-input v-model="form.payTotalMoney"></el-input>
<el-input v-model="form.account_balance"></el-input>
</el-form-item>
</el-form>
<el-form ref="form" :model="form" class="form" label-width="auto">
<el-form-item label="集体补助">
<el-input placeholder="该框暂无对应字段，请联系开发人员"></el-input>
<el-input v-model="form.collectivePercent"></el-input>
</el-form-item>
<el-form-item label="利息">
<el-input v-model="form.interest"></el-input>
......@@ -131,7 +131,12 @@
mon_annuityGov: "",
mon_annuity: "",
interest: "",
payTotalMoney: ""
payTotalMoney: "",
collectivePercent: 0,
bank_Account: "",
address: "",
payNum: "",
benefits: "",
},
urls: [],
}
......@@ -145,7 +150,7 @@
}).then(() => {
Loading.service();
var data = {
recordId: sessionStorage.getItem("recordId"),
recordId: this.$route.params.treApp.recordId,
examineState: 1,
remark: "",
userId: 1
......@@ -169,9 +174,18 @@
message: res.message
});
}
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "待遇申请审核 ") {
closeAll[j].click();
return;
}
}
}).catch((res) => {
console.log("进入catch: " + res);
let loadingInstance = Loading.service();
that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
this.$message({
......@@ -188,7 +202,7 @@
},
//审核不通过
nopass() {
var that = this
// let that = this;
this.$prompt('请输入原因', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -196,7 +210,7 @@
if (value) {
Loading.service();
var data = {
recordId: sessionStorage.getItem("recordId"),
recordId: this.$route.params.treApp.recordId,
examineState: 2,
remark: value,
userId: 1
......@@ -220,6 +234,14 @@
message: res.message
});
}
// 关闭当前标签
let closeAll = document.querySelectorAll(".el-icon-close");
for(let j = 0, len = closeAll.length; j < len; j++) {
if (closeAll[j].previousSibling.innerText === "待遇申请审核 ") {
closeAll[j].click();
return;
}
}
}).catch((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
......@@ -232,10 +254,10 @@
});
} else {
let loadingInstance = Loading.service();
that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
loadingInstance.close();
});
that.$message({
this.$message({
type: 'info',
message: '请输入原因'
});
......@@ -264,16 +286,16 @@
}
},
created() {
this.show = this.$route.params.show;
if (this.$route.params.info) {
sessionStorage.setItem("info", this.$route.params.info);
var a = JSON.stringify(this.$route.params);
sessionStorage.setItem("items", a);
if (typeof(this.$route.params.treApp) !== "undefined" && this.$route.params.treApp.info) {
this.show = this.$route.params.treApp.show;
sessionStorage.setItem("treAppInfo", this.$route.params.treApp.info);
sessionStorage.setItem("treAppItems", JSON.stringify(this.$route.params.treApp));
}
this.form = JSON.parse(sessionStorage.getItem("info"));
this.form = JSON.parse(sessionStorage.getItem("treAppInfo"));
this.form.name = this.decrypt(this.form.name);
this.form.identity_number = this.decrypt(this.form.identity_number);
var obj = JSON.parse(sessionStorage.getItem("items"));
this.form.telphoneValue = this.decrypt(this.form.telphoneValue);
var obj = JSON.parse(sessionStorage.getItem("treAppItems"));
if (obj.bankpic) {
this.bb = true;
this.itmebs = "银行卡";
......
xichongSys/src/views/Myvue/upgradeReoAudit.vue 0 → 100644
View file @ bc8b5c35
This diff is collapsed.
xichongSys/src/views/Sys/User.vue
View file @ bc8b5c35
......@@ -36,7 +36,7 @@
</table-column-filter-dialog>
</div>
<!--表格内容栏-->
<kt-table :height="350" permsEdit="sys:user:edit" permsDelete="sys:user:delete"
<kt-table :height="550" permsEdit="sys:user:edit" permsDelete="sys:user:delete"
:data="pageResult" :columns="filterColumns"
@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete">
</kt-table>
......@@ -48,7 +48,7 @@
<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" readonly="true"></el-input>
<el-input v-if="!operation" v-model="dataForm.name" auto-complete="off" readonly></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">
......@@ -57,7 +57,10 @@
<el-form-item label="密码" prop="password">
<el-input v-model="dataForm.password" type="password" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="机构" prop="deptName">
<el-form-item label="身份证" prop="bangIdcard">
<el-input v-model="dataForm.bangIdcard" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="机构" prop="deptId">
<el-cascader
ref="deptTree"
v-model="dataForm.deptId"
......@@ -80,7 +83,7 @@
<el-form-item label="手机" prop="mobile">
<el-input v-model="dataForm.mobile" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="角色" prop="userRoles" v-if="!operation">
<el-form-item label="角色" prop="userRoles">
<el-select v-model="dataForm.userRoles" multiple placeholder="请选择"
style="width: 100%;">
<el-option v-for="item in roles" :key="item.id"
......@@ -88,6 +91,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="职务" prop="job">
<el-input v-model="dataForm.job" auto-complete="off"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :size="size" @click.native="dialogVisible = false" @click="cancelRules('dataForm')">{{$t('action.cancel')}}</el-button>
......@@ -132,6 +138,9 @@ export default {
],
truename: [
{ required: true, message: '请输入真实姓名', trigger: 'blur' }
],
deptId: [
{ required: true, message: '请选择机构', trigger: 'change'}
]
},
// 新增编辑界面数据
......@@ -140,10 +149,12 @@ export default {
name: '',
truename:'',
password: '',
bangIdcard: '',
deptId: '',
deptName: '',
email: '',
mobile: '',
job: '',
status: 1,
userRoles: []
},
......@@ -152,7 +163,8 @@ export default {
label: 'name',
children: 'children'
},
roles: []
roles: [],
dParentId: '',
}
},
methods: {
......@@ -187,10 +199,12 @@ export default {
id: 0,
name: '',
password: '',
deptId: 1,
bangIdcard: '',
deptId: '',
deptName: '',
email: '',
mobile: '',
job: '',
status: 1,
userRoles: []
}
......@@ -200,6 +214,20 @@ export default {
this.dialogVisible = true
this.operation = false
this.dataForm = Object.assign({}, params.row)
this.treeData(this.list, this.dataForm.deptId);
let deptId = [];
deptId.push(1);
if (this.dParentId > 1) {
deptId.push(this.dParentId);
}
if (this.dataForm.deptId !== 1) {
deptId.push(this.dataForm.deptId);
}
console.log(deptId);
this.dataForm.deptId = deptId;
// for (let i=0;i<this.list.length;i++) {
// console.log(this.list[i]);
// }
let userRoles = []
for(let i=0,len=params.row.userRoles.length; i<len; i++) {
userRoles.push(params.row.userRoles[i].roleId)
......@@ -208,6 +236,7 @@ export default {
},
// 编辑
submitForm: function () {
console.log(this.dataForm);
this.$refs.dataForm.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
......@@ -285,7 +314,8 @@ export default {
this.columns = [
{prop:"id", label:"ID", minWidth:50},
{prop:"name", label:"用户名", minWidth:100},
{prop:"truename", label:"真实姓名", minWidth:80},
{prop:"truename", label:"真实姓名", minWidth:80},
{prop:"idCard", label:"身份证", minWidth:100},
{prop:"deptName", label:"机构", minWidth:100},
{prop:"roleNames", label:"角色", minWidth:80},
{prop:"job", label:"职务", minWidth:80},
......@@ -298,8 +328,20 @@ export default {
]
this.filterColumns = JSON.parse(JSON.stringify(this.columns));
       },
// 清空验证的提示信息
cancelRules: function (formName) {
this.$refs[formName].resetFields();
},
treeData: function (tree, deptId) {
for(let i in tree){
if (tree[i].id === deptId) {
this.dParentId = tree[i].parentId;
return;
}
if (tree[i].children) {
this.treeData(tree[i].children, deptId);
}
}
}
},
mounted() {
......
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