Browse Source

报表添加导出

xiaodai2022 2 years ago
parent
commit
b1f73c4c10
2 changed files with 24 additions and 22 deletions
  1. 0 0
      dist/static/js/0.js
  2. 24 22
      src/views/reportQuery/saleReport/components/table20.vue

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 24 - 22
src/views/reportQuery/saleReport/components/table20.vue

@@ -23,17 +23,7 @@
     >
       <template #table-header="{}">
         <div style="width: 100%">
-          <el-row style="padding: 0 0 0 80px">
-            <el-col :span="6" style="width: 442px">
-              <periodDatePickerActive
-                :start="parmValue.start_date"
-                :end="parmValue.end_date"
-                :placeholder="'产品下线'"
-                :width="'205px'"
-                :size="searchSize"
-                @timeReturned="time"
-              />
-            </el-col>
+          <el-row style="width: 100%; padding: 0 0 0 80px">
             <el-col :span="6" style="width: 200px">
               <el-select
                 :size="searchSize"
@@ -78,7 +68,7 @@
                 />
               </el-select>
             </el-col>
-            <!-- <el-col :span="4" style="width: 66px; float: right">
+            <el-col :span="4" style="width: 66px; float: right">
               <el-button
                 type="primary"
                 style="margin-left: 30px"
@@ -88,7 +78,7 @@
               >
                 导出
               </el-button>
-            </el-col> -->
+            </el-col>
             <el-col :span="3" style="width: 66px; float: right">
               <el-button
                 :size="searchSize"
@@ -99,14 +89,26 @@
                 刷新
               </el-button>
             </el-col>
+          </el-row>
+          <el-row style="padding: 10px 0 0 0" gutter="10">
+            <el-col :span="6" style="width: 442px">
+              <periodDatePickerActive
+                :start="parmValue.start_date"
+                :end="parmValue.end_date"
+                :placeholder="'下单'"
+                :width="'205px'"
+                :size="searchSize"
+                @timeReturned="time"
+              />
+            </el-col>
             <el-col :span="4" style="width: 66px; float: right">
               <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">
                 重置
               </el-button>
             </el-col>
           </el-row>
-          <!-- <el-row style="padding: 10px 0 0 0" gutter="10">
-            <el-col :span="6" style="width: 240px">
+
+          <!--<el-col :span="6" style="width: 240px">
               <el-input
                 clearable
                 placeholder="采购维护人"
@@ -306,12 +308,12 @@ export default {
       // }
       let start_date = new Date(this.parmValue.start_date).valueOf();
       let end_date = new Date(this.parmValue.end_date).valueOf();
-      let flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000;
+      // let flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000;
       if (this.parmValue.start_date != "" && this.parmValue.end_date != "") {
-        if (flag) {
-          this.$message.warning("导出文件的时间区间不能超过30天");
-          return;
-        }
+        // if (flag) {
+        //   this.$message.warning("导出文件的时间区间不能超过30天");
+        //   return;
+        // }
       } else {
         this.$message.warning("请选择导出文件的时间区间");
         return;
@@ -323,7 +325,7 @@ export default {
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/reportgoodofflineexport",
+          url: this.fileUrl + "admin/snae",
           responseType: "blob",
           data: model,
           headers: {
@@ -346,7 +348,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "产品下线报表.zip";
+              let excelName = "无地址销售订单报表.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();

Some files were not shown because too many files changed in this diff