{{ $store.state.notices.waitPayBill || 0 }}
待审核分账
+
+
+ {{ $store.state.notices.appointmentWorkOrder || 0 }}
+ 未完成预约工单
+
+
@@ -127,10 +135,7 @@
{{ $store.state.notices.procurementAudit || 0 }}
+ 待审核采购单
+ 今日交易额
- {{ $filters.unitPrice(homeData.todayOrderPrice, '￥') }}
- ￥0.00
+ {{ $filters.unitPrice(homeData.todayOrderPrice || 0, "￥") }}
今日新增店铺
@@ -160,6 +165,34 @@
+
+
流量走势、交易趋势和热卖 TOP10 使用同一时间范围，当前为{{ rangeTitle }}。
+
@@ -174,7 +207,7 @@
-
热卖商品TOP10
+热卖商品TOP10 · {{ rangeTitle }}
-
待与商家对账
+
+ 未完成预约工单
+
+
+ 待审核采购单
+
@@ -58,6 +64,14 @@ export default {
},
methods: {
navigateTo(name) {
+ if (name === "manager-appointment-work-orders") {
+ this.$router.push({ name, query: { serviceStatus: "OPEN" } });
+ return;
+ }
+ if (name === "manager-procurement-order-list") {
+ this.$router.push({ name, query: { status: "SUBMITTED" } });
+ return;
+ }
this.$router.push({ name });
},
},
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 76da142a6..04320b6dc 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -4,51 +4,41 @@
-
-
-
-
-
+
+
-
+
+
-
-
+
-
-
+
-
-
+
@@ -59,12 +49,12 @@
clearable
start-placeholder="开始时间"
end-placeholder="结束时间"
- style="width: 360px"
@change="selectDateRange"
/>
-
- 搜索
+
+ 搜索
+ 重置
@@ -73,38 +63,61 @@
-
+
+
+
+
{{ clientTypeText(row.clientType) }}
-
+
+ {{ orderTypeText(row.orderType) }}
+
+
{{ orderPromotionText(row.orderPromotionType) }}
-
+ {{ deliveryMethodText(row.deliveryMethod) }}
+
- {{ unitPrice(row.flowPrice, '￥') }}
+ {{ unitPrice(row.flowPrice, "￥") }}
-
+
{{ paymentMethodText(row.paymentMethod) }}
@@ -113,7 +126,7 @@
+
查看
@@ -124,7 +137,7 @@
import * as API_Order from "@/api/order";
-import { ElMessage } from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
import { unitPrice, customRouterPush } from "@/utils/filters";
+const QUERY_KEY = "manager-order-list-query";
+const PAGE_SIZES = [20, 50, 100];
+
+const PROMOTION_OPTIONS = [
+ { label: "普通订单", value: "NORMAL" },
+ { label: "拼团订单", value: "PINTUAN" },
+ { label: "赠品订单", value: "GIFT" },
+ { label: "积分订单", value: "POINTS" },
+ { label: "砍价订单", value: "KANJIA" },
+];
+
+const ORDER_TYPE_OPTIONS = [
+ { label: "普通订单", value: "NORMAL" },
+ { label: "虚拟订单", value: "VIRTUAL" },
+ { label: "电子卡券", value: "E_COUPON" },
+ { label: "预约订单", value: "APPOINTMENT" },
+];
+
+const PAYMENT_OPTIONS = [
+ { label: "微信支付", value: "WECHAT" },
+ { label: "支付宝", value: "ALIPAY" },
+ { label: "余额支付", value: "WALLET" },
+ { label: "线下转账", value: "BANK_TRANSFER" },
+];
+
+function emptySearchForm(pageSize = 20) {
+ return {
+ pageNumber: 1,
+ pageSize,
+ sort: "createTime",
+ order: "desc",
+ startDate: "",
+ endDate: "",
+ orderType: "",
+ orderSn: "",
+ buyerName: "",
+ goodsName: "",
+ shipName: "",
+ consigneeMobile: "",
+ storeName: "",
+ orderStatus: "",
+ paymentMethod: "",
+ orderPromotionType: "",
+ };
+}
+
+function readSavedQuery() {
+ const raw = sessionStorage.getItem(QUERY_KEY);
+ if (!raw) return null;
+ try {
+ const saved = JSON.parse(raw);
+ const form = emptySearchForm();
+ const src = saved && saved.searchForm ? saved.searchForm : {};
+ Object.keys(form).forEach((key) => {
+ if (src[key] !== undefined && src[key] !== null) {
+ form[key] = src[key];
+ }
+ });
+ form.pageNumber = Number(form.pageNumber) || 1;
+ form.pageSize = PAGE_SIZES.includes(Number(form.pageSize)) ? Number(form.pageSize) : 20;
+ const currentStatus = saved.currentStatus || form.orderStatus || "ALL";
+ if (!currentStatus || currentStatus === "ALL") {
+ form.orderStatus = "";
+ }
+ return {
+ searchForm: form,
+ selectDate: Array.isArray(saved.selectDate) ? saved.selectDate : null,
+ currentStatus: currentStatus || "ALL",
+ };
+ } catch (e) {
+ sessionStorage.removeItem(QUERY_KEY);
+ return null;
+ }
+}
+
export default {
name: "orderList",
data() {
return {
- fields: {
- 订单编号: "sn",
- 下单时间: "createTime",
- 客户名称: "memberName",
- 支付方式: {
- field: "clientType",
- callback: (value) => {
- if (value == "H5") return "移动端";
- if (value == "PC") return "PC端";
- if (value == "WECHAT_MP") return "小程序端";
- if (value == "APP") return "移动应用端";
- return value;
- },
- },
- 商品数量: "groupNum",
- 付款状态: {
- field: "payStatus",
- callback: (value) =>
- value == "UNPAID" ? "未付款" : value == "PAID" ? "已付款" : "",
- },
- 店铺: "storeName",
- },
loading: true,
- searchForm: {
- pageNumber: 1,
- pageSize: 20,
- sort: "createTime",
- order: "desc",
- startDate: "",
- endDate: "",
- orderType: "",
- orderSn: "",
- keywords: "",
- buyerName: "",
- goodsName: "",
- shipName: "",
- orderStatus: "",
- paymentMethod: "",
- orderPromotionType: "",
- },
+ exporting: false,
+ pageSizes: PAGE_SIZES,
+ promotionOptions: PROMOTION_OPTIONS,
+ orderTypeOptions: ORDER_TYPE_OPTIONS,
+ paymentOptions: PAYMENT_OPTIONS,
+ searchForm: emptySearchForm(),
selectDate: null,
data: [],
total: 0,
@@ -194,44 +249,18 @@ export default {
},
computed: {
orderStatusWithCount() {
+ const count = (value) => (value ? `(${value})` : "");
return [
{ title: "全部", value: "ALL" },
- {
- title: `未付款${this.orderNumData.waitPayNum ? "(" + this.orderNumData.waitPayNum + ")" : ""}`,
- value: "UNPAID",
- },
- {
- title: `已付款${this.orderNumData.waitDeliveryNum ? "(" + this.orderNumData.waitDeliveryNum + ")" : ""}`,
- value: "PAID",
- },
- {
- title: `待发货${this.orderNumData.waitShipNum ? "(" + this.orderNumData.waitShipNum + ")" : ""}`,
- value: "UNDELIVERED",
- },
- {
- title: `部分发货${this.orderNumData.partsDeliveredNumNum ? "(" + this.orderNumData.partsDeliveredNumNum + ")" : ""}`,
- value: "PARTS_DELIVERED",
- },
- {
- title: `待收货${this.orderNumData.deliveredNum ? "(" + this.orderNumData.deliveredNum + ")" : ""}`,
- value: "DELIVERED",
- },
- {
- title: `待核验${this.orderNumData.waitCheckNum ? "(" + this.orderNumData.waitCheckNum + ")" : ""}`,
- value: "TAKE",
- },
- {
- title: `待自提${this.orderNumData.waitSelfPickNum ? "(" + this.orderNumData.waitSelfPickNum + ")" : ""}`,
- value: "STAY_PICKED_UP",
- },
- {
- title: `已完成${this.orderNumData.finishNum ? "(" + this.orderNumData.finishNum + ")" : ""}`,
- value: "COMPLETED",
- },
- {
- title: `已关闭${this.orderNumData.closeNum ? "(" + this.orderNumData.closeNum + ")" : ""}`,
- value: "CANCELLED",
- },
+ { title: `未付款${count(this.orderNumData.waitPayNum)}`, value: "UNPAID" },
+ { title: `已付款${count(this.orderNumData.waitDeliveryNum)}`, value: "PAID" },
+ { title: `待发货${count(this.orderNumData.waitShipNum)}`, value: "UNDELIVERED" },
+ { title: `部分发货${count(this.orderNumData.partsDeliveredNumNum)}`, value: "PARTS_DELIVERED" },
+ { title: `待收货${count(this.orderNumData.deliveredNum)}`, value: "DELIVERED" },
+ { title: `待核验${count(this.orderNumData.waitCheckNum)}`, value: "TAKE" },
+ { title: `待自提${count(this.orderNumData.waitSelfPickNum)}`, value: "STAY_PICKED_UP" },
+ { title: `已完成${count(this.orderNumData.finishNum)}`, value: "COMPLETED" },
+ { title: `已关闭${count(this.orderNumData.closeNum)}`, value: "CANCELLED" },
];
},
},
@@ -240,19 +269,21 @@ export default {
onStatusTabClick(tab) {
this.orderStatusClick(tab.paneName);
},
+ orderGoods(row) {
+ const items = row && row.orderItems;
+ return items && items.length ? items : [];
+ },
clientTypeText(v) {
const map = { H5: "移动端", PC: "PC端", WECHAT_MP: "小程序端", APP: "移动应用端" };
- return map[v] || v || "-";
+ return map[v] || v || "—";
+ },
+ orderTypeText(v) {
+ const found = ORDER_TYPE_OPTIONS.find((item) => item.value === v);
+ return found ? found.label : v || "—";
},
orderPromotionText(v) {
- const map = {
- NORMAL: "普通订单",
- PINTUAN: "拼团订单",
- GIFT: "赠品订单",
- POINTS: "积分订单",
- KANJIA: "砍价订单",
- };
- return map[v] || v || "-";
+ const found = PROMOTION_OPTIONS.find((item) => item.value === v);
+ return found ? found.label : v || "—";
},
orderPromotionTagType(v) {
const map = {
@@ -264,15 +295,24 @@ export default {
};
return map[v] || "info";
},
+ deliveryMethodText(v) {
+ const map = {
+ SELF_PICK_UP: "自提",
+ LOCAL_TOWN_DELIVERY: "同城配送",
+ LOGISTICS: "物流",
+ VIRTUAL: "虚拟发货",
+ };
+ return map[v] || v || "—";
+ },
paymentMethodText(v) {
const map = {
- NOT_ACTUALLY_PAID: "-",
+ NOT_ACTUALLY_PAID: "—",
WECHAT: "微信支付",
ALIPAY: "支付宝",
WALLET: "余额支付",
BANK_TRANSFER: "线下转账",
};
- return map[v] || v || "-";
+ return map[v] || v || "—";
},
orderStatusText(v) {
const map = {
@@ -286,7 +326,7 @@ export default {
TAKE: "待核验",
CANCELLED: "已关闭",
};
- return map[v] || v || "-";
+ return map[v] || v || "—";
},
orderStatusTagType(v) {
const map = {
@@ -302,6 +342,23 @@ export default {
};
return map[v] || "info";
},
+ rememberQuery() {
+ sessionStorage.setItem(
+ QUERY_KEY,
+ JSON.stringify({
+ searchForm: this.searchForm,
+ selectDate: this.selectDate,
+ currentStatus: this.currentStatus,
+ })
+ );
+ },
+ restoreQuery() {
+ const saved = readSavedQuery();
+ if (!saved) return;
+ this.searchForm = saved.searchForm;
+ this.selectDate = saved.selectDate;
+ this.currentStatus = saved.currentStatus;
+ },
init() {
this.getDataList();
this.getOrderNumData();
@@ -317,10 +374,17 @@ export default {
},
handleSearch() {
this.searchForm.pageNumber = 1;
- this.searchForm.pageSize = 20;
this.getDataList();
this.getOrderNumData();
},
+ handleReset() {
+ const pageSize = this.searchForm.pageSize;
+ this.searchForm = emptySearchForm(pageSize);
+ this.selectDate = null;
+ this.currentStatus = "ALL";
+ sessionStorage.removeItem(QUERY_KEY);
+ this.init();
+ },
selectDateRange(v) {
if (v && v.length === 2) {
this.searchForm.startDate = v[0];
@@ -330,17 +394,26 @@ export default {
this.searchForm.endDate = "";
}
},
+ countParams() {
+ const params = { ...this.searchForm };
+ delete params.orderStatus;
+ delete params.pageNumber;
+ delete params.pageSize;
+ delete params.sort;
+ delete params.order;
+ return params;
+ },
getDataList() {
this.loading = true;
+ this.rememberQuery();
API_Order.getOrderList(this.searchForm)
.then((res) => {
- this.loading = false;
if (res.success) {
this.data = res.result.records;
this.total = res.result.total;
}
})
- .catch(() => {
+ .finally(() => {
this.loading = false;
});
},
@@ -352,29 +425,36 @@ export default {
},
async exportOrder() {
if (!this.searchForm.startDate || !this.searchForm.endDate) {
- ElMessage.error("必须选择时间范围，搜索后进行导出！");
- return;
+ try {
+ await ElMessageBox.confirm(
+ "未选择下单时间，将按当前筛选条件导出全部匹配订单。",
+ "导出订单",
+ { type: "warning", confirmButtonText: "继续导出", cancelButtonText: "取消" }
+ );
+ } catch (e) {
+ return;
+ }
}
+ this.exporting = true;
API_Order.exportOrder(this.searchForm)
.then((res) => {
const blob = new Blob([res], {
type: "application/vnd.ms-excel;charset=utf-8",
});
- if ("download" in document.createElement("a")) {
- const link = document.createElement("a");
- link.download = "订单列表.xlsx";
- link.style.display = "none";
- link.href = URL.createObjectURL(blob);
- document.body.appendChild(link);
- link.click();
- URL.revokeObjectURL(link.href);
- document.body.removeChild(link);
- } else {
- navigator.msSaveBlob(blob, "订单列表.xlsx");
- }
+ const link = document.createElement("a");
+ link.download = "订单列表.xlsx";
+ link.style.display = "none";
+ link.href = URL.createObjectURL(blob);
+ document.body.appendChild(link);
+ link.click();
+ URL.revokeObjectURL(link.href);
+ document.body.removeChild(link);
})
- .catch((err) => {
- console.log(err);
+ .catch(() => {
+ ElMessage.error("导出失败");
+ })
+ .finally(() => {
+ this.exporting = false;
});
},
orderStatusClick(name) {
@@ -385,22 +465,24 @@ export default {
this.searchForm.orderStatus = name;
this.currentStatus = name;
}
+ this.searchForm.pageNumber = 1;
this.getDataList();
},
getOrderNumData() {
- // orderNum 接口仅查 li_order，不含 order_item 关联；keywords/goodsName 会引用 oi 字段导致 SQL 报错
- const { orderStatus, keywords, goodsName, ...searchParams } = this.searchForm;
- API_Order.getOrderNum(searchParams)
+ API_Order.getOrderNum(this.countParams())
.then((res) => {
if (res.success) {
this.orderNumData = res.result;
}
})
- .catch((err) => {
- console.error("获取订单数量统计失败:", err);
+ .catch(() => {
+ this.orderNumData = {};
});
},
},
+ created() {
+ this.restoreQuery();
+ },
mounted() {
this.init();
},
@@ -408,6 +490,37 @@ export default {
diff --git a/manager/src/views/procurement/purchase-order/list.vue b/manager/src/views/procurement/purchase-order/list.vue
index 7146f804e..b173beab9 100644
--- a/manager/src/views/procurement/purchase-order/list.vue
+++ b/manager/src/views/procurement/purchase-order/list.vue
@@ -69,6 +69,10 @@ export default {
};
},
mounted() {
+ const status = this.$route.query.status;
+ if (status) {
+ this.searchForm.status = status;
+ }
this.getDataList();
},
methods: {
热卖店铺TOP10
+热卖店铺TOP10 · {{ rangeTitle }}
- 导出订单
+ 导出订单
+
+ —
+
+
+ ![]()
+
+
+
+ {{ item.name || "—" }}
+
+