diff --git a/src/api/statistics.js b/src/api/statistics.js index 1d59c7e..0b67179 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -58,6 +58,22 @@ export function dayStatistic(params) { data: params }); } +// 当日负卡金疗程记录查询 +export function dayStatisticTreatment(params) { + return service({ + url: "/api" + "/demay/ssm/negativeCard/CourseDayStatistic", + method: "post", + data: params + }); +} +//当日负卡金充值记录查询 +export function dayStatisticRecharge(params) { + return service({ + url: "/api" + "/demay/ssm/negativeCard/rechargeDayStatistic", + method: "post", + data: params + }); +} // 门店会员统计列表 门店端-门店统计-门店会员统计列表 export function storeStatisticMemberList(params) { return service({ diff --git a/src/layout/components/asider.vue b/src/layout/components/asider.vue index f1174f6..0dd7c2f 100644 --- a/src/layout/components/asider.vue +++ b/src/layout/components/asider.vue @@ -355,6 +355,13 @@ export default { index: "transfer", number: "4001500", }, + { + name: "会员转门店", + icon: "el-icon-sort", + route: "/transferstore", + index: "transferstore", + number: "4001600", + }, // { // name: "收款", // icon: "el-icon-s-management", @@ -396,6 +403,13 @@ export default { index: "repayment", number: "500800", }, + { + name: "取消欠款", + icon: "el-icon-notebook-2", + route: "/noarrears", + index: "noarrears", + number: "500900", + }, { name: "异常单", icon: "el-icon-question", diff --git a/src/pages/eashier/noArrears/components/detail.vue b/src/pages/eashier/noArrears/components/detail.vue new file mode 100644 index 0000000..d37d580 --- /dev/null +++ b/src/pages/eashier/noArrears/components/detail.vue @@ -0,0 +1,287 @@ + + + + + diff --git a/src/pages/eashier/noArrears/components/index.vue b/src/pages/eashier/noArrears/components/index.vue new file mode 100644 index 0000000..18561e2 --- /dev/null +++ b/src/pages/eashier/noArrears/components/index.vue @@ -0,0 +1,310 @@ + + + + diff --git a/src/pages/eashier/noArrears/noarrears.vue b/src/pages/eashier/noArrears/noarrears.vue new file mode 100644 index 0000000..4dd14de --- /dev/null +++ b/src/pages/eashier/noArrears/noarrears.vue @@ -0,0 +1,723 @@ + + + + diff --git a/src/pages/eashier/noArrears/repayment.vue b/src/pages/eashier/noArrears/repayment.vue new file mode 100644 index 0000000..834c096 --- /dev/null +++ b/src/pages/eashier/noArrears/repayment.vue @@ -0,0 +1,671 @@ + + + + diff --git a/src/pages/eashier/repayment/repayment.vue b/src/pages/eashier/repayment/repayment.vue index 069a589..f04fd29 100644 --- a/src/pages/eashier/repayment/repayment.vue +++ b/src/pages/eashier/repayment/repayment.vue @@ -55,7 +55,7 @@ - + - + - +
diff --git a/src/pages/statistics/negativeCard/negativeCard.vue b/src/pages/statistics/negativeCard/negativeCard.vue index bc89ba1..34e05f7 100644 --- a/src/pages/statistics/negativeCard/negativeCard.vue +++ b/src/pages/statistics/negativeCard/negativeCard.vue @@ -2,65 +2,58 @@
- 刷新 + 刷新

- - - - - - - - - - - - - - - - - - - - - - +
+
+ + + + + + + + + + + +
+
+ + + + + + + + + + +
+
+
diff --git a/src/pages/storeManage/memberList/memberList.vue b/src/pages/storeManage/memberList/memberList.vue index 64f31e1..2f12f86 100644 --- a/src/pages/storeManage/memberList/memberList.vue +++ b/src/pages/storeManage/memberList/memberList.vue @@ -22,8 +22,7 @@ - - + diff --git a/src/pages/storeManage/transferStore/components/edit.vue b/src/pages/storeManage/transferStore/components/edit.vue new file mode 100644 index 0000000..1606d06 --- /dev/null +++ b/src/pages/storeManage/transferStore/components/edit.vue @@ -0,0 +1,245 @@ + + + + + diff --git a/src/pages/storeManage/transferStore/index.vue b/src/pages/storeManage/transferStore/index.vue new file mode 100644 index 0000000..1b4d258 --- /dev/null +++ b/src/pages/storeManage/transferStore/index.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 9a91fac..e3976ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -412,6 +412,16 @@ const router = new VueRouter({ index: "repayment" } }, + //取消欠款 + { + path: "/noarrears", + component: () => import("../pages/eashier/noArrears/repayment.vue"), + meta: { + title: "取消欠款", + index: "noarrears" + } + }, + //异常单 errorOrder { path: "/errorOrder", @@ -770,6 +780,15 @@ const router = new VueRouter({ index: "transfer" } }, + + { + path: "/transferstore", + component: () => import("../pages/storeManage/transferStore/index"), //会员转门店 + meta: { + title: "会员转门店", + index: "transferstore" + } + }, { path: "/contribution", component: () => import("../pages/statistics/contribution/index"),