From c40fc03236e94c0b7710d5e931a915f78ecdea13 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 25 七月 2023 00:09:18 +0800
Subject: [PATCH] 所有模块的按时间搜索

---
 ruoyi-ui/src/views/device/index.vue      |    4 ++--
 ruoyi-ui/src/views/travel/index.vue      |    2 +-
 ruoyi-ui/src/views/bignote/index.vue     |    2 +-
 ruoyi-ui/src/views/selfeconomy/index.vue |    2 +-
 ruoyi-ui/src/views/economy/index.vue     |    2 +-
 ruoyi-ui/src/views/pet/index.vue         |   21 +++------------------
 ruoyi-ui/src/views/note/index.vue        |    2 +-
 ruoyi-ui/src/views/secret/index.vue      |    2 +-
 ruoyi-ui/src/views/wish/index.vue        |    2 +-
 ruoyi-ui/src/views/collection/index.vue  |    2 +-
 ruoyi-ui/src/views/healthy/index.vue     |    2 +-
 11 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 0ad8bdf..1e4a67f 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -48,7 +48,7 @@
         />
 
       </el-form-item>
-      <el-form-item label="鏃堕棿">
+      <el-form-item label="鏃堕棿" prop="happenTime">
         <el-date-picker
           v-model="dateRange"
           style="width:  197px;
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 9f60459..590c655 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -51,7 +51,7 @@
                   -->
       </el-form-item>
 
-      <el-form-item label="鏃堕棿">
+      <el-form-item label="鏃堕棿" prop="happenTime">
         <el-date-picker
           v-model="dateRange"
           style="width:  197px;
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 59a3549..b8b8a7d 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container" style="opacity: 1;">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-      <el-form-item label="鏃堕棿" >
+      <el-form-item label="鏃堕棿" prop="happenTime">
         <el-date-picker
           v-model="dateRange"
           style="width: 240px;"
@@ -128,7 +128,7 @@
       <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
       <el-table-column label="璁惧鍚嶇О" prop="name" sortable width="120" />
 
-      <el-table-column label="鏃堕棿" align="center" sortable prop="happenTime" width="180">
+      <el-table-column label="鏃堕棿" align="happenTime" sortable prop="happenTime" width="180">
         <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
       <el-table-column label="鏄惁娉ㄩ攢" align="center" sortable prop="status" width="180">
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 3a878be..ba82feb 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container" style="opacity: 1;">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-      <el-form-item label="鏃堕棿" >
+      <el-form-item label="鏃堕棿"  prop="createTime">
         <el-date-picker
           v-model="dateRange"
           style="width: 240px;"
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index 2c375a5..cfe4641 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container" style="opacity: 1;">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-      <el-form-item label="鏃堕棿" >
+      <el-form-item label="浣撴鏃堕棿"  prop="checkTime">
         <el-date-picker
           v-model="dateRange"
           style="width: 240px;"
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 7661f80..6e73003 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -48,7 +48,7 @@
         />
       </el-form-item>
       <!-- </el-form-item> -->
-      <el-form-item label="鍙戠敓鏃堕棿">
+      <el-form-item label="鍙戠敓鏃堕棿"  prop="happenTime">
         <el-date-picker
           v-model="dateRange"
           style="width: 240px"
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index c562eb5..551e98b 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -33,24 +33,8 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="鎸佹湁浜�" prop="holder">
-          <el-input
-            v-model="queryParams.holder"
-            placeholder="璇疯緭鍏ユ寔鏈変汉"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <!-- <el-form-item label="鍏蜂綋浣嶇疆" prop="address">
-          <el-input
-            v-model="queryParams.address"
-            placeholder="璇疯緭鍏ュ叿浣撲綅缃�"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item> -->
+
+
       </el-form-item>
       <!-- <el-form-item label="鍙戠敓鏃堕棿">
         <el-date-picker
@@ -153,6 +137,7 @@
 
       </el-table-column>
       <el-table-column label="瀹犵墿id" prop="id" sortable width="100" />
+      <el-table-column label="涓讳汉濮撳悕" prop="masterName" sortable width="100" />
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 3d94ca3..e9dcd83 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -2,7 +2,7 @@
     <div class="app-container" style="opacity: 1;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-        <el-form-item label="鏃堕棿" >
+        <el-form-item label="鏃堕棿" prop="happenTime">
           <el-date-picker
             v-model="queryParams.happenTime"
             style="width: 240px;"
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 77702f5..cd6a243 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -20,7 +20,7 @@
 
         </el-form-item>
 
-        <el-form-item label="鏃ユ湡">
+        <el-form-item label="鏃ユ湡" prop="happenTime">
           <el-date-picker
             v-model="dateRange"
             style="width:  197px;
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 11072fa..7ea27cd 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container" style="opacity: 1;">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-      <el-form-item label="鏃堕棿" >
+      <el-form-item label="鏃堕棿" prop="startTime">
         <el-date-picker
           v-model="dateRange"
           style="width: 240px;"
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index bf9e2ff..5073518 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -51,7 +51,7 @@
                   -->
       </el-form-item>
 
-      <el-form-item label="鏃堕棿">
+      <el-form-item label="鏃堕棿" prop="happenTime">
         <el-date-picker
           v-model="dateRange"
           style="width:  197px;

--
Gitblit v1.9.1