From 2576c71ce6a7d0465fcbc5ebc7507da9472c41a3 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 05 十一月 2025 23:41:12 +0800
Subject: [PATCH] feat: 创建转运任务
---
app/pages/task/create-emergency.vue | 11 +++--------
sql/vehicle_dept_relation.sql | 2 ++
ruoyi-admin/src/main/resources/application.yml | 2 +-
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/app/pages/task/create-emergency.vue b/app/pages/task/create-emergency.vue
index 99fe82d..094a808 100644
--- a/app/pages/task/create-emergency.vue
+++ b/app/pages/task/create-emergency.vue
@@ -620,7 +620,7 @@
getAvailableVehicles() {
// 鏍规嵁鐢ㄦ埛鏈夋潈闄愮鐞嗙殑鍒嗗叕鍙革紝鏌ヨ鎵�鏈夊彲鐢ㄨ溅杈�
- listAvailableVehicles(null, 'EMERGENCY').then(response => {
+ return listAvailableVehicles(null, 'EMERGENCY').then(response => {
const vehicleList = response.data || []
this.vehicleOptions = vehicleList.map(vehicle => ({
id: vehicle.vehicleId,
@@ -629,13 +629,8 @@
status: vehicle.status,
deptNames: vehicle.deptNames || [] // 杞﹁締褰掑睘鐨勫涓垎鍏徃
}))
- this.vehicles = this.vehicleOptions.map(v => {
- // 濡傛灉杞﹁締褰掑睘澶氫釜鍒嗗叕鍙革紝鍦ㄨ溅鐗屽彿鍚庨潰鏄剧ず
- if (v.deptNames && v.deptNames.length > 0) {
- return `${v.name} (${v.deptNames.join('銆�')})`
- }
- return v.name
- })
+ // 鍙樉绀鸿溅鐗屽彿锛屼笉鏄剧ず鍒嗗叕鍙�
+ this.vehicles = this.vehicleOptions.map(v => v.name)
console.log('鍔犺浇鍙敤杞﹁締鏁伴噺:', this.vehicles.length)
}).catch(error => {
console.error('鍔犺浇杞﹁締鍒楄〃澶辫触:', error)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 413d0c9..bd5fb75 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -56,7 +56,7 @@
basename: i18n/messages
profiles:
# 鐜 dev|test|prod
- active: dev
+ active: prod
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/sql/vehicle_dept_relation.sql b/sql/vehicle_dept_relation.sql
index 0ffe09f..0995fb9 100644
--- a/sql/vehicle_dept_relation.sql
+++ b/sql/vehicle_dept_relation.sql
@@ -1,5 +1,7 @@
-- 杞﹁締-鍒嗗叕鍙稿叧鑱旇〃
-- 鐢ㄤ簬鏀寔涓�杈嗚溅褰掑睘澶氫釜鍒嗗叕鍙哥殑澶氬澶氬叧绯�
+alter table sys_user
+add oa_order_class varchar(200);
CREATE TABLE IF NOT EXISTS `tb_vehicle_dept` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鍏宠仈ID',
--
Gitblit v1.9.1