Commit 47dcd748 by Wangmin

Merge branch 'master' into new/java/wm20231009

parents ba70395c 3c9fe2a8
import request from '@/utils/request'
// 查询商户列表
export function listCompany(query) {
return request({
url: '/merchant/company/list',
method: 'get',
params: query
})
}
// 查询商户详细
export function getCompany(id) {
return request({
url: '/merchant/company/' + id,
method: 'get'
})
}
// 新增商户
export function addCompany(data) {
return request({
url: '/merchant/company',
method: 'post',
data: data
})
}
// 修改商户
export function updateCompany(data) {
return request({
url: '/merchant/company',
method: 'put',
data: data
})
}
// 删除商户
export function delCompany(id) {
return request({
url: '/merchant/company/' + id,
method: 'delete'
})
}
import request from '@/utils/request'
// 查询陪诊员列表
export function listEmployees(query) {
return request({
url: '/merchant/employees/list',
method: 'get',
params: query
})
}
// 查询陪诊员详细
export function getEmployees(id) {
return request({
url: '/merchant/employees/' + id,
method: 'get'
})
}
// 新增陪诊员
export function addEmployees(data) {
return request({
url: '/merchant/employees',
method: 'post',
data: data
})
}
// 修改陪诊员
export function updateEmployees(data) {
return request({
url: '/merchant/employees',
method: 'put',
data: data
})
}
// 删除陪诊员
export function delEmployees(id) {
return request({
url: '/merchant/employees/' + id,
method: 'delete'
})
}
import request from '@/utils/request'
// 查询订单消息列表
export function listMessage(query) {
return request({
url: '/system/message/list',
method: 'get',
params: query
})
}
// 查询订单消息详细
export function getMessage(id) {
return request({
url: '/system/message/' + id,
method: 'get'
})
}
// 新增订单消息
export function addMessage(data) {
return request({
url: '/system/message',
method: 'post',
data: data
})
}
// 修改订单消息
export function updateMessage(data) {
return request({
url: '/system/message',
method: 'put',
data: data
})
}
// 删除订单消息
export function delMessage(id) {
return request({
url: '/system/message/' + id,
method: 'delete'
})
}
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="商户名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入商户名称"
clearable
@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="['merchant:company: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="['merchant:company: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="['merchant:company: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="['merchant:company:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="companyList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" v-if="true"/>
<el-table-column label="商户名称" align="center" prop="name" />
<el-table-column label="城市" align="center" prop="cityId" />
<el-table-column label="商户电话" align="center" prop="tel" />
<el-table-column label="商户手机" align="center" prop="phone" />
<el-table-column label="商户地址" align="center" prop="address" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.company_state" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="营业执照" align="center" prop="businessLicense" />
<el-table-column label="是否缴纳保证金" align="center" prop="isCashDeposit">
<template slot-scope="scope">
<dict-tag :options="dict.type.company_is_cash_deposit" :value="scope.row.isCashDeposit"/>
</template>
</el-table-column>
<el-table-column label="保证金金额" align="center" prop="cashDeposit" />
<el-table-column label="创建人" align="center" prop="uid" />
<el-table-column label="总收益" align="center" prop="totalRevenue" />
<el-table-column label="当前余额" align="center" prop="balance" />
<el-table-column label="注册时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</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="['merchant:company:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['merchant:company: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="cityId">
<el-input v-model="form.cityId" placeholder="请输入城市" />
</el-form-item>
<el-form-item label="商户电话" prop="tel">
<el-input v-model="form.tel" 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="address">
<el-input v-model="form.address" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.company_state"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="营业执照" prop="businessLicense">
<el-input v-model="form.businessLicense" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="是否缴纳保证金" prop="isCashDeposit">
<el-input v-model="form.isCashDeposit" placeholder="请输入是否缴纳保证金" />
</el-form-item>
<el-form-item label="创建人" prop="uid">
<el-input v-model="form.uid" placeholder="请输入创建人" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listCompany, getCompany, delCompany, addCompany, updateCompany } from "@/api/merchant/company";
export default {
name: "Company",
dicts: ['company_state'],
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 商户表格数据
companyList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
name: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "ID不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "商户名称不能为空", trigger: "blur" }
],
cityId: [
{ required: true, message: "城市不能为空", trigger: "blur" }
],
tel: [
{ required: true, message: "商户电话不能为空", trigger: "blur" }
],
phone: [
{ required: true, message: "商户手机不能为空", trigger: "blur" }
],
address: [
{ required: true, message: "商户地址不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态不能为空", trigger: "change" }
],
businessLicense: [
{ required: true, message: "营业执照不能为空", trigger: "blur" }
],
isCashDeposit: [
{ required: true, message: "是否缴纳保证金不能为空", trigger: "blur" }
],
cashDeposit: [
{ required: true, message: "保证金金额不能为空", trigger: "blur" }
],
uid: [
{ required: true, message: "创建人不能为空", trigger: "blur" }
],
totalRevenue: [
{ required: true, message: "总收益不能为空", trigger: "blur" }
],
balance: [
{ required: true, message: "当前余额不能为空", trigger: "blur" }
],
freezeBalance: [
{ required: true, message: "冻结余额不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询商户列表 */
getList() {
this.loading = true;
listCompany(this.queryParams).then(response => {
this.companyList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: undefined,
name: undefined,
cityId: undefined,
tel: undefined,
phone: undefined,
address: undefined,
status: undefined,
businessLicense: undefined,
isCashDeposit: undefined,
cashDeposit: undefined,
uid: undefined,
totalRevenue: undefined,
balance: undefined,
freezeBalance: undefined,
createBy: undefined,
createTime: undefined,
updateBy: undefined,
updateTime: undefined,
delFlag: undefined
};
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.loading = true;
this.reset();
const id = row.id || this.ids
getCompany(id).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改商户";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.id != null) {
updateCompany(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addCompany(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除商户编号为"' + ids + '"的数据项?').then(() => {
this.loading = true;
return delCompany(ids);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('merchant/company/export', {
...this.queryParams
}, `company_${new Date().getTime()}.xlsx`)
}
}
};
</script>
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="陪诊员 " prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入陪诊员 "
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户" prop="uid">
<el-input
v-model="queryParams.uid"
placeholder="请输入用户"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.company_state"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="当前身份" prop="nowType">
<el-select v-model="queryParams.nowType" placeholder="请选择当前身份" clearable>
<el-option
v-for="dict in dict.type.employee_status"
: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="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['merchant:employees: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="['merchant:employees: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="['merchant:employees: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="['merchant:employees:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="employeesList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="" align="center" prop="id" v-if="true"/>
<el-table-column label="陪诊员 " align="center" prop="name" />
<el-table-column label="职业开始年份" align="center" prop="startYear" />
<el-table-column label="用户" align="center" prop="uid" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.company_state" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="所属商户" align="center" prop="companyId" />
<el-table-column label="身份证正面照" align="center" prop="cardFront" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.cardFront" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="身份证反面照" align="center" prop="cardReverse" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.cardReverse" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="健康证" align="center" prop="healthCertificate" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.healthCertificate" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="当前身份" align="center" prop="nowType">
<template slot-scope="scope">
<dict-tag :options="dict.type.employee_status" :value="scope.row.nowType"/>
</template>
</el-table-column>
<el-table-column label="总收益" align="center" prop="totalRevenue" />
<el-table-column label="当前余额" align="center" prop="balance" />
<el-table-column label="注册时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</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="['merchant:employees:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['merchant:employees: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="uid">
<el-input v-model="form.uid" placeholder="请输入用户" />
</el-form-item>
<el-form-item label="工作时段" prop="workingHours">
<el-input v-model="form.workingHours" placeholder="请输入工作时段" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态">
<el-option
v-for="dict in dict.type.company_state"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属商户" prop="companyId">
<el-input v-model="form.companyId" placeholder="请输入所属商户" />
</el-form-item>
<el-form-item label="身份证正面照" prop="cardFront">
<image-upload v-model="form.cardFront"/>
</el-form-item>
<el-form-item label="身份证反面照" prop="cardReverse">
<image-upload v-model="form.cardReverse"/>
</el-form-item>
<el-form-item label="健康证" prop="healthCertificate">
<image-upload v-model="form.healthCertificate"/>
</el-form-item>
<el-form-item label="经度" prop="lng">
<el-input v-model="form.lng" placeholder="请输入经度" />
</el-form-item>
<el-form-item label="纬度" prop="lat">
<el-input v-model="form.lat" placeholder="请输入纬度" />
</el-form-item>
<el-form-item label="城市" prop="cityId">
<el-input v-model="form.cityId" placeholder="请输入城市" />
</el-form-item>
<el-form-item label="当前身份" prop="nowType">
<el-select v-model="form.nowType" placeholder="请选择当前身份">
<el-option
v-for="dict in dict.type.employee_status"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="冻结余额" prop="freezeBalance">
<el-input v-model="form.freezeBalance" placeholder="请输入冻结余额" />
</el-form-item>
<el-form-item label="取消订单次数" prop="killOrder">
<el-input v-model="form.killOrder" placeholder="请输入取消订单次数" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listEmployees, getEmployees, delEmployees, addEmployees, updateEmployees } from "@/api/merchant/employees";
export default {
name: "Employees",
dicts: ['company_state', 'employee_status'],
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 陪诊员表格数据
employeesList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
name: undefined,
startYear: undefined,
uid: undefined,
status: undefined,
nowType: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "陪诊员 不能为空", trigger: "blur" }
],
startYear: [
{ required: true, message: "职业开始年份不能为空", trigger: "blur" }
],
uid: [
{ required: true, message: "用户不能为空", trigger: "blur" }
],
workingHours: [
{ required: true, message: "工作时段不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态不能为空", trigger: "change" }
],
companyId: [
{ required: true, message: "所属商户不能为空", trigger: "blur" }
],
cardFront: [
{ required: true, message: "身份证正面照不能为空", trigger: "blur" }
],
cardReverse: [
{ required: true, message: "身份证反面照不能为空", trigger: "blur" }
],
healthCertificate: [
{ required: true, message: "健康证不能为空", trigger: "blur" }
],
lng: [
{ required: true, message: "经度不能为空", trigger: "blur" }
],
lat: [
{ required: true, message: "纬度不能为空", trigger: "blur" }
],
cityId: [
{ required: true, message: "城市不能为空", trigger: "blur" }
],
nowType: [
{ required: true, message: "当前身份不能为空", trigger: "change" }
],
totalRevenue: [
{ required: true, message: "总收益不能为空", trigger: "blur" }
],
balance: [
{ required: true, message: "当前余额不能为空", trigger: "blur" }
],
freezeBalance: [
{ required: true, message: "冻结余额不能为空", trigger: "blur" }
],
killOrder: [
{ required: true, message: "取消订单次数不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询陪诊员列表 */
getList() {
this.loading = true;
listEmployees(this.queryParams).then(response => {
this.employeesList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: undefined,
name: undefined,
startYear: undefined,
uid: undefined,
workingHours: undefined,
status: undefined,
companyId: undefined,
cardFront: undefined,
cardReverse: undefined,
healthCertificate: undefined,
lng: undefined,
lat: undefined,
cityId: undefined,
nowType: undefined,
totalRevenue: undefined,
balance: undefined,
freezeBalance: undefined,
killOrder: undefined,
createBy: undefined,
createTime: undefined,
updateBy: undefined,
updateTime: undefined,
delFlag: undefined
};
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.loading = true;
this.reset();
const id = row.id || this.ids
getEmployees(id).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改陪诊员";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.id != null) {
updateEmployees(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addEmployees(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除陪诊员编号为"' + ids + '"的数据项?').then(() => {
this.loading = true;
return delEmployees(ids);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('merchant/employees/export', {
...this.queryParams
}, `employees_${new Date().getTime()}.xlsx`)
}
}
};
</script>
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="购买用户" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入购买用户"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="业务" prop="businessName">
<el-input
v-model="queryParams.businessName"
placeholder="请输入业务"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="服务" prop="serviceName">
<el-input
v-model="queryParams.serviceName"
placeholder="请输入服务"
clearable
@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="['system:message: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="['system:message: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="['system:message: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="['system:message:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="messageList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" v-if="true"/>
<el-table-column label="主订单Id" align="center" prop="totalOrderId" />
<el-table-column label="城市" align="center" prop="cityId" />
<el-table-column label="购买用户" align="center" prop="userName" />
<el-table-column label="业务" align="center" prop="businessName" />
<el-table-column label="服务" align="center" prop="serviceName" />
<el-table-column label="购买时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</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-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:message:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:message: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="主订单Id" prop="totalOrderId">
<el-input v-model="form.totalOrderId" placeholder="请输入主订单Id" />
</el-form-item>
<el-form-item label="城市" prop="cityId">
<el-input v-model="form.cityId" placeholder="请输入城市" />
</el-form-item>
<el-form-item label="购买用户" prop="userName">
<el-input v-model="form.userName" placeholder="请输入购买用户" />
</el-form-item>
<el-form-item label="业务" prop="businessName">
<el-input v-model="form.businessName" placeholder="请输入业务" />
</el-form-item>
<el-form-item label="服务" prop="serviceName">
<el-input v-model="form.serviceName" placeholder="请输入服务" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listMessage, getMessage, delMessage, addMessage, updateMessage } from "@/api/system/message";
export default {
name: "Message",
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 订单消息表格数据
messageList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
userName: undefined,
businessName: undefined,
serviceName: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "主键不能为空", trigger: "blur" }
],
totalOrderId: [
{ required: true, message: "主订单Id不能为空", trigger: "blur" }
],
cityId: [
{ required: true, message: "城市不能为空", trigger: "blur" }
],
userName: [
{ required: true, message: "购买用户不能为空", trigger: "blur" }
],
businessName: [
{ required: true, message: "业务不能为空", trigger: "blur" }
],
serviceName: [
{ required: true, message: "服务不能为空", trigger: "blur" }
]
}
};
},
created() {
this.getList();
},
methods: {
/** 查询订单消息列表 */
getList() {
this.loading = true;
listMessage(this.queryParams).then(response => {
this.messageList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: undefined,
totalOrderId: undefined,
cityId: undefined,
userName: undefined,
businessName: undefined,
serviceName: undefined,
createBy: undefined,
createTime: undefined,
updateBy: undefined,
updateTime: undefined,
remark: undefined
};
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.loading = true;
this.reset();
const id = row.id || this.ids
getMessage(id).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改订单消息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.id != null) {
updateMessage(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addMessage(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除订单消息编号为"' + ids + '"的数据项?').then(() => {
this.loading = true;
return delMessage(ids);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/message/export', {
...this.queryParams
}, `message_${new Date().getTime()}.xlsx`)
}
}
};
</script>
...@@ -35,8 +35,8 @@ module.exports = { ...@@ -35,8 +35,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8089`, target: `http://localhost:8089`,
target: `https://peizheng.shanpeikj.com/api`, // target: `https://peizheng.shanpeikj.com/api`,
// target: `http://192.168.0.169:8089`, // target: `http://192.168.0.169:8089`,
// target: `http://192.168.0.137:8089`, // target: `http://192.168.0.137:8089`,
// target: `http://192.168.0.125:8089`, // target: `http://192.168.0.125:8089`,
......
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