diff --git a/src/views/zh/hy/xz/index.vue b/src/views/zh/hy/xz/index.vue
index bc9cf0d..951d1d6 100644
--- a/src/views/zh/hy/xz/index.vue
+++ b/src/views/zh/hy/xz/index.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/src/views/zh/hy/zc/index.vue b/src/views/zh/hy/zc/index.vue
index 55b5837..0975f96 100644
--- a/src/views/zh/hy/zc/index.vue
+++ b/src/views/zh/hy/zc/index.vue
@@ -14,7 +14,7 @@
-
+
diff --git a/src/views/zh/order/order.api.ts b/src/views/zh/order/order.api.ts
new file mode 100644
index 0000000..9fb0c17
--- /dev/null
+++ b/src/views/zh/order/order.api.ts
@@ -0,0 +1,41 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+ housingestateList = '/zh/hy/queryHousingestateList',
+ queryOrderList = '/zh/order/queryOrderList',
+ queryWgOrderList = '/zh/order/queryWgOrderList',
+ querySjdtdcsList = '/zh/order/querySjdtdcsList',
+ querySjdtdjeList = '/zh/order/querySjdtdjeList',
+ queryWgddjetjList = '/zh/order/queryWgddjetjList',
+}
+
+/**
+ * 获取小区
+ * @param params
+ */
+export const housingestateList = (params) => defHttp.get({ url: Api.housingestateList, params });
+/**
+ * 订单列表
+ * @param params
+ */
+export const orderList = (params) => defHttp.get({ url: Api.queryOrderList, params });
+/**
+ * 违规订单列表
+ * @param params
+ */
+export const wgOrderList = (params) => defHttp.get({ url: Api.queryWgOrderList, params });
+/**
+ * 时间段投递次数
+ * @param params
+ */
+export const sjdtdcsList = (params) => defHttp.get({ url: Api.querySjdtdcsList, params });
+/**
+ * 时间段投递金额
+ * @param params
+ */
+export const sjdtdjeList = (params) => defHttp.get({ url: Api.querySjdtdjeList, params });
+/**
+ * 违规订单金额统计
+ * @param params
+ */
+export const wgddjetjList = (params) => defHttp.get({ url: Api.queryWgddjetjList, params });
diff --git a/src/views/zh/order/order.data.ts b/src/views/zh/order/order.data.ts
new file mode 100644
index 0000000..76e0c18
--- /dev/null
+++ b/src/views/zh/order/order.data.ts
@@ -0,0 +1,132 @@
+import {BasicColumn} from '/@/components/Table';
+
+export const detailColumns : BasicColumn[] =[
+ {
+ title: '序号',
+ dataIndex: 'rowNumber',
+ key: 'rowNumber',
+ align: 'center'
+ },
+ {
+ title: '小区名称',
+ dataIndex: 'housingestateName',
+ key: 'housingestateName',
+ align: 'center'
+ },
+ {
+ title: '设备地点',
+ dataIndex: 'content',
+ key: 'content',
+ align: 'center'
+ },
+ {
+ title: '会员手机号',
+ dataIndex: 'phone',
+ key: 'phone',
+ align: 'center'
+ },
+ {
+ title: '投递时间',
+ dataIndex: 'addTime',
+ key: 'addTime',
+ align: 'center'
+ },
+ {
+ title: '重量',
+ dataIndex: 'weight',
+ key: 'weight',
+ align: 'center'
+ },
+ {
+ title: '实际金额',
+ dataIndex: 'money',
+ key: 'money',
+ align: 'center',
+ customRender: function ({ text, record, index}) {
+ return (record.money - record.deductMoney).toFixed(2)
+ }
+ },
+ {
+ title: '订单金额',
+ dataIndex: 'money',
+ key: 'money',
+ align: 'center',
+ },
+ {
+ title: '扣除金额',
+ dataIndex: 'deductMoney',
+ key: 'deductMoney',
+ align: 'center'
+ },
+ {
+ title: '订单状态',
+ dataIndex: 'invalid',
+ key: 'invalid',
+ align: 'center',
+ customRender: function ({ text }) {
+ if (text == '0') {
+ return '正常';
+ } else if (text == '1') {
+ return '违规';
+ } else if (text == '2') {
+ return '部分违规';
+ } else if (text == '3') {
+ return '待审核';
+ } else if (text == '4') {
+ return '异常';
+ } else if (text == '5') {
+ return '忽略';
+ }else{
+ return '';
+ }
+ },
+ },
+ {
+ title: '原因',
+ dataIndex: 'cause',
+ key: 'cause',
+ align: 'center'
+ },
+]
+
+export const sjdtdcsColumns : BasicColumn[] =[
+ {
+ title: '时间',
+ dataIndex: 'name',
+ key: 'name',
+ align: 'center'
+ },
+ {
+ title: '投递次数',
+ dataIndex: 'value',
+ key: 'value',
+ align: 'center'
+ },
+ {
+ title: '操作',
+ key: 'action',
+ align: 'center',
+ width: '150px',
+ }
+]
+
+export const sjdtdjeColumns : BasicColumn[] =[
+ {
+ title: '时间',
+ dataIndex: 'name',
+ key: 'name',
+ align: 'center'
+ },
+ {
+ title: '金额',
+ dataIndex: 'value',
+ key: 'value',
+ align: 'center'
+ },
+ {
+ title: '操作',
+ key: 'action',
+ align: 'center',
+ width: '150px',
+ }
+]
diff --git a/src/views/zh/order/sjdtdcs/index.vue b/src/views/zh/order/sjdtdcs/index.vue
new file mode 100644
index 0000000..ccd433d
--- /dev/null
+++ b/src/views/zh/order/sjdtdcs/index.vue
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+ 当天
+ 近3天
+ 近7天
+ 近30天
+ 自定义
+
+
+
+
+
+ 全部
+ {{item.housingestateName }}
+
+
+
+
+ 统计图
+ 列表页
+
+
+
+
+
+
+
+
+
+
+ 订单状态
+
+ 全部
+ 正常
+ 违规
+ 部分违规
+ 待审核
+ 异常
+ 忽略
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/zh/order/sjdtdje/index.vue b/src/views/zh/order/sjdtdje/index.vue
new file mode 100644
index 0000000..d784101
--- /dev/null
+++ b/src/views/zh/order/sjdtdje/index.vue
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+ 当天
+ 近3天
+ 近7天
+ 近30天
+ 自定义
+
+
+
+
+
+ 全部
+ {{item.housingestateName }}
+
+
+
+
+ 统计图
+ 列表页
+
+
+
+
+
+
+
+
+
+
+ 订单状态
+
+ 全部
+ 正常
+ 违规
+ 部分违规
+ 待审核
+ 异常
+ 忽略
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/zh/order/wgddjetj/index.vue b/src/views/zh/order/wgddjetj/index.vue
new file mode 100644
index 0000000..f5934ed
--- /dev/null
+++ b/src/views/zh/order/wgddjetj/index.vue
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+ 近7天
+ 近30天
+ 自定义
+
+
+
+
+
+
+
+ 统计图
+ 列表页
+
+
+
+
+
+
+
+
+
+
+ 订单状态
+
+ 全部
+ 违规
+ 部分违规
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/zh/qy/qy.data.ts b/src/views/zh/qy/qy.data.ts
index d3df94c..767f330 100644
--- a/src/views/zh/qy/qy.data.ts
+++ b/src/views/zh/qy/qy.data.ts
@@ -1,9 +1,4 @@
import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
-import {ref} from "vue";
export const detailSjqyColumns : BasicColumn[] =[
{
@@ -166,7 +161,6 @@ export const sjdqycsColumns : BasicColumn[] =[
}
]
-
export const sjdqyzlColumns : BasicColumn[] =[
{
title: '时间',
diff --git a/src/views/zh/qy/sjdcs/index.vue b/src/views/zh/qy/sjdcs/index.vue
index 49ffe45..dacfe8d 100644
--- a/src/views/zh/qy/sjdcs/index.vue
+++ b/src/views/zh/qy/sjdcs/index.vue
@@ -26,7 +26,7 @@
-
+
diff --git a/src/views/zh/qy/sjdzl/index.vue b/src/views/zh/qy/sjdzl/index.vue
index 461d065..0fbca5d 100644
--- a/src/views/zh/qy/sjdzl/index.vue
+++ b/src/views/zh/qy/sjdzl/index.vue
@@ -29,7 +29,7 @@
-
+
diff --git a/src/views/zh/qy/sjqycs/index.vue b/src/views/zh/qy/sjqycs/index.vue
index 9d1526f..f4bf3d4 100644
--- a/src/views/zh/qy/sjqycs/index.vue
+++ b/src/views/zh/qy/sjqycs/index.vue
@@ -26,7 +26,7 @@
-
diff --git a/src/views/zh/qy/sjqyzl/index.vue b/src/views/zh/qy/sjqyzl/index.vue
index 91240be..7221c1c 100644
--- a/src/views/zh/qy/sjqyzl/index.vue
+++ b/src/views/zh/qy/sjqyzl/index.vue
@@ -26,7 +26,7 @@
-
diff --git a/src/views/zh/qy/xqqycs/index.vue b/src/views/zh/qy/xqqycs/index.vue
index eb3cc7d..cfa23e7 100644
--- a/src/views/zh/qy/xqqycs/index.vue
+++ b/src/views/zh/qy/xqqycs/index.vue
@@ -26,7 +26,7 @@
-
-
-
+
diff --git a/src/views/zh/shebei/tdjetj/index.vue b/src/views/zh/shebei/tdjetj/index.vue
index a151293..aa14630 100644
--- a/src/views/zh/shebei/tdjetj/index.vue
+++ b/src/views/zh/shebei/tdjetj/index.vue
@@ -23,7 +23,7 @@
-
+
diff --git a/src/views/zh/shebei/tdzl/index.vue b/src/views/zh/shebei/tdzl/index.vue
index b30e4b8..4a23eee 100644
--- a/src/views/zh/shebei/tdzl/index.vue
+++ b/src/views/zh/shebei/tdzl/index.vue
@@ -26,7 +26,7 @@
-