From c658905698bc942164017615a0a9f784c7d5e129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9C=B1?= <2671189764@qq.com> Date: Fri, 9 May 2025 16:36:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AB=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/devops/workorder/workorderlist.vue | 25 +++--- .../pages/warehouse/ebikehouse/ebikehouse.vue | 4 +- .../warehouse/ebikehouse/vehicleoperation.vue | 6 +- .../vehicledispatch/vehicledispatch.vue | 54 ++++++++++-- ebike-user/components/bike-pay/bike-pay.vue | 86 ++++++++++++++++--- ebike-user/pages/user/home/home.vue | 6 +- .../pages/user/login/TroubleReportUser.vue | 4 +- ebike-user/pages/user/login/wx_login.vue | 13 +-- ebike-user/pages/user/scan/applysite.vue | 4 +- ebike-user/pages/user/scan/inputcode.vue | 4 +- ebike-user/pages/user/scan/scancode.vue | 4 +- ebike-user/utils/api.js | 3 + ebike-user/utils/tools.js | 33 ++++++- ebike-user/utils/usermap.js | 4 +- 14 files changed, 190 insertions(+), 60 deletions(-) diff --git a/ebike-maintenance/pages/devops/workorder/workorderlist.vue b/ebike-maintenance/pages/devops/workorder/workorderlist.vue index a444a04..c1659c2 100644 --- a/ebike-maintenance/pages/devops/workorder/workorderlist.vue +++ b/ebike-maintenance/pages/devops/workorder/workorderlist.vue @@ -7,7 +7,7 @@ - @@ -78,8 +78,8 @@ import * as api from '@/utils/api.js'; import config from '@/utils/config'; import { - onLoad - } from '@dcloudio/uni-app'; + onLoad,onShow + } from '@dcloudio/uni-app'; const isCancelOrClear = ref(false); @@ -142,19 +142,22 @@ selectedOption.value = option; paging.value.reload(); }; - const blur = (value) => { - if (value == searchValue.value) return; - paging.value.reload(); + const blur = (res) => { + if (res.value != searchValue.value) { + paging.value.reload(); + }; }; - const cancel = (value) => { - - if (value == "") return; + onShow(() => { + searchValue.value = ""; + loadMoreData(1,4) + }) + const cancel = (value) => { + // api.callEbikeInfo("getVehicleDetailsByRegionId?regionId=275024268783185920",{},"get") searchValue.value = ""; paging.value.reload(); } - const clearSearch = (value) => { - if (value == "") return; + const clearSearch = (value) => { searchValue.value = ""; paging.value.reload(); } diff --git a/ebike-maintenance/pages/warehouse/ebikehouse/ebikehouse.vue b/ebike-maintenance/pages/warehouse/ebikehouse/ebikehouse.vue index 54482a9..e6a3e36 100644 --- a/ebike-maintenance/pages/warehouse/ebikehouse/ebikehouse.vue +++ b/ebike-maintenance/pages/warehouse/ebikehouse/ebikehouse.vue @@ -195,8 +195,8 @@ let userOperation = uni.getStorageSync('userOperation'); userOperation.forEach(res => { let quyuemap = { - "text": res.regionName, - "value": res.regionId + "text": res.operationRegionName, + "value": res.operationRegionId }; regindata.value.push(quyuemap); }); diff --git a/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue b/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue index d759df4..30fbb07 100644 --- a/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue +++ b/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue @@ -197,13 +197,13 @@ // getUserRegionInfo(); let userDefultOperation = uni.getStorageSync('userDefultOperation'); //获取站点信息 - api.callOperateApi("ebikeRegion/getRegion?regionId=" + userDefultOperation.regionId, {}, "get").then( + api.callOperateApi("ebikeRegion/getRegion?regionId=" + userDefultOperation.operationRegionId, {}, "get").then( res => { if (res.code == 200) { res.data.forEach(res => { let quyuemap = { - "text": res.regionName, - "value": res.regionId + "text": res.siteName, + "value": res.siteRegionId }; regindata.value.push(quyuemap); }); diff --git a/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue index 59e146b..c84b895 100644 --- a/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue +++ b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue @@ -3,6 +3,10 @@ + + + @@ -71,10 +75,12 @@ const orderId = ref(""); const fileLists = ref([]); - + const reginvalue = ref(""); + const regindata = ref([]); const newbikeCode = ref(""); const dispatchRecords = ref([]); + const scheduleExtension = ref({}) const navButtonGroup = [{ text: '完成投放', backgroundColor: 'rgb(0,120,212)', @@ -82,20 +88,37 @@ }]; + const changeZT = (e) => { + console.log("e:", e); + } onLoad((options) => { orderId.value = options.orderId; }); onMounted(() => { - + let userDefultOperation = uni.getStorageSync('userDefultOperation'); + //获取站点信息 + api.callOperateApi("ebikeRegion/getRegion?regionId=" + userDefultOperation.operationRegionId, {}, "get") + .then( + res => { + if (res.code == 200) { + res.data.forEach(res => { + let quyuemap = { + "text": res.siteName, + "value": res.siteRegionId + }; + regindata.value.push(quyuemap); + }); + } + }) getInfoList(); }) const getInfoList = () => { api.callEbikeInfo("getDispatchVehicleByOrderId?orderId=" + orderId.value, {}, "get").then( res => { if (res.code == 200) { - dispatchRecords.value = res.data.dispatchRecords; + scheduleExtension.value = res.data.scheduleExtension } }) } @@ -181,15 +204,15 @@ .then((res) => { api.callCoreApi("gpsMsg" + "?ecuSn=" + ecuSn, {}, 'get').then((res) => { - if (res.code == 200) { + if (res.code == 200) { const latitude = res.data.latitude; const longitude = res.data.longitude; const params = { "orderId": orderId.value, "bikeCode": bikeCode, "dispatchState": 0, - "startVehicleLat":latitude, - "startVehicleLng":longitude + "startVehicleLat": latitude, + "startVehicleLng": longitude } newbikeCode.value = bikeCode; api.callEbikeInfo("createDispatchRecord", params) @@ -199,13 +222,13 @@ } else { showModelMessage(re.msg) } - + }) } else { showModelMessage("车辆经纬度获取失败!"); } }) - + }); @@ -223,8 +246,23 @@ } = res; if (index == 0) //完成投放 { + if (!scheduleExtension.value.siteId) { + uni.showToast({ + title: '请选择站点', + icon: 'none' + }); + return; + } + if(!fileLists.value.length){ + uni.showToast({ + title: '请上传投放的照片', + icon: 'none' + }); + return; + } const params = { "orderId": orderId.value, + "siteId": scheduleExtension.value.siteId, "fileLists": fileLists.value } api.callEbikeInfo("completeDeployment", params).then(res => { diff --git a/ebike-user/components/bike-pay/bike-pay.vue b/ebike-user/components/bike-pay/bike-pay.vue index 76b9695..6f4b9a5 100644 --- a/ebike-user/components/bike-pay/bike-pay.vue +++ b/ebike-user/components/bike-pay/bike-pay.vue @@ -6,29 +6,29 @@ - +
- {{data.sj}} + {{data.createdAt}}
费用明细
-
- - +
+ +
-
+
- +
-
+
@@ -41,24 +41,82 @@