From 0aa2dd71fa4b989838f89aff2cac82950a70097f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 22 八月 2024 18:10:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/vehicle/cars.vue | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
index be1ed7e..bdd6b22 100644
--- a/admin/src/views/vehicle/cars.vue
+++ b/admin/src/views/vehicle/cars.vue
@@ -1,24 +1,24 @@
<template>
<TableLayout :permissions="['business:member:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
- <el-form-item label="杞︾墝鍙�" prop="code">
- <el-input v-model="searchForm.code" clearable placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="" prop="code" title="杞︾墝鍙�">
+ <el-input v-model="searchForm.code" clearable placeholder="杞︾墝鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="杞︿富濮撳悕/鎵嬫満鍙�" prop="memberName">
+ <el-form-item label="" prop="memberName" title="杞︿富濮撳悕/鎵嬫満鍙�">
<el-input v-model="searchForm.memberName" clearable placeholder="杞︿富濮撳悕/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="杞︿富閮ㄩ棬" prop="companyName">
+ <el-form-item label="" prop="companyName" title="杞︿富閮ㄩ棬鍚嶇О">
<el-input v-model="searchForm.companyName" clearable placeholder="杞︿富閮ㄩ棬鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鎺堟潈鐘舵��" prop="authStatus">
- <el-select v-model="searchForm.authStatus" @keypress.enter.native="search" clearable placeholder="鏄惁鎺堟潈">
- <el-option label="鏄�" value="1"></el-option>
- <el-option label="鍚�" value="0"></el-option>
+ <el-form-item label="" prop="authStatus" title="鏄惁鎺堟潈">
+ <el-select v-model="searchForm.authStatus" @change="search" clearable placeholder="鏄惁鎺堟潈">
+ <el-option label="宸叉巿鏉�" value="1"></el-option>
+ <el-option label="鏈巿鏉�" value="0"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="杞﹁締绫诲瀷" prop="type">
- <el-select v-model="searchForm.type" @keypress.enter.native="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>
@@ -59,7 +59,7 @@
<span v-else style="color: red">鍚�</span>
</template>
</el-table-column>
- <el-table-column prop="parksName" label="宸叉巿鏉冨仠杞﹀満" min-width="200px">
+ <el-table-column prop="parksName" align="center" label="宸叉巿鏉冨仠杞﹀満" min-width="200px">
<template slot-scope="{row}">
<div v-if="row.parkBookList && row.parkBookList.length" >
<span v-for="item in row.parkBookList" :key="item.id" style="display: block">
@@ -69,24 +69,25 @@
<span v-if="row.parkBookList ==null ||row.parkBookList.length ==0">-</span>
</template>
</el-table-column>
- <el-table-column label="涓嬪彂鏈夋晥鏈�" min-width="170px">
+ <el-table-column label="涓嬪彂鏈夋晥鏈�" align="center" min-width="170px">
<template slot-scope="{row}">
<div v-if="row.authStatus !=null && row.authStatus == 1 && row.parkBookList!=null && row.parkBookList.length>0">
<div v-if="!row.startTime || !row.endTime">闀挎湡鏈夋晥</div>
<div v-else>
- <span>璧凤細{{row.startTime}}</span><br/>
- <span>姝細{{row.endTime}}</span>
+ <span style="color: green">璧凤細{{row.startTime}}</span><br/>
+ <span style="color: red">姝細{{row.endTime}}</span>
</div>
</div>
<div v-else >-</div>
</template>
</el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" 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="250"
+ min-width="200"
+ align="center"
fixed="right"
>
<template slot-scope="{row}">
--
Gitblit v1.9.3