chuangte/bick_back
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
邱贞招 2024-05-31 21:59:35 +08:00
parent 8be65ddfe3
commit 67bd7644f4
9 changed files with 31 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/layout/components/Navbar.vue
View File

@ -9,14 +9,6 @@
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<el-tooltip content="源码地址" effect="dark" placement="bottom">
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>
<el-tooltip content="文档地址" effect="dark" placement="bottom">
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
</el-tooltip>
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<el-tooltip content="布局大小" effect="dark" placement="bottom">

44
src/views/system/adminOrder/index.vue
View File

@ -17,16 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="维修类型" prop="repairType">-->
<!-- <el-select v-model="queryParams.repairType" placeholder="请选择维修类型" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.et_repair_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
@ -64,38 +54,6 @@
</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:order:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:order:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:order:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
@ -155,7 +113,7 @@
<dict-tag :options="dict.type.et_order_is_success" :value="scope.row.isSuccess"/>
</template>
</el-table-column>
<el-table-column label="是否有效" align="center" prop="isEffective">
<el-table-column label="是否有效1111111111" align="center" prop="isEffective">
<template slot-scope="scope">
<dict-tag :options="dict.type.et_order_is_effective" :value="scope.row.isEffective"/>
</template>

1
src/views/system/area/index.vue
View File

@ -406,7 +406,6 @@ export default {
cityList: [],
countyList: [],
},
loading: false,
// 表单校验
rules: {
areaName: [{ required: true, message: "运营区域不能为空", trigger: "blur" }],

21
src/views/system/dept/index.vue
View File

@ -97,12 +97,12 @@
</el-table>
<!-- 添加或修改运营商对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24" v-if="form.parentId !== 0">
<el-form-item label="上级运营商" prop="parentId">
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级运营商" />
<el-col :span="24">
<el-form-item label="上级组织" prop="parentId" >
<treeselect v-model="form.parentId" :options="deptOptions" disabled="true" :normalizer="normalizer" placeholder="选择上级运营商" />
</el-form-item>
</el-col>
</el-row>
@ -120,13 +120,13 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="负责人" prop="leader">
<el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
<el-form-item label="负责人" prop="leader">
<el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
</el-form-item>
</el-col>
</el-row>
@ -227,6 +227,7 @@ export default {
}
],
phone: [
{ required: true, message: "联系电话不能为空", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
@ -290,15 +291,13 @@ export default {
/** 新增按钮操作 */
handleAdd(row) {
this.reset();
if (row != undefined) {
this.form.parentId = row.deptId;
}
this.open = true;
this.title = "添加运营商";
listDept().then(response => {
this.deptOptions = this.handleTree(response.data, "deptId");
listArea().then(response => {
this.areaOptions = response.rows;
this.form.parentId = 100;
});
});
},

2
src/views/system/flow/index.vue
View File

@ -73,7 +73,7 @@
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="区域" align="center" prop="areaId" />
<el-table-column label="区域" align="center" prop="areaName" />
<el-table-column label="关联订单号" width="260" align="center" prop="orderNo" />
<el-table-column label="第三方交易单号" width="250" align="center" prop="outTradeNo" />
<el-table-column label="收支类型" align="center" prop="type">

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

@ -92,9 +92,8 @@
<el-table-column label="合伙人名称" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" prop="phonenumber" />
<el-table-column label="运营区域" align="center" prop="areaName" />
<el-table-column label="分成比例" align="center" prop="dividendProportion" />
<el-table-column label="分账比例(%)" align="center" prop="dividendProportion" />
<el-table-column label="车辆数" align="center" prop="deviceNum" />
<!-- <el-table-column label="收款方式" align="center" prop="phonenumber" />-->
<el-table-column label="状态" align="center" >
<template slot-scope="scope">
<el-switch
@ -157,8 +156,11 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item v-if="form.userId == undefined" label="名称" prop="userName">
<el-input v-model="form.userName" placeholder="请输入名称" maxlength="30" />
<el-form-item v-if="form.userId == undefined" label="用户名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名" maxlength="30" />
<span class="el-form-item__tip" style="width: 100%;">
<div>tips:用户名长度在 2 到 20 个字符，用于登录系统，新增后不可修改</div>
</span>
</el-form-item>
</el-col>
<el-col :span="12">
@ -188,8 +190,8 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="分账比例" prop="dividendProportion">
<el-input v-model="form.dividendProportion" placeholder="请输入分账比例" maxlength="11" />
<el-form-item label="分账比例(%)" label-width="100" prop="dividendProportion">
<el-input style="width: 64%" v-model="form.dividendProportion" placeholder="请输入分账比例" maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -350,6 +352,7 @@ export default {
{ pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
],
phonenumber: [
{ required: true, message: "手机号不能为空", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
@ -525,6 +528,7 @@ export default {
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
this.form.userType = '03';
if (valid) {
if (this.form.userId != undefined) {
updateUser(this.form).then(response => {
@ -533,7 +537,6 @@ export default {
this.getList();
});
} else {
this.form.userType = '03';
addUser(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
@ -588,3 +591,10 @@ export default {
}
};
</script>
<style>
.el-form-item__tip{
color: #ff0000;
font-size: 12px;
line-height: 18px;
}
</style>

37
src/views/system/repair/index.vue
View File

@ -64,38 +64,6 @@
</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:order:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:order:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:order:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
@ -117,11 +85,6 @@
<el-table-column label="运维人员" align="center" prop="adminName" />
<el-table-column label="手机号" align="center" prop="phone" />
<el-table-column label="故障部位" align="center" prop="faultTypeStr" />
<!-- <el-table-column label="是否成功" align="center" prop="isSuccess">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.et_order_is_success" :value="scope.row.isSuccess"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="是否有效" align="center" prop="isEffective">
<template slot-scope="scope">
<dict-tag :options="dict.type.et_order_is_effective" :value="scope.row.isEffective"/>

313
src/views/system/replacement/index.vue
View File

@ -1,313 +0,0 @@
<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="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入工单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备mac" label-width="90px" prop="deviceMac">
<el-input
v-model="queryParams.deviceMac"
placeholder="请输入设备mac"
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.et_replacement_electricity_order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否成功" prop="isSuccess">
<el-select v-model="queryParams.isSuccess" placeholder="请选择是否成功" clearable>
<el-option
v-for="dict in dict.type.et_replacement_electricity_is_success"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否有效" prop="isEffective">
<el-select v-model="queryParams.isEffective" placeholder="请选择是否有效" clearable>
<el-option
v-for="dict in dict.type.et_replacement_electricity_is_effective"
: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="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:replacement:edit']"
>修改</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:replacement:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="replacementList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="工单编号" width="180" align="center" prop="orderNo" />
<el-table-column label="设备mac" align="center" prop="deviceMac" />
<el-table-column label="运维人员" align="center" prop="adminName" />
<el-table-column label="换电前电量(%)" width="120" align="center">
<template slot-scope="scope">
{{ scope.row.beforeElectric + '%' }}
</template>
</el-table-column>
<el-table-column label="换电后电量(%)" width="120" align="center">
<template slot-scope="scope">
{{ scope.row.afterElectric + '%' }}
</template>
</el-table-column>
<el-table-column label="开电池仓时间" align="center" prop="openTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.openTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="关电池仓时间" align="center" prop="closeTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.closeTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.et_replacement_electricity_order_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="是否成功" align="center" prop="isSuccess">
<template slot-scope="scope">
<dict-tag :options="dict.type.et_replacement_electricity_is_success" :value="scope.row.isSuccess"/>
</template>
</el-table-column>
<el-table-column label="是否有效" align="center" prop="isEffective">
<template slot-scope="scope">
<dict-tag :options="dict.type.et_replacement_electricity_is_effective" :value="scope.row.isEffective"/>
</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:replacement:edit']"
>修改</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['system:replacement: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>
<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 { listReplacement, getReplacement, delReplacement, addReplacement, updateReplacement } from "@/api/system/replacement";
export default {
name: "Replacement",
dicts: ['et_replacement_electricity_is_success', 'et_replacement_electricity_order_status', 'et_replacement_electricity_is_effective'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 换电工单表格数据
replacementList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderNo: null,
deviceMac: null,
status: null,
isSuccess: null,
isEffective: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询换电工单列表 */
getList() {
this.loading = true;
listReplacement(this.queryParams).then(response => {
this.replacementList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
orderNo: null,
deviceMac: null,
adminName: null,
beforeElectric: null,
afterElectric: null,
openTime: null,
closeTime: null,
status: null,
isSuccess: null,
isEffective: null,
createTime: null,
remark: 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
getReplacement(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) {
updateReplacement(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addReplacement(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 delReplacement(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/replacement/export', {
...this.queryParams
}, `replacement_${new Date().getTime()}.xlsx`)
}
}
};
</script>

4
src/views/system/user/profile/index.vue
View File

@ -24,8 +24,8 @@
<div class="pull-right">{{ user.email }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
<svg-icon icon-class="tree" />所属运营区
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色