From 5eae401ee623a3ba2a144fb05df2242747d0a466 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 19 七月 2024 17:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/do/b1-inspect-order-plan/Inspection.vue |    3 ---
 src/assets/api/controller.js                           |    1 +
 src/components/view/b1-expenses.vue                    |   27 +++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 4a53106..19d9552 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -173,6 +173,7 @@
   updateStatus: "/insOrder/updateStatus", //灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
   updateInspected: "/insOrder/updateInspected", //灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
   labelPrinting: "/insOrder/labelPrinting", //鏍囩鎵撳嵃
+  export: "/insOrder/export", //瀵煎嚭
 }
 
 const sampleOrder = {
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 28d912b..a339685 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -209,9 +209,6 @@
   <div v-loading="loading" class="inspection">
     <el-row class="title">
       <el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屽崟璇︽儏
-        <!-- <span style="color: #3A7BFA;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;鏍峰搧</span>
-        <span v-if="currentFiberOpticTape" style="color: #3A7BFA;"> - 鍏夌氦甯�</span>
-        <span v-if="currentFiberOptic" style="color: #3A7BFA;"> - 鍏夌氦</span> -->
       </el-col>
       <el-col :span="12" style="text-align: right;">
         <!-- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">鍏夌氦鍒囨崲</el-button>
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 67596ee..92081fb 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -83,6 +83,9 @@
           <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
         </div>
         <div class="search_thing" style="padding-left: 70px;">鎬讳环锛歿{total}}</div>
+        <div class="search_thing" style="padding-left: 70px;">
+          <el-button size="small" type="primary" @click="handleDown" :loading="outLoading">瀵煎嚭</el-button>
+        </div>
       </div>
       <div class="table">
         <ValueTable ref="ValueTable" :url="$api.insOrder.costStatistics" :componentData="componentData" :key="upIndex"
@@ -215,6 +218,7 @@
           current: -1,
           size: -1,
         },
+        outLoading:false
       }
     },
     mounted() {
@@ -224,6 +228,29 @@
       this.getPower()
     },
     methods: {
+      handleDown(){
+        let entity = {...this.componentData.entity}
+        // entity.dates = JSON.stringify(entity.dates)
+        delete entity.orderBy
+        this.outLoading = true
+        this.$axios.post(this.$api.insOrder.export,{
+          entity:entity
+        },{
+            headers: {
+              'Content-Type': 'application/json'
+            }
+          ,responseType: "blob"}).then(res => {
+          this.outLoading = false
+          this.$message.success('瀵煎嚭鎴愬姛')
+          const blob = new Blob([res],{ type: 'application/octet-stream' });
+          const url = URL.createObjectURL(blob);
+          const link = document.createElement('a');
+          link.href = url;
+          let date = JSON.parse(entity.dates)
+          link.download = (entity.company?entity.company+' ':'')+date[0]+' - '+date[1]+'璐圭敤缁熻.xlsx';
+          link.click();
+        })
+      },
       getTotal(){
         this.$axios.post(this.$api.insOrder.costStatistics2, {
           entity:this.componentData.entity

--
Gitblit v1.9.3