Merge remote-tracking branch 'origin/master'

src/api/inout/statData.js

@@ -44,6 +44,7 @@ export function filterYearList(params) {
     return axios({
       url: "/udiwms/inv/excelExportOut",
       method: "get",
+      responseType: 'blob',
       params: params
     });
   }

src/views/inout/stat/IoStatDaySearch.vue

@@ -158,6 +158,7 @@
 
 <script>
 import {getStatOrderList, filterDayList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
   site_id: "",
@@ -283,8 +284,16 @@ export default {
     },
 
     excel(){
-      let params={billNo:this.currentRow.recordKey};
+      if(isBlank(this.currentRow.recordKey)){
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params={billNo:this.currentRow.recordKey,key:"day"};
       excelImport(params ).then( res =>{
+        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
           this.$message("成功")
       })
 

src/views/inout/stat/IoStatMonthSearch.vue

@@ -100,6 +100,10 @@
                          icon="el-icon-search"
               >查询
               </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
             </el-button-group>
           </el-form-item>
         </el-form>
@@ -149,7 +153,8 @@
 </template>
 
 <script>
-import {getStatOrderList, filterMonthList} from "@/api/inout/statData";
+import {getStatOrderList, filterMonthList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
   site_id: "",
@@ -256,6 +261,23 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
+
+    excel(){
+      debugger
+      if(isBlank(this.currentRow.recordKey)){
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params={billNo:this.currentRow.recordKey,key:"month"};
+      excelImport(params ).then( res =>{
+        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+        this.$message("成功")
+      })
+
+    },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },

src/views/inout/stat/IoStatQuarterSearch.vue

@@ -100,6 +100,10 @@
                          icon="el-icon-search"
               >查询
               </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
             </el-button-group>
           </el-form-item>
         </el-form>
@@ -149,7 +153,8 @@
 </template>
 
 <script>
-import {getStatOrderList, filterQuarterList} from "@/api/inout/statData";
+import {getStatOrderList, filterQuarterList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
   site_id: "",
@@ -277,6 +282,21 @@ export default {
       this.detailList = [];
       this.detailTotal = 0;
     },
+    excel(){
+      if(isBlank(this.currentRow.recordKey)){
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params={billNo:this.currentRow.recordKey,key:"quarter"};
+      excelImport(params ).then( res =>{
+        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+        this.$message("成功")
+      })
+
+    },
     //获取订单列表
     getList() {
       this.loading = true;

src/views/inout/stat/IoStatYearSearch.vue

@@ -100,6 +100,10 @@
                          icon="el-icon-search"
               >查询
               </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
             </el-button-group>
           </el-form-item>
         </el-form>
@@ -149,7 +153,8 @@
 </template>
 
 <script>
-import {getStatOrderList, filterYearList} from "@/api/inout/statData";
+import {getStatOrderList, filterYearList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
   site_id: "",
@@ -256,6 +261,21 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
+    excel(){
+      if(isBlank(this.currentRow.recordKey)){
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params={billNo:this.currentRow.recordKey,key:"year"};
+      excelImport(params ).then( res =>{
+        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+        this.$message("成功")
+      })
+
+    },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },