auto commit

src/utils/exportexcel.js

@@ -9,8 +9,9 @@ import { Message } from 'element-ui';
 export function exportExcel(data, fileName) {
   const contentByExportExcel = data;
   const blobByExportExcel = new Blob([contentByExportExcel], { type: "application/vnd.ms-excel;charset=utf-8" });
-  console.log('blobByExportExcel',blobByExportExcel);
+  // console.log('blobByExportExcel',blobByExportExcel);
   // const filenameByExportExcel = fileName + "_" + parseTime(new Date(), "{y}-{m}-{d}") + "_" + new Date().getTime() + ".xlsx";
+  console.log(fileName + "_" + parseTime(new Date(), "{y}-{m}-{d}"));
   const filenameByExportExcel = fileName + Date.parse(new Date()) + ".xlsx";
   if ('download' in document.createElement('a')) {
     const elink = document.createElement('a');

src/views/oms/order/index.vue

@@ -26,7 +26,7 @@
           <el-form-item label="收货人：">
             <el-input v-model="listQuery.receiverKeyword" class="input-width" placeholder="收货人姓名/手机号码"></el-input>
           </el-form-item>
-          <el-form-item label="提交时间：">
+          <!-- <el-form-item label="提交时间：">
             <el-date-picker
               class="input-width"
               v-model="listQuery.createTime"
@@ -34,7 +34,7 @@
               type="date"
               placeholder="请选择时间">
             </el-date-picker>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="订单状态：">
             <el-select v-model="listQuery.status" class="input-width" placeholder="全部" clearable>
               <el-option v-for="item in statusOptions"
@@ -319,7 +319,11 @@
       }
     },
     created() {
+      let storage = window.sessionStorage;  
+      let currentPage = storage.getItem('productPage');
+      if(currentPage){this.listQuery.pageNum = Number(currentPage)};
       this.getList();
+      storage.removeItem('productPage');//使用后删除,否则从其他页面进来也不一定是第一页
     },
     filters: {
       formatCreateTime(time) {
@@ -471,6 +475,8 @@
           this.list = response.data.list;
           this.total = response.data.total;
         });
+        let storage = window.sessionStorage; 
+        storage.setItem('productPage',this.listQuery.pageNum);
       },
       deleteOrder(ids){
         this.$confirm('是否要进行该删除操作?', '提示', {

src/views/pms/product/index.vue

@@ -501,7 +501,11 @@
 
     },
     created() {
+      let storage = window.sessionStorage;  
+      let currentPage = storage.getItem('productPage');
+      if(currentPage){this.listQuery.pageNum = Number(currentPage)};
       this.getList();
+      storage.removeItem('productPage');//使用后删除,否则从其他页面进来也不一定是第一页
       this.getBrandList();
       this.getProductCateList();
       this.getcompList();
@@ -555,6 +559,8 @@
           this.list = response.data.list;
           this.total = response.data.total;
         });
+        let storage = window.sessionStorage; 
+        storage.setItem('productPage',this.listQuery.pageNum);
       },
       getBrandList() {
         fetchBrandList({pageNum: 1, pageSize: 100}).then(response => {
@@ -732,6 +738,7 @@
         });
       },
       handleUpdateProduct(index,row){
+        console.log('this page',this.listQuery.pageNum);
         this.$router.push({path:'/pms/updateProduct',query:{id:row.id}});
       },
       handleShowProduct(index,row){