Skip to content

C
cloud-platform-ui
Commit 50cb5450 authored by lixy's avatar lixy
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

parents 2da5bd5f cde4c848
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 30 deletions
src/api/admin/group/index.js
View file @ 50cb5450
......@@ -130,4 +130,10 @@ export function getAppUserGroups(id) {
});
}
export function getGroups() {
return fetch({
url: '/api/admin/group/getGroups',
method: 'get'
});
}
src/api/admin/userManagement/index.js
View file @ 50cb5450
......@@ -58,3 +58,15 @@ export function delMemberObj(id) {
});
}
/**
* 用户列表-删除
* @param id
*/
export function deleteUser(id) {
return fetch({
url: '/api/admin/appUsersManage/deleteById/' + id,
method: 'delete'
});
}
src/router/index.js
View file @ 50cb5450
......@@ -120,7 +120,7 @@ export const asyncRouterMap = [{
path: 'userManager',
icon: 'fa-user',
component: _import('admin/user/index'),
name: '用户管理',
name: '后台用户管理',
authority: 'userManager'
}, {
path: 'appUserManager',
......@@ -336,12 +336,12 @@ export const asyncRouterMap = [{
name: '车辆保养记录',
authority: 'vehicleUpkeepLog'
},
{
path: 'vehicleSchedulManage',
component: _import('vehicle/vehicleSchedulManage/index'),
name: '车辆排班管理',
authority: 'vehicleSchedulManage'
}
// {
// path: 'vehicleSchedulManage',
// component: _import('vehicle/vehicleSchedulManage/index'),
// name: '车辆排班管理',
// authority: 'vehicleSchedulManage'
// }
]
},
{
......
src/views/admin/user/index.vue
View file @ 50cb5450
......@@ -64,26 +64,29 @@
</el-radio-group>
</el-form-item>
<el-form-item label="所属片区" prop="zoneId">
<el-select class="filter-item" v-model="form.zoneId" placeholder="请选择">
<el-select class="filter-item" v-model="form.zoneId" clearable placeholder="请选择" @change="getProvinceRegions">
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="所属分公司" prop="companyId">
<el-autocomplete
class="inline-input"
v-model="form.state2"
:fetch-suggestions="querySearch"
placeholder="请输入内容"
@select="handleSelect1"
></el-autocomplete>
<!--<el-select class="filter-item" v-model="form.companyId" placeholder="请选择分公司">-->
<!--<el-option v-for="item in allCompanies" :key="item.id" :label="item.name" :value="item.id"> </el-option>-->
<!--</el-select>-->
<!-- <el-autocomplete-->
<!-- class="inline-input"-->
<!-- v-model="form.state2"-->
<!-- :fetch-suggestions="querySearch"-->
<!-- placeholder="请输入内容"-->
<!-- @select="handleSelect1"-->
<!-- ></el-autocomplete>-->
<el-select class="filter-item" v-model="form.companyId"clearable filterable placeholder="请选择分公司">
<el-option v-for="item in allCompaniesArr" :key="item.id" :label="item.name" :value="item.id"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="所属角色" prop="groupId">
<el-select v-model="form.members" multiple filterable remote placeholder="请选择角色" :remote-method="remoteGroupsMethod" :loading="loading">
<el-option v-for="item in myGroups" :key="item.id" :label="item.name" :value="item.id"> </el-option>
</el-select>
<!-- <el-select v-model="form.members" multiple filterable placeholder="请选择角色" >-->
<!-- <el-option v-for="item in myGroups" :key="item.id" :label="item.name" :value="item.id"> </el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item label="数据权限" prop="dataState">
<el-checkbox-group v-model="form.dataLimit" >
......@@ -125,8 +128,10 @@ import {
import {
fetchTree,
getUserGroups
getUserGroups,
getCurrentGroups
} from 'api/admin/group/index';
import {getAllBranchCompanyByZoneId} from "../../../api/order/rentVehicle";
export default {
name: 'user',
......@@ -146,6 +151,9 @@ export default {
dataLimit: [],
members: [],
},
baranchQuery: {
zoneId:null
},
rules: {
name: [
{
......@@ -257,6 +265,7 @@ export default {
'elements'
]),
getAllZoneList(){
console.log('getAllZoneList')
this.allZoneArr = getAllZone();
return getAllZone();
},
......@@ -300,6 +309,7 @@ export default {
},
handleCreate() {
this.resetTemp();
// this.getGroups()
this.dialogStatus = 'create';
this.dialogFormVisible = true;
},
......@@ -444,6 +454,20 @@ export default {
}
});
},
//监听change事件
getProvinceRegions(item) {
this.form.zoneId = item
console.log('getProvinceRegions:item='+JSON.stringify(item))
// console.log('begin'+JSON.stringify(this.allCompaniesArr))
this.baranchQuery.zoneId = item
getAllBranchCompanyByZoneId(this.baranchQuery)
.then(response => {
this.allCompaniesArr = response.data;
// console.log('end'+JSON.stringify(this.allCompaniesArr))
})
},
resetTemp() {
this.form = {
username: undefined,
......
src/views/appManagement/appVersion/index.vue
View file @ 50cb5450
......@@ -163,7 +163,7 @@
<el-upload
:multiple="multipleb"
class="upload-demo"
:action="BASE_API+'/api/app/version/upload/installationPackage'"
action="https://dev.dfangche.com/api/app/version/upload/installationPackage"
:headers="getHeaderWithToken"
:on-preview="handlePreview"
:on-remove="handleRemove"
......
src/views/userManagement/memberEnter.vue
View file @ 50cb5450
......@@ -409,6 +409,7 @@
* 获取用户列表
*/
getList() {
let query = this.listQuery;
console.log(typeof this.listQuery.startTime);
if(this.listQuery.startTime && (typeof this.listQuery.startTime == "object")){
......
src/views/userManagement/userList/index.vue
View file @ 50cb5450
......@@ -11,7 +11,7 @@
<el-col :span="4">
<el-form-item label="注册终端">
<el-select class="filter-item" v-model="listQuery.channel" placeholder="请选注册终端">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in mobileList " :key="val.id" :label="val.name"
:value="val.id"></el-option>
</el-select>
......@@ -20,7 +20,7 @@
<el-col :span="4">
<el-form-item label="会员类型">
<el-select class="filter-item" v-model="listQuery.memberLevel" placeholder="请选会员类型">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option :key="undefined" label="全部用户" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in memberLevelist " :key="val.id" :label="val.name"
:value="val.id"></el-option>
</el-select>
......@@ -139,6 +139,18 @@
</el-button>
<el-button v-if="scope.row.status==1" size="small" type="danger" @click="available(scope.row)">取消禁用
</el-button>
<el-popover
ref="popover5"
placement="top"
width="160"
v-model="scope.row.visible2">
<p>确定删除吗？</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deleteUser(scope.row)">确定</el-button>
</div>
</el-popover>
<el-button type="danger" size="small" v-popover:popover5>删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -528,7 +540,8 @@
appPage,
seveObj,
setDisable,
setAvailable
setAvailable,
deleteUser,
} from 'src/api/admin/userManagement/index';
import {getToken} from 'src/utils/auth';
import {mapGetters} from 'vuex';
......@@ -560,7 +573,7 @@
validityType: '无',
userOrderMessage: {},
mobileList: [{id: 1, name: 'app'}, {id: 2, name: "小程序"}],
memberLevelist: [{id: 1, name: '普通会员'}, {id: 2, name: '黄金会员'}, {id: 3, name: '钻石会员'}],
memberLevelist: [{id: 1, name: '普通会员'}, {id: 2, name: '黄金会员'}, {id: 3, name: '钻石会员'},{id: -1, name: '全部会员'}],
sourceList: [{id: 1, name: '自来'}, {id: 2, name: '用户邀请'}],
orderStatusList: [
{id: 1, name: '删除'},
......@@ -703,12 +716,6 @@
},
},
watch: {
'userMembershipInformation.memberLevel'(newValue, oldValue) {
console.log('userMembershipInformation.memberLevel=' + newValue)
}
},
methods: {
/**
......@@ -823,6 +830,7 @@
listKey.channel = this.terminal[listKey.channel];
listKey.source = this.source[listKey.source];
listKey.validTime = listKey.validTime ? ((listKey.validTime == 0) ? '永久' : listKey.validTime) : '无';
listKey.visible2 =false
},
/**
......@@ -1122,6 +1130,23 @@
},
change() {
this.$forceUpdate()
},
deleteUser(row){
deleteUser(row.userId).then(
res=>{
if (res.rel) {
this.$notify.success({
title: '删除成功',
message: `success`
})
} else {
this.$notify.warning({
title: '删除失败',
message: `failed`
})
}
this.getList()
})
}
}
}
......
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