提交代码

This commit is contained in:
keivn 2021-12-05 09:54:40 +08:00
parent 10db6657f0
commit 178c561c19
11 changed files with 2038 additions and 333 deletions

View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询黑名单列表
export function listBlacklist(query) {
return request({
url: '/carpool/blacklist/list',
method: 'get',
params: query
})
}
// 查询黑名单详细
export function getBlacklist(id) {
return request({
url: '/carpool/blacklist/' + id,
method: 'get'
})
}
// 新增黑名单
export function addBlacklist(data) {
return request({
url: '/carpool/blacklist',
method: 'post',
data: data
})
}
// 修改黑名单
export function updateBlacklist(data) {
return request({
url: '/carpool/blacklist',
method: 'put',
data: data
})
}
// 删除黑名单
export function delBlacklist(id) {
return request({
url: '/carpool/blacklist/' + id,
method: 'delete'
})
}
// 导出黑名单
export function exportBlacklist(query) {
return request({
url: '/carpool/blacklist/export',
method: 'get',
params: query
})
}

View File

@ -0,0 +1,64 @@
import request from '@/utils/request'
// 查询司机信息列表
export function listDriver(query) {
return request({
url: '/carpool/driver/list',
method: 'get',
params: query
})
}
// 查询司机信息详细
export function getDriver(id) {
return request({
url: '/carpool/driver/' + id,
method: 'get'
})
}
// 新增司机信息
export function addDriver(data) {
return request({
url: '/carpool/driver',
method: 'post',
data: data
})
}
// 修改司机信息
export function updateDriver(data) {
return request({
url: '/carpool/driver',
method: 'put',
data: data
})
}
// 删除司机信息
export function delDriver(id) {
return request({
url: '/carpool/driver/' + id,
method: 'delete'
})
}
// 设置黑名单
export function setBlacklist(data) {
return request({
url: '/carpool/blacklist' ,
method: 'post',
data: data
})
}
// 导出司机信息
export function exportDriver(query) {
return request({
url: '/carpool/driver/export',
method: 'get',
params: query
})
}

View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询订单信息列表
export function listOrder(query) {
return request({
url: '/carpool/order/list',
method: 'get',
params: query
})
}
// 查询订单信息详细
export function getOrder(id) {
return request({
url: '/carpool/order/' + id,
method: 'get'
})
}
// 新增订单信息
export function addOrder(data) {
return request({
url: '/carpool/order',
method: 'post',
data: data
})
}
// 修改订单信息
export function updateOrder(data) {
return request({
url: '/carpool/order',
method: 'put',
data: data
})
}
// 删除订单信息
export function delOrder(id) {
return request({
url: '/carpool/order/' + id,
method: 'delete'
})
}
// 导出订单信息
export function exportOrder(query) {
return request({
url: '/carpool/order/export',
method: 'get',
params: query
})
}

View File

@ -0,0 +1,63 @@
import request from '@/utils/request'
// 查询乘客信息列表
export function listPassenger(query) {
return request({
url: '/carpool/passenger/list',
method: 'get',
params: query
})
}
// 查询乘客信息详细
export function getPassenger(id) {
return request({
url: '/carpool/passenger/' + id,
method: 'get'
})
}
// 新增乘客信息
export function addPassenger(data) {
return request({
url: '/carpool/passenger',
method: 'post',
data: data
})
}
// 修改乘客信息
export function updatePassenger(data) {
return request({
url: '/carpool/passenger',
method: 'put',
data: data
})
}
// 删除乘客信息
export function delPassenger(id) {
return request({
url: '/carpool/passenger/' + id,
method: 'delete'
})
}
// 设置黑名单
export function setBlacklist(data) {
return request({
url: '/carpool/blacklist' ,
method: 'post',
data: data
})
}
// 导出乘客信息
export function exportPassenger(query) {
return request({
url: '/carpool/passenger/export',
method: 'get',
params: query
})
}

View File

@ -66,7 +66,7 @@ export const constantRoutes = [
children: [
{
path: 'index',
component: (resolve) => require(['@/views/index'], resolve),
component: (resolve) => require(['@/views/index_v1'], resolve),
name: 'Index',
meta: { title: '首页', icon: 'dashboard', affix: true }
}

View File

@ -0,0 +1,298 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户ID" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入平台唯一ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户名" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入用户名"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-input
v-model="queryParams.phone"
placeholder="请输入电话"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所在城市" prop="city">
<el-input
v-model="queryParams.city"
placeholder="请输入所在城市"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="类型:" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择用户类型:" clearable size="small">
<el-option
v-for="dict in dict.type.carpool_user_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['carpool:blacklist:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['carpool:blacklist:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="blacklistList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="autoID" align="center" prop="id" />-->
<el-table-column label="平台唯一ID" align="center" prop="userId" />
<el-table-column label="用户名" align="center" prop="name" />
<el-table-column label="电话" align="center" prop="phone" />
<el-table-column label="年龄" align="center" prop="age" />
<el-table-column label="所在城市" align="center" prop="city" />
<el-table-column label="用户类型" align="center" prop="type" >
<template slot-scope="scope">
<dict-tag :options="dict.type.carpool_user_type" :value="scope.row.type"/>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center" prop="remark" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['carpool:blacklist:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改黑名单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用户名" prop="name">
<el-input v-model="form.name" placeholder="请输入用户名" />
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
<el-form-item label="年龄" prop="age">
<el-input v-model="form.age" placeholder="请输入年龄" />
</el-form-item>
<el-form-item label="所在城市" prop="city">
<el-input v-model="form.city" placeholder="请输入所在城市" />
</el-form-item>
<el-form-item label="用户类型" prop="type">
<el-select v-model="form.type" placeholder="请选择用户类型:">
<el-option
v-for="dict in dict.type.carpool_user_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listBlacklist, getBlacklist, delBlacklist, addBlacklist, updateBlacklist } from "@/api/carpool/blacklist";
export default {
name: "Blacklist",
dicts: ['carpool_user_type', 'sys_user_sex'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
blacklistList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
userId: null,
name: null,
phone: null,
age: null,
city: null,
type: null,
},
//
form: {},
//
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询黑名单列表 */
getList() {
this.loading = true;
listBlacklist(this.queryParams).then(response => {
this.blacklistList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
userId: null,
name: null,
phone: null,
age: null,
city: null,
type: null,
remark: null,
createTime: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.userId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加黑名单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getBlacklist(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改黑名单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateBlacklist(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addBlacklist(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.userId || this.ids ;
this.$modal.confirm('是否确认删除黑名单编号为"' + ids + '"的数据项?').then(function() {
return delBlacklist(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('carpool/blacklist/export', {
...this.queryParams
}, `blacklist_${new Date().getTime()}.xlsx`)
}
}
};
</script>

View File

@ -0,0 +1,414 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="平台ID" prop="driverId">
<el-input
v-model="queryParams.driverId"
placeholder="平台ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="司机姓名" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入司机姓名"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="性别:" prop="sex">
<el-select v-model="queryParams.sex" placeholder="请选择性别:" clearable size="small">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input
v-model="queryParams.idCard"
placeholder="请输入身份证号码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="年龄" prop="age">
<el-input
v-model="queryParams.age"
placeholder="请输入年龄"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号码" prop="phone">
<el-input
v-model="queryParams.phone"
placeholder="请输入手机号码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所在城市" prop="city">
<el-input
v-model="queryParams.city"
placeholder="请输入所在城市"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所在省份" prop="province">
<el-input
v-model="queryParams.province"
placeholder="请输入所在省份"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所在国家" prop="country">
<el-input
v-model="queryParams.country"
placeholder="请输入所在国家"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['carpool:driver:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['carpool:driver:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['carpool:driver:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['carpool:driver:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="driverList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="平台ID" align="center" prop="driverId" />
<el-table-column label="司机姓名" align="center" prop="name" />
<el-table-column label="性别" align="center" prop="sex">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
</template>
</el-table-column>
<el-table-column label="身份证号码" align="center" prop="idCard" />
<el-table-column label="年龄" align="center" prop="age" />
<el-table-column label="手机号码" align="center" prop="phone" />
<el-table-column label="所在城市" align="center" prop="city" />
<el-table-column label="所在省份" align="center" prop="province" />
<el-table-column label="所在国家" align="center" prop="country" />
<el-table-column label="是否黑名单用户" align="center" prop="isBlacklist" >
<template slot-scope="scope">
<dict-tag :options="dict.type.carpool_isblacklist" :value="scope.row.isBlacklist"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['carpool:driver:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['carpool:driver:remove']"
>删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-s-release"
@click="handleBlackLIst(scope.row)"
v-hasPermi="['carpool:driver:edit']"
>添加黑名单</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改司机信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="司机姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入司机姓名" />
</el-form-item>
<el-form-item label="性别" prop="sex">
<el-select v-model="form.sex" placeholder="请选择性别" size="small">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入身份证号码" />
</el-form-item>
<el-form-item label="年龄" prop="age">
<el-input v-model="form.age" placeholder="请输入年龄" />
</el-form-item>
<el-form-item label="手机号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号码" />
</el-form-item>
<el-form-item label="所在城市" prop="city">
<el-input v-model="form.city" placeholder="请输入所在城市" />
</el-form-item>
<el-form-item label="所在省份" prop="province">
<el-input v-model="form.province" placeholder="请输入所在省份" />
</el-form-item>
<el-form-item label="所在国家" prop="country">
<el-input v-model="form.country" placeholder="请输入所在国家" />
</el-form-item>
<el-form-item label="是否黑名单用户" prop="isBlacklist">
<el-select v-model="form.isBlacklist" placeholder="请选择是否黑名单用户" size="small">
<el-option
v-for="dict in dict.type.carpool_isblacklist"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listDriver, getDriver, delDriver, addDriver, updateDriver , setBlacklist } from "@/api/carpool/driver";
export default {
name: "Driver",
dicts: ['sys_user_sex' , 'carpool_isblacklist'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
driverList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
driverId: null,
name: null,
sex: null,
idCard: null,
age: null,
phone: null,
city: null,
province: null,
country: null,
isBlacklist: null,
},
//
form: {},
//
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询司机信息列表 */
getList() {
this.loading = true;
listDriver(this.queryParams).then(response => {
this.driverList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
driverId: null,
name: null,
sex: null,
idCard: null,
age: null,
phone: null,
city: null,
province: null,
country: null,
isBlacklist: null,
createTime: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加司机信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getDriver(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改司机信息";
});
},
/** 添加黑名单 */
handleBlackLIst(row) {
const id = row.driverId
const type = row.type
const name = row.name || this.driverId;
this.$modal.confirm('是否确认将司机姓名为"' + name + '"的数据项添加至黑名单?').then(function() {
return setBlacklist({"userId":id ,"type" : type});
}).then(() => {
this.getList();
this.$modal.msgSuccess("添加黑名单成功");
}).catch(() => {});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateDriver(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addDriver(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.driverId;
const name = row.name || this.driverId;
this.$modal.confirm('是否确认删除司机姓名为"' + name + '"的数据项?').then(function() {
return delDriver(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('carpool/driver/export', {
...this.queryParams
}, `driver_${new Date().getTime()}.xlsx`)
}
}
};
</script>

View File

@ -0,0 +1,365 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单号" prop="orderNum">
<el-input
v-model="queryParams.orderNum"
placeholder="请输入订单号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出发地" prop="departure">
<el-input
v-model="queryParams.departure"
placeholder="请输入出发地"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="目的地" prop="destination">
<el-input
v-model="queryParams.destination"
placeholder="请输入目的地"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出发时间" prop="departureTime">
<el-date-picker clearable size="small"
v-model="queryParams.departureTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择出发时间">
</el-date-picker>
</el-form-item>
<el-form-item label="订单状态" prop="state">
<el-select v-model="queryParams.state" placeholder="请选择订单状态">
<el-option
v-for="dict in dict.type.carpool_order_state"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否接单" prop="isTake">
<el-select v-model="queryParams.isTake" placeholder="请选择接单状态">
<el-option
v-for="dict in dict.type.carpool_is_take"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="司机姓名" prop="driverName">
<el-input
v-model="queryParams.driverName"
placeholder="请输入司机姓名"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['carpool:order:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['carpool:order:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['carpool:order:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['carpool:order:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="autoID" align="center" prop="id" />-->
<el-table-column label="订单号" align="center" prop="orderNum" />
<el-table-column label="出发地" align="center" prop="departure" />
<el-table-column label="目的地" align="center" prop="destination" />
<el-table-column label="出发时间" align="center" prop="departureTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.departureTime ,'{y}-{m}-{d} {h}:{i}:{s}')}}</span>
</template>
</el-table-column>
<el-table-column label="当前人数" align="center" prop="member" />
<el-table-column label="是否接单" align="center" prop="isTake" >
<template slot-scope="scope">
<dict-tag :options="dict.type.carpool_is_take" :value="scope.row.isTake"/>
</template>
</el-table-column>
<el-table-column label="接单司机" align="center" prop="driverName" />
<el-table-column label="订单当前的状态" align="center" prop="state" >
<template slot-scope="scope">
<dict-tag :options="dict.type.carpool_order_state" :value="scope.row.state"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['carpool:order:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['carpool:order:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改订单信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="出发地" prop="departure">
<el-input v-model="form.departure" placeholder="请输入出发地" />
</el-form-item>
<el-form-item label="目的地" prop="destination">
<el-input v-model="form.destination" placeholder="请输入目的地" />
</el-form-item>
<el-form-item label="出发时间" prop="departureTime">
<el-date-picker clearable size="small"
v-model="form.departureTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择出发时间">
</el-date-picker>
</el-form-item>
<el-form-item label="当前人数" prop="member">
<el-input v-model="form.member" placeholder="请输入当前人数" />
</el-form-item>
<el-form-item label="订单状态" prop="state">
<el-select v-model="form.state" placeholder="请选择订单状态">
<el-option
v-for="dict in dict.type.carpool_order_state"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/carpool/order";
export default {
name: "Order",
dicts: ['sys_user_sex' , 'carpool_order_state', 'carpool_is_take'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
orderList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
orderNum: null,
departure: null,
destination: null,
departureTime: null,
member: null,
state: null,
isTake: null,
driverName: null,
isdelete: null,
createUser: null,
updateUser: null,
},
//
form: {},
//
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询订单信息列表 */
getList() {
this.loading = true;
listOrder(this.queryParams).then(response => {
this.orderList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
orderNum: null,
departure: null,
destination: null,
departureTime: null,
member: null,
state: null,
isdelete: null,
createUser: null,
createTime: null,
updateUser: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加订单信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getOrder(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改订单信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateOrder(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除订单信息编号为"' + ids + '"的数据项?').then(function() {
return delOrder(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('carpool/order/export', {
...this.queryParams
}, `order_${new Date().getTime()}.xlsx`)
}
}
};
</script>

View File

@ -0,0 +1,395 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="平台ID" prop="custId">
<el-input
v-model="queryParams.custId"
placeholder="请输入用户平台ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户名" prop="custName">
<el-input
v-model="queryParams.custName"
placeholder="请输入用户名"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号码" prop="custPhone">
<el-input
v-model="queryParams.custPhone"
placeholder="请输入用户手机号码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="性别" prop="sex">
<el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所在城市" prop="city">
<el-input
v-model="queryParams.city"
placeholder="请输入所在城市"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所在省份" prop="province">
<el-input
v-model="queryParams.province"
placeholder="请输入所在省份"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['carpool:passenger:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['carpool:passenger:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['carpool:passenger:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['carpool:passenger:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="passengerList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="用户平台ID" align="center" prop="custId" />
<el-table-column label="用户名" align="center" prop="custName" />
<el-table-column label="微信昵称" align="center" prop="nickName" />
<el-table-column label="微信用户唯一标识" align="center" prop="openId" />
<el-table-column label="用户手机号码" align="center" prop="custPhone" />
<el-table-column label="性别" align="center" prop="sex" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
</template>
</el-table-column>
<el-table-column label="生日" align="center" prop="birthday" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="所在城市" align="center" prop="city" />
<el-table-column label="所在省份" align="center" prop="province" />
<el-table-column label="是否黑名单用户" align="center" prop="isBlacklist" >
<template slot-scope="scope">
<dict-tag :options="dict.type.carpool_isblacklist" :value="scope.row.isBlacklist"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['carpool:passenger:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['carpool:passenger:remove']"
>删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-s-release"
@click="handleBlackLIst(scope.row)"
v-hasPermi="['carpool:passenger:edit']"
>添加黑名单</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改乘客信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用户名" prop="custName">
<el-input v-model="form.custName" placeholder="请输入用户名" />
</el-form-item>
<el-form-item label="微信昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入微信昵称" />
</el-form-item>
<el-form-item label="微信用户唯一标识" prop="openId">
<el-input v-model="form.openId" placeholder="请输入微信用户唯一标识" />
</el-form-item>
<el-form-item label="用户手机号码" prop="custPhone">
<el-input v-model="form.custPhone" placeholder="请输入用户手机号码" />
</el-form-item>
<el-form-item label="性别" prop="sex">
<el-select v-model="form.sex" placeholder="请选择性别">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生日" prop="birthday">
<el-date-picker clearable size="small"
v-model="form.birthday"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择生日">
</el-date-picker>
</el-form-item>
<el-form-item label="所在城市" prop="city">
<el-input v-model="form.city" placeholder="请输入所在城市" />
</el-form-item>
<el-form-item label="所在省份" prop="province">
<el-input v-model="form.province" placeholder="请输入所在省份" />
</el-form-item>
<el-form-item label="是否黑名单用户" prop="isBlacklist">
<el-select v-model="form.isBlacklist" placeholder="请选择是否黑名单用户" size="small">
<el-option
v-for="dict in dict.type.carpool_isblacklist"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listPassenger, getPassenger, delPassenger, addPassenger, updatePassenger , setBlacklist } from "@/api/carpool/passenger";
export default {
name: "Passenger",
dicts: ['sys_user_sex','carpool_isblacklist'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
passengerList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
custId: null,
custName: null,
nickName: null,
openId: null,
custPhone: null,
sex: null,
birthday: null,
city: null,
province: null,
isBlacklist: null,
},
//
form: {},
//
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询乘客信息列表 */
getList() {
this.loading = true;
listPassenger(this.queryParams).then(response => {
this.passengerList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: null,
custId: null,
custName: null,
nickName: null,
openId: null,
custPhone: null,
sex: null,
birthday: null,
city: null,
province: null,
isBlacklist: null,
createTime: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加乘客信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getPassenger(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改乘客信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updatePassenger(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addPassenger(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 添加黑名单 */
handleBlackLIst(row) {
const id = row.custId ;
const type = row.type ;
const name = row.custName ;
this.$modal.confirm('是否确认将司机姓名为"' + name + '"的数据项添加至黑名单?').then(function() {
return setBlacklist({"userId":id ,"type" : type});
}).then(() => {
this.getList();
this.$modal.msgSuccess("添加黑名单成功");
}).catch(() => {});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除乘客信息编号为"' + ids + '"的数据项?').then(function() {
return delPassenger(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('carpool/passenger/export', {
...this.queryParams
}, `passenger_${new Date().getTime()}.xlsx`)
}
}
};
</script>

View File

@ -69,7 +69,7 @@ export default {
cookiePassword: "",
loginForm: {
username: "admin",
password: "admin123",
password: "",
rememberMe: false,
code: "",
uuid: ""

View File

@ -33,7 +33,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8080`,
target: `http://localhost:16009`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''