From 84562e1978146f396c6976c75dc931c12b188982 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 26 四月 2024 15:54:17 +0800
Subject: [PATCH] 核算报告功能完善

---
 src/views/system/report/index.vue |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index 950f1e9..f399ce2 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -52,6 +52,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-hasPermi="['system:report:add']"
         >鏂板</el-button>
       </el-col>
 <!--      <el-col :span="1.5">-->
@@ -72,6 +73,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-hasPermi="['system:report:remove']"
         >鍒犻櫎</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -81,6 +83,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          v-hasPermi="['system:report:export']"
         >瀵煎嚭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -93,7 +96,11 @@
       <el-table-column label="鐐逛綅" align="center" prop="pointName" />
       <el-table-column label="鎶ュ绫诲瀷" align="center" prop="reportType" />
       <el-table-column label="鎶ュ鍐呭" align="center" prop="reportContent" show-overflow-tooltip="true" />
-      <el-table-column label="涓婃姤鏉愭枡" align="center" prop="reportMaterials" />
+      <el-table-column label="涓婃姤鏉愭枡" align="center" prop="reportMaterials" show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <div v-for="(item, index) in scope.row.reportMaterials.split(',')" :key="index">{{ item.substring(item.lastIndexOf("/") + 1) }}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" />
       <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditingTime" width="180">
         <template slot-scope="scope">
@@ -114,7 +121,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleAuditing(scope.row)"
-            v-hasPermi="['system:report:audit']"
+            v-hasPermi="['system:report:edit']"
             v-if="scope.row.status === 0"
           >瀹℃牳</el-button>
           <el-button
@@ -169,15 +176,16 @@
             <el-option label="璁惧閬楀け" value="璁惧閬楀け"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="鏈夋晥鏃堕棿">
+        <el-form-item label="鎶ュ鏃堕棿" prop="expirTime">
           <el-date-picker
-            v-model="expirTime"
+            v-model="form.expirTime"
             style="width: 240px"
             value-format="yyyy-MM-dd"
             type="daterange"
             range-separator="-"
-            start-placeholder="鐢熸晥鏃ユ湡"
-            end-placeholder="澶辨晥鏃ユ湡"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+            @change="handleExpirTimeChange"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="鎶ュ鍐呭" prop="reportContent">
@@ -222,7 +230,7 @@
           <el-input type="textarea" v-html="auditingForm.reportContent" disabled />
         </el-form-item>
         <el-form-item label="涓婃姤鏉愭枡">
-          <el-link :href="auditingForm.reportMaterials" :underline="false">{{ auditingForm.reportMaterials }}</el-link>
+          <el-link v-for="item in auditingForm.reportMaterials != null ? auditingForm.reportMaterials.split(',') : auditingForm.reportMaterials" :underline="false" :key="item" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
         </el-form-item>
         <el-form-item label="瀹℃牳缁撴灉">
           <el-radio-group v-model="auditingForm.status">
@@ -328,7 +336,7 @@
           { required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "blur" }
         ],
         expirTime: [
-          { required: true, message: "璇烽�夋嫨鏈夋晥鏃堕棿", trigger: "blur" }
+          { required: true, message: "璇烽�夋嫨鎶ュ鏃堕棿", trigger: "blur" }
         ],
       }
     };
@@ -454,13 +462,14 @@
         this.auditingForm = {}
       });
     },
+    handleExpirTimeChange() {
+      if (null != this.form.expirTime && '' != this.form.expirTime) {
+        this.form["beginCreateTime"] = this.form.expirTime[0];
+        this.form["endCreateTime"] = this.form.expirTime[1];
+      }
+    },
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
-
-      if (null != this.expirTime && '' != this.expirTime) {
-        this.form["beginCreateTime"] = this.expirTime[0];
-        this.form["endCreateTime"] = this.expirTime[1];
-      }
 
       // todo 鍒ゆ柇鏄簨鍓嶆姤澶�
 
@@ -497,6 +506,10 @@
       this.download('report/export', {
         ...this.queryParams
       }, `report_${new Date().getTime()}.xlsx`)
+    },
+    /** 涓嬭浇鎸夐挳鎿嶄綔 */
+    handleDownload (data) {
+      this.$download.resource(data);
     }
   }
 };

--
Gitblit v1.8.0