From 1beebc6d565aacfae90235d14bcd4ad79aa4e79d Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 01 八月 2023 01:33:40 +0800
Subject: [PATCH] 完善相应模块的电子文件与详情显示问题

---
 ruoyi-ui/src/views/selfeconomy/index.vue |   75 +++++++++++++++++++++++++------------
 1 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index a0bb643..15ce206 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -1,15 +1,14 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-        <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
+        <el-form-item label="" prop="type incomeName timeLimit happenTime " >
           <el-input
-            v-model:phone="queryParams.phone"
-            v-model:wx="queryParams.wx"
-            v-model:qq="queryParams.qq"
-            v-model:twitter="queryParams.twitter"
-            v-model:isAlways="queryParams.isAlways"
-            v-model:remark="queryParams.remark"
-            placeholder="鍦ㄢ�滅櫨骞村績鎰库�濅腑鎼滅储"
+            v-model:type="queryParams.type"
+            v-model:incomeName="queryParams.incomeName"
+            v-model:timeLimit="queryParams.timeLimit"
+            v-model:happenTime="queryParams.happenTime"
+
+            placeholder="鍦ㄢ�滆储浜р�濅腑鎼滅储"
             clearable
             style="width: 240px"
             @keyup.enter.native="handleQuery">
@@ -20,7 +19,7 @@
 
         </el-form-item>
 
-        <el-form-item label="鏃ユ湡">
+        <el-form-item label="鏃ユ湡" prop="happenTime">
           <el-date-picker
             v-model="dateRange"
             style="width:  197px;
@@ -48,10 +47,10 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="鏀舵敮鍚嶇О" prop="incomeName" >
+        <el-form-item label="鑾峰緱鏂瑰紡" prop="incomeName" >
           <el-input
             v-model="queryParams.incomeName"
-            placeholder="璇疯緭鍏ユ敹鏀悕绉�"
+            placeholder="璇疯緭鍏ヨ幏寰楁柟寮�"
             clearable
             style="width: 240px"
             @keyup.enter.native="handleQuery">
@@ -63,6 +62,16 @@
           <el-input
             v-model="queryParams.timeLimit"
             placeholder="璇疯緭鍏ユ湡闄�"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery">
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="璐骇鍚嶇О" prop="incomeName">
+          <el-input
+            v-model="queryParams.incomeName"
+            placeholder="璇疯緭鍏ヨ储浜у悕绉�"
             clearable
             style="width: 240px"
             @keyup.enter.native="handleQuery">
@@ -151,7 +160,7 @@
         <el-table-column label="璐骇绫诲埆" prop="type" sortable width="120" align="center">
           <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
         </el-table-column>
-        <el-table-column label="鏀舵敮鍚嶇О" prop="incomeName" sortable :show-overflow-tooltip="true" width="120" align="center" >
+        <el-table-column label="璐骇鍚嶇О" prop="incomeName" sortable :show-overflow-tooltip="true" width="120" align="center" >
           <template slot-scope="scope">{{scope.row.incomeName? scope.row.incomeName: '鈥斺�斺�斺��'}}</template>
         </el-table-column>
         <el-table-column label="浠峰�硷紙閲戦锛�" prop="price" sortable width="140" align="center" >
@@ -253,8 +262,8 @@
             <el-input v-model="formDat.type" placeholder="璇疯緭鍏ヨ储浜х被鍒�" clearable :style="{width: '100%'}" >
             </el-input>
           </el-form-item>
-          <el-form-item label="鏀舵敮鍚嶇О" prop="incomeName">
-            <el-input v-model="formDat.incomeName" placeholder="璇疯緭鍏ユ敹鏀悕绉�" clearable :style="{width: '100%'}" >
+          <el-form-item label="璐骇鍚嶇О" prop="incomeName">
+            <el-input v-model="formDat.incomeName" placeholder="璇疯緭鍏ヨ储浜у悕绉�" clearable :style="{width: '100%'}" >
             </el-input>
           </el-form-item>
           <el-form-item label="閲戦" prop="price">
@@ -333,7 +342,7 @@
             class="upload-demo"
             multiple
 
-            :on-remove="handleRemove"
+            :on-remove="handleRemoveFile"
             :http-request="requestUpload"
             :show-file-list="true"
           >
@@ -444,8 +453,9 @@
           pageSize: 10,
           type:undefined,
           incomeName:undefined,
-          beneficiary:undefined,
-          // happenTime:undefined,
+          timeLimit:undefined,
+          happenTime:undefined,
+
         },
         // searchVal:"",
 
@@ -574,7 +584,18 @@
       },
 
       handleRemove(file) {
-        alert(323)
+        for(let i = 0; i < this.fileList.length; i++)
+        {
+          if(this.fileList[i].url==file.url)
+            this.$delete(this.fileList,i);
+        }
+      },
+      handleRemoveFile(file) {
+        for(let i = 0; i < this.fileListOther.length; i++)
+        {
+          if(this.fileListOther[i].url==file.url)
+            this.$delete(this.fileListOther,i);
+        }
       },
       // 鍙栨秷鎸夐挳
       cancel() {
@@ -686,6 +707,12 @@
             });
           }
         });
+        // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+        Object.keys(this.formDat).forEach(key => {
+          this.formDat[key] = '';
+        });
+        this.handleRemove(this.fileList[0]);
+        this.handleRemoveFile(this.fileListOther[0]);
       },
       requestUpload(params)
       {
@@ -726,20 +753,20 @@
 
         if(Ids.length==0)
         {
-          this.download('zIdea/export', {
+          this.download('zProperty/export', {
             ...this.queryParams
-          }, `zIdea_${new Date().getTime()}.xlsx`)
+          }, `zProperty_${new Date().getTime()}.xlsx`)
         }else{
-          this.download('zIdea/export1/'+Ids, {
-          }, `zIdea_${new Date().getTime()}.xlsx`)
+          this.download('zProperty/export1/'+Ids, {
+          }, `zProperty_${new Date().getTime()}.xlsx`)
         }
       },
 
       /** 瀵煎叆妯℃澘涓嬭浇鎸夐挳鎿嶄綔 */
       handleExportModel() {
 
-        this.download('/zIdea/model', {
-        }, `zIdea_model_${new Date().getTime()}.xlsx`)
+        this.download('/zProperty/model', {
+        }, `zProperty_model_${new Date().getTime()}.xlsx`)
       },
 
       /** 瀵煎叆鎿嶄綔*/

--
Gitblit v1.9.1