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/parkBook.vue | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/admin/src/views/vehicle/parkBook.vue b/admin/src/views/vehicle/parkBook.vue
index adf8ffe..ee74c48 100644
--- a/admin/src/views/vehicle/parkBook.vue
+++ b/admin/src/views/vehicle/parkBook.vue
@@ -1,18 +1,18 @@
<template>
<TableLayout :permissions="['business:member:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
- <el-form-item label="杞︾墝鍙�" prop="carCode">
- <el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item title="杞︾墝鍙�" prop="carCode">
+ <el-input v-model="searchForm.carCode" placeholder="杞︾墝鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="杞︿富濮撳悕/鎵嬫満鍙�" prop="memberName">
- <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ憳宸ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ <el-form-item title="杞︿富濮撳悕/鎵嬫満鍙�" prop="memberName">
+ <el-input v-model="searchForm.memberName" placeholder="鍛樺伐濮撳悕/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="杞︿富缁勭粐" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ヨ溅涓荤粍缁�" @keypress.enter.native="search"></el-input>
+ <el-form-item title="杞︿富缁勭粐" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="杞︿富缁勭粐鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍋滆溅搴撳悕绉�" prop="parksName">
- <el-input v-model="searchForm.parksName" placeholder="璇疯緭鍏ュ仠杞﹀簱鍚嶇О" @keypress.enter.native="search"></el-input>
+ <el-form-item title="鍋滆溅搴撳悕绉�" prop="parksName">
+ <el-input v-model="searchForm.parksName" placeholder="鍋滆溅搴撳悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -33,8 +33,27 @@
@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>
- <el-table-column prop="parksName" label="鍋滆溅鍦�" min-width="100px"></el-table-column>
+ <el-table-column prop="carCode" label="杞︾墝鍙�" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="parksName" label="鍋滆溅鍦�" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="startTime" label="鏈夋晥鏈�" align="center" fixed min-width="150px">
+ <template slot-scope="{row}">
+ <div v-if="!row.startTime || !row.endTime">闀挎湡鏈夋晥</div>
+ <div v-else>
+ <span style="color: green">璧凤細{{row.startTime}}</span><br/>
+ <span style="color: red">姝細{{row.endTime}}</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="startTime" label="鐘舵��" fixed min-width="100px">
+ <template slot-scope="{row}">
+ <div v-if="row.isdeleted==1" style="color: red">宸插垹闄�</div>
+ <div v-else style="color: green">
+ <span v-if="row.hkStatus==0" style="color: #435EBE">寰呬笅鍙�</span>
+ <span v-if="row.hkStatus==1" style="color: green">涓嬪彂鎴愬姛</span>
+ <span v-if="row.hkStatus==2" style="color: red">涓嬪彂澶辫触</span>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column label="鐢ㄦ埛绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.memberType === 0">鍔冲姟璁垮</span>
@@ -45,29 +64,12 @@
<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="companyName" label="缁勭粐" min-width="100px"></el-table-column>
- <el-table-column prop="startTime" label="鏈夋晥鏈�" min-width="130px">
- <template slot-scope="{row}">
- <span>{{validity(row.startTime, row.endTime)}}</span>
-<!-- <span v-if="!row.startTime || !row.endTime">闀挎湡</span>-->
-<!-- <span v-else>{{row.startTime}} 鑷� {{row.endTime}}</span>-->
- </template>
- </el-table-column>
- <el-table-column prop="startTime" label="鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <div v-if="row.isdeleted==1" style="color: red">宸插垹闄�</div>
- <div v-else style="color: green">
- <span v-if="row.hkStatus==0" style="color: #435EBE">寰呬笅鍙�</span>
- <span v-if="row.hkStatus==1" style="color: green">涓嬪彂鎴愬姛</span>
- <span v-if="row.hkStatus==2" style="color: red">涓嬪彂澶辫触</span>
- </div>
- </template>
- </el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.isdeleted !=2">{{row.remark}}</span>
</template>
</el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="140px"></el-table-column>
<!-- <el-table-column-->
<!-- v-if="containPermissions(['business:member:update', 'business:member:delete'])"-->
<!-- label="鎿嶄綔"-->
--
Gitblit v1.9.3