From eb275c6d06d3c27fd30bbf4975d27c93d7f56eb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十二月 2024 18:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/vehicle/cars.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
index 55db881..cddc4f7 100644
--- a/admin/src/views/vehicle/cars.vue
+++ b/admin/src/views/vehicle/cars.vue
@@ -10,7 +10,7 @@
@keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="" prop="catePName" title="鍒嗙被鍚嶇О">
- <el-cascader v-model="searchForm.cateIds" @change="changeSel" clearable :options="cateList" :props="{
+ <el-cascader v-model="searchForm.cateIds" @change="changeSel" placeholder="璇烽�夋嫨鍒嗙被" clearable :options="cateList" :props="{
label: 'name',
value: 'id',
children: 'childCategoryList',
@@ -28,7 +28,7 @@
</el-select>
</el-form-item>
<el-form-item label="" prop="type" title="涓氬姟绫诲瀷">
- <el-select v-model="searchForm.type" @change="search" clearable placeholder="涓氬姟绫诲瀷">
+ <el-select v-model="searchForm.type" @change="search" clearable placeholder="澶囨敞">
<el-option label="瀹夋嘲鍏姟杞�" value="0"></el-option>
<el-option label="瀹夋嘲鑷湁鐗╂祦杞�" value="1"></el-option>
<el-option label="鍏朵粬" value="2"></el-option>
@@ -55,13 +55,6 @@
<el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="code" label="杞︾墝鍙�" min-width="100px"></el-table-column>
- <el-table-column label="涓氬姟绫诲瀷" min-width="120px">
- <template slot-scope="{row}">
- <span v-if="row.type == 0">瀹夋嘲鍏姟杞�</span>
- <span v-if="row.type == 1">瀹夋嘲鑷湁鐗╂祦杞�</span>
- <span v-if="row.type == 2">鍏朵粬</span>
- </template>
- </el-table-column>
<el-table-column prop="memberName" label="杞︿富濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="memberPhone" label="杞︿富鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="catePName" label="涓�绾у垎绫�" min-width="120px"></el-table-column>
@@ -100,6 +93,13 @@
<div v-else>-</div>
</template>
</el-table-column>
+ <el-table-column label="澶囨敞" min-width="120px">
+ <template slot-scope="{row}">
+ <span v-if="row.type == 0">瀹夋嘲鍏姟杞�</span>
+ <span v-if="row.type == 1">瀹夋嘲鑷湁鐗╂祦杞�</span>
+ <span v-if="row.type == 2">鍏朵粬</span>
+ </template>
+ </el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="140px"></el-table-column>
<el-table-column
--
Gitblit v1.9.3