gang.huang 2 år sedan
förälder
incheckning
530f7de7c9
2 ändrade filer med 13 tillägg och 3 borttagningar
  1. 1 1
      src/pages/subPages/order.vue
  2. 12 2
      src/pages/subPages/reconciliation.vue

+ 1 - 1
src/pages/subPages/order.vue

@@ -81,7 +81,7 @@
         <div>
             <el-button style="margin-right:10px;margin-bottom:20px" type="primary" @click="queryList">查询</el-button>
             <el-button style="margin-right:10px;margin-left:0px;margin-bottom:20px" type="danger" @click="onReset">重置</el-button>
-            <el-button style="margin-right:10px;margin-left:0px;margin-bottom:20px" type="warning" @click="onExport">导出</el-button>
+            <!-- <el-button style="margin-right:10px;margin-left:0px;margin-bottom:20px" type="warning" @click="onExport">导出</el-button> -->
             <el-button style="margin-right:10px;margin-left:0px;margin-bottom:20px" type="success" @click="onExcopy">复制</el-button>
         </div>
     </el-header>

+ 12 - 2
src/pages/subPages/reconciliation.vue

@@ -51,7 +51,7 @@
         <el-table-column align="center" prop="errorCount" label="操作">
            <template slot-scope="scope">
             <el-button size="mini" disabled v-if="scope.row.state != 3">下载</el-button>
-            <el-button type="primary" size="mini" @click="downloadfile(scope.row.file_path)">下载</el-button>
+            <el-button type="primary" size="mini" v-if="scope.row.state == 3" @click="downloadfile(scope.row.file_path)">下载</el-button>
            </template>
         </el-table-column>
       </el-table>
@@ -158,6 +158,10 @@ export default {
           }, 1000)
           return
         }
+        if(!this.dataRange) {
+           this.$message.warning('请选择日期')
+           return;
+        }
         this.searchLoading = true
         this.isLoading = true
         console.log('this.dataRange',this.dataRange);
@@ -175,7 +179,9 @@ export default {
             this.downloadfile(res.datas.file_path)
            }
            else{
-             this.$message.warning('暂无导出订单')
+             this.$message.warning('导出任务生成成功')
+             this.curpage = 1;
+             this.getExportOrderList();
            }
          
         }
@@ -208,6 +214,10 @@ export default {
           }, 1000)
           return
         }
+         if(!this.dataRange) {
+           this.$message.warning('请选择日期')
+           return;
+        }
         this.searchLoading = true
         this.isLoading = true
         this.startTime = this.dataRange/1000