925116093-qq.com
/
javacodeadmin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250524

This commit is contained in:
张潘 2025-05-24 11:38:06 +08:00
parent 1ca61dc479
commit a957a3e0d5
14 changed files with 600 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-system/src/main/resources/mapper/system/CooperateMapper.xml
View File

@ -25,10 +25,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectCooperateVo"/> <include refid="selectCooperateVo"/>
<where> <where>
<if test="uid != null "> and uid = #{uid}</if> <if test="uid != null "> and uid = #{uid}</if>
<if test="company != null and company != ''"> and company = #{company}</if> <if test="company != null and company != ''"> and company like concat('%', #{company}, '%')</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if> <if test="phone != null and phone != ''"> and phone = #{phone}</if>
<if test="address != null and address != ''"> and address = #{address}</if> <if test="address != null and address != ''"> and address like concat('%', #{address}, '%')</if>
<if test="info != null and info != ''"> and info = #{info}</if> <if test="info != null and info != ''"> and info = #{info}</if>
<if test="status != null "> and status = #{status}</if> <if test="status != null "> and status = #{status}</if>
<if test="createdAt != null "> and created_at = #{createdAt}</if> <if test="createdAt != null "> and created_at = #{createdAt}</if>

6
ruoyi-system/src/main/resources/mapper/system/MobileMiddleMapper.xml
View File

@ -20,9 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectMobileMiddleList" parameterType="MobileMiddle" resultMap="MobileMiddleResult"> <select id="selectMobileMiddleList" parameterType="MobileMiddle" resultMap="MobileMiddleResult">
<include refid="selectMobileMiddleVo"/> <include refid="selectMobileMiddleVo"/>
<where> <where>
<if test="phone != null and phone != ''"> and phone = #{phone}</if> <if test="phone != null and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
<if test="provinceId != null "> and province_id = #{provinceId}</if> <if test="provinceId != null "> and province_id like concat('%', #{provinceId}, '%')</if>
<if test="cityId != null "> and city_id = #{cityId}</if> <if test="cityId != null "> and city_id like concat('%', #{cityId}, '%')</if>
<if test="createdAt != null "> and created_at = #{createdAt}</if> <if test="createdAt != null "> and created_at = #{createdAt}</if>
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if> <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
</where> </where>

6
ruoyi-system/src/main/resources/mapper/system/MobileNotifyMapper.xml
View File

@ -20,9 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectMobileNotifyList" parameterType="MobileNotify" resultMap="MobileNotifyResult"> <select id="selectMobileNotifyList" parameterType="MobileNotify" resultMap="MobileNotifyResult">
<include refid="selectMobileNotifyVo"/> <include refid="selectMobileNotifyVo"/>
<where> <where>
<if test="phone != null and phone != ''"> and phone = #{phone}</if> <if test="phone != null and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
<if test="provinceId != null and provinceId != ''"> and province_id = #{provinceId}</if> <if test="provinceId != null and provinceId != ''"> and province_id like concat('%', #{provinceId}, '%')</if>
<if test="cityId != null and cityId != ''"> and city_id = #{cityId}</if> <if test="cityId != null and cityId != ''"> and city_id like concat('%', #{cityId}, '%')</if>
<if test="createdAt != null "> and created_at = #{createdAt}</if> <if test="createdAt != null "> and created_at = #{createdAt}</if>
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if> <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
</where> </where>

2
ruoyi-system/src/main/resources/mapper/system/ServiceGoodsMapper.xml
View File

@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and price BETWEEN #{maxPrice} AND #{maxPrice} and price BETWEEN #{maxPrice} AND #{maxPrice}
</if> </if>
<if test="createdStart != null and createdEnd != null"> <if test="createdStart != null and createdEnd != null">
and createdAt BETWEEN #{createdStart} AND #{createdEnd} and created_at BETWEEN #{createdStart} AND #{createdEnd}
</if> </if>
<if test="cateId != null "> and cate_id = #{cateId}</if> <if test="cateId != null "> and cate_id = #{cateId}</if>
<if test="type != null "> and type = #{type}</if> <if test="type != null "> and type = #{type}</if>

4
ruoyi-system/src/main/resources/mapper/system/WorkerApplyMapper.xml
View File

@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where> <where>
<if test="uid != null "> and uid = #{uid}</if> <if test="uid != null "> and uid = #{uid}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if> <if test="phone != null and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
<if test="address != null and address != ''"> and address = #{address}</if> <if test="address != null and address != ''"> and address like concat('%', #{address}, '%')</if>
<if test="cardNo != null and cardNo != ''"> and card_no = #{cardNo}</if> <if test="cardNo != null and cardNo != ''"> and card_no = #{cardNo}</if>
<if test="skillId != null and skillId != ''"> and skill_id = #{skillId}</if> <if test="skillId != null and skillId != ''"> and skill_id = #{skillId}</if>
<if test="cardAvatar != null and cardAvatar != ''"> and card_avatar = #{cardAvatar}</if> <if test="cardAvatar != null and cardAvatar != ''"> and card_avatar = #{cardAvatar}</if>

7
ruoyi-ui/src/api/system/Cooperate.js
View File

@ -20,6 +20,13 @@ export function changetypeStatus(id, status) {
data: data data: data
}) })
} }
// 获取接单记录列表
export function getUserDataList(type) {
return request({
url: '/system/transfer/getUsersDataList/'+type,
method: 'get'
})
}
// 查询企业合作详细 // 查询企业合作详细
export function getCooperate(id) { export function getCooperate(id) {
return request({ return request({

9
ruoyi-ui/src/api/system/UserAddress.js
View File

@ -25,7 +25,14 @@ export function addUserAddress(data) {
data: data data: data
}) })
} }
// 获取接单记录列表
export function getUserDataList(type) {
return request({
url: '/system/transfer/getUsersDataList/'+type,
method: 'get'
})
}
// 查询企业合
// 修改用户收货地址 // 修改用户收货地址
export function updateUserAddress(data) { export function updateUserAddress(data) {
return request({ return request({

8
ruoyi-ui/src/api/system/WorkerApply.js
View File

@ -25,7 +25,13 @@ export function addWorkerApply(data) {
data: data data: data
}) })
} }
// 获取接单记录列表
export function getUserDataList(type) {
return request({
url: '/system/transfer/getUsersDataList/'+type,
method: 'get'
})
}
// 修改师傅申请记录 // 修改师傅申请记录
export function updateWorkerApply(data) { export function updateWorkerApply(data) {
return request({ return request({

44
ruoyi-ui/src/api/system/users.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询用户列表列表
export function listUsers(query) {
return request({
url: '/system/users/list',
method: 'get',
params: query
})
}
// 查询用户列表详细
export function getUsers(id) {
return request({
url: '/system/users/' + id,
method: 'get'
})
}
// 新增用户列表
export function addUsers(data) {
return request({
url: '/system/users',
method: 'post',
data: data
})
}
// 修改用户列表
export function updateUsers(data) {
return request({
url: '/system/users',
method: 'put',
data: data
})
}
// 删除用户列表
export function delUsers(id) {
return request({
url: '/system/users/' + id,
method: 'delete'
})
}

19
ruoyi-ui/src/views/system/Cooperate/index.vue
View File

@ -2,12 +2,9 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户" prop="uid"> <el-form-item label="用户" prop="uid">
<el-input <el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
v-model="queryParams.uid" <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
placeholder="请输入用户" </el-select>
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="公司名称" prop="company"> <el-form-item label="公司名称" prop="company">
<el-input <el-input
@ -220,7 +217,7 @@
</template> </template>
<script> <script>
import { listCooperate, getCooperate, delCooperate, addCooperate, updateCooperate,changetypeStatus } from "@/api/system/Cooperate" import { listCooperate, getCooperate, delCooperate, addCooperate, updateCooperate,changetypeStatus,getUserDataList } from "@/api/system/Cooperate"
export default { export default {
name: "Cooperate", name: "Cooperate",
@ -239,6 +236,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
userDataList: [],
// 企业合作表格数据 // 企业合作表格数据
CooperateList: [], CooperateList: [],
// 弹出层标题 // 弹出层标题
@ -286,6 +284,7 @@ export default {
}, },
created() { created() {
this.getList() this.getList()
this.getuserDataList()
}, },
methods: { methods: {
/** 查询企业合作列表 */ /** 查询企业合作列表 */
@ -334,7 +333,11 @@ export default {
this.single = selection.length!==1 this.single = selection.length!==1
this.multiple = !selection.length this.multiple = !selection.length
}, },
getuserDataList(){
getUserDataList("1").then(response => {
this.userDataList = response.data
})
},
// 任务状态修改 // 任务状态修改
handleStatusChange(row) { handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用" let text = row.status === "0" ? "启用" : "停用"

28
ruoyi-ui/src/views/system/GoodsOrder/index.vue
View File

@ -595,3 +595,31 @@ export default {
} }
} }
</script> </script>
<style scoped>
/* 表单输入框字体变大，颜色分明 */
.el-input__inner,
.el-select .el-input__inner,
.el-date-editor .el-input__inner {
font-size: 18px !important;
color: #222 !important;
background: #f8f8f8 !important;
border: 1.5px solid #409EFF !important;
}
.el-form-item__label {
font-size: 16px !important;
color: #1a1a1a !important;
font-weight: bold;
}
.el-select-dropdown__item {
font-size: 16px !important;
color: #222 !important;
}
.el-table th, .el-table td {
font-size: 16px !important;
color: #222 !important;
}
</style>

72
ruoyi-ui/src/views/system/UserAddress/index.vue
View File

@ -2,12 +2,9 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户" prop="uid"> <el-form-item label="用户" prop="uid">
<el-input <el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
v-model="queryParams.uid" <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
placeholder="请输入用户" </el-select>
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="收货人" prop="name"> <el-form-item label="收货人" prop="name">
<el-input <el-input
@ -33,22 +30,17 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="${comment}" prop="createdAt"> <el-form-item label="默认" prop="isDefault">
<el-date-picker clearable <el-select v-model="queryParams.isDefault" placeholder="请选择默认" clearable>
v-model="queryParams.createdAt" <el-option
type="date" v-for="dict in dict.type.user_address_status"
value-format="yyyy-MM-dd" :key="dict.value"
placeholder="请选择${comment}"> :label="dict.label"
</el-date-picker> :value="dict.value"
</el-form-item> />
<el-form-item label="${comment}" prop="updatedAt"> </el-select>
<el-date-picker clearable
v-model="queryParams.updatedAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -103,18 +95,22 @@
<el-table v-loading="loading" :data="UserAddressList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="UserAddressList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" /> <el-table-column label="ID" align="center" prop="id" />
<el-table-column label="用户" align="center" prop="uid" /> <el-table-column label="用户" align="center" prop="uid" />
<el-table-column label="收货人" align="center" prop="name" /> <el-table-column label="收货人" align="center" prop="name" />
<el-table-column label="电话" align="center" prop="phone" /> <el-table-column label="电话" align="center" prop="phone" />
<el-table-column label="具体地址" align="center" prop="info" /> <el-table-column label="具体地址" align="center" prop="info" />
<el-table-column label="默认 1：是 ，0：否" align="center" prop="isDefault" /> <el-table-column label="默认" align="center" prop="isDefault">
<el-table-column label="${comment}" align="center" prop="createdAt" width="180"> <template slot-scope="scope">
<dict-tag :options="dict.type.user_address_status" :value="scope.row.isDefault"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createdAt" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="${comment}" align="center" prop="updatedAt" width="180"> <el-table-column label="更新时间" align="center" prop="updatedAt" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
</template> </template>
@ -174,6 +170,15 @@
<el-form-item label="具体地址" prop="info"> <el-form-item label="具体地址" prop="info">
<el-input v-model="form.info" placeholder="请输入具体地址" /> <el-input v-model="form.info" placeholder="请输入具体地址" />
</el-form-item> </el-form-item>
<el-form-item label="默认 1：是 ，0：否" prop="isDefault">
<el-radio-group v-model="form.isDefault">
<el-radio
v-for="dict in dict.type.user_address_status"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="${comment}" prop="createdAt"> <el-form-item label="${comment}" prop="createdAt">
<el-date-picker clearable <el-date-picker clearable
v-model="form.createdAt" v-model="form.createdAt"
@ -208,10 +213,11 @@
</template> </template>
<script> <script>
import { listUserAddress, getUserAddress, delUserAddress, addUserAddress, updateUserAddress } from "@/api/system/UserAddress" import { listUserAddress, getUserAddress, delUserAddress, addUserAddress, updateUserAddress,getUserDataList } from "@/api/system/UserAddress"
export default { export default {
name: "UserAddress", name: "UserAddress",
dicts: ['user_address_status'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -225,6 +231,7 @@ export default {
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
// 总条数 // 总条数
userDataList: [],
total: 0, total: 0,
// 用户收货地址表格数据 // 用户收货地址表格数据
UserAddressList: [], UserAddressList: [],
@ -241,7 +248,6 @@ export default {
phone: null, phone: null,
info: null, info: null,
isDefault: null, isDefault: null,
createdAt: null,
updatedAt: null, updatedAt: null,
}, },
// 表单参数 // 表单参数
@ -257,12 +263,6 @@ export default {
phone: [ phone: [
{ required: true, message: "电话不能为空", trigger: "blur" } { required: true, message: "电话不能为空", trigger: "blur" }
], ],
latitude: [
{ required: true, message: "纬度不能为空", trigger: "blur" }
],
longitude: [
{ required: true, message: "经度不能为空", trigger: "blur" }
],
info: [ info: [
{ required: true, message: "具体地址不能为空", trigger: "blur" } { required: true, message: "具体地址不能为空", trigger: "blur" }
], ],
@ -274,6 +274,7 @@ export default {
}, },
created() { created() {
this.getList() this.getList()
this.getuserDataList()
}, },
methods: { methods: {
/** 查询用户收货地址列表 */ /** 查询用户收货地址列表 */
@ -325,6 +326,11 @@ export default {
this.single = selection.length!==1 this.single = selection.length!==1
this.multiple = !selection.length this.multiple = !selection.length
}, },
getuserDataList(){
getUserDataList("1").then(response => {
this.userDataList = response.data
})
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset() this.reset()

428
ruoyi-ui/src/views/system/Users/index.vue Normal file
View File

@ -0,0 +1,428 @@
<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="phone">
<el-input
v-model="queryParams.phone"
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.users_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="['system:users: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:users: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:users: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:users:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="usersList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" width="55" prop="id" />
<el-table-column label="昵称" align="center" prop="name" />
<el-table-column label="电话" align="center" prop="phone" />
<el-table-column label="头像" align="center" prop="avatar" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.avatar" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.users_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createdAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新时间" align="center" prop="updatedAt" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedAt, '{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="['system:users:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:users: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="nickname">
<el-input v-model="form.nickname" placeholder="请输入微信昵称" />
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
<el-form-item label="${comment}" prop="password">
<el-input v-model="form.password" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="rememberToken">
<el-input v-model="form.rememberToken" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="openid">
<el-input v-model="form.openid" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="头像" prop="avatar">
<image-upload v-model="form.avatar"/>
</el-form-item>
<el-form-item label="师傅签到时间" prop="workerTime">
<el-date-picker clearable
v-model="form.workerTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择师傅签到时间">
</el-date-picker>
</el-form-item>
<el-form-item label="可用积分" prop="integral">
<el-input v-model="form.integral" placeholder="请输入可用积分" />
</el-form-item>
<el-form-item label="累计积分" prop="totalIntegral">
<el-input v-model="form.totalIntegral" placeholder="请输入累计积分" />
</el-form-item>
<el-form-item label="1:启用 0：关闭" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.users_status"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="师傅等级" prop="level">
<el-input v-model="form.level" placeholder="请输入师傅等级" />
</el-form-item>
<el-form-item label="师傅佣金" prop="commission">
<el-input v-model="form.commission" placeholder="请输入师傅佣金" />
</el-form-item>
<el-form-item label="累计佣金" prop="totalComm">
<el-input v-model="form.totalComm" placeholder="请输入累计佣金" />
</el-form-item>
<el-form-item label="质保金" prop="margin">
<el-input v-model="form.margin" placeholder="请输入质保金" />
</el-form-item>
<el-form-item label="工号" prop="jobNumber">
<el-input v-model="form.jobNumber" placeholder="请输入工号" />
</el-form-item>
<el-form-item label="禁止接单开始时间" prop="prohibitTime">
<el-date-picker clearable
v-model="form.prohibitTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择禁止接单开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="禁止接单时长" prop="prohibitTimeNum">
<el-input v-model="form.prohibitTimeNum" placeholder="请输入禁止接单时长" />
</el-form-item>
<el-form-item label="师傅累计接单" prop="toa">
<el-input v-model="form.toa" placeholder="请输入师傅累计接单" />
</el-form-item>
<el-form-item label="师傅服务城市" prop="serviceCityPid">
<el-input v-model="form.serviceCityPid" placeholder="请输入师傅服务城市" />
</el-form-item>
<el-form-item label="师傅服务区域" prop="serviceCityIds">
<el-input v-model="form.serviceCityIds" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="师傅技能ID" prop="skillIds">
<el-input v-model="form.skillIds" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="累计提现" prop="propose">
<el-input v-model="form.propose" placeholder="请输入累计提现" />
</el-form-item>
<el-form-item label="0:默认 1：停止接单" prop="isStop">
<el-input v-model="form.isStop" placeholder="请输入0:默认 1：停止接单" />
</el-form-item>
<el-form-item label="1：虚拟号码-已认证" prop="middleAuth">
<el-input v-model="form.middleAuth" placeholder="请输入1：虚拟号码-已认证" />
</el-form-item>
<el-form-item label="${comment}" prop="createdAt">
<el-date-picker clearable
v-model="form.createdAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</el-form-item>
<el-form-item label="${comment}" prop="updatedAt">
<el-date-picker clearable
v-model="form.updatedAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
</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 { listUsers, getUsers, delUsers, addUsers, updateUsers } from "@/api/system/users"
export default {
name: "Users",
dicts: ['users_status'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 用户列表表格数据
usersList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
name: null,
phone: null,
status: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
name: [
{ required: true, message: "昵称不能为空", trigger: "blur" }
],
phone: [
{ required: true, message: "电话不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "1:启用 0：关闭不能为空", trigger: "change" }
],
}
}
},
created() {
this.getList()
},
methods: {
/** 查询用户列表列表 */
getList() {
this.loading = true
listUsers(this.queryParams).then(response => {
this.usersList = response.rows
this.total = response.total
this.loading = false
})
},
// 取消按钮
cancel() {
this.open = false
this.reset()
},
// 表单重置
reset() {
this.form = {
id: null,
name: null,
nickname: null,
phone: null,
password: null,
rememberToken: null,
openid: null,
avatar: null,
type: null,
workerTime: null,
integral: null,
totalIntegral: null,
status: null,
level: null,
commission: null,
totalComm: null,
margin: null,
jobNumber: null,
prohibitTime: null,
prohibitTimeNum: null,
toa: null,
serviceCityPid: null,
serviceCityIds: null,
skillIds: null,
propose: null,
loginStatus: null,
isStop: null,
middleAuth: null,
createdAt: null,
updatedAt: 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
getUsers(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) {
updateUsers(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
} else {
addUsers(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 delUsers(ids)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
},
/** 导出按钮操作 */
handleExport() {
this.download('system/users/export', {
...this.queryParams
}, `users_${new Date().getTime()}.xlsx`)
}
}
}
</script>

19
ruoyi-ui/src/views/system/WorkerApply/index.vue
View File

@ -1,6 +1,12 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户" prop="uid">
<el-select v-model="queryParams.uid" placeholder="请选择用户" clearable filterable>
<el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
<el-input <el-input
v-model="queryParams.name" v-model="queryParams.name"
@ -27,7 +33,7 @@
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态0：待处理1：同意 2：驳回" clearable> <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option <el-option
v-for="dict in dict.type.worker_apply_status" v-for="dict in dict.type.worker_apply_status"
:key="dict.value" :key="dict.value"
@ -234,7 +240,7 @@
</template> </template>
<script> <script>
import { listWorkerApply, getWorkerApply, delWorkerApply, addWorkerApply, updateWorkerApply } from "@/api/system/WorkerApply" import { listWorkerApply, getWorkerApply, delWorkerApply, addWorkerApply, updateWorkerApply,getUserDataList } from "@/api/system/WorkerApply"
export default { export default {
name: "WorkerApply", name: "WorkerApply",
@ -253,6 +259,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 用户数据列表
userDataList: [],
// 师傅申请记录表格数据 // 师傅申请记录表格数据
WorkerApplyList: [], WorkerApplyList: [],
// 弹出层标题 // 弹出层标题
@ -298,6 +306,7 @@ export default {
}, },
created() { created() {
this.getList() this.getList()
this.getuserDataList()
}, },
methods: { methods: {
/** 查询师傅申请记录列表 */ /** 查询师傅申请记录列表 */
@ -358,6 +367,12 @@ export default {
this.single = selection.length!==1 this.single = selection.length!==1
this.multiple = !selection.length this.multiple = !selection.length
}, },
getuserDataList(){
getUserDataList("1").then(response => {
this.userDataList = response.data
})
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset() this.reset()