Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen
This commit is contained in:
commit
63c1f98de0
|
|
@ -70,6 +70,21 @@
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="账户时效" prop="isPermanent">
|
||||||
|
<el-select
|
||||||
|
v-model="queryParams.isPermanent"
|
||||||
|
placeholder="用户状态"
|
||||||
|
clearable
|
||||||
|
style="width: 240px"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="dict in dict.type.sys_user_permanent"
|
||||||
|
:key="dict.value"
|
||||||
|
:label="dict.label"
|
||||||
|
:value="dict.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="创建时间">
|
<el-form-item label="创建时间">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="dateRange"
|
v-model="dateRange"
|
||||||
|
|
@ -240,11 +255,10 @@
|
||||||
v-if="columns[6].visible"
|
v-if="columns[6].visible"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.photoUrl" style="color: #1890ff;cursor: pointer;" @click="openImg(scope.row)">查看</span>
|
<img :src="scope.row.photoUrl" v-if="scope.row.photoUrl" alt="" style="width: 60px;height: 60px;" @click="openImg(scope.row)">
|
||||||
<span v-else>无</span>
|
<span v-else>无</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column label="账号时效" align="center">
|
<el-table-column label="账号时效" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{
|
<span>{{
|
||||||
|
|
@ -819,6 +833,7 @@ export default {
|
||||||
userName: undefined,
|
userName: undefined,
|
||||||
phonenumber: undefined,
|
phonenumber: undefined,
|
||||||
status: undefined,
|
status: undefined,
|
||||||
|
isPermanent: undefined,
|
||||||
deptId: undefined,
|
deptId: undefined,
|
||||||
},
|
},
|
||||||
// 列信息
|
// 列信息
|
||||||
|
|
@ -1142,12 +1157,15 @@ export default {
|
||||||
this.$set(this.form, 'postIds', response.postIds)
|
this.$set(this.form, 'postIds', response.postIds)
|
||||||
this.$set(this.form, 'roleIds', response.roleIds)
|
this.$set(this.form, 'roleIds', response.roleIds)
|
||||||
// console.log(store.getters.face)
|
// console.log(store.getters.face)
|
||||||
if(response.data.photoUrl){
|
if(response.data.photoUrl&&response.data.photoUrl!=''){
|
||||||
this.fileList=[{url:response.data.photoUrl}]
|
this.fileList=[{url:response.data.photoUrl}]
|
||||||
|
this.checkUrlList=[response.data.photoUrl]
|
||||||
|
this.checkUrlNameList = []
|
||||||
}else{
|
}else{
|
||||||
this.fileList=[]
|
this.fileList=[]
|
||||||
}
|
this.checkUrlList=[]
|
||||||
this.checkUrlList=[response.data.photoUrl]
|
this.checkUrlNameList = []
|
||||||
|
}
|
||||||
this.open = true
|
this.open = true
|
||||||
this.title = '修改用户'
|
this.title = '修改用户'
|
||||||
this.form.password = ''
|
this.form.password = ''
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue