diff --git a/mock/modules/ycy.js b/mock/modules/ycy.js
index 69091dd..94304eb 100644
--- a/mock/modules/ycy.js
+++ b/mock/modules/ycy.js
@@ -8,7 +8,6 @@ const StockList = Mock.mock({
billserial: "@integer(100000000,199999999)1",
billType: "@integer(0,4)",
stockNum: "@integer(1,2)",
- unit: "@cword(张本,1)",
stockDate: "@date",
operator: "@cname",
remark: " @integer(10000000000,19999999999)",
@@ -182,6 +181,21 @@ const breakageList = Mock.mock({
},
],
});
+//
+const detailReportList = Mock.mock({
+ "list|5": [
+ {
+ "id|+1": 0,
+ branch: "@cname",
+ stockNum: "@integer(1,20)张",
+ cancelNum: "@integer(0,20)张",
+ receiveNum: "@integer(0,20)张",
+ breakNum: "@integer(0,20)张",
+ destoryNum: "@integer(0,20)张",
+ grossBillRatio: "25%",
+ },
+ ],
+});
export default [
{
@@ -252,4 +266,14 @@ export default [
};
},
},
+ {
+ url: "/api/detailReportList",
+ method: "get",
+ response: () => {
+ return {
+ code: 200,
+ data: detailReportList,
+ };
+ },
+ },
];
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index df36fcf..0000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/src/api/finance-bill-manage/detailReportList.js b/src/api/finance-bill-manage/detailReportList.js
new file mode 100644
index 0000000..82162bf
--- /dev/null
+++ b/src/api/finance-bill-manage/detailReportList.js
@@ -0,0 +1,7 @@
+import request from "@/utils/requestMock";
+
+const API = {
+ DETAILREPORT_LIST: "/detailReportList",
+};
+
+export const reqDetailReportList = () => request.get(API.DETAILREPORT_LIST);
diff --git a/src/components/echarts/bar.vue b/src/components/echarts/bar.vue
new file mode 100644
index 0000000..b4a916b
--- /dev/null
+++ b/src/components/echarts/bar.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
diff --git a/src/components/echarts/line.vue b/src/components/echarts/line.vue
new file mode 100644
index 0000000..4875089
--- /dev/null
+++ b/src/components/echarts/line.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue
new file mode 100644
index 0000000..a34ecbb
--- /dev/null
+++ b/src/components/echarts/pie.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
diff --git a/src/layout/components/LayoutAside.vue b/src/layout/components/LayoutAside.vue
index faf4f0d..15d9975 100644
--- a/src/layout/components/LayoutAside.vue
+++ b/src/layout/components/LayoutAside.vue
@@ -31,6 +31,9 @@
票据核销
+
+ 报表明细
+
diff --git a/src/pages/finance-bill-manage/billBreakage.vue b/src/pages/finance-bill-manage/billBreakage.vue
index 38f6784..1a1771e 100644
--- a/src/pages/finance-bill-manage/billBreakage.vue
+++ b/src/pages/finance-bill-manage/billBreakage.vue
@@ -174,6 +174,7 @@
+
+ {{ `${row.stockNum}张` }}
+
{{ item.label }}
@@ -134,6 +137,7 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+ {{ `${row.quitneckNum}张` }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/home/components/homeCenter.vue b/src/pages/home/components/homeCenter.vue
new file mode 100644
index 0000000..71e32ab
--- /dev/null
+++ b/src/pages/home/components/homeCenter.vue
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
diff --git a/src/pages/home/components/homeFooter.vue b/src/pages/home/components/homeFooter.vue
new file mode 100644
index 0000000..7c05996
--- /dev/null
+++ b/src/pages/home/components/homeFooter.vue
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/home/components/homeHeader.vue b/src/pages/home/components/homeHeader.vue
new file mode 100644
index 0000000..acb7bf9
--- /dev/null
+++ b/src/pages/home/components/homeHeader.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 677f24b..af7b30f 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -1,7 +1,41 @@
-
+
+
+
+
+
+
+
+
+
-
+
-
+
diff --git a/src/router/modules/financeBillManage.js b/src/router/modules/financeBillManage.js
index 9da78d7..642f93f 100644
--- a/src/router/modules/financeBillManage.js
+++ b/src/router/modules/financeBillManage.js
@@ -5,6 +5,7 @@ import BillReceiptURL from "@/pages/finance-bill-manage/billReceipt.vue";
import BillQuitneckURL from "@/pages/finance-bill-manage/billQuitneck.vue";
import BillBreakagekURL from "@/pages/finance-bill-manage/billBreakage.vue";
import BillDestroyURL from "@/pages/finance-bill-manage/billDestroy.vue";
+import DetailReportURL from "@/pages/finance-bill-manage/detailReport.vue";
const financeBillManage = [
{
@@ -61,6 +62,14 @@ const financeBillManage = [
title: "票据核销",
},
},
+ {
+ path: "DetailReport",
+ name: "detailReport",
+ component: DetailReportURL,
+ meta: {
+ title: "报表明细",
+ },
+ },
],
},
];