From 2c86a8bd60deed0dd0e044bad6fb83f75d19a332 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 26 十月 2025 15:05:50 +0800
Subject: [PATCH] Merge branch 'feature-task'
---
ruoyi-ui/src/views/system/vehicle/index.vue | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/system/vehicle/index.vue b/ruoyi-ui/src/views/system/vehicle/index.vue
index 4049d3d..ee37dd0 100644
--- a/ruoyi-ui/src/views/system/vehicle/index.vue
+++ b/ruoyi-ui/src/views/system/vehicle/index.vue
@@ -118,6 +118,7 @@
<dict-tag :options="dict.type.sys_platform" :value="scope.row.platformCode"/>
</template>
</el-table-column>
+ <el-table-column label="褰掑睘閮ㄩ棬" align="center" prop="deptName" />
<el-table-column label="鐘舵��" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
@@ -186,6 +187,16 @@
:key="dict.value"
:label="dict.label"
:value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
+ <el-select v-model="form.deptId" placeholder="璇烽�夋嫨閮ㄩ棬" clearable>
+ <el-option
+ v-for="dept in deptOptions"
+ :key="dept.deptId"
+ :label="dept.deptName"
+ :value="dept.deptId"
/>
</el-select>
</el-form-item>
@@ -283,6 +294,9 @@
],
platformCode: [
{ required: true, message: "骞冲彴鏍囪瘑涓嶈兘涓虹┖", trigger: "change" }
+ ],
+ deptId: [
+ { required: true, message: "褰掑睘閮ㄩ棬涓嶈兘涓虹┖", trigger: "change" }
]
}
};
@@ -301,10 +315,15 @@
this.loading = false;
});
},
- /** 鑾峰彇閮ㄩ棬鍒楄〃 */
+ /** 鑾峰彇閮ㄩ棬鍒楄〃锛堝彧鏄剧ず鍒嗗叕鍙革細parent_id=100锛� */
getDeptList() {
- listDept().then(response => {
- this.deptList = response.data;
+ listDept({ parentId: 100 }).then(response => {
+ // 杩囨护鍑哄垎鍏徃锛坧arent_id=100鐨勯儴闂級
+ if (response.data) {
+ this.deptList = response.data.filter(dept => dept.parentId === 100);
+ } else {
+ this.deptList = [];
+ }
});
},
// 鍙栨秷鎸夐挳
--
Gitblit v1.9.1