优化

snowy-admin-web/src/views/biz/bizappointmentrecord/index.vue

@@ -241,6 +241,7 @@
 	import downloadUtil from '@/utils/downloadUtil'
 	import bizRecordApi from '@/api/biz/bizRecordApi'
 	import Sign from './sign.vue'
+	import bizOrderApi from "@/api/biz/bizOrderApi";
 
 	const submitLoading = ref(false)
 	const tableRef = ref()
@@ -461,9 +462,28 @@
 
 	//导出
 	const exportTotal = () => {
-		const searchFormParam = cloneDeep(searchFormState.value)
+		/*const searchFormParam = cloneDeep(searchFormState.value)
 		bizAppointmentRecordApi.exportRecord(Object.assign(searchFormParam)).then((res)=>{
 			downloadUtil.resultDownload(res)
+		})*/
+		Modal.confirm({
+			title: '确定要导出记录吗？',
+			icon: createVNode(ExclamationCircleOutlined),
+			content: '',
+			onOk() {
+				submitLoading.value = true
+				const searchFormParam = cloneDeep(searchFormState.value)
+
+				bizAppointmentRecordApi
+					.exportRecord(Object.assign(searchFormParam))
+					.then((res) => {
+						downloadUtil.resultDownload(res)
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			},
+			onCancel() {}
 		})
 	}
 

snowy-admin-web/src/views/biz/bizorder/index.vue

@@ -635,9 +635,29 @@
 
 	//导出
 	const exportTotal = () => {
-		const searchFormParam = cloneDeep(searchFormState.value)
+		/*const searchFormParam = cloneDeep(searchFormState.value)
 		bizOrderApi.exportRecord(Object.assign(searchFormParam)).then((res)=>{
 			downloadUtil.resultDownload(res)
+		})*/
+
+		Modal.confirm({
+			title: '确定要导出记录吗？',
+			icon: createVNode(ExclamationCircleOutlined),
+			content: '',
+			onOk() {
+				submitLoading.value = true
+				const searchFormParam = cloneDeep(searchFormState.value)
+
+				bizOrderApi
+					.exportRecord(Object.assign(searchFormParam))
+					.then((res) => {
+						downloadUtil.resultDownload(res)
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			},
+			onCancel() {}
 		})
 	}
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/result/BizRecordExportResult.java

@@ -41,11 +41,13 @@ public class BizRecordExportResult {
     private String carNumber;
 
     /** 车牌号码 */
+    @ColumnWidth(20)
     @HeadStyle(fillPatternType = FillPatternTypeEnum.NO_FILL)
     @ExcelProperty({"过磅记录", "车牌号码"})
     private String licensePlate;
 
     /** 车牌颜色 */
+    @ColumnWidth(20)
     @HeadStyle(fillPatternType = FillPatternTypeEnum.NO_FILL)
     @ExcelProperty({"过磅记录", "车牌颜色"})
     private String plateColor;
@@ -95,6 +97,12 @@ public class BizRecordExportResult {
     @ExcelProperty({"过磅记录", "订单信息", "订单编号"})
     private String orderNumber;
 
+    /** 客户名称 */
+    @ColumnWidth(20)
+    @HeadStyle(fillPatternType = FillPatternTypeEnum.NO_FILL)
+    @ExcelProperty({"过磅记录", "客户名称"})
+    private String customerName;
+
     /** 货品名称 */
     @ColumnWidth(20)
     @HeadStyle(fillPatternType = FillPatternTypeEnum.NO_FILL)