- 
+ 
泠泷水月阁管理系统
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 3ba3fe9..220301d 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -452,7 +452,7 @@ export const constantRoute = [
}
]
},
- //节日管理+商城轮播图管理+课程首页轮播图管理
+ //节日管理+商城轮播图管理+课程首页轮播图管理+优惠力度&预约须知管理
{
path: '/OtherManage',
redirect: '/EntityCarouseCenter',
@@ -492,6 +492,16 @@ export const constantRoute = [
icon: 'Calendar',
hidden: false
}
+ },
+ {
+ path: '/NoticeAndFavorable',
+ name: '优惠和预约须知',
+ component: () => import("@/views/OtherManagement/NoticeAndFavorable.vue"),
+ meta: {
+ title: '优惠和预约须知',
+ icon: 'Files',
+ hidden: false
+ }
}
]
},
@@ -499,5 +509,15 @@ export const constantRoute = [
path: '/Test',
name: '测试页面',
component: () => import("../views/test.vue")
+ },
+ {
+ path: '/Test2',
+ name: '测试页面2',
+ component: () => import("../views/test2.vue")
+ },
+ {
+ path: '/Test3',
+ name: '测试页面3',
+ component: () => import("../views/excelTest.vue")
}
]
diff --git a/src/utils/YYYYMMDD.js b/src/utils/YYYYMMDD.js
new file mode 100644
index 0000000..4a051a2
--- /dev/null
+++ b/src/utils/YYYYMMDD.js
@@ -0,0 +1,22 @@
+//将当前日期转换为YYYYMMDD
+export const getCurrentDate =()=> {
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = String(now.getMonth() + 1).padStart(2, '0');
+ const day = String(now.getDate()).padStart(2, '0');
+
+ return `${year}-${month}-${day}`;
+}
+
+//获取数组中日期最大的元素
+export const getMaxDate=(dates)=> {
+ return dates.reduce((maxDate, currentDate) => (currentDate > maxDate ? currentDate : maxDate));
+}
+
+//两个日期比较
+export const compareDates =(date1, date2)=> {
+ const d1 = new Date(date1);
+ const d2 = new Date(date2);
+ return d1 >= d2;
+}
+
diff --git a/src/utils/excelUtil/bookOrderExcel.js b/src/utils/excelUtil/bookOrderExcel.js
new file mode 100644
index 0000000..ef55419
--- /dev/null
+++ b/src/utils/excelUtil/bookOrderExcel.js
@@ -0,0 +1,95 @@
+import { saveAs } from "file-saver";
+import ExcelJS from "exceljs";
+
+
+
+// const getBase64Image = (url ) => {
+// return new Promise((resolve, reject) => {
+// const img = new Image()
+// const canvas = document.createElement('canvas');
+// img.crossOrigin = '*';
+// img.onload = function () {
+// const width = img.width, height = img.height;
+// canvas.width = width;
+// canvas.height = height;
+//
+// const ctx = canvas.getContext('2d');
+// ctx.fillStyle = 'white';
+// ctx.fillRect(0, 0, canvas.width, canvas.height);
+// ctx.drawImage(img, 0, 0, width, height);
+// const base64 = canvas.toDataURL(type);
+// resolve(base64);
+// };
+// img.onerror = function () {
+// reject(new Error('message'));
+// };
+// img.src = url;
+// });
+// };
+
+
+
+export const bookOrderList = (tableData) => {
+ const workbook = new ExcelJS.Workbook();
+ const worksheet = workbook.addWorksheet('Order Details');
+
+ // 设置列标题
+ worksheet.columns = [
+ { header: '订单序号', key: 'index', width: 10 },
+ { header: '订单编号', key: 'orderNumber', width: 30 },
+ { header: '下单时间', key: 'createTime', width: 20 },
+ { header: '购买的写真服务', key: 'photoName', width: 30 },
+ { header: '服装类别', key: 'type', width: 20 },
+ { header: '服装单价(元)', key: 'price', width: 15 },
+ { header: '总价(元)', key: 'itemTotalAmount', width: 15 },
+ { header: '预约日期', key: 'reservationDate', width: 15 },
+ { header: '预约时间点', key: 'timePoint', width: 15 },
+ { header: '拍摄地点', key: 'place', width: 15 },
+ { header: '妆造服务', key: 'makeup', width: 15 },
+ { header: '联系人姓名', key: 'contactName', width: 20 },
+ { header: '联系人手机号', key: 'contactPhone', width: 20 },
+ { header: '订单实付金额(元)', key: 'totalAmount', width: 20 },
+ { header: '订单状态', key: 'orderStatus', width: 20 },
+ ];
+
+ // 遍历 tableData 并填充数据
+ tableData.forEach((order, index) => {
+ const row = worksheet.addRow({
+ index: index + 1,
+ orderNumber: order.orderNumber,
+ createTime: order.createTime,
+ photoName: order.photoProductsSnapshot.name,
+ type: order.photoProductsSnapshot.categoryName,
+ price: order.photoProductsSnapshot.price,
+ itemTotalAmount: order.totalAmount,
+ reservationDate: order.specificDate,
+ timePoint: order.timePoint,
+ place: order.isIndoors === 1 ? '室内' : '室外',
+ makeup: order.isMakeup === 1 ? '是' : '否',
+ contactName: order.contactsSnapshot.name,
+ contactPhone: order.contactsSnapshot.phone,
+ totalAmount: order.totalAmount,
+ orderStatus: order.orderStatus
+ })
+ // 设置列的背景色
+ row.getCell('B').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'A9D08E' } } };
+ row.getCell('J').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'A2C4E7' } } };
+ row.getCell('K').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'A2C4E7' } } };
+ row.getCell('O').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'F4CCCC' } } };
+ row.getCell('M').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: '98EBFF' } } };
+ row.getCell('N').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'F7FF72' } } };
+ // 调整行高为自适应
+ const rowHeight = Math.max(...row._cells.map(cell => String(cell.value).length));
+ row.height = rowHeight > 10 ? rowHeight + 5 : 15; // 设置最小行高为15，最大行高为文字长度 + 5
+
+ });
+
+ // 启用筛选功能
+ worksheet.autoFilter = { from: 'A1', to: 'O1' }; // 设置 A1 到 O1 列范围作为筛选区域
+
+ // 导出为 Excel 文件
+ workbook.xlsx.writeBuffer().then((buffer) => {
+ const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+ saveAs(blob, '写真服务订单.xlsx');
+ });
+};
diff --git a/src/utils/excelUtil/entityOrderExcel.js b/src/utils/excelUtil/entityOrderExcel.js
new file mode 100644
index 0000000..5f6c191
--- /dev/null
+++ b/src/utils/excelUtil/entityOrderExcel.js
@@ -0,0 +1,70 @@
+import {saveAs} from "file-saver";
+import ExcelJS from "exceljs";
+
+export const entityOrderList = (tableData) => {
+ const workbook = new ExcelJS.Workbook();
+ const worksheet = workbook.addWorksheet('Order Details');
+
+ // 设置列标题
+ worksheet.columns = [
+ { header: '订单序号', key: 'index', width: 10 },
+ { header: '订单编号', key: 'orderNumber', width: 25 },
+ { header: '下单时间', key: 'createTime', width: 15 },
+ { header: '用户名', key: 'userName', width: 15 },
+ { header: '商品名称', key: 'goodName', width: 20 },
+ { header: '商品单价(元)', key: 'price', width: 15 },
+ { header: '数量', key: 'quantity', width: 10 },
+ { header: '总价(元)', key: 'itemTotalAmount', width: 15 },
+ { header: '收货人', key: 'recipient', width: 20 },
+ { header: '手机号', key: 'phone', width: 15 },
+ { header: '地区', key: 'region', width: 20 },
+ { header: '详细地址', key: 'detailAddress', width: 40 },
+ { header: '订单实付金额(元)', key: 'totalAmount', width: 15 },
+ { header: '订单状态', key: 'orderStatus', width: 15 },
+ { header: '快递单号', key: 'trackingNumber', width: 20 },
+ ];
+
+ // 遍历 tableData 并填充数据
+ tableData.forEach((order, index) => {
+ // 展平每个订单的数据
+ order.orderItemList.forEach((item) => {
+ const row = worksheet.addRow({
+ index: index + 1,
+ orderNumber: order.orderNumber,
+ createTime: order.createTime,
+ userName: order.userName,
+ goodName: item.goodSnapshot.name,
+ price: item.goodSnapshot.price,
+ quantity: item.quantity,
+ itemTotalAmount: item.itemTotalAmount,
+ recipient: order.addressSnapshot.name,
+ phone: order.addressSnapshot.phone,
+ region: order.addressSnapshot.region,
+ detailAddress: order.addressSnapshot.detailAddress,
+ totalAmount: order.totalAmount,
+ orderStatus: order.orderStatus,
+ trackingNumber: order.trackingNumber,
+ });
+
+ // 设置列的背景色
+ row.getCell('B').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'A9D08E' } } }; // 订单编号
+ row.getCell('I').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'A2C4E7' } } }; // 收货人
+ row.getCell('J').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'A2C4E7' } } }; // 手机号
+ row.getCell('O').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'F4CCCC' } } }; // 订单状态
+ row.getCell('M').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: '98EBFF' } } }; // 订单状态
+ row.getCell('N').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'F7FF72' } } }; // 订单实付金额（改为黄色）
+ // 调整行高为自适应
+ const rowHeight = Math.max(...row._cells.map(cell => String(cell.value).length));
+ row.height = rowHeight > 10 ? rowHeight + 5 : 15; // 设置最小行高为15，最大行高为文字长度 + 5
+ });
+ });
+
+ // 启用筛选功能
+ worksheet.autoFilter = { from: 'A1', to: 'O1' }; // 设置 A1 到 O1 列范围作为筛选区域
+
+ // 导出为 Excel 文件
+ workbook.xlsx.writeBuffer().then((buffer) => {
+ const blob = new Blob([buffer], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
+ saveAs(blob, '实体类订单信息.xlsx');
+ });
+};
diff --git a/src/utils/excelUtil/rentOrderExcel.js b/src/utils/excelUtil/rentOrderExcel.js
new file mode 100644
index 0000000..3f5226b
--- /dev/null
+++ b/src/utils/excelUtil/rentOrderExcel.js
@@ -0,0 +1,95 @@
+import { saveAs } from "file-saver";
+import ExcelJS from "exceljs";
+
+
+
+// const getBase64Image = (url ) => {
+// return new Promise((resolve, reject) => {
+// const img = new Image()
+// const canvas = document.createElement('canvas');
+// img.crossOrigin = '*';
+// img.onload = function () {
+// const width = img.width, height = img.height;
+// canvas.width = width;
+// canvas.height = height;
+//
+// const ctx = canvas.getContext('2d');
+// ctx.fillStyle = 'white';
+// ctx.fillRect(0, 0, canvas.width, canvas.height);
+// ctx.drawImage(img, 0, 0, width, height);
+// const base64 = canvas.toDataURL(type);
+// resolve(base64);
+// };
+// img.onerror = function () {
+// reject(new Error('message'));
+// };
+// img.src = url;
+// });
+// };
+
+
+
+export const rentOrderList = (tableData) => {
+ const workbook = new ExcelJS.Workbook();
+ const worksheet = workbook.addWorksheet('Order Details');
+
+ // 设置列标题
+ worksheet.columns = [
+ { header: '订单序号', key: 'index', width: 10 },
+ { header: '订单编号', key: 'orderNumber', width: 30 },
+ { header: '下单时间', key: 'createTime', width: 20 },
+ { header: '用户名', key: 'username', width: 20 },
+ { header: '租赁服装名称', key: 'clothName', width: 30 },
+ { header: '可租赁天数', key: 'period', width: 15 },
+ // { header: '服装类别', key: 'type', width: 20 },
+ { header: '服装单价(元)', key: 'price', width: 15 },
+ { header: '总价', key: 'itemTotalAmount', width: 15 },
+ { header: '取货时间', key: 'pickupTime', width: 15 },
+ { header: '租赁天数', key: 'rentDays', width: 15 },
+ { header: '联系人姓名', key: 'contactName', width: 20 },
+ { header: '联系人手机号', key: 'contactPhone', width: 20 },
+ { header: '订单实付金额(元)', key: 'totalAmount', width: 20 },
+ { header: '订单状态', key: 'orderStatus', width: 20 },
+ ];
+
+ // 遍历 tableData 并填充数据
+ tableData.forEach((order, index) => {
+ const row = worksheet.addRow({
+ index: index + 1,
+ orderNumber: order.orderNumber,
+ createTime: order.createTime,
+ username: order.userName,
+ clothName: order.clothesSnapshot.name,
+ period: order.clothesSnapshot.period,
+ // type: order.clothesSnapshot.categoryName,
+ price: order.clothesSnapshot.price,
+ itemTotalAmount: order.totalAmount,
+ pickupTime: order.pickupTime,
+ rentDays: order.rentDays,
+ contactName: order.contactsSnapshot.name,
+ contactPhone: order.contactsSnapshot.phone,
+ totalAmount: order.totalAmount,
+ orderStatus: order.orderStatus
+ })
+ // 设置列的背景色
+ row.getCell('B').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'A9D08E' } } };
+ row.getCell('J').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'A2C4E7' } } };
+ row.getCell('O').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'F4CCCC' } } };
+ row.getCell('K').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: '98EBFF' } } };
+ row.getCell('L').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: '98EBFF' } } };
+ row.getCell('N').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'F7FF72' } } };
+ // 调整行高为自适应
+ const rowHeight = Math.max(...row._cells.map(cell => String(cell.value).length));
+ row.height = rowHeight > 10 ? rowHeight + 5 : 15; // 设置最小行高为15，最大行高为文字长度 + 5
+
+ });
+
+ // 启用筛选功能
+ worksheet.autoFilter = { from: 'A1', to: 'O1' }; // 设置 A1 到 O1 列范围作为筛选区域
+
+ // 导出为 Excel 文件
+ workbook.xlsx.writeBuffer().then((buffer) => {
+ const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+ saveAs(blob, '服装租赁订单.xlsx');
+ });
+};
diff --git a/src/utils/excelUtil/serviceOrderExcel.js b/src/utils/excelUtil/serviceOrderExcel.js
new file mode 100644
index 0000000..4def5c9
--- /dev/null
+++ b/src/utils/excelUtil/serviceOrderExcel.js
@@ -0,0 +1,98 @@
+import { saveAs } from "file-saver";
+import ExcelJS from "exceljs";
+
+
+// const getBase64Image = (url ) => {
+// return new Promise((resolve, reject) => {
+// const img = new Image()
+// const canvas = document.createElement('canvas');
+// img.crossOrigin = '*';
+// img.onload = function () {
+// const width = img.width, height = img.height;
+// canvas.width = width;
+// canvas.height = height;
+//
+// const ctx = canvas.getContext('2d');
+// ctx.fillStyle = 'white';
+// ctx.fillRect(0, 0, canvas.width, canvas.height);
+// ctx.drawImage(img, 0, 0, width, height);
+// const base64 = canvas.toDataURL(type);
+// resolve(base64);
+// };
+// img.onerror = function () {
+// reject(new Error('message'));
+// };
+// img.src = url;
+// });
+// };
+
+
+
+export const serviceOrderList = (tableData, downloadUrl) => {
+ const workbook = new ExcelJS.Workbook();
+ const worksheet = workbook.addWorksheet('Order Details');
+
+ // 设置列标题
+ worksheet.columns = [
+ { header: '订单序号', key: 'index', width: 10 },
+ { header: '订单编号', key: 'orderNumber', width: 30 },
+ { header: '下单时间', key: 'createTime', width: 20 },
+ { header: '用户名', key: 'userName', width: 15 },
+ { header: '所购买的商品', key: 'goodName', width: 30 },
+ { header: '商品类别', key: 'type', width: 20 },
+ { header: '商品单价(元)', key: 'price', width: 15 },
+ { header: '数量', key: 'quantity', width: 10 },
+ { header: '总价(元)', key: 'itemTotalAmount', width: 15 },
+ { header: '预约日期', key: 'reservationDate', width: 15 },
+ { header: '预约时间段', key: 'timeSlot', width: 15 },
+ { header: '联系人姓名', key: 'contactName', width: 20 },
+ { header: '联系人手机号', key: 'contactPhone', width: 20 },
+ { header: '订单实付金额(元)', key: 'totalAmount', width: 20 },
+ { header: '订单状态', key: 'orderStatus', width: 20 },
+ ];
+
+ // 遍历 tableData 并填充数据
+ tableData.forEach((order, index) => {
+ // 展平每个订单的数据
+ order.orderItemList.forEach(async (item) => {
+ // 订单每个商品的行
+ const row = worksheet.addRow({
+ index: index + 1,
+ orderNumber: order.orderNumber,
+ createTime: order.createTime,
+ userName: order.userName,
+ goodName: item.goodSnapshot.name,
+ type: item.goodSnapshot.type,
+ price: item.goodSnapshot.price,
+ quantity: item.quantity,
+ itemTotalAmount: item.itemTotalAmount,
+ reservationDate: item.reservationDate,
+ timeSlot: item.timeSlot,
+ contactName: order.contactsSnapshot.name,
+ contactPhone: order.contactsSnapshot.phone,
+ totalAmount: order.totalAmount,
+ orderStatus: order.orderStatus,
+ });
+
+ // 设置列的背景色
+ row.getCell('B').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'A9D08E' } } }; // 订单编号
+ row.getCell('J').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'A2C4E7' } } }; // 收货人
+ row.getCell('K').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'A2C4E7' } } }; // 手机号
+ row.getCell('O').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'F4CCCC' } } }; // 订单状态
+ row.getCell('M').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: '98EBFF' } } }; // 订单状态
+ row.getCell('N').style = { fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: 'F7FF72' } } }; // 订单实付金额（改为黄色）
+ // 调整行高为自适应
+ const rowHeight = Math.max(...row._cells.map(cell => String(cell.value).length));
+ row.height = rowHeight > 10 ? rowHeight + 5 : 15; // 设置最小行高为15，最大行高为文字长度 + 5
+ });
+ });
+
+ // 启用筛选功能
+ worksheet.autoFilter = { from: 'A1', to: 'O1' }; // 设置 A1 到 O1 列范围作为筛选区域
+
+ // 导出为 Excel 文件
+ workbook.xlsx.writeBuffer().then((buffer) => {
+ const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+ saveAs(blob, '服务类商品订单.xlsx');
+ });
+};
diff --git a/src/utils/formatImgUpload.ts b/src/utils/formatImgUpload.ts
index 87a2e1b..d9ed127 100644
--- a/src/utils/formatImgUpload.ts
+++ b/src/utils/formatImgUpload.ts
@@ -1,4 +1,9 @@
//上传链接
export const uploadUrl : string = 'http://localhost:9092/api/file/uploadFile'
+
// export const uploadUrl : string= 'https://www.carboner.cn:8888/api/file/uploadFile'
+
+// export const uploadUrl : string = 'http://154.8.193.216:9093/api/file/uploadFile' //测试环境
+
+//下载链接
export const downloadUrl : string = 'https://www.carboner.cn:8888/api/file/downloadFile?objectKey='
diff --git a/src/views/ActivityMessageManagement/AddMessage.vue b/src/views/ActivityMessageManagement/AddMessage.vue
index f0a9aaf..d2c5297 100644
--- a/src/views/ActivityMessageManagement/AddMessage.vue
+++ b/src/views/ActivityMessageManagement/AddMessage.vue
@@ -10,7 +10,7 @@
+
泠泷水月阁管理系统
- 搜索
- 重置
-
-
-
+ 已上架
- {{ totalProductNum }}
- {{ offshelvesNum }}
- {{ shelvesNum }}
+ {{ totalProductNum }}
+ {{ offshelvesNum }}
+ {{ shelvesNum }}
+
+
+
+
+
+
+
+
+ {{ $index + 1 }}
+
+
+
+
+ {{ scope.row.orderStatus === '待发货' ? '待消费' : scope.row.orderStatus }}
+
+
+
+
+
+ 详情
+
+
+
+ 取消订单
+
+
+
+
+ 拍摄完成
+
+
+
+
+ 退款
+
+
+
+
+
+
+
@@ -64,6 +76,9 @@ import { ElMessage } from "element-plus";
import {SuccessInfo, ErrorInfo, WarnInfo} from "@/utils/messageInfo";
import { useRouter, useRoute } from "vue-router";
import emitter from "@/utils/emitter";
+import {bookOrderList} from "@/utils/excelUtil/bookOrderExcel";
+import {compareDates, getCurrentDate} from "@/utils/YYYYMMDD";
+
const tableData: any = ref([]); //表单展示数据
const total = ref(0);
const orderNumber = ref('')
@@ -95,7 +110,7 @@ const getOrderList = async () => {
try {
searchParams.value.orderNumber = orderNumber.value
const res = await myAxios.post('/advanceOrder/list', { ...searchParams.value });
- // console.log('订单信息--->', res.data.data);
+ console.log('订单信息--->', res.data.data);
if (res.data.code === 1) {
tableData.value = res.data.data.records;
total.value = parseInt(res.data.data.total)
@@ -121,6 +136,11 @@ const showDetail = (row: any) => {
})
};
const changeOrderStatus = async (row: any,msg: string) => { //改变订单状态
+ console.log('当前列--->',row)
+ if(msg === '交易成功' && compareDates(row.specificDate,getCurrentDate())) {
+ WarnInfo('未到服务日期不能完成订单！')
+ return;
+ }
const res = await myAxios.post('/advanceOrder/update/orderStatus',{
id: row.id,
orderStatus: msg
@@ -176,4 +196,15 @@ const cancelOrder = async (row: any) => { //取消订单的方法(未支付能
font-family: 'Arial', sans-serif;
/* 设置字体 */
}
+
+.table_page {
+ min-width: 1000px;
+ overflow: auto;
+}
+
+.titleHeader {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20px
+}
\ No newline at end of file
diff --git a/src/views/HomePage/DashBoard.vue b/src/views/HomePage/DashBoard.vue
index 393efed..196bec2 100644
--- a/src/views/HomePage/DashBoard.vue
+++ b/src/views/HomePage/DashBoard.vue
@@ -72,9 +72,28 @@
+ 搜索
+ 重置
+
+
+
- 取消订单
+ 导出为表格
-
-
- 拍摄完成
-
-
-
-
- 退款
-
-
-
-
-
-
-
+
+
-
+
+
+
@@ -107,6 +126,11 @@ const waitPhotoOrder = ref(0) //待拍摄订单
const waitDeliverOrder = ref(0) //待发货订单
const waitPayOrder = ref(0) //待支付订单数量
const waitConsumption = ref(0) //待消费订单
+const totalListingClothes = ref(0) //全部已上架服装
+const totalClothes = ref(0) //全部服装
+const rentedClothes = ref(0) //已租赁服装
+const totalDelistClothes = ref(0) //全部已下架服装
+
onMounted(() => {
getDashBoard()
})
@@ -128,8 +152,12 @@ const getDashBoard = async () => {
waitDeliverOrder.value = dashBord.get('实体类待发货订单')
waitPayOrder.value = dashBord.get('所有待支付订单数量')
waitConsumption.value = dashBord.get('服务类待消费订单')
+ totalListingClothes.value = dashBord.get('全部已上架服装数量')
+ totalClothes.value = dashBord.get('全部服装数量')
+ rentedClothes.value = dashBord.get('已租赁订单数量')
+ totalDelistClothes.value = dashBord.get('全部已下架服装数量')
}
- console.log(res.data.data)
+ // console.log(res.data.data)
}
diff --git a/src/views/Orders/OrderList.vue b/src/views/Orders/OrderList.vue
index 178cef8..2af5d6b 100644
--- a/src/views/Orders/OrderList.vue
+++ b/src/views/Orders/OrderList.vue
@@ -1,94 +1,100 @@
服装总览
+
+
+ 全部服装
+ 已上架
+ 已租赁服装
+ 已下架
+
+
+ {{ totalClothes }}
+ {{ totalListingClothes }}
+ {{ rentedClothes }}
+ {{ totalDelistClothes }}
-
-
-
- {{ $index + 1 }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ $index + 1 }}
-
-
-
-
-
-
-
-
- 取消订单
-
-
- 详情
-
-
- 发货
-
-
-
- 交易成功
+
+
+
+
+
+
+
+
-
-
-
- 退款
-
-
-
-
-
+
+
+
+
+
+
+
+ 取消订单
+
+
+ 详情
+
+
+ 发货
+
+
+
+ 交易成功
+
+
+
+
+ 退款
+
+
+
+
+
- 搜索
- 重置
-
-
-
- ![]()
-
-
-
+
+
+
+ 搜索
+ 重置
+
+
+
+
+ 导出为表格
+
+
+
+
+ ![]()
+
+
+
-
-
-
- {{ $index + 1 }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ $index + 1 }}
-
-
-
-
-
-
-
-
-
- 取消订单
+
+
+
+
+
+
+
+
-
-
-
- 完成订单
-
-
-
-
- 退款
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 取消订单
+
+
+
+
+ 完成订单
+
+
+
+
+ 退款
+
+
+
+
+
- 搜索
- 重置
-
-
-
- ![]()
-
-
-
+
+
+
+ 搜索
+ 重置
+
+
+
+
+ 导出为表格
+
+
+
+
+ ![]()
+
+
+
@@ -94,6 +100,8 @@ import myAxios from "@/api/myAxios";
import { ElMessage } from "element-plus";
import {SuccessInfo, ErrorInfo, WarnInfo} from "@/utils/messageInfo";
import { downloadUrl } from '@/utils/formatImgUpload'
+import { serviceOrderList } from "@/utils/excelUtil/serviceOrderExcel";
+import { getCurrentDate,getMaxDate,compareDates } from "@/utils/YYYYMMDD";
const tableData: any = ref([]); //表单展示数据
const total = ref(0);
@@ -172,11 +180,18 @@ const cancelOrder = async (row:any)=>{ //取消订单的方法(未支付能取
ErrorInfo('请求错误')
}
}
-const orderTransaction = async (oid: any, msg: string) => { //订单完成方法
- // console.log('当前订单信息---->',oid)
- // loading.value = true
+const orderTransaction = async (obj: any, msg: string) => { //订单完成方法
+ let maxBookDate : any = [] //最大预约日期
+ obj.orderItemList.forEach((item:any) => {
+ maxBookDate.push(item.reservationDate)
+ })
+ maxBookDate = getMaxDate(maxBookDate)
+ if(msg === '交易成功' && compareDates(maxBookDate,getCurrentDate()) ) {
+ WarnInfo('未到服务日期不能完成订单!')
+ return;
+ }
const res = await myAxios.post('/order/update/all/orderStatus',{
- id: oid,
+ id: obj.id,
orderStatus: msg
})
if (res.data.code === 1) {
@@ -202,4 +217,10 @@ const orderTransaction = async (oid: any, msg: string) => { //订单完成方
min-width: 1000px;
overflow: auto;
}
+
+.titleHeader {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20px
+}
\ No newline at end of file
diff --git a/src/views/OtherManagement/NoticeAndFavorable.vue b/src/views/OtherManagement/NoticeAndFavorable.vue
new file mode 100644
index 0000000..f211b05
--- /dev/null
+++ b/src/views/OtherManagement/NoticeAndFavorable.vue
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+ 保存
+
+
+
+ 保存
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/OutfitLease/OutfitLeaseOrderCenter.vue b/src/views/OutfitLease/OutfitLeaseOrderCenter.vue
index d964286..b8f215e 100644
--- a/src/views/OutfitLease/OutfitLeaseOrderCenter.vue
+++ b/src/views/OutfitLease/OutfitLeaseOrderCenter.vue
@@ -1,11 +1,21 @@
-
+ {
try {
searchParams.value.orderNumber = orderNumber.value
const res = await myAxios.post('/clothesRent/list', { ...searchParams.value });
- // console.log('订单信息--->', res.data.data);
+ console.log('订单信息--->', res.data.data);
if (res.data.code === 1) {
tableData.value = res.data.data.records;
total.value = parseInt(res.data.data.total)
@@ -205,4 +217,9 @@ const cancelOrder = async (row: any) => { //取消订单的方法(未支付能
width: 100%;
min-width: 1000px;
}
+.titleHeader {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20px
+}
\ No newline at end of file
diff --git a/src/views/ServiceType/ProductCenter.vue b/src/views/ServiceType/ProductCenter.vue
index 4022f1c..78ccecb 100644
--- a/src/views/ServiceType/ProductCenter.vue
+++ b/src/views/ServiceType/ProductCenter.vue
@@ -321,7 +321,7 @@ const onSearch = (data : String)=>{ //搜索按钮方法
//批量删除
const delBatch = async ()=>{
console.log(idList.value);
- const res = await myAxios.post('/goods/delBatch',{
+ const res = await myAxios.post('/goods/delBatch/service',{
idList: idList.value
})
console.log(res.data);
@@ -330,7 +330,7 @@ const delBatch = async ()=>{
type: 'success',
message: '批量删除成功'
})
- getProductList()
+ await getProductList()
} else {
ElMessage.error('删除失败')
}
diff --git a/src/views/User/PersonalCenter.vue b/src/views/User/PersonalCenter.vue
index c96237c..d3d96c2 100644
--- a/src/views/User/PersonalCenter.vue
+++ b/src/views/User/PersonalCenter.vue
@@ -25,6 +25,7 @@
+
搜索
重置
+
+
+
+ 导出为表格
+
+
+
+
+ {{ btnText }}
确认
@@ -37,12 +38,12 @@ import { ref, onBeforeMount } from 'vue'
import { SuccessInfo, WarnInfo } from '@/utils/messageInfo';
import { useRoute } from "vue-router";
import PreviewSingleImgUpload from "@/utils/imgUpload/PreviewSingleImgUpload.vue";
-import {invInput} from "@/utils/entityProduct/globalVar";
const disabled = ref(true) //表单是否禁用
const userForm: any = ref({}) //用户表单
const route = useRoute()
+const btnText = ref('编辑') //编辑按钮
onBeforeMount(()=>{
if(route.params.flag === '1') {
@@ -62,6 +63,17 @@ const getUserInfo = async () => {
}
}
+const changeBtnStatus = () => {
+ if(btnText.value === '编辑') {
+ disabled.value = false
+ btnText.value = '取消'
+ } else if(btnText.value === '取消') {
+ disabled.value = true
+ btnText.value = '编辑'
+ getUserInfo()
+ }
+}
+
const saveEdit = async ()=>{ //保存用户信息
const res = await myAxios.post('/user/update',{
id: userForm.value.id,
@@ -69,11 +81,13 @@ const saveEdit = async ()=>{ //保存用户信息
userName: userForm.value.userName,
userAvatar: userForm.value.userAvatar,
phone: userForm.value.phone,
- userRole: userForm.value.userRole
+ userRole: userForm.value.userRole,
+ points: userForm.value.points
})
console.log('更新信息--->',res.data)
if (res.data.code === 1) {
disabled.value = true
+ btnText.value = '编辑'
SuccessInfo('更新成功')
} else {
WarnInfo('更新失败')
diff --git a/src/views/User/SingleUserDetail.vue b/src/views/User/SingleUserDetail.vue
index 84e9bd7..54e6bdc 100644
--- a/src/views/User/SingleUserDetail.vue
+++ b/src/views/User/SingleUserDetail.vue
@@ -69,7 +69,8 @@ const saveEdit = async ()=>{ //保存用户信息
userName: userForm.value.userName,
userAvatar: userForm.value.userAvatar,
phone: userForm.value.phone,
- userRole: userForm.value.userRole
+ userRole: userForm.value.userRole,
+ points: userForm.value.points
})
console.log('更新信息--->',res.data)
if (res.data.code === 1) {
diff --git a/src/views/excelTest.vue b/src/views/excelTest.vue
new file mode 100644
index 0000000..fd911ce
--- /dev/null
+++ b/src/views/excelTest.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+ {{ $index + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出为 Excel
+
+
+
+
diff --git a/src/views/test2.vue b/src/views/test2.vue
new file mode 100644
index 0000000..16628bc
--- /dev/null
+++ b/src/views/test2.vue
@@ -0,0 +1,110 @@
+import { saveAs } from "file-saver";
+import ExcelJS from "exceljs";
+
+// 用于将图片转换为 Base64 编码
+function getBase64Image(url) {
+return new Promise((resolve, reject) => {
+const img = new Image();
+img.crossOrigin = 'Anonymous'; // 允许跨域获取
+img.onload = () => {
+const canvas = document.createElement('canvas');
+const ctx = canvas.getContext('2d');
+canvas.height = img.height;
+canvas.width = img.width;
+ctx.drawImage(img, 0, 0);
+const dataURL = canvas.toDataURL('image/png');
+resolve(dataURL);
+};
+img.onerror = (error) => reject(error);
+img.src = url;
+});
+}
+
+export const serviceOrderList = (tableData, downloadUrl) => {
+const workbook = new ExcelJS.Workbook();
+const worksheet = workbook.addWorksheet('Order Details');
+
+// 设置列标题
+worksheet.columns = [
+{ header: '订单序号', key: 'index', width: 10 },
+{ header: '订单编号', key: 'orderNumber', width: 30 },
+{ header: '下单时间', key: 'createTime', width: 20 },
+{ header: '用户名', key: 'userName', width: 15 },
+{ header: '所购买的商品', key: 'goodName', width: 30 },
+{ header: '商品图片', key: 'goodImg', width: 20 },
+{ header: '商品类别', key: 'type', width: 20 },
+{ header: '商品单价', key: 'price', width: 15 },
+{ header: '数量', key: 'quantity', width: 10 },
+{ header: '总价', key: 'itemTotalAmount', width: 15 },
+{ header: '预约日期', key: 'reservationDate', width: 15 },
+{ header: '预约时间段', key: 'timeSlot', width: 15 },
+{ header: '联系人姓名', key: 'contactName', width: 20 },
+{ header: '联系人手机号', key: 'contactPhone', width: 20 },
+{ header: '订单实付金额', key: 'totalAmount', width: 20 },
+{ header: '订单状态', key: 'orderStatus', width: 20 },
+];
+
+// 遍历 tableData 并填充数据
+tableData.forEach((order, index) => {
+// 展平每个订单的数据
+order.orderItemList.forEach(async (item) => {
+// 订单每个商品的行
+const row = worksheet.addRow({
+index: index + 1,
+orderNumber: order.orderNumber,
+createTime: order.createTime,
+userName: order.userName,
+goodName: item.goodSnapshot.name,
+goodImg: item.goodSnapshot.goodImg.split(';')[0], // 提取商品图片路径
+type: item.goodSnapshot.type,
+price: item.goodSnapshot.price,
+quantity: item.quantity,
+itemTotalAmount: item.itemTotalAmount,
+reservationDate: item.reservationDate,
+timeSlot: item.timeSlot,
+contactName: order.contactsSnapshot.name,
+contactPhone: order.contactsSnapshot.phone,
+totalAmount: order.totalAmount,
+orderStatus: order.orderStatus,
+});
+
+// 获取商品图片的 Base64 编码
+try {
+const imageUrl = 'https://www.carboner.cn:8888/api/file/downloadFile?objectKey=' + row.getCell('goodImg').value;
+const base64Image = await getBase64Image(imageUrl);
+
+// 将 Base64 图片添加到 Excel
+const imageId = workbook.addImage({
+base64: base64Image,
+extension: 'png',
+});
+
+// 设置图片在 Excel 单元格中的显示
+worksheet.getRow(row.number).getCell('goodImg').value = { type: 'image', imageId };
+worksheet.getRow(row.number).getCell('goodImg').style = {
+alignment: { vertical: 'middle', horizontal: 'center' },
+};
+} catch (error) {
+console.error('图片转换失败', error);
+}
+});
+});
+
+// 自适应列宽
+worksheet.columns.forEach((column) => {
+let maxLength = 0;
+column.eachCell({ includeEmpty: true }, (cell) => {
+const cellValue = cell.value ? String(cell.value) : ''; // 确保空值也处理
+maxLength = Math.max(maxLength, cellValue.length);
+});
+
+// 设置列宽，确保列宽适应最大值
+column.width = maxLength + 2; // 留出额外的空间
+});
+
+// 导出为 Excel 文件
+workbook.xlsx.writeBuffer().then((buffer) => {
+const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+saveAs(blob, '订单信息.xlsx');
+});
+};
+ ![]()
+
+
+