1

config/dev.env.js

@@ -6,5 +6,6 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://120.224.213.150/thware_mj/"'
 	 BASE_API: '"http://localhost:8080/thware/"'
+  // BASE_API: '"http://localhost:8080/thware_war/"'
 	// BASE_API: '"http://47.104.245.159:8081/thware/"'
 })

config/prod.env.js

@@ -2,6 +2,6 @@
 module.exports = {
   NODE_ENV: '"production"',
   BASE_API: '"http://120.224.213.150/thware_mj/"'
-	// BASE_API: '"http://60.205.9.174:8081/thware/"'
+	//  BASE_API: '"http://60.205.9.174:8080/thware_mj/"'
 	// BASE_API: '"http://39.105.120.43:8080/thware/"'
 }

src/view/record/changerecord.vue

@@ -265,55 +265,63 @@ childUrl:'WareChangeRecord/queryTotal.do',
 
 			},
 			// 导出Excel
-			handleExport() {
+			async handleExport() {
 				// 显示加载动画
 				this.exportLoading = true;
+				try {
+					var baseUrl = this.$store.state.app.serverName;
+					var url = baseUrl + 'WareChangeRecord/exportExcel.do';
+					let userId = localStorage.getItem("userId");
+					let belongId = localStorage.getItem("belongId");
+					let token = localStorage.getItem("token");
 
-				var baseUrl = this.$store.state.app.serverName;
-				var url = baseUrl + 'WareChangeRecord/exportExcel.do';
-				let userId = localStorage.getItem("userId");
-				let belongId = localStorage.getItem("belongId");
-				let token = localStorage.getItem("token");
+					var param = {
+						wareName: this.query.wareName,
+						stackName: this.query.stackName,
+						model: this.query.model,
+						materialName: this.query.materialName,
+						standard: this.query.standard,
+						customerName: this.query.customerName,
+						plateNo: this.query.plateNo,
+						pFromDate: (!this.query.RecordDate[0]) ? "1970-01-01 00:00:00" : this.query.RecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),
+						pToDate: (!this.query.RecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") : this.query.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
+						userId: userId,
+						belongId: belongId
+					};
 
-				var param = {
-					wareName: this.query.wareName,
-					stackName: this.query.stackName,
-					model: this.query.model,
-					materialName: this.query.materialName,
-					standard: this.query.standard,
-					customerName: this.query.customerName,
-					plateNo: this.query.plateNo,
-					pFromDate: (!this.query.RecordDate[0]) ? "1970-01-01 00:00:00" : this.query.RecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),
-					pToDate: (!this.query.RecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") : this.query.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
-					userId: userId,
-					belongId: belongId
-				};
+					// POST请求，携带token鉴权头，5分钟超时（大数据量导出需要更长时间）
+					const controller = new AbortController();
+					const timeoutId = setTimeout(() => controller.abort(), 300000); // 5分钟超时
 
-				var params = [];
-				for (var key in param) {
-					params.push(key + '=' + encodeURIComponent(param[key]));
-				}
-				var fullUrl = url + (params.length > 0 ? '?' + params.join('&') : '');
+					// 使用 fetch + blob 方式，POST方法下载完成后关闭 loading
+					const response = await fetch(url, {
+						method: 'POST',
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'token': token,
+							'userId': userId,
+							'belongId': belongId
+						},
+						body: new URLSearchParams(param),
+						signal: controller.signal
+					});
+					clearTimeout(timeoutId);
 
-				// 使用 fetch + blob 方式，下载完成后关闭 loading
-				fetch(fullUrl, {
-					headers: {
-						'token': token,
-						'userId': userId,
-						'belongId': belongId
-					}
-				})
-				.then(response => {
 					if (!response.ok) {
-						throw new Error('网络请求失败');
+						throw new Error('网络请求失败，状态码：' + response.status);
+					}
+					const blob = await response.blob();
+
+					// 判断后端是否返回错误提示（非Excel二进制）
+					if (blob.type.includes('text')) {
+						const text = await blob.text();
+						throw new Error(text || '导出数据查询失败，请缩小筛选时间范围');
 					}
-					return response.blob();
-				})
-				.then(blob => {
+
 					// 创建下载链接
-					const url = window.URL.createObjectURL(blob);
+					const blobUrl = window.URL.createObjectURL(blob);
 					const link = document.createElement('a');
-					link.href = url;
+					link.href = blobUrl;
 					link.download = '转移记录_' + new Date().toISOString().slice(0, 10) + '.xlsx';
 					document.body.appendChild(link);
 					link.click();
@@ -322,14 +330,19 @@ childUrl:'WareChangeRecord/queryTotal.do',
 					// 清理
 					setTimeout(() => {
 						document.body.removeChild(link);
-						window.URL.revokeObjectURL(url);
+						window.URL.revokeObjectURL(blobUrl);
 					}, 100);
-				})
-				.catch(error => {
+					this.$message.success('导出成功');
+				} catch (error) {
 					console.error('导出失败:', error);
-					this.$message.error('导出失败：' + error.message);
+					// 超时单独提示
+					if (error.name === 'AbortError') {
+						this.$message.error('导出超时(5分钟)：数据量过大，请缩短查询时间区间或分批导出');
+					} else {
+						this.$message.error('导出失败：' + error.message);
+					}
 					this.exportLoading = false;
-				});
+				}
 			}
 		},
 	}

src/view/record/inrecord.vue

@@ -462,77 +462,90 @@
 				const replaceResult = this.query.ordNo.replace(/[；,，;\s\r\n]+/g, ",").split(",");
 				this.query.ordNo = replaceResult;
 			},
-			handleExport() {
-        // 显示加载动画
+      async handleExport() {
         this.exportLoading = true;
+        try {
+          const baseUrl = this.$store.state.app.serverName;
+          const url = baseUrl + 'WareStore/inExportStoreExcel.do';
+          const userId = localStorage.getItem("userId");
+          const belongId = localStorage.getItem("belongId");
+          const token = localStorage.getItem("token");
+          console.log(userId, belongId, token);
 
-        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,
-					wareName: this.query.wareName,
-					stackName: this.query.stackName,
-					model: this.query.model,
-					materialName: this.query.materialName,
-					standard: this.query.standard,
-					customerName: this.query.customerName,
-					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
-					fromDate:(!this.query.inRecordDate[0]) ? "1970-01-01 00:00:00" : this.query.inRecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),		//date类型
-					toDate  :(!this.query.inRecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.inRecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
-					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
-					carNo : this.query.carNo,
-					tallyPeople:this.query.tallyPeople,
-					fkComponyName:this.query.fkComponyName,
-					remark1:this.query.remark1,
-          contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
-          userId: userId,
-          belongId: belongId
-				}
+          // 组装导出参数（直接放body，不再拼接URL）
+          const param = {
+            page: -1,
+            rows: -1,
+            wareName: this.query.wareName,
+            stackName: this.query.stackName,
+            model: this.query.model,
+            materialName: this.query.materialName,
+            standard: this.query.standard,
+            customerName: this.query.customerName,
+            plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
+            fromDate: (!this.query.inRecordDate[0]) ? "1970-01-01 00:00:00" : this.query.inRecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),
+            toDate: (!this.query.inRecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") : this.query.inRecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
+            ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
+            carNo: this.query.carNo,
+            tallyPeople: this.query.tallyPeople,
+            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('&') : '');
+          // POST请求，携带token鉴权头，60秒超时
+          const controller = new AbortController();
+          const timeoutId = setTimeout(() => controller.abort(), 600000); // 10分钟超时
+
+          const response = await fetch(url, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+              'token': token // 带上登录凭证，和列表查询接口保持一致
+            },
+            body: new URLSearchParams(param), // 参数放入请求体，不再拼URL
+            signal: controller.signal
+          });
+          clearTimeout(timeoutId);
 
-        // 使用 fetch + blob 方式，下载完成后关闭 loading
-        fetch(fullUrl)
-        .then(response => {
           if (!response.ok) {
-            throw new Error('网络请求失败');
+            throw new Error(`服务异常，状态码：${response.status}`);
+          }
+          const blob = await response.blob();
+          // 判断后端是否返回错误提示（非Excel二进制）
+          if (blob.type.includes('text')) {
+            const text = await blob.text();
+            throw new Error(text || '导出数据查询失败，请缩小筛选时间范围');
           }
-          return response.blob();
-        })
-        .then(blob => {
-          // 创建下载链接
-          const url = window.URL.createObjectURL(blob);
+
+          // 下载文件逻辑不变
+          const blobUrl = window.URL.createObjectURL(blob);
           const link = document.createElement('a');
-          link.href = url;
+          link.href = blobUrl;
           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);
+            window.URL.revokeObjectURL(blobUrl);
           }, 100);
-        })
-        .catch(error => {
+          this.$message.success('导出成功');
+        } catch (error) {
           console.error('导出失败:', error);
-          this.$message.error('导出失败：' + error.message);
+          // 超时单独提示
+          if (error.name === 'AbortError') {
+            this.$message.error('导出超时：数据量过大，请缩短查询时间区间');
+          } else {
+            this.$message.error('导出失败：' + error.message);
+          }
+        } finally {
           this.exportLoading = false;
-        });
+        }
+      },
 
-			},
-			exportExcel(imptData) {
+      exportExcel(imptData) {
 				// alert(JSON.stringify(imptData))
 				const header = ["仓库名称"
 								,"垛位"

src/view/record/outrecord.vue

@@ -764,7 +764,7 @@
 					});
 					return;
 				}
-				window.open(this.serverName + 'ureport/preview?_u=file:out.ureport.xml&id=' + distId +
+				window.open(this.serverName + 'ureport/preview?_u=file:out_new.ureport.xml&id=' + distId +
 					'&time=' + this.time)
 
 			},
@@ -816,72 +816,90 @@
 				this.time = year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
 
 			},
-			handleExport() {
+    async handleExport() {
         // 显示Loading遮罩，禁止用户操作
         this.exportLoading = true;
+        try {
+          const baseUrl = this.$store.state.app.serverName;
+          const url = baseUrl + 'WareStore/outExportStoreExcel.do';
+          const userId = localStorage.getItem("userId");
+          const belongId = localStorage.getItem("belongId");
+          const token = localStorage.getItem("token");
+          console.log(userId, belongId, token);
 
-        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,
-					wareName: this.query.wareName,
-					stackName: this.query.stackName,
-					model: this.query.model,
-					materialName: this.query.materialName,
-					standard: this.query.standard,
-					customerName: this.query.customerName,
-					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
-					pFromDate:(!this.query.RecordDate[0]) ? "1970-01-01 00:00:00" : this.query.RecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),		//date类型
-					pToDate  :(!this.query.RecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
-					carNo:this.query.carNo,
-					tallyPeople:this.query.tallyPeople,
-					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
-					fkComponyName:this.query.fkComponyName,
-					remark1:this.query.remark1,
-          contractNo:this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
-          userId: userId,
-          belongId: belongId
-				}
+          // 组装导出参数（直接放body，不再拼接URL）
+          const param = {
+            page: -1,
+            rows: -1,
+            wareName: this.query.wareName,
+            stackName: this.query.stackName,
+            model: this.query.model,
+            materialName: this.query.materialName,
+            standard: this.query.standard,
+            customerName: this.query.customerName,
+            plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
+            pFromDate: (!this.query.RecordDate[0]) ? "1970-01-01 00:00:00" : this.query.RecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),
+            pToDate: (!this.query.RecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") : this.query.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
+            carNo: this.query.carNo,
+            tallyPeople: this.query.tallyPeople,
+            ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
+            fkComponyName: this.query.fkComponyName,
+            remark1: this.query.remark1,
+            contractNo: this.query.contractNo.length == 0 ? '' : this.query.contractNo.join(','),
+            userId: userId,
+            belongId: belongId
+          };
 
-        var params = [];
-        for (var key in param) {
-          params.push(key + '=' + encodeURIComponent(param[key]));
-        }
-        var fullUrl = url + (params.length > 0 ? '?' + params.join('&') : '');
+          // POST请求，携带token鉴权头，5分钟超时（大数据量导出需要更长时间）
+          const controller = new AbortController();
+          const timeoutId = setTimeout(() => controller.abort(), 600000); // 5分钟超时
+
+          const response = await fetch(url, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+              'token': token // 带上登录凭证，和列表查询接口保持一致
+            },
+            body: new URLSearchParams(param), // 参数放入请求体，不再拼URL
+            signal: controller.signal
+          });
+          clearTimeout(timeoutId);
 
-        // 使用 fetch + blob 方式，下载完成后关闭 loading
-        fetch(fullUrl)
-        .then(response => {
           if (!response.ok) {
-            throw new Error('网络请求失败');
+            throw new Error(`服务异常，状态码：${response.status}`);
+          }
+          const blob = await response.blob();
+          // 判断后端是否返回错误提示（非Excel二进制）
+          if (blob.type.includes('text')) {
+            const text = await blob.text();
+            throw new Error(text || '导出数据查询失败，请缩小筛选时间范围');
           }
-          return response.blob();
-        })
-        .then(blob => {
-          // 创建下载链接
-          const url = window.URL.createObjectURL(blob);
+
+          // 下载文件逻辑不变
+          const blobUrl = window.URL.createObjectURL(blob);
           const link = document.createElement('a');
-          link.href = url;
+          link.href = blobUrl;
           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);
+            window.URL.revokeObjectURL(blobUrl);
           }, 100);
-        })
-        .catch(error => {
+          this.$message.success('导出成功');
+        }
+        catch (error) {
           console.error('导出失败:', error);
-          this.$message.error('导出失败：' + error.message);
+          // 超时单独提示
+          if (error.name === 'AbortError') {
+            this.$message.error('导出超时(5分钟)：数据量过大，请缩短查询时间区间或分批导出');
+          } else {
+            this.$message.error('导出失败：' + error.message);
+          }
+        }
+        finally {
           this.exportLoading = false;
-        });
+        }
 
 		},
 			exportExcel(imptData) {