From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/operation/serviceCar/apprRecord.vue |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 7eb4afa..01da365 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <TableLayout :permissions="['business:empower:query']">
+  <TableLayout :permissions="['business:carusebook:query']">
     <!-- 鎼滅储琛ㄥ崟 -->
     <div ref="QueryFormRef" slot="search-form">
       <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
@@ -29,7 +29,7 @@
             <el-option label="甯傚鐢ㄨ溅" value="1"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="鍑哄彂鏃堕棿" prop="startTime">
+        <el-form-item label="鐢宠鏃堕棿" prop="startTime">
           <!-- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
             format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
             range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
@@ -64,7 +64,7 @@
           <el-button type="primary" @click="handleEx" v-permissions="['business:carusebook:exportExcel']">瀵煎嚭</el-button>
         </li>
       </ul>
-      <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
+      <el-table :height="tableHeightNew" 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="carCode" label="杞︾墝鍙�" min-width="100px"></el-table-column>
@@ -101,15 +101,16 @@
 
         <el-table-column prop="createDate" label="鐢宠鏃堕棿" min-width="150px"></el-table-column>
         <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
-        <el-table-column label="鎿嶄綔" min-width="160" align="center" fixed="right">
+        <el-table-column label="鎿嶄綔" min-width="240" align="center" fixed="right">
           <template slot-scope="{ row }">
             <el-button type="text" icon="el-icon-edit"
               @click="$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', row)">鏌ョ湅璇︽儏</el-button>
             <!-- <el-button v-if="(row.status === 1 || row.status === 2) && new Date().getTime() < new Date(row.startTime).getTime()" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >鎾ら攢</el-button> -->
-            <el-button style="color: red"
-              v-if="(row.status === 0 || row.status === 1 || row.status === 2) && new Date().getTime() < new Date(row.startTime).getTime()"
-              type="text" icon="el-icon-delete" @click="rowRevokeClick(row)">鎾ら攢</el-button>
-            <el-button style="color: red" type="text" icon="el-icon-delete" @click="deleteById(row)">鍒犻櫎</el-button>
+            <el-button style="color: red" v-if="row.hasRole == 1" type="text" icon="el-icon-delete"
+              @click="rowRevokeClick(row)">鎾ら攢</el-button>
+            <!-- <el-button style="color: red"   v-if="(row.status === 0 && row.creator == userInfo.id)||((row.status === 0 || row.status === 1 ) || ( row.status === 2 && new Date().getTime() < new Date(row.startTime).getTime() ))"  type="text"  icon="el-icon-delete"   @click="rowRevokeClick(row)" >鎾ら攢</el-button>-->
+            <el-button style="color: red" type="text" icon="el-icon-delete"
+              v-permissions="['business:carusebook:delete']" @click="deleteById(row)">鍒犻櫎</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -148,12 +149,13 @@
   components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow },
   data() {
     return {
+      // userInfo: this.$store.state.userInfo,
       // 鎼滅储
       searchForm: {
         memberName: '',
         companyName: '',
-        startTime: '',
-        endTime: '',
+        queryStartTime: '',
+        queryEndTime: '',
         type: null,
         status: null,
         radio: 0
@@ -179,11 +181,6 @@
     // this.search()
     this.changeRadio('0')
     this.loadParams()
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
-    })
   },
   methods: {
     rowRevokeClick(row) {
@@ -263,17 +260,27 @@
         })
     },
     seleTime(e) {
-      this.searchForm.queryStartTime = e[0]
-      this.searchForm.queryEndTime = e[1]
+      this.searchForm.queryStartTime = null
+      this.searchForm.queryEndTime = null
+      if (e != null && e.length >= 2) {
+        this.searchForm.queryStartTime = e[0]
+        this.searchForm.queryEndTime = e[1]
+      }
       this.searchForm.radio = null
       this.search()
     },
     reset() {
       this.$refs.searchForm.resetFields()
-      this.searchForm = {}
-      this.time = []
-      // this.searchForm.radio = '0'
-      // this.changeRadio('0')
+      this.searchForm = {
+        memberName: '',
+        companyName: '',
+        queryStartTime: '',
+        queryEndTime: '',
+        type: null,
+        status: null,
+        radio: ''
+      }
+      // this.changeRadio(0)
       this.search()
     }
   }

--
Gitblit v1.9.3