修改导出问题、检索重新按时间排序

src/components/scExport/index.vue

@@ -6,18 +6,28 @@
 		<div class="contentPopover" v-if="show">
 			<div class="bodyMain">
 				<span class="arrow"></span>
-				<div v-for="item in list" :key="item">
+				<template v-if="listIsType">
-					<div v-if="list.length>0 && type == item.type">
+					<div v-for="item in list" :key="item">
-						<div class="exportHeader">
+						<div v-if="list.length>0 && type == item.type">
-							<div class="exportName">{{item.type_desc}}</div>
+							<div class="exportHeader">
-							<div class="status" v-if="item.status==0">
+								<div class="exportName">{{item.type_desc}}</div>
-								<el-tooltip effect="dark" :content="item.msg">
+								<div class="status" v-if="item.status==0">
-									<span size="mini">{{item.msg}}</span>
+									<el-tooltip effect="dark" :content="item.msg">
-								</el-tooltip>
+										<span size="mini">{{item.msg}}</span>
+									</el-tooltip>
+								</div>
+								<div class="finish" v-if="item.status==1"><i class="icon"><sc-icon-Finish/></i> 文件生成完成</div>
 							</div>
-							<div class="finish" v-if="item.status==1"><i class="icon"><sc-icon-Finish/></i> 文件生成完成</div>
+							<el-progress class="exportPopover" :text-inside="true" :stroke-width="12" :percentage="item.rate" />
 						</div>
-						<el-progress class="exportPopover" :text-inside="true" :stroke-width="12" :percentage="item.rate" />
+					</div>
+				</template>
+				<div v-else>
+					<div>
+						<div class="exportHeader">
+							<div class="exportName">正在解析中...</div>
+						</div>
+						<el-progress class="exportPopover" :text-inside="true" :stroke-width="12" percentage="0" />
 					</div>
 				</div>
 			</div>
@@ -36,6 +46,13 @@ export default {
 	},
 	watch:{
 
+	},
+	computed:{
+		listIsType(){
+			let arr = this.$TOOL.objCopy(this.list);
+			arr = arr.filter(item => item.type && item.type == this.type);
+			return arr.length && arr.length > 0;
+		}
 	},
 	data(){
 		return{

src/components/scTable/components/headerSearch.vue

@@ -51,7 +51,7 @@ export default {
 		searchList:{
 			handler(val){
 				if(val && val.length>0){
-					this.columnList = val.filter(em=> !em.hide && em.is_search);
+					this.columnList = this.sortData(this.$TOOL.objCopy(val.filter(em=> !em.hide && em.is_search)));
 					this.params = this.groupByType(val);
 				}
 			},
@@ -123,6 +123,26 @@ export default {
 				}
 			}
 		},
+		// 排序
+		sortData(list){
+			const sortedArray = list.sort((a, b) => {
+				const priority = ['date_range', 'date'];
+
+				// 获取a和b的search_type在优先级数组中的索引
+				const aPriority = priority.indexOf(a.search_type);
+				const bPriority = priority.indexOf(b.search_type);
+
+				// 如果a在优先级数组中而b不在，a排在前面
+				if (aPriority !== -1 && bPriority === -1) return -1;
+				// 如果b在优先级数组中而a不在，b排在前面
+				if (bPriority !== -1 && aPriority === -1) return 1;
+				// 如果都在优先级数组中，按优先级数组中的顺序排序
+				if (aPriority !== -1 && bPriority !== -1) return aPriority - bPriority;
+				// 如果都不在优先级数组中，保持原顺序
+				return 0;
+			});
+			return sortedArray;
+		},
 
 		groupByType(list){
 			const grouped = {};

src/views/cost/feeRecords/index.vue

@@ -299,6 +299,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.finance.cost.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/cost/shipmentStatistics/index.vue

@@ -247,6 +247,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.finance.cost.summaryExport.post(this.reqParams);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/earlyManager/list.vue

@@ -377,6 +377,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.early.earlyWarn.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/finance/feesStatistics/index.vue

@@ -176,6 +176,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.orders.order.maintenance.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/inventory/inoutRecord/index.vue

@@ -264,6 +264,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.orders.order.maintenance.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/order/inventoryList/index.vue

@@ -289,6 +289,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.orders.order.sock.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/order/inventoryStatistics/index.vue

@@ -265,6 +265,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.orders.order.maintenance.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/order/orderList/index.vue

@@ -439,6 +439,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.orders.order.maintenance.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/reports/keepRepairReports/index.vue

@@ -264,6 +264,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.orders.order.maintenance.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/reports/shipmentReports/index.vue

@@ -264,6 +264,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.orders.order.maintenance.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/setting/bom/index.vue

@@ -276,6 +276,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.setup.bom.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/setting/company/index.vue

@@ -371,6 +371,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.system.company.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/setting/log/components/ability.vue

@@ -189,13 +189,14 @@ export default {
 		// 下载导出
 		exportChangeShow(params){
 			if(params.type == 8){
-				this.exportShow = params.status==0?true:false
+				this.exportShow = params.status==0?true:false;
 			}
 		},
 		async exportData() {
 			if(this.exportShow) return
 			const res = await this.$API.system.log.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/setting/log/components/command.vue

@@ -70,6 +70,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.system.log.commandExport.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/setting/partsMag/components/info.vue

@@ -316,6 +316,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.system.spareInfo.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/setting/partsMag/components/library.vue

@@ -320,6 +320,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.system.spare.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/setting/user/index.vue

@@ -438,6 +438,7 @@
 				if(this.exportShow) return
 				const res = await this.$API.system.user.export.post();
 				if(res.code == 200){
+					this.exportShow = true;
 					this.$message.success('开始导出');
 				}
 			},

src/views/shipment/shipmentDataConfirm/index.vue

@@ -265,6 +265,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.orders.order.maintenance.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/shipment/shipmentList/bom.vue

@@ -182,6 +182,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.shipment.out.bomExport.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/shipment/shipmentList/list.vue

@@ -276,6 +276,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.shipment.out.stockExport.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/shipment/shipmentStatistics/index.vue

@@ -265,6 +265,7 @@ export default {
 			if(this.exportShow) return
 			const res = await this.$API.orders.order.maintenance.export.post(this.params);
 			if(res.code == 200){
+				this.exportShow = true;
 				this.$message.success('开始导出');
 			}
 		},

src/views/userCenter/user/logs.vue

@@ -200,6 +200,7 @@
 				if(this.exportShow) return
 				const res = await this.$API.user.export.post(this.params);
 				if(res.code == 200){
+					this.exportShow = true;
 					this.$message.success('开始导出');
 				}
 			},