Explorar o código

批量下载优化

shish hai 1 ano
pai
achega
8566d2e4f1
Modificáronse 1 ficheiros con 34 adicións e 11 borrados
  1. 34 11
      ghs/src/views/order/list.vue

+ 34 - 11
ghs/src/views/order/list.vue

@@ -146,20 +146,20 @@
       </template>
       </template>
 
 
       <template #slot-search-option="{scope}">
       <template #slot-search-option="{scope}">
-        <el-input v-model="name" placeholder="客户名称 / 订单号" size="mini" style="width:150px;" :clearable="true" ref="orderSearchRef" @input="changeSearch()" @focus="name=''"></el-input>
-				<el-select size="mini" v-model="currentKdStaffName" placeholder="开单人" style="width:110px;margin-left:10px;" @change="getKdStaff" :clearable="true">
+        <el-input v-model="name" placeholder="客户名称 / 订单号" size="mini" style="width:130px;" :clearable="true" ref="orderSearchRef" @input="changeSearch()" @focus="name=''"></el-input>
+				<el-select size="mini" v-model="currentKdStaffName" placeholder="开单人" style="width:110px;margin-left:8px;" @change="getKdStaff" :clearable="true">
 					<el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 					<el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
 				</el-select>
-        <span style="margin-left:9px;font-size:19px;">付款时间:</span>
+        <span style="margin-left:9px;font-size:18px;">付款:</span>
         <el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getSearchDate" value-format="yyyy-MM-dd"
         <el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getSearchDate" value-format="yyyy-MM-dd"
-                end-placeholder="结束日期" :picker-options="pickerOptions" size="mini" style="margin-right:10px;">
+                end-placeholder="结束日期" :picker-options="pickerOptions" size="mini" style="margin-right:8px;">
         </el-date-picker>
         </el-date-picker>
-        <el-radio-group v-model="book" @change="changeBook" style="margin-right:20px;padding-top:6px;margin-left:5px;">
+        <el-radio-group v-model="book" @change="changeBook" style="margin-right:20px;padding-top:6px;margin-left:4px;">
           <el-radio label="-1">全部</el-radio>
           <el-radio label="-1">全部</el-radio>
           <el-radio label="0">常规订单</el-radio>
           <el-radio label="0">常规订单</el-radio>
           <el-radio label="1">预订单</el-radio>
           <el-radio label="1">预订单</el-radio>
         </el-radio-group>
         </el-radio-group>
-        <el-radio-group v-model="clearSign" @change="changeClearSign" style="margin-right:15px;padding-top:6px;margin-left:5px;">
+        <el-radio-group v-model="clearSign" @change="changeClearSign" style="margin-right:15px;padding-top:6px;margin-left:4px;">
         <el-radio label="-1">全部</el-radio>
         <el-radio label="-1">全部</el-radio>
           <el-radio label="0">待结款</el-radio>
           <el-radio label="0">待结款</el-radio>
           <el-radio label="1">已结款</el-radio>
           <el-radio label="1">已结款</el-radio>
@@ -167,7 +167,7 @@
       </template>
       </template>
 
 
 			<template #slot-export-order>
 			<template #slot-export-order>
-				<el-button type="primary" size="mini" style="margin-left:30px;" @click="exportData()">导出数据</el-button>
+				<el-button type="primary" size="mini" style="margin-left:10px;" @click="exportData()">导出数据</el-button>
 			</template>
 			</template>
 
 
 			<template #slot-more-do-btn>
 			<template #slot-more-do-btn>
@@ -576,12 +576,22 @@ export default {
 				this.$message.error('请选择订单')
 				this.$message.error('请选择订单')
 				return false
 				return false
 			}
 			}
-      this.$confirm('确认下载?确认后请稍等30秒', '提示', {confirmButtonText: '确定',cancelButtonText: '取消',type: 'warning'}).then(() => {
+      let num = 0
+      this.selectedData.forEach((item,idx,arr) => {
+        if(Number(item.status) != 1 && Number(item.status)!=5){
+          num++
+        }
+      })
+      if(num == 0){
+        this.$message.error('没有订单需要下载')
+        return false
+      }
+      this.$confirm('共'+num+'个,确认下载?确认后请稍等30秒', '提示', {confirmButtonText: '确定',cancelButtonText: '取消',type: 'warning'}).then(() => {
         this.selectedData.forEach((item,idx,arr) => {
         this.selectedData.forEach((item,idx,arr) => {
           if(Number(item.status) != 1 && Number(item.status)!=5){
           if(Number(item.status) != 1 && Number(item.status)!=5){
             setTimeout(() => {
             setTimeout(() => {
               that.down({id:item.id})
               that.down({id:item.id})
-            }, 2000*idx);
+            }, 6000*idx);
           }
           }
         })
         })
       })
       })
@@ -598,14 +608,27 @@ export default {
           return false
           return false
         }
         }
 
 
-        this.$confirm('确认下载?确认后请稍等30秒', '提示', {confirmButtonText: '确定',cancelButtonText: '取消',type: 'warning'}).then(() => {
+        let num = 0
+        this.selectedData.forEach((item,idx,arr) => {
+          if(Number(item.status) != 1 && Number(item.status)!=5){
+            if(Number(item.sameTimeIdsNum)>1){
+              num++
+            }
+          }
+        })
+        if(num == 0){
+          this.$message.error('没有订单需要下载')
+          return false
+        }
+
+        this.$confirm('共'+num+'个,确认下载?确认后请稍等30秒', '提示', {confirmButtonText: '确定',cancelButtonText: '取消',type: 'warning'}).then(() => {
 
 
           this.selectedData.forEach((item,idx,arr) => {
           this.selectedData.forEach((item,idx,arr) => {
             if(Number(item.status) != 1 && Number(item.status)!=5){
             if(Number(item.status) != 1 && Number(item.status)!=5){
               if(Number(item.sameTimeIdsNum)>1){
               if(Number(item.sameTimeIdsNum)>1){
                 setTimeout(() => {
                 setTimeout(() => {
                   that.allDown({id:item.id})
                   that.allDown({id:item.id})
-                }, 2000*idx);
+                }, 6000*idx);
               }
               }
             }
             }
           })
           })