From 84b7e68f71e414e575518b3c34bf722782cc507d Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 07 一月 2025 17:27:20 +0800
Subject: [PATCH] feat: 修改月租车页面
---
src/components/page/whiteList/index.vue | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/src/components/page/whiteList/index.vue b/src/components/page/whiteList/index.vue
index b108f5e..a6ca08c 100644
--- a/src/components/page/whiteList/index.vue
+++ b/src/components/page/whiteList/index.vue
@@ -3,8 +3,27 @@
<div style="padding: 10px 10px 0px 10px;">
<el-form :inline="true" :model="searchForm">
<el-form-item label="杞︾墝鍙�">
- <el-input v-model="searchForm.carNo"></el-input>
+ <el-input v-model="searchForm.carNo" clearable></el-input>
</el-form-item>
+ <el-form-item label="绫诲瀷">
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨" clearable>
+ <el-option label="姘镐箙" :value="0"></el-option>
+ <el-option label="鏈堢エ" :value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏉ユ簮">
+ <el-select v-model="searchForm.payFlag" placeholder="璇烽�夋嫨" clearable>
+ <el-option label="绯荤粺娣诲姞" :value="0"></el-option>
+ <el-option label="鑷富缂磋垂" :value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閫夋嫨缁撴潫鏃堕棿">
+ <div class="date-box">
+ <el-date-picker type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+ v-model="searchForm.date" placeholder="" clearable>
+ </el-date-picker>
+ </div>
+ </el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="onSearch" icon="el-icon-search">鏌ヨ</el-button>
<el-button type="primary" size="small" @click="onAdd" icon="el-icon-plus">澧炲姞</el-button>
@@ -12,7 +31,7 @@
</el-form>
</div>
- <el-table :data="pageData.rows" v-loading="pageData.isLoading" border style="width:100%;border:1px solid #bcbec2;">
+ <el-table :height="tableHeight" :data="pageData.rows" v-loading="pageData.isLoading" border style="width:100%;border:1px solid #bcbec2;">
<el-table-column type="index" width="50" label="搴忓彿" align="center"> </el-table-column>
<el-table-column prop="carNo" label="杞︾墝鍙�" align="center" width="150"></el-table-column>
<el-table-column prop="type" label="绫诲瀷" align="center" width="100">
@@ -21,9 +40,17 @@
<p v-if="scope.row.type==1">鏈堢エ</p>
</template>
</el-table-column>
+ <el-table-column prop="payFlag" label="娣诲姞绫诲瀷" align="center" width="100">
+ <template slot-scope="scope">
+ <p v-if="scope.row.payFlag==0">绯荤粺娣诲姞</p>
+ <p v-if="scope.row.payFlag==1">鑷富缂磋垂</p>
+ </template>
+ </el-table-column>
<el-table-column prop="startTime" label="鏈堢エ寮�濮嬫棩鏈�" align="center"></el-table-column>
<el-table-column prop="endTime" label="鏈堢エ缁撴潫鏃ユ湡" align="center"></el-table-column>
<el-table-column prop="name" label="鍋滆溅鍦�" align="center"></el-table-column>
+ <el-table-column prop="phone" label="鎵嬫満鍙�" align="center"></el-table-column>
+ <el-table-column prop="createBy" label="鎿嶄綔浜�" align="center"></el-table-column>
<el-table-column label="鎿嶄綔" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="onEdit(scope.row)">缂栬緫</el-button>
@@ -50,8 +77,8 @@
<el-form-item label="鏈堢エ缁撴潫鏃ユ湡" prop="endTime" v-if="flag2">
<el-date-picker placeholder="閫夋嫨鏃堕棿" v-model="formData.endTime"></el-date-picker>
</el-form-item>
- <el-form-item label="鍋滆溅鍦�" prop="parkId" v-if="flag2">
- <el-select v-model="formData.parkId">
+ <el-form-item label="鍋滆溅鍦�" prop="parkIds" v-if="flag2">
+ <el-select v-model="ids" multiple clearable>
<el-option v-for="item in table1" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -72,7 +99,11 @@
flag:false,
flag2:false,
searchForm: {
- name: ''
+ name: '',
+ carNo:'',
+ type:null,
+ date: null,
+ payFlag:null
},
pageData: this.$byutil.defaultPageData(),
formData: {
@@ -80,17 +111,27 @@
type: 0,
endTime: '',
startTime: '',
- parkId:null
+ parkIds: null,
+ name: '',
+ createBy:'',
+ updateBy:''
},
- urlPath:this.$systemconfig.basePath + '/whiteList/',
+ ids:[],
+ urlPath:this.$systemconfig.basePath + '/ffzf/whiteList/',
table1:[],
+ userName:'',
+ tableHeight:500,
}
},
mounted() {
+ let username = localStorage.getItem('name')
+ this.formData.createBy = username
+ this.userName = username
this.loadData();
- this.$byutil.postData(this, this.$systemconfig.basePath+'/park/findAll', this.formData, res => {
+ this.$byutil.postData(this, this.$systemconfig.basePath+'/ffzf/park/findAll', this.formData, res => {
this.table1 = res.data;
})
+ this.tableHeight = window.innerHeight - 260
},
methods: {
selectChange(value){
@@ -103,6 +144,7 @@
onSave(){
this.$refs['formData'].validate((valid) => {
if (valid) {
+ this.formData.parkIds = this.ids.join(",")
this.$byutil.postData(this, this.urlPath+'save', this.formData, res => {
this.$refs['formData'].resetFields();
this.flag=false;
@@ -115,7 +157,7 @@
});
},
loadData() {
- this.$byutil.loadPageData(this, this.urlPath+'findPage', this.searchForm);
+ this.$byutil.loadPageData(this, this.urlPath+'findPageNew', this.searchForm);
},
onSearch() {
this.pageData = this.$byutil.defaultPageData();
@@ -130,14 +172,21 @@
type: 0,
endTime: '',
startTime: '',
- parkId:null
+ parkIds: null,
+ payFlag:0
}
},
onEdit(row) {
this.flag=true;
+ this.ids = []
this.formData = row;
+ this.formData.updateBy = this.userName
if(row.type==1){
- this.flag2=true;
+ this.ids = this.formData.parkIds.split(",")
+ this.ids = this.ids.map(function(data){
+ return +data;
+ });
+ this.flag2=true;
}
},
onDelete(row) {
--
Gitblit v1.9.1