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/business/trainTime.vue |   51 +++++++++++++++++----------------------------------
 1 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/admin/src/views/business/trainTime.vue b/admin/src/views/business/trainTime.vue
index d571886..2c060c8 100644
--- a/admin/src/views/business/trainTime.vue
+++ b/admin/src/views/business/trainTime.vue
@@ -9,9 +9,13 @@
         <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
       </el-form-item>
       <el-form-item label="鍩硅寮�濮嬫椂闂�" prop="eventType">
-        <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+        <!-- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
           value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
-        </el-date-picker>
+        </el-date-picker> -->
+        <el-date-picker type="datetime" v-model="searchForm.startTimeStart" value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+        <el-date-picker type="datetime" v-model="searchForm.startTimeEnd" value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
       </el-form-item>
       <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
         <el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -25,7 +29,7 @@
     </el-form>
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
-      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
+      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
         <el-table-column prop="name" label="浜哄憳濮撳悕" min-width="100px"></el-table-column>
         <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
         <el-table-column prop="idcardNo" label="璇佷欢鍙�" min-width="150px"></el-table-column>
@@ -86,18 +90,23 @@
   },
   methods: {
     changeRadio(e) {
+      this.searchForm.radio = e
       if (e === '0') {
         this.searchForm.startTimeStart = timeForMat(0)[0]
         this.searchForm.startTimeEnd = timeForMat(0)[1]
-        this.time = timeForMat(0)
       } else if (e === '1') {
         this.searchForm.startTimeStart = timeForMat(6)[0]
         this.searchForm.startTimeEnd = timeForMat(6)[1]
-        this.time = timeForMat(6)
       } else if (e === '2') {
         this.searchForm.startTimeStart = timeForMat(29)[0]
         this.searchForm.startTimeEnd = timeForMat(29)[1]
-        this.time = timeForMat(29)
+      } else {
+        this.searchForm.radio = ''
+      }
+      if (this.searchForm.startTimeStart && this.searchForm.startTimeEnd && new Date(this.searchForm.startTimeStart).getTime() > new Date(this.searchForm.startTimeEnd).getTime()) {
+        this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+        this.searchForm.startTimeStart = ''
+        return
       }
       this.search()
     },
@@ -106,40 +115,14 @@
         this.searchForm.startTimeStart = e[0]
         this.searchForm.startTimeEnd = e[1]
         this.searchForm.radio = null
-        this.search()
-      }
-    },
-    changeRadio1(e) {
-      if (e === '0') {
-        this.searchForm.endTimeStart = timeForMat(0)[0]
-        this.searchForm.endTimeEnd = timeForMat(0)[1]
-        this.time1 = timeForMat(0)
-      } else if (e === '1') {
-        this.searchForm.endTimeStart = timeForMat(6)[0]
-        this.searchForm.endTimeEnd = timeForMat(6)[1]
-        this.time1 = timeForMat(6)
-      } else if (e === '2') {
-        this.searchForm.endTimeStart = timeForMat(29)[0]
-        this.searchForm.endTimeEnd = timeForMat(29)[1]
-        this.time1 = timeForMat(29)
-      }
-      this.search()
-    },
-    seleTime1(e) {
-      if (e && e.length > 1) {
-        this.searchForm.endTimeStart = e[0]
-        this.searchForm.endTimeEnd = e[1]
-        this.searchForm.radio1 = null
+        this.time = [e[0], e[1]]
         this.search()
       }
     },
     reset() {
       this.$refs.searchForm.resetFields()
+      this.searchForm = {}
       this.time = []
-      this.time1 = []
-      this.searchForm.radio = ''
-      this.searchForm.radio1 = '0'
-      // this.changeRadio('0')
       this.search()
     }
   }

--
Gitblit v1.9.3