优化导出,新增遮罩层,优化配车防连点

src/components/PopupDistribution.vue

@@ -1,8 +1,11 @@
 <template>
 	<div>
-		<el-dialog title="配车" :visible.sync="dialogVisible" width="1000px" height="400px"  @close="close">
+		<el-dialog title="配车" :visible.sync="dialogVisible"
+                width="1000px" height="400px"  @close="close">
 
-			<el-form :model="distribution" label-width="100px" inline="">
+			<el-form :model="distribution" v-loading="dialoging"
+               element-loading-text="拼命加载中"
+               element-loading-spinner="el-icon-loading" label-width="100px" inline="">
 				<el-form-item label="车号">
 					<el-select v-model="truckNo" clearable allow-create filterable default-first-option @change="change" style="width: 200px;">
 						<el-option v-for="item in trucks" :key="item.id" :label="item.truckNo" :value="item.truckNo">
@@ -102,6 +105,9 @@
 			selectRows: {
 				type: Array
 			},
+      dialoging:{
+        type:Boolean
+      }
 		},
 		data() {
 			return {
@@ -115,6 +121,7 @@
 				query: '',
 				isShow: false,
 				dialogVisible: false,
+        dialoging: false,
 				distribution: {
 					truckNo: '',
 					driverName: '',
@@ -229,9 +236,9 @@
 					// console.log("iiiiiiiiii"+JSON.stringify(this.distribution))
 					// if(typeof(this.distribution.listDetail) != "undefined"){
 					// 	alert("kk")
-						
+
 					// }
-					
+
 					for (let i = 0; i < this.selectRows.length; i++) {
 							this.tableData.push(this.selectRows[i])
 							console.log(JSON.stringify(this.selectRows[i]))
@@ -239,11 +246,11 @@
 					}
 					for (let i = 0; i < this.distribution.listDetail.length; i++) {
 							// alert(JSON.stringify(this.distribution.listDetail[i].store))
-						if(tempPltNo.indexOf(this.distribution.listDetail[i].store.plateNo) === -1){	
+						if(tempPltNo.indexOf(this.distribution.listDetail[i].store.plateNo) === -1){
 							this.tableData.push(this.distribution.listDetail[i].store)
-						}	
+						}
 					}
-					
+
 
 					this.distribution.sumWeight = this.sumWeight
 					this.distribution.sumCount = this.sumCount
@@ -252,6 +259,7 @@
 			},
 			handleSave() {
 				//console.log(JSON.stringify(this.distribution))
+        this.dialoging = true
 				this.distribution.sumWeight = this.sumWeight
 				this.distribution.sumCount = this.sumCount
 				this.distribution.truckNo = this.truckNo
@@ -269,7 +277,7 @@
 				}
 				axios.post(url, param).then(response => {
 					if (response.data.code == 0) {
-
+            this.dialoging = false
 						this.dialogVisible = false
 						this.selectRows    = []
 					} else {
@@ -277,7 +285,8 @@
 							type: 'error',
 							message: '失败！' + response.data.msg,
 						});
-					}
+            this.dialoging = false
+          }
 				});
 			},
 			close() {
@@ -329,7 +338,7 @@
 						});
 						return;
 					}
-					
+
 				}
 
 				this.selection = selection;
@@ -358,12 +367,12 @@
 					}
 				});
 			},
-			
+
 
 			tableRowClassName({
 				row,
 				rowIndex
-			}) 
+			})
 			{
 				if (row.lockFlag == '1') {
 					return 'success-row';

src/view/record/inrecord.vue

@@ -166,9 +166,53 @@
 		<popup-material ref="PopupMaterial" @receviceFromChild="receviceFromMaterial"></popup-material>
 		<popup-customer ref="PopupCustomer" @receviceFromChild="receviceFromCustomer"></popup-customer>
 		<popup-customer ref="PopupFkCompony" @receviceFromChild="receviceFromFkCompony"></popup-customer>
+
+		<!-- 导出Loading遮罩层 -->
+		<div v-if="exportLoading" class="export-loading-mask">
+			<div class="export-loading-content">
+				<i class="el-icon-loading"></i>
+				<p>正在导出，请稍候...</p>
+			</div>
+		</div>
 	</div>
 </template>
 
+<style>
+/* 导出Loading遮罩样式 */
+.export-loading-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.export-loading-content {
+  background-color: #fff;
+  padding: 30px 50px;
+  border-radius: 8px;
+  text-align: center;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.3);
+}
+
+.export-loading-content i {
+  font-size: 40px;
+  color: #409EFF;
+  margin-bottom: 15px;
+}
+
+.export-loading-content p {
+  font-size: 16px;
+  color: #333;
+  margin: 0;
+}
+</style>
+
 <script>
 	import axios from '@/axios'
 	import PopupStack from '@/components/PopupStack.vue'
@@ -203,6 +247,7 @@
 				},
 				selectRows: [],
 				loading: false,
+			exportLoading: false,
 				tableData: [],
 				optionsWare: [],
 				dialogVisible: false,
@@ -418,8 +463,15 @@
 				this.query.ordNo = replaceResult;
 			},
 			handleExport() {
-				var imptData = [];
-				var url = 'WareInRecord/query.do'
+        // 显示加载动画
+        this.exportLoading = true;
+
+        var baseUrl = this.$store.state.app.serverName;
+        var url = baseUrl + 'WareStore/inExportStoreExcel.do';
+        let userId = localStorage.getItem("userId");
+        let belongId = localStorage.getItem("belongId");
+        let token = localStorage.getItem("token");
+        console.log(userId, belongId, token);
 				var param = {
 					page: -1,
 					rows: -1,
@@ -438,30 +490,46 @@
 					fkComponyName:this.query.fkComponyName,
 					remark1:this.query.remark1,
           contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
+          userId: userId,
+          belongId: belongId
 				}
 
+        var params = [];
+        // 去掉 if(param\[key\]) 判断，空字符串也要传递给后端
+        for (var key in param) {
+          params.push(key + '=' + encodeURIComponent(param[key]));
+        }
+        var fullUrl = url + (params.length > 0 ? '?' + params.join('&') : '');
 
-				axios.get(url, param).then(response => {
-
-					if (response.data.code == 0) {
-						var imptData = response.data.data;
-						if (imptData.length == 0) {
-							this.$alert('无法导出，选择时间段无记录', '提示', {
-								confirmButtonText: '确定',
-								callback: action => {}
-							});
-						} else {
-
-							this.exportExcel(imptData)
-						}
-					} else {
-						this.$message({
-							type: 'error',
-							message: '操作失败；' + response.data.msg,
-						});
-					}
-
-				});
+        // 使用 fetch + blob 方式，下载完成后关闭 loading
+        fetch(fullUrl)
+        .then(response => {
+          if (!response.ok) {
+            throw new Error('网络请求失败');
+          }
+          return response.blob();
+        })
+        .then(blob => {
+          // 创建下载链接
+          const url = window.URL.createObjectURL(blob);
+          const link = document.createElement('a');
+          link.href = url;
+          link.download = '入库记录_' + new Date().toISOString().slice(0, 10) + '.xlsx';
+          document.body.appendChild(link);
+          link.click();
+          // 浏览器开始下载后立即关闭 loading
+          this.exportLoading = false;
+          // 清理
+          setTimeout(() => {
+            document.body.removeChild(link);
+            window.URL.revokeObjectURL(url);
+          }, 100);
+        })
+        .catch(error => {
+          console.error('导出失败:', error);
+          this.$message.error('导出失败：' + error.message);
+          this.exportLoading = false;
+        });
 
 			},
 			exportExcel(imptData) {

src/view/record/outrecord.vue

@@ -265,6 +265,14 @@
 		<popup-material ref="PopupMaterial" @receviceFromChild="receviceFromMaterial"></popup-material>
 		<popup-customer ref="PopupCustomer" @receviceFromChild="receviceFromCustomer"></popup-customer>
 		<popup-customer ref="PopupFkCompony" @receviceFromChild="receviceFromFkCompony"></popup-customer>
+
+		<!-- 导出Loading遮罩层 -->
+		<div v-if="exportLoading" class="export-loading-mask">
+			<div class="export-loading-content">
+				<i class="el-icon-loading"></i>
+				<p>正在导出，请稍候...</p>
+			</div>
+		</div>
 	</div>
 </template>
 
@@ -349,10 +357,11 @@
 				modifyWgt:0,
 				modifyPrice:0,
 				optionsCust:[],
-				changeCarNo:"",
-				popupCarno: false,
-				ChangeOutDtm:''
-			};
+			changeCarNo:"",
+			popupCarno: false,
+			ChangeOutDtm:'',
+			exportLoading: false  // 导出Loading状态
+		};
 		},
 		//页面加载完成渲染
 		mounted() {
@@ -808,10 +817,14 @@
 
 			},
 			handleExport() {
-				var imptData = [];
+        // 显示Loading遮罩，禁止用户操作
+        this.exportLoading = true;
 
-
-				var url = 'WareOutRecord/query.do'
+        var baseUrl = this.$store.state.app.serverName;
+				var url = baseUrl + 'WareStore/outExportStoreExcel.do';
+        let userId = localStorage.getItem("userId");
+        let belongId = localStorage.getItem("belongId");
+        let token = localStorage.getItem("token");
 				var param = {
 					page: -1,
 					rows: -1,
@@ -830,32 +843,47 @@
 					fkComponyName:this.query.fkComponyName,
 					remark1:this.query.remark1,
           contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
+          userId: userId,
+          belongId: belongId
 				}
-				// alert(JSON.stringify(param))
-
-				axios.get(url, param).then(response => {
-					// alert(JSON.stringify(response))
-					if (response.data.code == 0) {
-						var imptData = response.data.data;
-						if (imptData.length == 0) {
-							this.$alert('无法导出，选择时间段无记录', '提示', {
-								confirmButtonText: '确定',
-								callback: action => {}
-							});
-						} else {
 
-							this.exportExcel(imptData)
-						}
-					} else {
-						this.$message({
-							type: 'error',
-							message: '操作失败；' + response.data.msg,
-						});
-					}
+        var params = [];
+        for (var key in param) {
+          params.push(key + '=' + encodeURIComponent(param[key]));
+        }
+        var fullUrl = url + (params.length > 0 ? '?' + params.join('&') : '');
 
-				});
+        // 使用 fetch + blob 方式，下载完成后关闭 loading
+        fetch(fullUrl)
+        .then(response => {
+          if (!response.ok) {
+            throw new Error('网络请求失败');
+          }
+          return response.blob();
+        })
+        .then(blob => {
+          // 创建下载链接
+          const url = window.URL.createObjectURL(blob);
+          const link = document.createElement('a');
+          link.href = url;
+          link.download = '出库记录_' + new Date().toISOString().slice(0, 10) + '.xlsx';
+          document.body.appendChild(link);
+          link.click();
+          // 浏览器开始下载后立即关闭 loading
+          this.exportLoading = false;
+          // 清理
+          setTimeout(() => {
+            document.body.removeChild(link);
+            window.URL.revokeObjectURL(url);
+          }, 100);
+        })
+        .catch(error => {
+          console.error('导出失败:', error);
+          this.$message.error('导出失败：' + error.message);
+          this.exportLoading = false;
+        });
 
-			},
+		},
 			exportExcel(imptData) {
 				 console.log(JSON.stringify(imptData))
 				const header = ["仓库名称"
@@ -980,4 +1008,37 @@
 		height: calc(100% - 230px);
 		/*background-color: #000;*/
 	}
+
+	/* 导出Loading遮罩层样式 */
+	.export-loading-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		z-index: 9999;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.export-loading-content {
+		background-color: #fff;
+		padding: 40px 60px;
+		border-radius: 8px;
+		text-align: center;
+		box-shadow: 0 2px 12px rgba(0, 0, 0, 0.15);
+	}
+
+	.export-loading-content .el-icon-loading {
+		font-size: 48px;
+		color: #409EFF;
+	}
+
+	.export-loading-content p {
+		margin-top: 20px;
+		font-size: 16px;
+		color: #333;
+	}
 </style>

src/view/ware/storechange.vue

@@ -271,6 +271,14 @@
       </el-form>
     </el-dialog>
 
+		<!-- 导出Loading遮罩层 -->
+		<div v-if="exportLoading" class="export-loading-mask">
+			<div class="export-loading-content">
+				<i class="el-icon-loading"></i>
+				<p>正在导出，请稍候...</p>
+			</div>
+		</div>
+
 	</div>
 </template>
 
@@ -367,11 +375,12 @@
 				newStack:'',
 				newRemark1:'',
 				newRemark:'',
-				changeCUSTDialogVisible: false,
-				newCustomername:'',
-				newFKCustomername:'',
+			changeCUSTDialogVisible: false,
+			newCustomername:'',
+			newFKCustomername:'',
         outDialogVisible: false,
         address: '',
+				exportLoading: false,  // 导出Loading状态
 			};
 		},
 		mounted() {