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

202505301015

This commit is contained in:
张潘 2025-05-30 10:15:43 +08:00
parent 268dc896a4
commit 487ee3663c
13 changed files with 243 additions and 577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-system/src/main/java/com/ruoyi/system/controller/AreaController.java
View File

@ -2,6 +2,8 @@ package com.ruoyi.system.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.system.domain.ServiceCate;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -46,6 +48,22 @@ public class AreaController extends BaseController
return getDataTable(list);
}
/**
* 查询地区信息列表不分页，只要用户下拉选择
*/
@PreAuthorize("@ss.hasPermi('system:Area:query')")
@GetMapping(value = "/selectAreaList/{id}")
public AjaxResult selectServiceCateList(@PathVariable("id") Long id)
{
Area area=new Area();
if(id!=null){
area.setPid(id);
}
return success(areaService.selectAreaList(area));
}
/**
* 导出地区信息列表
*/

20
ruoyi-ui/src/api/system/Area.js
View File

@ -1,44 +1,44 @@
import request from '@/utils/request'
// 查询地区信息列表
// 查询地区列表
export function listArea(query) {
return request({
url: '/system/Area/list',
url: '/system/area/list',
method: 'get',
params: query
})
}
// 查询地区信息详细
// 查询地区详细
export function getArea(id) {
return request({
url: '/system/Area/' + id,
url: '/system/area/' + id,
method: 'get'
})
}
// 新增地区信息
// 新增地区
export function addArea(data) {
return request({
url: '/system/Area',
url: '/system/area',
method: 'post',
data: data
})
}
// 修改地区信息
// 修改地区
export function updateArea(data) {
return request({
url: '/system/Area',
url: '/system/area',
method: 'put',
data: data
})
}
// 删除地区信息
// 删除地区
export function delArea(id) {
return request({
url: '/system/Area/' + id,
url: '/system/area/' + id,
method: 'delete'
})
}

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

@ -17,6 +17,14 @@ export function getMobileMiddle(id) {
})
}
// 查询双向呼叫号码详细
export function selectAreaList(id) {
return request({
url: '/system/Area/selectAreaList/' + id,
method: 'get'
})
}
// 新增双向呼叫号码
export function addMobileMiddle(data) {
return request({

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

@ -17,6 +17,15 @@ export function getMobileNotify(id) {
})
}
// 查询双向呼叫号码详细
export function selectAreaList(id) {
return request({
url: '/system/Area/selectAreaList/' + id,
method: 'get'
})
}
// 新增语音通知号码
export function addMobileNotify(data) {
return request({

49
ruoyi-ui/src/views/system/Content/index.vue
View File

@ -58,16 +58,7 @@
v-hasPermi="['system:Content: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:Content:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -149,31 +140,13 @@
<el-input v-model="form.link" placeholder="请输入链接地址" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序" />
<el-input-number v-model="form.sort" :min="0" :max="999" placeholder="请输入排序" />
</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-item label="${comment}" prop="deletedAt">
<el-date-picker clearable
v-model="form.deletedAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择${comment}">
</el-date-picker>
<el-form-item label="显示状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="1">显示</el-radio>
<el-radio :label="2">不显示</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -230,7 +203,7 @@ export default {
{ required: true, message: "标题不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "1:列表显示 2：单页显示不能为空", trigger: "change" }
{ required: true, message: "显示状态不能为空", trigger: "change" }
],
}
}
@ -262,10 +235,8 @@ export default {
content: null,
image: null,
link: null,
sort: null,
status: null,
createdAt: null,
updatedAt: null,
sort: 0,
status: 1,
deletedAt: null
}
this.resetForm("form")

11
ruoyi-ui/src/views/system/Coupons/index.vue
View File

@ -176,16 +176,7 @@
v-hasPermi="['system:Coupons: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:Coupons:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>

81
ruoyi-ui/src/views/system/MobileMiddle/index.vue
View File

@ -66,16 +66,7 @@
v-hasPermi="['system:MobileMiddle: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:MobileMiddle:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -128,28 +119,29 @@
<el-form-item label="号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入号码" />
</el-form-item>
<el-form-item label="省份" prop="provinceId">
<el-input v-model="form.provinceId" placeholder="请输入省份" />
<el-select v-model="form.provinceId" placeholder="请选择省份" @change="handleProvinceChange">
<el-option
v-for="item in selectAreaShenDataList"
:key="item.id"
:label="item.title"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="城市" prop="cityId">
<el-input v-model="form.cityId" placeholder="请输入城市" />
</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-select v-model="form.cityId" placeholder="请选择城市" :disabled="!form.provinceId">
<el-option
v-for="item in selectAreaShiDataList"
:key="item.id"
:label="item.title"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -160,7 +152,7 @@
</template>
<script>
import { listMobileMiddle, getMobileMiddle, delMobileMiddle, addMobileMiddle, updateMobileMiddle } from "@/api/system/MobileMiddle"
import { listMobileMiddle, getMobileMiddle, delMobileMiddle, addMobileMiddle, updateMobileMiddle, selectAreaList } from "@/api/system/MobileMiddle"
export default {
name: "MobileMiddle",
@ -182,6 +174,10 @@ export default {
MobileMiddleList: [],
// 弹出层标题
title: "",
// 下拉省选择
selectAreaShenDataList: [],
// 下拉市选择
selectAreaShiDataList: [],
// 是否显示弹出层
open: false,
// 查询参数
@ -206,6 +202,7 @@ export default {
},
created() {
this.getList()
this.getShenDataList()
},
methods: {
/** 查询双向呼叫号码列表 */
@ -232,6 +229,7 @@ export default {
createdAt: null,
updatedAt: null
}
this.selectAreaShiDataList = []
this.resetForm("form")
},
/** 搜索按钮操作 */
@ -253,15 +251,34 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.getShenDataList()
this.open = true
this.title = "添加双向呼叫号码"
},
getShenDataList(){
selectAreaList("100000").then(response => {
this.selectAreaShenDataList = response.data
})
},
getShiDataList(id){
selectAreaList(id).then(response => {
this.selectAreaShiDataList = response.data
})
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.id || this.ids
getMobileMiddle(id).then(response => {
console.log(response)
this.form = response.data
this.getShenDataList()
if(this.form.provinceId) {
this.getShiDataList(this.form.provinceId)
}
this.open = true
this.title = "修改双向呼叫号码"
})
@ -301,6 +318,12 @@ export default {
this.download('system/MobileMiddle/export', {
...this.queryParams
}, `MobileMiddle_${new Date().getTime()}.xlsx`)
},
handleProvinceChange() {
if(this.form.provinceId) {
this.getShiDataList(this.form.provinceId)
this.form.cityId = null
}
}
}
}

99
ruoyi-ui/src/views/system/MobileNotify/index.vue
View File

@ -66,16 +66,7 @@
v-hasPermi="['system:MobileNotify: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:MobileNotify:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -130,27 +121,26 @@
<el-input v-model="form.phone" placeholder="请输入号码" />
</el-form-item>
<el-form-item label="省份" prop="provinceId">
<el-input v-model="form.provinceId" placeholder="请输入省份" />
<el-select v-model="form.provinceId" placeholder="请选择省份" @change="handleProvinceChange">
<el-option
v-for="item in selectAreaShenDataList"
:key="item.id"
:label="item.title"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="城市" prop="cityId">
<el-input v-model="form.cityId" placeholder="请输入城市" />
</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-select v-model="form.cityId" placeholder="请选择城市" :disabled="!form.provinceId">
<el-option
v-for="item in selectAreaShiDataList"
:key="item.id"
:label="item.title"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -161,7 +151,7 @@
</template>
<script>
import { listMobileNotify, getMobileNotify, delMobileNotify, addMobileNotify, updateMobileNotify } from "@/api/system/MobileNotify"
import { listMobileNotify, getMobileNotify, delMobileNotify, addMobileNotify, updateMobileNotify, selectAreaList } from "@/api/system/MobileNotify"
export default {
name: "MobileNotify",
@ -179,6 +169,11 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 下拉省选择
selectAreaShenDataList: [],
// 下拉市选择
selectAreaShiDataList: [],
// 语音通知号码表格数据
MobileNotifyList: [],
// 弹出层标题
@ -213,6 +208,7 @@ export default {
},
created() {
this.getList()
this.getShenDataList()
},
methods: {
/** 查询语音通知号码列表 */
@ -239,6 +235,7 @@ export default {
createdAt: null,
updatedAt: null
}
this.selectAreaShiDataList = []
this.resetForm("form")
},
/** 搜索按钮操作 */
@ -260,6 +257,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.getShenDataList()
this.open = true
this.title = "添加语音通知号码"
},
@ -268,11 +266,52 @@ export default {
this.reset()
const id = row.id || this.ids
getMobileNotify(id).then(response => {
this.form = response.data
let _data=response.data
_data.provinceId=Number(_data.provinceId)
_data.cityId=Number(_data.cityId)
this.form = _data
this.getShenDataList().then(() => {
if(this.form.provinceId) {
// 找到并设置省份名称
const province = this.selectAreaShenDataList.find(item => item.id === this.form.provinceId)
if(province) {
this.form.provinceName = province.title
}
// 加载城市数据
this.getShiDataList(this.form.provinceId).then(() => {
if(this.form.cityId) {
// 找到并设置城市名称
const city = this.selectAreaShiDataList.find(item => item.id === this.form.cityId)
if(city) {
this.form.cityName = city.title
}
}
})
}
})
this.open = true
this.title = "修改语音通知号码"
})
},
getShenDataList(){
return selectAreaList("100000").then(response => {
this.selectAreaShenDataList = response.data
})
},
getShiDataList(id){
return selectAreaList(id).then(response => {
this.selectAreaShiDataList = response.data
})
},
handleProvinceChange() {
if(this.form.provinceId) {
this.getShiDataList(this.form.provinceId)
this.form.cityId = null
}
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {

65
ruoyi-ui/src/views/system/OrderRework/index.vue
View File

@ -44,51 +44,7 @@
</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:OrderRework: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:OrderRework: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:OrderRework: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:OrderRework:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="OrderReworkList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
@ -105,24 +61,7 @@
</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:OrderRework:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:OrderRework:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination

65
ruoyi-ui/src/views/system/OrderSound/index.vue
View File

@ -25,51 +25,7 @@
</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:OrderSound: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:OrderSound: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:OrderSound: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:OrderSound:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="OrderSoundList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
@ -109,24 +65,7 @@
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150" 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:OrderSound:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:OrderSound:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination

45
ruoyi-ui/src/views/system/PayMoneyLog/index.vue
View File

@ -26,51 +26,6 @@
</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:PayMoneyLog: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:PayMoneyLog: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:PayMoneyLog: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:PayMoneyLog:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="PayMoneyLogList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" />

161
ruoyi-ui/src/views/system/UsersWorker/index.vue
View File

@ -240,131 +240,24 @@
@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>
<UserEditDialog
:visible.sync="editDialogVisible"
:user="editUser"
:mode="editMode"
@confirm="handleEditConfirm"
@cancel="editDialogVisible = false"
/>
</div>
</template>
<script>
import { listUsers, getUsers, delUsers, addUsers, updateUsers,getUserDataList,changetypeStatus } from "@/api/system/users"
import UserEditDialog from './UserEditDialog.vue'
export default {
name: "Users",
dicts: ['users_status','users_login_status'],
components: { UserEditDialog },
data() {
return {
// 遮罩层
@ -415,7 +308,10 @@ export default {
status: [
{ required: true, message: "1:启用 0：关闭不能为空", trigger: "change" }
],
}
},
editDialogVisible: false,
editUser: {},
editMode: 'add',
}
},
created() {
@ -493,19 +389,15 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = "添加用户列表"
this.editUser = {};
this.editMode = 'add';
this.editDialogVisible = true;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.id || this.ids
getUsers(id).then(response => {
this.form = response.data
this.open = true
this.title = "修改用户列表"
})
this.editUser = { ...row };
this.editMode = 'edit';
this.editDialogVisible = true;
},
// 状态修改
handleStatusChange(row) {
@ -553,7 +445,22 @@ export default {
this.download('system/users/export', {
...this.queryParams
}, `users_${new Date().getTime()}.xlsx`)
},
handleEditConfirm(user) {
if (this.editMode === 'add') {
addUsers(user).then(response => {
this.$modal.msgSuccess("新增成功");
this.editDialogVisible = false;
this.getList();
});
} else {
updateUsers(user).then(response => {
this.$modal.msgSuccess("修改成功");
this.editDialogVisible = false;
this.getList();
});
}
},
}
}
</script>

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

@ -143,108 +143,24 @@
@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="uid">
<el-input v-model="form.uid" placeholder="请输入用户" />
</el-form-item>
<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="address">
<el-input v-model="form.address" placeholder="请输入地址" />
</el-form-item>
<el-form-item label="身份证号码" prop="cardNo">
<el-input v-model="form.cardNo" placeholder="请输入身份证号码" />
</el-form-item>
<el-form-item label="技能ID" prop="skillId">
<el-input v-model="form.skillId" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="身份张头像面--废弃" prop="cardAvatar">
<image-upload v-model="form.cardAvatar"/>
</el-form-item>
<el-form-item label="身份张国徽面--废弃" prop="cardBadge">
<image-upload v-model="form.cardBadge"/>
</el-form-item>
<el-form-item label="电子照片" prop="image">
<image-upload v-model="form.image"/>
</el-form-item>
<el-form-item label="技能证书" prop="skill">
<image-upload v-model="form.skill"/>
</el-form-item>
<el-form-item label="无犯罪证明" prop="criminal">
<image-upload v-model="form.criminal"/>
</el-form-item>
<el-form-item label="健康证" prop="health">
<image-upload v-model="form.health"/>
</el-form-item>
<el-form-item label="学历证书" prop="education">
<image-upload v-model="form.education"/>
</el-form-item>
<el-form-item label="驾照" prop="drive">
<image-upload v-model="form.drive"/>
</el-form-item>
<el-form-item label="状态0：待处理1：同意 2：驳回" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.worker_apply_status"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="接单城市" prop="cityPid">
<el-input v-model="form.cityPid" placeholder="请输入接单城市" />
</el-form-item>
<el-form-item label="接单地区" prop="cityIds">
<el-input v-model="form.cityIds" type="textarea" placeholder="请输入内容" />
</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-item label="${comment}" prop="deletedAt">
<el-date-picker clearable
v-model="form.deletedAt"
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>
<!-- 使用新的编辑组件 -->
<worker-apply-edit
:visible.sync="open"
:title="title"
:data="form"
@confirm="handleEditConfirm"
/>
</div>
</template>
<script>
import { listWorkerApply, getWorkerApply, delWorkerApply, addWorkerApply, updateWorkerApply, getUserDataList } from "@/api/system/WorkerApply"
import WorkerApplyEdit from './WorkerApplyEdit.vue'
export default {
name: "WorkerApply",
dicts: ['worker_apply_status'],
components: { WorkerApplyEdit },
data() {
return {
// 遮罩层
@ -280,28 +196,7 @@ export default {
cityIds: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
uid: [
{ required: true, message: "用户不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "姓名不能为空", trigger: "blur" }
],
phone: [
{ required: true, message: "电话不能为空", trigger: "blur" }
],
address: [
{ required: true, message: "地址不能为空", trigger: "blur" }
],
cardNo: [
{ required: true, message: "身份证号码不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态0：待处理1：同意 2：驳回不能为空", trigger: "change" }
],
}
form: {}
}
},
created() {
@ -325,31 +220,7 @@ export default {
},
// 表单重置
reset() {
this.form = {
id: null,
uid: null,
name: null,
phone: null,
address: null,
cardNo: null,
skillId: null,
cardAvatar: null,
cardBadge: null,
image: null,
skill: null,
criminal: null,
health: null,
education: null,
drive: null,
status: null,
remarks: null,
cityPid: null,
cityIds: null,
createdAt: null,
updatedAt: null,
deletedAt: null
}
this.resetForm("form")
this.form = {}
},
/** 搜索按钮操作 */
handleQuery() {
@ -390,24 +261,20 @@ export default {
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateWorkerApply(this.form).then(response => {
handleEditConfirm(formData) {
if (formData.id != null) {
updateWorkerApply(formData).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
} else {
addWorkerApply(this.form).then(response => {
addWorkerApply(formData).then(response => {
this.$modal.msgSuccess("新增成功")
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {