Skip to content

C
cloud-platform-ui
Commit 5dcbfecd authored by guoyou's avatar guoyou
Browse files
Options

用户列表

parent 98fda56f
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 40 deletions
src/views/interior/employeesInput.vue
View file @ 5dcbfecd
......@@ -258,12 +258,12 @@
<div v-if="isShow == 4">
<el-form :model="amendCompany" ref="amendCompany" label-width="80px">
<el-form-item label="修改原因" style="width:80%">
<el-radio-group v-model="amendCompany.changeStatus" prop="changeStatus">
<el-radio-button label="3">人事调动</el-radio-button>
<el-radio-button label="2">信息修改</el-radio-button>
<el-radio-group v-model="amendStatus" prop="changeStatus">
<el-radio-button label="0">人事调动</el-radio-button>
<el-radio-button label="1">信息修改</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="调动日期" v-show="amendCompany.changeStatus == 3" prop="relTime">
<el-form-item label="调动日期" v-show="amendStatus == 0" prop="relTime">
<el-date-picker v-model="amendCompany.relTime" type="datetime" placeholder="选择日期时间"></el-date-picker>
</el-form-item>
<el-form-item label="分公司" prop="companyId">
......@@ -403,12 +403,11 @@ export default {
position:{
relTime: null, //修改时间
jobId:null,//职位
},
loading:true,
amendStatus:0,//0人事调动 1信息修改
//修改分公司
amendCompany: {
changeStatus: 3,
companyId: null, //公司id
relTime: null //修改时间
},
......@@ -486,7 +485,6 @@ export default {
this.amendContent = '修改所属公司'
this.isShow = val
this.amendCompany= {
changeStatus: 3,
companyId: null, //公司id
relTime: null //修改时间
}
......@@ -517,7 +515,7 @@ export default {
if (!this.amendCompany.companyId) {
this.$message('分公司不能为空')
return false
} else if (this.amendCompany.changeStatus == 3) {
} else if (this.amendStatus == 0) {
if (!this.amendCompany.relTime) {
this.$message('调动日期不能为空')
return false
......@@ -527,24 +525,20 @@ export default {
this.amendCompany.companyName = name[0].name
this.amendCompany.jobId = this.staffTitleFrom.jobId
this.amendCompany.positionId = this.staffTitleFrom.positionId
this.amendCompany.changeStatus = 4
this.amendCompany.isQuit = this.staffTitleFrom.isQuit == '在职' ? 0 : 1
this.setApi(this.amendCompany)
}
} else {
//信息修改
let params = {};
let name = this.companyList.filter(item => item.id == this.amendCompany.companyId)
console.log(name)
params.companyName = name[0].name
params.companyId = name[0].id
params.positionId = this.staffTitleFrom.positionId
// params.isQuit = this.staffTitleFrom.isQuit == '在职' ? 0 : 1
// params.changeStatus = 2
// params.jobId = this.staffTitleFrom.jobId
params.name = this.staffTitleFrom.name
params.phone = this.staffTitleFrom.phone
params.id = this.staffTitleFrom.id
console.log(params)
// this.setApi(this.amendCompany)
editorUpd(params).then(data=>{
if (data.status == 200) {
this.$message.success('编辑成功')
......@@ -574,7 +568,7 @@ export default {
},
//身份修改
amendIdentityBtn() {
this.amendIdentity.changeStatus = 2
this.amendIdentity.changeStatus = 3
if (!this.amendIdentity.positionId || !this.amendIdentity.relTime ) {
this.$message('身份和变更日期不能为空')
return false
......@@ -604,27 +598,30 @@ export default {
this.isJobForm.jobId = this.staffTitleFrom.jobId
if(val == '离职时间'){
this.setApi(this.isJobForm)
}else{
let params = {}
params.phone = this.staffTitleFrom.phone
params.id = this.staffTitleFrom.id
params.companyName = this.staffTitleFrom.companyName
params.positionId = this.staffTitleFrom.positionId
params.companyId = this.staffTitleFrom.companyId
params.isQuit = 0
params.changeStatus = 2
params.jobId = this.staffTitleFrom.jobId
params.name = this.staffTitleFrom.name
updAddPositionChangeRecord(params).then(data=>{
if (data.status == 200) {
this.$message.success('编辑成功')
this.amendPop = false;
this.bulkUploadMember = false
this.getList()
}else{
this.$message.error(data.message)
}
})
}else{//复职
this.isJobForm.isQuit = 2
this.isJobForm.changeStatus = 6
this.setApi(this.isJobForm)
// let params = {}
// params.phone = this.staffTitleFrom.phone
// params.id = this.staffTitleFrom.id
// params.companyName = this.staffTitleFrom.companyName
// params.positionId = this.staffTitleFrom.positionId
// params.companyId = this.staffTitleFrom.companyId
// params.isQuit = 0
// params.changeStatus = 6
// params.jobId = this.staffTitleFrom.jobId
// params.name = this.staffTitleFrom.name
// updAddPositionChangeRecord(params).then(data=>{
// if (data.status == 200) {
// this.$message.success('编辑成功')
// this.amendPop = false;
// this.bulkUploadMember = false
// this.getList()
// }else{
// this.$message.error(data.message)
// }
// })
}
}
},
......
src/views/userManagement/userList/index.vue
View file @ 5dcbfecd
......@@ -92,7 +92,7 @@
</el-table-column>
<el-table-column width="110" align="center" label="注册终端">
<template scope="scope">
<span>{{scope.row.channel}}</span>
<span>{{scope.row.channel == 1 ? 'app' : scope.row.channel == 2 ? '小程序' : 'ios'}}</span>
</template>
</el-table-column>
<el-table-column width="90" align="center" label="来源">
......@@ -148,9 +148,9 @@
<el-button size="small" class="el-button el-button--text el-button--small" @click="viewDetails(scope.row)">
查看详情
</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" v-if="admin_btn_user_postion_put"
<!-- <el-button size="small" class="el-button el-button--text el-button--small" v-if="admin_btn_user_postion_put"
@click="peopleSetting(scope.row)">身份设置
</el-button>
</el-button> -->
<el-button class="el-button el-button--text el-button--small" v-if="scope.row.status!=1&&userList_btn_edit"
size="small" @click=" setMember(scope.row)">设置会员信息
</el-button>
......@@ -1127,7 +1127,7 @@
listKey.lastTime = listKey.lastTime ? timestamp2Date(listKey.lastTime) : '';
listKey.createTime = listKey.createTime ? timestamp2Date(listKey.createTime * 1000) : '';
listKey.buyCount = listKey.buyCount ? listKey.buyCount : 0;
listKey.channel = this.terminal[listKey.channel];
// listKey.channel = this.terminal[listKey.channel];
listKey.source = this.source[listKey.source];
listKey.validTime = listKey.validTime ? ((listKey.validTime == 0) ? '永久' : listKey.validTime) : '无';
listKey.visible2 = false
......
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