chuangte/ride-lease-vue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户信息修改

Browse Source
This commit is contained in:
tx 2024-10-17 17:27:43 +08:00
parent f5a78514e1
commit 5a5b4cac95
8 changed files with 190 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.development
View File

@ -5,7 +5,8 @@ VUE_APP_TITLE = 电动车租赁系统
ENV = 'development'
# 电动车租赁系统/开发环境
VUE_APP_BASE_API = '/dev-api'
# VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_API = 'http://192.168.2.21:8090'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

3
.env.production
View File

@ -5,4 +5,5 @@ VUE_APP_TITLE = 电动车租赁系统
ENV = 'production'
# 电动车租赁系统/生产环境
VUE_APP_BASE_API = '/prod-api'
# VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API = 'http://192.168.2.21:8090'

3
.env.staging
View File

@ -7,4 +7,5 @@ NODE_ENV = production
ENV = 'staging'
# 电动车租赁系统/测试环境
VUE_APP_BASE_API = '/stage-api'
# VUE_APP_BASE_API = '/stage-api'
VUE_APP_BASE_API = 'http://192.168.2.21:8090'

2
src/components/Business/SmUser/UserInput.vue
View File

@ -159,6 +159,7 @@ export default {
},
// 确定
onSubmit(selected){
console.log(selected,'selectedselected');
let value = null;
if (this.multiple) {
value = selected.map(item => item[this.prop]);
@ -169,6 +170,7 @@ export default {
// if (!isDeepEqual(this.value, value)) {
// this.$emit('change', selected);
// }
console.log(value,'valuevalue');
this.inputValue(value);
this.closeDialog();
},

37
src/components/Business/SmUser/smUserDialog.vue
View File

@ -45,6 +45,7 @@
<script>
import {clone} from "@/utils";
// import {listSmUser} from "@/api/system/smUser";
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
export default {
name: "smUserDialog",
@ -60,6 +61,20 @@ export default {
total: 0,
row: null,
selected: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
dividendStatus: undefined,
userName: undefined,
phonenumber: undefined,
dividendProportion: undefined,
status: undefined,
deptId: undefined,
areaId: undefined,
typeList: "00"
},
}
},
props: {
@ -128,9 +143,11 @@ export default {
// 确认选中
submit() {
if (this.multiple) {
this.$emit('select', this.selected);
console.log(this.selected,'this.selected');
// this.$emit('select', this.selected);
} else {
this.select(this.row);
// console.log(this.row,'this.selected');
}
},
// 更换某一行的选中状态
@ -155,16 +172,26 @@ export default {
// 获取数据列表
searchList() {
this.loadTable = true;
// listSmUser(this.searchForm).then(response => {
listUser(this.addDateRange(this.queryParams)).then(response => {
this.tableData = response.rows;
this.total = response.total;
// 刷新表格状态
this.$nextTick(()=>{
this.refreshTableSelection();
})
}).finally(() => {
this.loadTable = false;
})
// listUser(this.addDateRange(this.queryParams)).then(response => {
// this.tableData = response.rows;
// this.total = response.total;
// // 刷新表格状态
// this.$nextTick(()=>{
// this.refreshTableSelection();
// })
// }).finally(() => {
// this.loadTable = false;
// })
// }
// );
},
// 关闭弹窗
close() {

24
src/views/system/partner/index.vue
View File

@ -194,7 +194,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
<!-- <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
<el-option
v-for="item in roleOptions"
:key="item.roleId"
@ -202,6 +202,15 @@
:value="item.roleId"
:disabled="item.status == 1"
></el-option>
</el-select> -->
<el-select v-model="form.roleIds" placeholder="请选择角色">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
@ -347,6 +356,19 @@ export default {
areaId: undefined,
typeList: "00,02,03,04"
},
options: [{
value: '00',
label: '系统用户'
}, {
value: '02',
label: '代理商'
}, {
value: '03',
label: '商户'
}, {
value: '04',
label: '调度员'
}],
// 表单校验
rules: {
dividendProportion: [

249
src/views/system/store/index.vue
View File

@ -2,35 +2,20 @@
<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="userId" v-if="notHasView(views.user)">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="店铺名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入店铺名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.name" placeholder="请输入店铺名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="店铺状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择店铺状态" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.store_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in dict.type.store_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="是否生效" prop="enabled">
<el-select v-model="queryParams.enabled" placeholder="请选择审核状态" clearable @change="handleQuery">
<el-option label="已生效" :value="true"/>
<el-option label="未生效" :value="false"/>
<el-option label="已生效" :value="true" />
<el-option label="未生效" :value="false" />
</el-select>
</el-form-item>
<el-form-item>
@ -41,156 +26,112 @@
<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="['ss:store:add']"
>新增</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ss:store: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="['ss:store:edit']"
>修改</el-button>
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['ss:store: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="['ss:store:remove']"
>删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['ss:store: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="['ss:store:export']"
>导出</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['ss:store:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="storeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="storeId" width="50"/>
<el-table-column label="ID" align="center" prop="storeId" width="50" />
<el-table-column label="所属用户" align="center" prop="userName" width="120">
<user-link slot-scope="d" :id="d.row.userId" :name="d.row.userName"/>
<user-link slot-scope="d" :id="d.row.userId" :name="d.row.userName" />
</el-table-column>
<el-table-column label="商户图片" align="center" prop="picture" width="100">
<template slot-scope="scope">
<image-preview :src="scope.row.picture" :width="50" :height="50"/>
<image-preview :src="scope.row.picture" :width="50" :height="50" />
</template>
</el-table-column>
<el-table-column label="店铺名称" align="center" prop="name" >
<store-link slot-scope="d" :id="d.row.storeId" :name="d.row.name"/>
<el-table-column label="店铺名称" align="center" prop="name">
<store-link slot-scope="d" :id="d.row.storeId" :name="d.row.name" />
</el-table-column>
<el-table-column label="营业时间" align="center" min-width="100">
<template slot-scope="d">
{{d.row.businessTimeStart}} 至 {{d.row.businessTimeEnd}}
{{ d.row.businessTimeStart }} 至 {{ d.row.businessTimeEnd }}
</template>
</el-table-column>
<el-table-column label="门店地址" align="center" min-width="200" show-overflow-tooltip>
<template slot-scope="d">
{{d.row.province}}{{d.row.city}}{{d.row.county}}{{d.row.address}}
{{ d.row.province }}{{ d.row.city }}{{ d.row.county }}{{ d.row.address }}
</template>
</el-table-column>
<el-table-column label="店铺状态" align="center">
<template slot-scope="d">
<dict-tag :value="d.row.status" :options="dict.type.store_status"/>
<dict-tag :value="d.row.status" :options="dict.type.store_status" />
</template>
</el-table-column>
<el-table-column label="是否生效" align="center">
<template slot-scope="d">
<el-tag :type="d.row.enabled ? 'success' : 'danger'">{{d.row.enabled ? '已生效' : '未生效'}}</el-tag>
<el-tag :type="d.row.enabled ? 'success' : 'danger'">{{ d.row.enabled ? '已生效' : '未生效' }}</el-tag>
</template>
</el-table-column>
<el-table-column label="设备数量" align="center" prop="deviceCount" >
<template slot-scope="d">{{d.row.deviceCount}} 台</template>
<el-table-column label="设备数量" align="center" prop="deviceCount">
<template slot-scope="d">{{ d.row.deviceCount }} 台</template>
</el-table-column>
<el-table-column label="在线数量" align="center" prop="onlineCount" >
<template slot-scope="d">{{d.row.onlineCount}} 台</template>
<el-table-column label="在线数量" align="center" prop="onlineCount">
<template slot-scope="d">{{ d.row.onlineCount }} 台</template>
</el-table-column>
<el-table-column label="离线数量" align="center" prop="offlineCount" >
<template slot-scope="d">{{d.row.offlineCount}} 台</template>
<el-table-column label="离线数量" align="center" prop="offlineCount">
<template slot-scope="d">{{ d.row.offlineCount }} 台</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" />
<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-view"
@click="handleView(scope.row)"
v-hasPermi="['ss:store:detail']"
>查看详情</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['ss:store:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ss:store:remove']"
>删除</el-button>
<el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
v-hasPermi="['ss:store:detail']">查看详情</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ss:store:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ss:store: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"
/>
<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="50%" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="8">
<form-col label="店铺图片" prop="picture" :span="span * 2">
<image-upload v-model="form.picture" :limit="9"/>
<image-upload v-model="form.picture" :limit="9" />
</form-col>
<form-col label="所属用户" prop="userId" :span="span">
<user-input v-model="form.userId" :query="userQuery" :disabled="hasView(views.user)"/>
<form-col label="所属用户" prop="merchantId" :span="span">
<el-select v-model="form.merchantId" filterable placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
<!-- <user-input v-model="form.userId" :query="userQuery" :disabled="hasView(views.user)"/> -->
</form-col>
<form-col label="是否在地图展示" prop="show" :span="span" label-width="9em">
<el-switch v-model="form.show"/>
<el-switch v-model="form.show" />
</form-col>
<form-col label="店铺名称" prop="name" :span="span * 2">
<el-input v-model="form.name" placeholder="请输入店铺名称" />
</form-col>
<form-col label="车型" prop="name" :span="span * 2">
<el-select v-model="form.modelIds" filterable placeholder="请选择" :multiple="true">
<el-option v-for="item in modelList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</form-col>
<form-col label="营业时间" prop="businessTimeStart" :span="span">
<el-time-picker
is-range
v-model="formatBusinessTime"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="HH:mm"
value-format="HH:mm"
:clearable="false"
style="width: 100%"
<el-time-picker is-range v-model="formatBusinessTime" range-separator="至" start-placeholder="开始时间"
end-placeholder="结束时间" format="HH:mm" value-format="HH:mm" :clearable="false" style="width: 100%"
placeholder="请选择营业时间范围">
</el-time-picker>
</form-col>
@ -198,7 +139,7 @@
<el-input v-model="form.address" placeholder="请输入店铺地址">
<template #prepend>
<div>
{{form.province}}{{form.city}}{{form.county}}
{{ form.province }}{{ form.city }}{{ form.county }}
</div>
</template>
<template #append>
@ -207,10 +148,10 @@
</el-input>
</form-col>
<form-col label="联系人" prop="contactName" :span="span">
<el-input v-model="form.contactName" placeholder="请输入联系人"/>
<el-input v-model="form.contactName" placeholder="请输入联系人" />
</form-col>
<form-col label="联系电话" prop="contactMobile" :span="span">
<el-input v-model="form.contactMobile" placeholder="请输入联系电话" maxlength="11" show-word-limit/>
<el-input v-model="form.contactMobile" placeholder="请输入联系电话" maxlength="11" show-word-limit />
</form-col>
</el-row>
</el-form>
@ -220,17 +161,14 @@
</div>
</el-dialog>
<place-search-dialog
:show.sync="showPlaceSearchMap"
:init-lat="form.lat"
:init-lng="form.lng"
@submit="onSubmitAddress"
marker-type="store"
/>
<place-search-dialog :show.sync="showPlaceSearchMap" :init-lat="form.lat" :init-lng="form.lng"
@submit="onSubmitAddress" marker-type="store" />
</div>
</template>
<script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { listModel } from "@/api/rl/model";
import { listStore, getStore, delStore, addStore, updateStore } from "@/api/rl/store";
import SmUserSelect from '@/components/Business/SmUser/smUserSelect.vue'
import UserInput from '@/components/Business/SmUser/UserInput.vue'
@ -284,6 +222,19 @@ export default {
address: null,
deleted: null
},
options: [{
value: '00',
label: '系统用户'
}, {
value: '02',
label: '代理商'
}, {
value: '03',
label: '商户'
}, {
value: '04',
label: '调度员'
}],
// 表单参数
form: {},
// 表单校验
@ -309,6 +260,9 @@ export default {
},
showPlaceSearchMap: false,
span: 12,
options:[],
modelList:[]
};
},
computed: {
@ -335,7 +289,10 @@ export default {
...this.queryParams,
...this.query
}
this.searchList()
this.getList();
this.getlistModel()
},
methods: {
parseTime,
@ -348,6 +305,48 @@ export default {
this.form.county = addr.county;
this.form.specificAddress = addr.name;
},
// 获取数据列表
searchList() {
let data = {
pageNum: 1,
pageSize: 20,
dividendStatus: undefined,
userName: undefined,
phonenumber: undefined,
dividendProportion: undefined,
status: undefined,
deptId: undefined,
areaId: undefined,
typeList: "00,03"
}
listUser(this.addDateRange(data)).then(response => {
console.log(response,'responseresponseresponse');
this.options = response.rows.map(item => ({
value: item.userId,
label: item.realName+' ' +item.phonenumber
}));
console.log( this.options,' this.options this.options');
});
},
getlistModel() {
let data = {
pageNum: 1,
pageSize: 20,
}
listModel(this.addDateRange(data)).then(response => {
console.log(response,'responseresponseresponse');
// this.modelList = response.rows
this.modelList = response.rows.map(item => ({
value: item.modelId,
label: item.model
}));
console.log( this.options,' this.options this.options');
});
},
/** 查询商户列表列表 */
getList() {
this.loading = true;
@ -400,7 +399,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.storeId)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
@ -450,12 +449,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const storeIds = row.storeId || this.ids;
this.$modal.confirm('是否确认删除商户列表编号为"' + storeIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除商户列表编号为"' + storeIds + '"的数据项？').then(function () {
return delStore(storeIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {

2
vue.config.js
View File

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