From c4872b20503ddb671fa988e628e7f5363362d794 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Wed, 17 Jul 2024 09:52:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=B8=80=E9=94=AE=E5=87=BA=E4=BB=93=E3=80=81?= =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=85=A5=E4=BB=93=202.=E6=8F=90=E7=8E=B0=203?= =?UTF-8?q?.=E5=9C=B0=E5=9B=BE=E5=88=87=E6=8D=A2=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/device.js | 18 + src/api/system/flow.js | 17 + src/api/system/order.js | 9 + src/api/system/user.js | 2 +- src/main.js | 2 + src/views/system/audit/index.vue | 34 +- src/views/system/dept/index.vue | 110 +++- .../system/device/components/orderRecord.vue | 6 +- src/views/system/device/index.vue | 98 +++- src/views/system/fee/index.vue | 24 +- src/views/system/flow/index.vue | 7 +- src/views/system/map/index.vue | 50 +- src/views/system/order/index.vue | 2 +- src/views/system/user/index.vue | 1 + src/views/system/withdrawAudit/index.vue | 470 ++++++++++++++++++ src/views/user/user/index.vue | 2 +- 16 files changed, 801 insertions(+), 51 deletions(-) create mode 100644 src/views/system/withdrawAudit/index.vue diff --git a/src/api/system/device.js b/src/api/system/device.js index 657bd6f..fd6cd4f 100644 --- a/src/api/system/device.js +++ b/src/api/system/device.js @@ -59,6 +59,24 @@ export function oneClickOffline(deviceId) { }) } + +// 一键出仓 +export function oneClickListing(deviceId) { + return request({ + url: '/system/device/oneClickListing/' + deviceId, + method: 'post' + }) +} + +// 一键入仓 +export function oneClickWarehousing(deviceId) { + return request({ + url: '/system/device/oneClickWarehousing/' + deviceId, + method: 'post' + }) +} + + // 查询所有车辆信息 export function allDevice() { return request({ diff --git a/src/api/system/flow.js b/src/api/system/flow.js index 08f0c42..5d4f107 100644 --- a/src/api/system/flow.js +++ b/src/api/system/flow.js @@ -42,3 +42,20 @@ export function delFlow(flowId) { method: 'delete' }) } + +// 提现 +export function withdraw(data) { + return request({ + url: '/system/flow/withdraw', + method: 'post', + data: data + }) +} +// 提现失败 +export function rejectWithdraw(data) { + return request({ + url: '/system/flow/rejectWithdraw', + method: 'post', + data: data + }) +} diff --git a/src/api/system/order.js b/src/api/system/order.js index 3949192..7e1fe4a 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -112,3 +112,12 @@ export function authoritypass(orderNo) { }) } +// 查询押金订单 +export function getDepositOrder(query) { + return request({ + url: '/appVerify/getDepositOrder', + method: 'get', + params: query + }) +} + diff --git a/src/api/system/user.js b/src/api/system/user.js index d1f1242..c05c7ad 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -21,7 +21,7 @@ export function getUser(userId) { // 绑定APP用户 export function bandAppUser(data) { return request({ - url: '/system/user/bandAppUser', + url: '/system/dept/bandAppUser', method: 'put', data: data }) diff --git a/src/main.js b/src/main.js index e781160..5f5b981 100644 --- a/src/main.js +++ b/src/main.js @@ -55,6 +55,8 @@ Vue.prototype.selectDictLabel = selectDictLabel Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.download = download Vue.prototype.handleTree = handleTree +// 创建全局事件总线 +Vue.prototype.$eventBus = new Vue(); // 全局组件挂载 Vue.component('DictTag', DictTag) diff --git a/src/views/system/audit/index.vue b/src/views/system/audit/index.vue index 4ccd271..8007868 100644 --- a/src/views/system/audit/index.vue +++ b/src/views/system/audit/index.vue @@ -289,21 +289,12 @@ - - 200 元 + + {{deposit}} 元 - + {{form5.deductionAmount}} 元 - - - - 展示音频 - - - - -
关 闭 @@ -346,7 +337,7 @@ changePrice, refund, returnVehicle, - deduction, passAudit, rejectAudit, authoritypass + deduction, passAudit, rejectAudit, authoritypass, getDepositOrder } from '@/api/system/order' import TrajectoryMap from '@/components/Map/TrajectoryMap' import { getArea, optionselect as getAreaOptionselect } from '@/api/system/area' @@ -392,6 +383,7 @@ export default { view5: false, vehicleNum: null, audioFiles: [], + deposit: null, // 查询参数 queryParams: { pageNum: 1, @@ -526,6 +518,10 @@ export default { }, /**官方审核通过 自动退押金 */ authorityPass(){ + if(this.deposit < this.form5.deductionAmount){ + this.$modal.msgError("押金小于扣款金额！") + return + } this.$refs["form5"].validate(valid => { if (valid) { if (this.form5.orderNo != null) { @@ -580,10 +576,14 @@ export default { this.view = false; }, handleAuthorityAudit(row){ - this.open5 = true; - this.form5 = row; - console.log("this.form5============="+JSON.stringify(this.form5)) - this.view5 = false; + getDepositOrder({userId:row.userId}).then(response => { + this.open5 = true; + this.form5 = row; + this.deposit = response.data.payFee; + console.log("this.form5============="+JSON.stringify(this.form5)) + console.log("this.deposit============="+JSON.stringify(this.deposit)) + this.view5 = false; + }); }, getTypeText(type) { switch (type) { diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index d2f174a..92d470d 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -58,6 +58,13 @@ > + + + + + @@ -276,6 +320,8 @@ import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import { listArea } from '../../../api/system/area' +import { fastSearch } from '@/api/user/user' +import { bandAppUser, getUser } from '@/api/system/user' export default { name: "Dept", @@ -291,12 +337,17 @@ export default { deptList: [], // 运营商树选项 deptOptions: [], + options: [], // 运营区选项 areaOptions: [], // 弹出层标题 title: "", + title2: "", + userName:null, // 是否显示弹出层 open: false, + open2: false, + loading2: false, // 是否展开，默认全部展开 isExpandAll: true, // 重新渲染表格状态 @@ -304,10 +355,12 @@ export default { // 查询参数 queryParams: { deptName: undefined, - status: undefined + status: undefined, + phonenumber: null }, // 表单参数 form: {}, + form2: {}, // 表单校验 rules: { parentId: [ @@ -334,13 +387,60 @@ export default { trigger: "blur" } ] + }, + rules2: { + phonenumber: [ + { required: true, message: "手机号码不能为空", trigger: "blur" }, + ] } }; }, created() { + console.log("当前用户信息：",this.$store.state.user.id) + this.userName = this.$store.state.user.name; + let userId = this.$store.state.user.id; + getUser(userId).then(response => { + this.user = response.data; + }); this.getList(); }, methods: { + submitForm2: function() { + let form2 = this.form2 + this.$refs['form2'].validate(valid => { + if (valid) { + this.$modal.confirm('是否确认绑定？').then(function() { + return bandAppUser({appUserId:form2.phonenumber,deptId:form2.deptId}) + }).then(() => { + // 刷新页面 + location.reload() + this.$modal.msgSuccess('操作成功') + }).catch(() => { + }) + } + }) + }, + queryPhonenumber(query) { + console.log("query:",query) + if (query !== '') { + this.loading2 = true; + setTimeout(() => { + this.loading2 = false; + fastSearch({"phonenumber":query}).then(response => { + this.options = response.data; + } + ); + }, 200); + } else { + this.options = [] + } + }, + bandWxUser(row){ + this.reset(); + this.form2 = row; + this.open2 = true; + this.title2 = "绑定微信用户"; + }, /** 查询运营商列表 */ getList() { this.loading = true; @@ -363,6 +463,7 @@ export default { // 取消按钮 cancel() { this.open = false; + this.open2 = false; this.reset(); }, // 表单重置 @@ -381,6 +482,7 @@ export default { }, /** 搜索按钮操作 */ handleQuery() { + this.queryParams.pageNum = 1; this.getList(); }, /** 重置按钮操作 */ @@ -463,3 +565,9 @@ export default { } }; + diff --git a/src/views/system/device/components/orderRecord.vue b/src/views/system/device/components/orderRecord.vue index 4ee6da7..dd18d40 100644 --- a/src/views/system/device/components/orderRecord.vue +++ b/src/views/system/device/components/orderRecord.vue @@ -4,7 +4,8 @@ @@ -83,6 +84,9 @@ export default { }).finally(() => { this.loading = false; }); + }, + closeAllDialogs() { + this.$eventBus.$emit('close-all-dialogs'); } } } diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue index 3a965fd..9c7ab88 100644 --- a/src/views/system/device/index.vue +++ b/src/views/system/device/index.vue @@ -93,22 +93,11 @@ v-hasPermi="['system:device:edit']" >修改 - - 删除 - 一键禁用 + + 一键出仓 + + + 一键入仓 + + + 删除 + - + + + + @@ -346,7 +373,7 @@ - + @@ -377,12 +404,20 @@

自动更新

- + {{ form.longitude }} - + {{ form.latitude }} + + {{ form.lastTime }} + + + + 当前无gps信号 + + 当前选择： {{selected.address}}, {{selected.lng}}, {{selected.lat}} @@ -433,7 +468,7 @@ addDevice, updateDevice, handleLock, - handleUnlocking, ring, oneClickOnline, oneClickOffline, reboot + handleUnlocking, ring, oneClickOnline, oneClickOffline, reboot, oneClickListing, oneClickWarehousing } from '@/api/system/device' import Map from "@/components/Map"; import OrderRecord from "@/views/system/device/components/orderRecord.vue"; @@ -531,6 +566,7 @@ export default { const vehicleNum = this.$route.params && this.$route.params.vehicleNum; console.log("sn------",sn) console.log("vehicleNum------",vehicleNum) + this.$eventBus.$on('close-all-dialogs', this.closeDialog); if (sn != null) { this.queryParams.sn = sn; } @@ -570,7 +606,13 @@ export default { } } }, + beforeDestroy() { + this.$eventBus.$off('close-all-dialogs', this.closeDialog); + }, methods: { + closeDialog() { + this.open2 = false; + }, /** 当选择车型时调用 */ fetchData(modelId) { // console.log("根据车型id查询运营商"+modelId) @@ -616,6 +658,26 @@ export default { this.$modal.msgSuccess("操作成功"); }).catch(() => {}); }, + /** 一键出仓*/ + oneClickListing(row){ + const deviceIds = row.deviceId || this.ids; + this.$modal.confirm('确认一键出仓？').then(function() { + return oneClickListing(deviceIds); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("操作成功"); + }).catch(() => {}); + }, + /** 一键入仓*/ + oneClickWarehousing(row){ + const deviceIds = row.deviceId || this.ids; + this.$modal.confirm('确认一键入仓？').then(function() { + return oneClickWarehousing(deviceIds); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("操作成功"); + }).catch(() => {}); + }, onMapGeo(data, lat, lng) { console.log("onMapGeo", data) let component = data.regeocode.addressComponent; diff --git a/src/views/system/fee/index.vue b/src/views/system/fee/index.vue index dafcc84..bfd63a8 100644 --- a/src/views/system/fee/index.vue +++ b/src/views/system/fee/index.vue @@ -153,14 +153,16 @@
- + 元（含 - - + + + + {{ timeUnit }}) @@ -169,14 +171,16 @@ - + 元/ - - + + + + {{ timeUnit }}（超出起步价后） @@ -419,6 +423,14 @@ export default { sectionCharges: [ { required: true, message: '请输入区间收费', trigger: 'blur' }, ], + startingTime: [ + { required: true, message: '请输入起步时间', trigger: 'blur' }, + { pattern: /^\d+$/, message: '起步时间必须为正整数', trigger: 'blur' } + ], + timeoutTime: [ + { required: true, message: '请输入超时时间', trigger: 'blur' }, + { pattern: /^\d+$/, message: '超时时间必须为正整数', trigger: 'blur' } + ], }, }; }, diff --git a/src/views/system/flow/index.vue b/src/views/system/flow/index.vue index b68c360..8cfc646 100644 --- a/src/views/system/flow/index.vue +++ b/src/views/system/flow/index.vue @@ -111,6 +111,11 @@ + + + 未上架/下线
+
+ 切换运营区 + + + +
全局查看 切换地图 @@ -97,7 +108,7 @@ import AMapLoader from "@amap/amap-jsapi-loader"; import globalConfig from "@/utils/config/globalConfig"; import { getDevice, listDevice } from '@/api/system/device' - import {listArea} from "@/api/system/area"; + import { listArea, optionselect as getAreaOptionselect } from '@/api/system/area' import { listParking } from '@/api/system/parking' import LocationMap from '@/components/Map/location/LocationMap' import OrderRecord from '@/views/system/device/components/orderRecord' @@ -143,6 +154,7 @@ tips: null, // 运营区表格数据 areaList: [], + userName: undefined, lon: null, lat: null, area:null, @@ -159,6 +171,8 @@ open2: false, // 表单参数 form: {}, + areaId: 14, + areaOptions: [], infoWindow: null, // 设备表格数据 deviceList: [], @@ -170,12 +184,26 @@ } }, mounted() { - this.getAreaList(); + console.log("当前用户信息：",this.$store.state.user.name) + this.userName = this.$store.state.user.name; + this.getAreaList(this.areaId); + this.getAreaOptions(); }, unmounted() { this.map?.destroy(); }, methods: { + handleAreaChange(newAreaId) { + console.log('newAreaId:', newAreaId); + this.areaId = newAreaId; + this.getAreaList(this.areaId); + }, + getAreaOptions() { + getAreaOptionselect().then(response => { + this.areaOptions = response.data; + console.log("areaOptions", this.areaOptions) + }); + }, onMapGeo(data, lat, lng) { console.log("onMapGeo", data) let component = data.regeocode.addressComponent; @@ -228,8 +256,8 @@ element.style.visibility = this.show ? 'hidden' : 'visible'; }); }, - async getAreaList(){ - listArea().then(response => { + async getAreaList(areaId){ + listArea({areaId: areaId}).then(response => { this.areaList = response.rows; if (this.areaList.length > 0) { // 确保数组不为空 const firstArea = this.areaList[0]; // 获取第一个元素 @@ -695,6 +723,20 @@ margin-right: 10px; /* 图片与文字间距，根据需要调整 */ } } + .area-options{ + display: flex; + flex-direction: row; + position: absolute; + top: 15px; + right: 15px; + span{ + display: flex; + align-items: center; + padding-right: 10px; + font-size: 13px; + color: #535353; + } + } diff --git a/src/views/user/user/index.vue b/src/views/user/user/index.vue index 5b12816..d0acfa2 100644 --- a/src/views/user/user/index.vue +++ b/src/views/user/user/index.vue @@ -571,7 +571,7 @@ export default { handleBandSysUser(row){ this.reset(); const userId = row.userId || this.ids; - getSysUserList({"userType":"00"}).then(response => { + getSysUserList({userType:"00",pageSize:9999,pageNum:1}).then(response => { this.sysUserOptions = response.rows; this.form.userId = userId; this.open2 = true;