From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 admin/src/views/business/bikeRetakeRecord.vue |   53 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/admin/src/views/business/bikeRetakeRecord.vue b/admin/src/views/business/bikeRetakeRecord.vue
index 3b4b016..bcee59b 100644
--- a/admin/src/views/business/bikeRetakeRecord.vue
+++ b/admin/src/views/business/bikeRetakeRecord.vue
@@ -3,28 +3,31 @@
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
 
-      <el-form-item label="鐢ㄦ埛" prop="memberId">
-        <el-input v-model="searchForm.memberId" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+      <el-form-item label="鐢ㄦ埛" prop="openid">
+        <el-input v-model="searchForm.openid" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
       </el-form-item>
       <el-form-item label="杞﹁締缂栫爜" prop="bikeCode">
         <el-input v-model="searchForm.bikeCode" placeholder="璇疯緭鍏ヨ溅杈嗙紪鐮�" @keypress.enter.native="search"></el-input>
       </el-form-item>
-      <el-form-item label="鏄惁褰掕繕" prop="closeStatus">
-        <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
+      <el-form-item label="鏄惁褰掕繕" prop="hasBack">
+        <el-select v-model="searchForm.hasBack" placeholder="璇烽�夋嫨">
           <el-option
             label="鏈綊杩�"
-            :value="1">
+            :value="false">
           </el-option>
           <el-option
             label="宸插綊杩�"
-            :value="1">
+            :value="true">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="绉熷�熸椂闂�" prop="rentDate">
+      <el-form-item label="鍊熷嚭鏃堕棿" prop="rentDate">
         <el-date-picker
           v-model="value1"
           type="daterange"
+          @change="selectDate"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd HH:mm:ss"
           range-separator="鑷�"
           start-placeholder="寮�濮嬫棩鏈�"
           end-placeholder="缁撴潫鏃ユ湡">
@@ -33,12 +36,15 @@
 
       <section>
         <el-button type="primary" @click="search">鎼滅储</el-button>
-        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:memberrides:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+        <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:memberrides:exportExcel']" @click="exportExcel">瀵煎嚭</el-button> -->
         <el-button @click="reset">閲嶇疆</el-button>
       </section>
     </el-form>
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
+      <ul class="toolbar">
+        <li ><el-button type="primary" :loading="isWorking.export" v-permissions="['business:memberrides:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
+      </ul>
       <el-table
         v-loading="isWorking.search"
         :data="tableData.list"
@@ -99,6 +105,7 @@
 import BaseTable from '@/components/base/BaseTable'
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
+import { formatDateTime } from '@/utils/util'
 export default {
   name: 'MemberRides',
   extends: BaseTable,
@@ -109,12 +116,12 @@
       searchForm: {
         id: '',
         createDate: '',
-        creator: '',
+        hasBack: '',
         editDate: '',
         editor: '',
         isdeleted: '',
         info: '',
-        memberId: '',
+        openid: '',
         bikeCode: '',
         balance: '',
         paramId: '',
@@ -143,9 +150,11 @@
         backType: '',
         backReason: '',
         backInfo: '',
+        startDate: '',
+        endDate: '',
         backUserid: ''
       },
-      value1: []
+      value1: [new Date(), new Date()]
     }
   },
   created () {
@@ -155,7 +164,27 @@
       'field.id': 'id',
       'field.main': 'id'
     })
+    this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
+    this.searchForm.endDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 23:59:59'
     this.search()
-  }
+  },
+  methods: {
+    reset() {
+      this.value1 = []
+      this.searchForm.startDate = ''
+      this.searchForm.endDate = ''
+      this.$refs.searchForm.resetFields()
+      this.search()
+    },
+    selectDate(v) {
+      this.searchForm.startDate = ''
+      this.searchForm.endDate = ''
+      if (v) {
+        this.searchForm.startDate = v[0]
+        this.searchForm.endDate = v[1]
+      }
+      this.search()
+    },
+  },
 }
 </script>

--
Gitblit v1.9.3