From b46065a201c09ce69f111806f2bda4a5f476bc4e Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 18 十月 2025 17:20:22 +0800
Subject: [PATCH] fix:用户同步，机构同步
---
ruoyi-ui/src/views/system/vehicle/index.vue | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/views/system/vehicle/index.vue b/ruoyi-ui/src/views/system/vehicle/index.vue
index 4ec9201..30bfde2 100644
--- a/ruoyi-ui/src/views/system/vehicle/index.vue
+++ b/ruoyi-ui/src/views/system/vehicle/index.vue
@@ -11,13 +11,14 @@
/>
</el-form-item>
<el-form-item label="杞﹁締绫诲瀷" prop="vehicleType">
- <el-input
- v-model="queryParams.vehicleType"
- placeholder="璇疯緭鍏ヨ溅杈嗙被鍨�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-select v-model="queryParams.vehicleType" placeholder="璇烽�夋嫨杞﹁締绫诲瀷" clearable size="small">
+ <el-option
+ v-for="dict in dict.type.sys_vehicle_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
<el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��" clearable size="small">
@@ -36,6 +37,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="queryParams.deptId" placeholder="璇烽�夋嫨閮ㄩ棬" clearable size="small">
+ <el-option
+ v-for="dept in deptList"
+ :key="dept.deptId"
+ :label="dept.deptName"
+ :value="dept.deptId"
/>
</el-select>
</el-form-item>
@@ -95,7 +106,11 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="杞﹁締ID" align="center" prop="vehicleId" />
<el-table-column label="杞︾墝鍙�" align="center" prop="vehicleNo" />
- <el-table-column label="杞﹁締绫诲瀷" align="center" prop="vehicleType" />
+ <el-table-column label="杞﹁締绫诲瀷" align="center" prop="vehicleType">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_vehicle_type" :value="scope.row.vehicleType"/>
+ </template>
+ </el-table-column>
<el-table-column label="杞﹁締鍝佺墝" align="center" prop="vehicleBrand" />
<el-table-column label="杞﹁締鍨嬪彿" align="center" prop="vehicleModel" />
<el-table-column label="骞冲彴鏍囪瘑" align="center" prop="platformCode">
@@ -108,6 +123,7 @@
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
+ <el-table-column label="褰掑睘閮ㄩ棬" align="center" prop="deptName" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
@@ -148,7 +164,14 @@
<el-input v-model="form.vehicleNo" placeholder="璇疯緭鍏ヨ溅鐗屽彿" />
</el-form-item>
<el-form-item label="杞﹁締绫诲瀷" prop="vehicleType">
- <el-input v-model="form.vehicleType" placeholder="璇疯緭鍏ヨ溅杈嗙被鍨�" />
+ <el-select v-model="form.vehicleType" placeholder="璇烽�夋嫨杞﹁締绫诲瀷" clearable style="width: 100%">
+ <el-option
+ v-for="dict in dict.type.sys_vehicle_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="杞﹁締鍝佺墝" prop="vehicleBrand">
<el-input v-model="form.vehicleBrand" placeholder="璇疯緭鍏ヨ溅杈嗗搧鐗�" />
@@ -175,6 +198,16 @@
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
+ <el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
+ <el-select v-model="form.deptId" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" clearable style="width: 100%">
+ <el-option
+ v-for="dept in deptList"
+ :key="dept.deptId"
+ :label="dept.deptName"
+ :value="dept.deptId"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
@@ -189,10 +222,11 @@
<script>
import { listVehicle, getVehicle, delVehicle, addVehicle, updateVehicle } from "@/api/system/vehicle";
+import { listDept } from "@/api/system/dept";
export default {
name: "Vehicle",
- dicts: ['sys_normal_disable', 'sys_platform'],
+ dicts: ['sys_normal_disable', 'sys_platform', 'sys_vehicle_type'],
data() {
return {
// 閬僵灞�
@@ -209,6 +243,8 @@
total: 0,
// 杞﹁締淇℃伅琛ㄦ牸鏁版嵁
vehicleList: [],
+ // 閮ㄩ棬鍒楄〃鏁版嵁
+ deptList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -222,7 +258,8 @@
vehicleBrand: null,
vehicleModel: null,
status: null,
- platformCode: null
+ platformCode: null,
+ deptId: null
},
// 琛ㄥ崟鍙傛暟
form: {
@@ -233,7 +270,8 @@
vehicleModel: null,
status: "0",
remark: null,
- platformCode: null
+ platformCode: null,
+ deptId: null
},
// 琛ㄥ崟鏍￠獙
rules: {
@@ -251,6 +289,7 @@
},
created() {
this.getList();
+ this.getDeptList();
},
methods: {
/** 鏌ヨ杞﹁締淇℃伅鍒楄〃 */
@@ -260,6 +299,17 @@
this.vehicleList = response.rows;
this.total = response.total;
this.loading = false;
+ });
+ },
+ /** 鑾峰彇閮ㄩ棬鍒楄〃锛堝彧鏄剧ず鍒嗗叕鍙革細parent_id=100锛� */
+ getDeptList() {
+ listDept({ parentId: 100 }).then(response => {
+ // 杩囨护鍑哄垎鍏徃锛坧arent_id=100鐨勯儴闂級
+ if (response.data) {
+ this.deptList = response.data.filter(dept => dept.parentId === 100);
+ } else {
+ this.deptList = [];
+ }
});
},
// 鍙栨秷鎸夐挳
@@ -277,7 +327,8 @@
vehicleModel: null,
status: "0",
remark: null,
- platformCode: null
+ platformCode: null,
+ deptId: null
};
this.resetForm("form");
},
--
Gitblit v1.9.1