diff --git a/ebike-maintenance/pages.json b/ebike-maintenance/pages.json index deeae79..b5d0c26 100644 --- a/ebike-maintenance/pages.json +++ b/ebike-maintenance/pages.json @@ -357,6 +357,14 @@ "navigationBarTitleText": "审核用户报障" } }] + }, { + "root": "pages/warehouse/vehicledispatch", + "pages": [{ + "path": "vehicledispatch", + "style": { + "navigationBarTitleText": "车辆调度" + } + }] } ], diff --git a/ebike-maintenance/pages/warehouse/ebikehouse/ebikehouse.vue b/ebike-maintenance/pages/warehouse/ebikehouse/ebikehouse.vue index 23c5de4..648a162 100644 --- a/ebike-maintenance/pages/warehouse/ebikehouse/ebikehouse.vue +++ b/ebike-maintenance/pages/warehouse/ebikehouse/ebikehouse.vue @@ -192,11 +192,11 @@ const statusBarHeight = systemInfo.statusBarHeight; // 计算去掉状态栏后的可用区域高度 usableHeight.value = screenHeight - statusBarHeight - 170; - let userZone = uni.getStorageSync('userZone'); - userZone.forEach(res => { + let userOperation = uni.getStorageSync('userOperation'); + userOperation.forEach(res => { let quyuemap = { - "text": res.name, - "value": res.id + "text": res.regionName, + "value": res.regionId }; regindata.value.push(quyuemap); }); @@ -240,7 +240,7 @@ const params = { "bikeCode": customFormData.value.deviceValues, //车辆编号 "status": statusZT.value, //入库时间 例:2025-03-21 - "regionId":customFormData.reginvalue + "reginId":customFormData.value.reginvalue } api.callEbikeInfo("vehicleLeaveWarehouse", params).then((res) => { if (res.code == 200) { diff --git a/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue b/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue index 317e91b..a652aa8 100644 --- a/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue +++ b/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue @@ -83,7 +83,7 @@ - + @@ -189,19 +189,20 @@ // getUserRegionInfo(); let userDefultOperation = uni.getStorageSync('userDefultOperation'); //获取站点信息 - api.callOperateApi("ebikeRegion/getRegion?regionId="+userDefultOperation.regionId,{} ,"get").then(res=>{ - if(res.code==200){ - res.data.forEach(res => { - let quyuemap = { - "text": res.regionName, - "value": res.regionId - }; - regindata.value.push(quyuemap); - }); - } - }) + api.callOperateApi("ebikeRegion/getRegion?regionId=" + userDefultOperation.regionId, {}, "get").then( + res => { + if (res.code == 200) { + res.data.forEach(res => { + let quyuemap = { + "text": res.regionName, + "value": res.regionId + }; + regindata.value.push(quyuemap); + }); + } + }) + - }); const getUserRegionInfo = () => { @@ -243,37 +244,78 @@ }); }; - const submit = (ref) => { customForm.value.validate().then(res => { - const params = { - "bikeCode": customFormData.value.deviceValues, //车辆编号 - "status": statusZT.value, //入库时间 例:2025-03-21 - } - api.callEbikeInfo("vehicleLeaveWarehouse", params).then((res) => { - if (res.code == 200) { - popup.value.close("center") - uni.showToast({ - title: '操作成功', - icon: 'success', - duration: 2000 - }); - searchInfo(); - } else { - - uni.showToast({ - title: '操作失败', - icon: 'error', - duration: 2000 - }); - } - + if (statusZT.value == 0) { // 下架 + handleLeaveWarehouse(); + } else { // 投放 + + uni.navigateTo({ + url:"/pages/warehouse/vehicledispatch/vehicledispatch?orderId=272553556257517568" }) + // handleLaunch(); + } }).catch(err => { console.log('err', err); + }); + } + + // 处理下架逻辑 + const handleLeaveWarehouse = () => { + const params = { + "bikeCode": customFormData.value.deviceValues, // 车辆编号 + "status": statusZT.value, + "reginId": "" + } + api.callEbikeInfo("vehicleLeaveWarehouse", params).then((res) => { + if (res.code == 200) { + popup.value.close("center"); + uni.showToast({ + title: '操作成功', + icon: 'success', + duration: 2000 + }); + searchInfo(); + } else { + uni.showToast({ + title: '操作失败', + icon: 'error', + duration: 2000 + }); + } }) } + // 处理投放逻辑 + const handleLaunch = () => { + // 在这里编写投放的具体逻辑 + console.log('投放逻辑执行'); + const params={ + "bikeCodes": customFormData.value.deviceValues, // 车辆编号 + "status": statusZT.value, + "siteId": customFormData.value.reginvalue, + "DispatchType":"仓库车调度" + } + // 例如,调用API处理投放 + api.callEbikeInfo("createWorkOrderDispatch",params).then((res) => { + if (res.code == 200) { + popup.value.close("center"); + uni.showToast({ + title: '操作成功', + icon: 'success', + duration: 2000 + }); + } else { + uni.showToast({ + title: '操作失败', + icon: 'error', + duration: 2000 + }); + } + }) + } + + const onPullDownRefresh = () => { console.log('onPullDownRefresh') diff --git a/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue new file mode 100644 index 0000000..3c8ed45 --- /dev/null +++ b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue @@ -0,0 +1,75 @@ + + + + + \ No newline at end of file