From 75e703c6a450b22c070a9ec017f3b304ff344480 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 25 七月 2023 15:31:08 +0800
Subject: [PATCH] 时间搜索

---
 ruoyi-ui/src/views/economy/index.vue |   55 +++++++++++++++++--------------------------------------
 1 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 88d62f6..cfc9b16 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;"
@@ -22,15 +22,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="绫诲瀷" prop="type">
-        <el-input
-          v-model="queryParams.type"
-          placeholder="璇疯緭鍏ョ被鍨�"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
 
       <el-form-item label="鐢ㄩ��" prop="useFor">
         <el-input
@@ -86,7 +78,7 @@
           plain
           icon="el-icon-download"
           size="mini"
-          @click="handleExportTemplate"
+          @click="handleExport"
           v-hasPermi="['family:note:export']"
         >瀵煎叆妯℃澘涓嬭浇</el-button>
       </el-col>
@@ -109,7 +101,7 @@
     <!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
     <el-table v-loading="loading" :data="economyList"  @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
       <el-table-column type="selection" width="55"  align="center" />
-      <el-table-column  label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+      <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
 
       <el-table-column label="鍙戠敓鏃堕棿" prop="createTime" sortable width="100" align="center">
         <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
@@ -118,13 +110,14 @@
       <el-table-column label="鏀跺叆/鏀嚭" prop="price" sortable width="100" >
 
       </el-table-column>
+      <el-table-column label="閲戦" prop="balance" sortable width="100" />
       <el-table-column label="鐢ㄩ��" prop="useFor" sortable width="100" />
 
       <el-table-column label="浣跨敤浜�" prop="usePeople" sortable width="100" />
       <el-table-column label="鐜伴噾/鑷姩鎵e垝" prop="kind" sortable width="130" >
         <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
-      <el-table-column label="浣欓" prop="balance" sortable width="100" />
+
       <el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable  width="110" >
         <template slot-scope="scope" >
           <img
@@ -171,6 +164,7 @@
         </template>
       </el-table-column>
     </el-table>
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -188,9 +182,9 @@
           <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
 
-        <el-form-item label="鏃堕棿" prop="happenTime">
+        <el-form-item label="鏃堕棿" prop="createTime">
           <el-date-picker
-            v-model='formDat.happenTime'
+            v-model='formDat.createTime'
             type='date'
             placeholder='閫夋嫨鏃ユ湡'
           ></el-date-picker>
@@ -217,6 +211,8 @@
           <el-input v-model="formDat.kind" placeholder="璇疯緭鍏ユ敮浠樻柟寮�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
+
+
         <el-form-item label="澶囨敞" prop="remark">
           <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
@@ -347,7 +343,7 @@
       btn:false,
       formDat: {
         type: undefined,
-        createTime: undefined,
+        happenTime: undefined,
         useFor: undefined,
         usePeople: undefined,
         kind:undefined,
@@ -365,7 +361,8 @@
         type:undefined,
         useFor:undefined,
         usePeople:undefined,
-        createTime:undefined,
+
+        createTime:undefined
 
       },
       // 琛ㄥ崟鍙傛暟
@@ -421,7 +418,8 @@
         {
           value: '鏀嚭',
           label: '鏀嚭',
-        }],
+        }
+      ],
       typeOptions1: [
         {
           value: '0',
@@ -515,10 +513,6 @@
     cancel() {
       this.open = false;
       this.reset();
-    },
-    getRowId(row)
-    {
-      return row.id
     },
     // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
     cancelDataScope() {
@@ -645,7 +639,7 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
         return delEconomy(Ids);
       }).then(() => {
         this.getList();
@@ -654,24 +648,10 @@
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
-      const Ids = this.ids;
-
-      if(Ids.length==0)
-      {
       this.download('/zfEconomy/export', {
         ...this.queryParams
       }, `zfEconomy_${new Date().getTime()}.xlsx`)
-      }else
-      {
-        this.download('/zfEconomy/export1/'+Ids, {
-        }, `zfEconomy_${new Date().getTime()}.xlsx`)
-      }
     }
-  ,
-  handleExportTemplate(){
-      this.download('/zfEconomy/model', {
-
-      }, `zfEconomy_${new Date().getTime()}.xlsx`)
   },
   /** 瀵煎叆鎿嶄綔*/
   handleEnport(params){
@@ -689,7 +669,6 @@
       Message({ message: "瀵煎叆澶辫触", type: 'error' })
     }
 
-  }
   }
 
 };

--
Gitblit v1.9.1