From b33f2e78ffd4fd401698b84a33dc3c293793c62f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 二月 2025 16:22:33 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/vehicle/cars.vue |   99 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 74 insertions(+), 25 deletions(-)

diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
index 2477ce4..2d74182 100644
--- a/admin/src/views/vehicle/cars.vue
+++ b/admin/src/views/vehicle/cars.vue
@@ -9,10 +9,14 @@
         <el-input v-model="searchForm.memberName" clearable placeholder="杞︿富淇℃伅"
           @keypress.enter.native="search"></el-input>
       </el-form-item>
-      <!-- <el-form-item label="" prop="cateName" title="杞﹁締鍒嗙被鍚嶇О">
-        <el-input v-model="searchForm.cateName" clearable placeholder="杞﹁締鍒嗙被鍚嶇О"
-          @keypress.enter.native="search"></el-input>
-      </el-form-item> -->
+      <el-form-item label="" prop="catePName" title="鍒嗙被鍚嶇О">
+        <el-cascader v-model="searchForm.cateIds" @change="changeSel" placeholder="璇烽�夋嫨鍒嗙被" clearable :options="cateList" :props="{
+          label: 'name',
+          value: 'id',
+          children: 'childCategoryList',
+          checkStrictly: true
+        }"></el-cascader>
+      </el-form-item>
       <el-form-item label="" prop="companyName" title="杞︿富缁勭粐鍚嶇О">
         <el-input v-model="searchForm.companyName" clearable placeholder="杞︿富缁勭粐鍚嶇О"
           @keypress.enter.native="search"></el-input>
@@ -23,8 +27,8 @@
           <el-option label="鏈巿鏉�" value="0"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="" prop="type" title="杞﹁締绫诲瀷">
-        <el-select v-model="searchForm.type" @change="search" clearable placeholder="杞﹁締绫诲瀷">
+      <el-form-item label="" prop="type" title="涓氬姟绫诲瀷">
+        <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>
@@ -37,25 +41,24 @@
     </el-form>
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
-      <ul class="toolbar" v-permissions="['business:cars:create', 'business:parkBook:create']">
+      <ul class="toolbar"
+        v-permissions="['business:cars:create', 'business:cars:exportExcel', 'business:parkBook:create']">
         <li><el-button type="primary" @click="handleEdit" icon="el-icon-plus"
             v-permissions="['business:cars:create']">鏂板缓</el-button></li>
+        <li><el-button type="primary" @click="$refs.OperaCarsImportWindowRef.open('杞﹁締瀵煎叆', searchForm.companyType)" v-permissions="['business:cars:create']">杞﹁締瀵煎叆</el-button>
+        </li>
+        <li><el-button type="primary" @click="exportExcel" v-permissions="['business:cars:exportExcel']">瀵煎嚭</el-button>
+        </li>
         <li><el-button type="primary" @click="startEmpowerBatch" icon="el-icon-plus"
             v-permissions="['business:parkbook:create']">涓嬪彂鎺堟潈</el-button></li>
       </ul>
       <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="code" label="杞︾墝鍙�"  fixed="left" min-width="100px"></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="cateName" label="杞﹁締鍒嗙被" min-width="160px"></el-table-column>
+        <el-table-column prop="catePName" label="涓�绾у垎绫�" min-width="120px"></el-table-column>
+        <el-table-column prop="cateName" label="浜岀骇鍒嗙被" min-width="120px"></el-table-column>
         <el-table-column prop="companyName" label="杞︿富缁勭粐" min-width="200px"></el-table-column>
         <el-table-column label="鏄惁鎺堟潈" align="center" min-width="100px">
           <template slot-scope="{row}">
@@ -68,8 +71,10 @@
             <div v-if="row.parkBookList && row.parkBookList.length">
               <span v-for="item in row.parkBookList" :key="item.id" style="display: block">
                 <span
-                  :style="(item.hkStatus == 0 ? 'color:#2080f7' : (item.hkStatus == 1 ? 'color:green' : (item.hkStatus == 2 ? 'color:red' : '')))">銆恵{ item.hkStatus ==
-                    0 ? '绛夊緟涓嬪彂' : (item.hkStatus == 1 ? '涓嬪彂鎴愬姛' : (item.hkStatus == 2?'涓嬪彂澶辫触':''))}}銆� </span>{{ item.parksName }}
+                  :style="(item.hkStatus == 0 ? 'color:#2080f7' : (item.hkStatus == 1 ? 'color:green' : (item.hkStatus == 2 ? 'color:red' : '')))">銆恵{
+                    item.hkStatus ==
+                      0 ? '绛夊緟涓嬪彂' : (item.hkStatus == 1 ? '涓嬪彂鎴愬姛' : (item.hkStatus == 2 ? '涓嬪彂澶辫触' : '')) }}銆� </span>{{
+                    item.parksName }}
               </span>
             </div>
             <span v-if="row.parkBookList == null || row.parkBookList.length == 0">-</span>
@@ -88,11 +93,18 @@
             <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
           v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
-          label="鎿嶄綔" min-width="200" align="center" fixed="right">
+          label="鎿嶄綔" min-width="200" align="center">
           <template slot-scope="{row}">
             <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)"
               v-permissions="['business:cars:update']">缂栬緫</el-button>
@@ -109,6 +121,7 @@
     </template>
     <!-- 鏂板缓/淇敼 -->
     <OperaCarAuthWindow ref="operaCarAuthWindow" @success="handlePageChange" />
+    <OperaCarsImportWindow ref="OperaCarsImportWindowRef" @success="handlePageChange" />
     <OperaCarsWindow v-if="isShowEdit" ref="operaCarsWindow" @close="isShowEdit = false" @success="handlePageChange" />
   </TableLayout>
 </template>
@@ -119,10 +132,12 @@
 import Pagination from '@/components/common/Pagination'
 import OperaCarsWindow from '@/components/business/OperaCarsWindow'
 import OperaCarAuthWindow from '@/components/business/OperaCarAuthWindow'
+import OperaCarsImportWindow from './components/OperaCarsImportWindow'
+import { fetchList } from '@/api/business/category.js'
 export default {
   name: 'Cars',
   extends: BaseTable,
-  components: { TableLayout, Pagination, OperaCarsWindow, OperaCarAuthWindow },
+  components: { TableLayout, Pagination, OperaCarsWindow, OperaCarAuthWindow,OperaCarsImportWindow },
   data() {
     return {
       // 鎼滅储
@@ -130,10 +145,16 @@
         code: '',
         memberName: '',
         companyName: '',
+        cateIds: [],
+        catePId: '',
+        cateId: '',
         type: null,
-        authStatus: null
+        authStatus: null,
+        ids: ''
       },
-      isShowEdit: false
+      isShowEdit: false,
+      cateList: [],
+      selIdsList: []
     }
   },
   created() {
@@ -144,17 +165,45 @@
       'field.main': 'id'
     })
     this.search()
+    this.getCate()
   },
   methods: {
+    // handleSelectionChange(e) {
+    //   this.searchForm.ids = e.map(i => i.id).join(',')
+    // },
+    changeSel(e) {
+      console.log(e)
+      if (e && e.length == 1) {
+        this.$set(this.searchForm, 'catePId', e[0])
+        this.$set(this.searchForm, 'cateId', '')
+      } else if (e && e.length == 2) {
+        this.$set(this.searchForm, 'catePId', e[0])
+        this.$set(this.searchForm, 'cateId', e[1])
+      } else {
+        this.$set(this.searchForm, 'catePId', '')
+        this.$set(this.searchForm, 'cateId', '')
+      }
+      this.search()
+    },
+    getCate() {
+      fetchList({
+        model: {},
+        capacity: 1000,
+        page: 1,
+      }).then(res => {
+        this.cateList = res.records || []
+
+      })
+    },
     handleEdit(row) {
       this.isShowEdit = true
       let str = row && row.id ? '缂栬緫杞﹁締' : '鏂板缓杞﹁締'
       this.$nextTick(() => {
         this.$refs.operaCarsWindow.open(str, row)
         if (row && row.id) {
-          let form = { ...row, cateId: []}
-          if(row.catePId){ form.cateId.push(row.catePId) }
-          if(row.cateId){ form.cateId.push(row.cateId) }
+          let form = { ...row, cateId: [] }
+          if (row.catePId) { form.cateId.push(row.catePId) }
+          if (row.cateId) { form.cateId.push(row.cateId) }
           this.$refs.operaCarsWindow.form = form
           this.$refs.operaCarsWindow.loadMember()
         }

--
Gitblit v1.9.3