From c0b29ee03f4f6c984f35618bfa669ba3f2ab6517 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 20 二月 2024 10:09:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web

---
 src/views/project/fundcheck/expertFeeCheck/index.vue |  113 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 63 insertions(+), 50 deletions(-)

diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 3b42e11..ce5d9a1 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -2,24 +2,18 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
-            <el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="createTime"
-              type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" end-placeholder="鐢宠缁撴潫鏃ユ湡"
-              @keyup.enter.native="flowconclusion">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
         <el-col :span="5">
-          <el-form-item label="閲戦" prop="money" style="float: left">
-            <el-input v-model="queryParams.money" placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" clearable size="small"
+          <el-form-item label="鎹愮尞妗堜緥" prop="donorname" style="float: left">
+            <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" clearable size="small"
               @keyup.enter.native="flowconclusion" />
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left">
-            <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small"
-              @keyup.enter.native="flowconclusion" />
+          <el-form-item label="棰勫鐘舵��" prop="checkstatus" style="float: left">
+            <el-select v-model="queryParams.checkstatus" placeholder="璇烽�夋嫨" style="width: 100%">
+              <el-option v-for="item in checkmaterials" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="5">
@@ -29,28 +23,29 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-        <!-- <el-col :span="6">
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
-        </el-col> -->
-      </el-row>
-      <el-row>
-        <el-col :span="5">
-          <el-form-item label-width="120px" label="鐢宠鏉愭枡鐘舵��" prop="checkstatus" style="float: left">
-            <el-select v-model="queryParams.checkstatus" placeholder="璇烽�夋嫨" style="width: 100%">
-              <el-option v-for="item in checkmaterials" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="5">
-          <el-form-item label="鎹愮尞鑰�" prop="donorname" style="float: left">
-            <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" clearable size="small"
+        </el-col><el-col :span="5">
+          <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left">
+            <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small"
               @keyup.enter.native="flowconclusion" />
           </el-form-item>
         </el-col>
-        <el-col :span="3">
+      </el-row>
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="鎶ラ攢閲戦" prop="money" style="float: left">
+            <el-input v-model="queryParams.money" placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" clearable size="small"
+              @keyup.enter.native="flowconclusion" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+            <el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="createTime"
+              type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" end-placeholder="鐢宠缁撴潫鏃ユ湡"
+              @keyup.enter.native="flowconclusion">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <div style="margin-bottom: 15px;">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -134,7 +129,7 @@
               <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
                 @click="handleCheck(scope.row)">瀹℃牳</el-button>
               <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
-              <el-button size="mini" type="text" icon="el-icon-download" @click="dayin(scope.row.id)">涓嬭浇</el-button>
+              <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)">涓嬭浇</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -461,6 +456,8 @@
 import Li_area_select from "@/components/Address";
 import OrgSelecter from "@/views/project/components/orgselect";
 import { setItem, grtItem, removeItem } from "@/utils/storage.js";
+import { getToken } from "@/utils/auth";
+
 
 export default {
   components: {
@@ -644,7 +641,10 @@
       approveLevel: 5,
       show: 0,
       fundtypeArrAll: [],
-      dialogType: "show"
+      dialogType: "show",
+      headers: {
+        Authorization: "Bearer " + getToken()
+      },
     };
   },
   watch: {},
@@ -761,23 +761,36 @@
 
     totaldayin(e) {
       // const id =this.row.id
-      getdownloadBX(e).then(res => {
-        if (res.downloadUrl) {
-          var fileUrl = res;
-          //鑾峰彇褰撳墠缃戝潃
-          var urlBase = process.env.VUE_APP_BASE_API;
-          var curWWWPath = window.document.location.href;
-          var pos = curWWWPath.indexOf(window.document.location.pathname);
-          // 鍒涘缓a鏍囩
-          var aEle = document.createElement("a");
-          aEle.href =
-            curWWWPath.substring(0, pos) + urlBase + fileUrl["downloadUrl"];
-          aEle.click();
-          this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
-            confirmButtonText: "纭畾",
-            type: "success"
+      getdownloadLW(e).then(res => {
+        var fileUrl = res;
+        //鑾峰彇褰撳墠缃戝潃
+        var urlBase = process.env.VUE_APP_BASE_API;
+        var curWWWPath = window.document.location.href;
+        var pos = curWWWPath.indexOf(window.document.location.pathname);
+        // 鍒涘缓a鏍囩
+        var aEle = document.createElement("a");
+        aEle.href =
+          curWWWPath.substring(0, pos) + urlBase + fileUrl["downloadUrl"];
+        console.log(aEle.href);
+        // 娣诲姞Authorization澶撮儴
+        fetch(aEle.href, {
+          headers: this.headers
+        })
+          .then(response => {
+            // 灏嗘枃浠朵笅杞介摼鎺ヤ綔涓篵lob瀵硅薄杩涜涓嬭浇
+            return response.blob();
+          })
+          .then(blob => {
+            const url = window.URL.createObjectURL(new Blob([blob]));
+            console.log(url);
+            const link = document.createElement("a");
+            link.href = url;
+            const name=fileUrl["downloadName"]
+            link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚�
+            document.body.appendChild(link);
+            link.click();
+            link.parentNode.removeChild(link);
           });
-        }
       });
     },
 

--
Gitblit v1.9.3