{{ dataList.allowMonth }}
@@ -563,7 +562,9 @@ export default {
// }
// }
// }
-
+ // if(item.paramentName == 'isAddition'){
+ // dataList.isAddition = item.paramentValue*1;
+ // }
if(item.paramentName == 'isSendSms'){
dataList.isSendSms = item.paramentValue;
}
@@ -893,13 +894,10 @@ export default {
//修改确定
editconfirm() {
- // setTimeout(() => {
- // this.loading = false;
- // }, 2500);
var dataList = { ...this.dataList };
- if(dataList.isSendSms){
- // dataList.isSendSms =dataList.isSendSms +"|" +"1 按比例使用充值金额,2 先使用实充金额,再使用赠送金额";
- }
+ // if(dataList.isAddition === 0 || dataList.isAddition){
+ // dataList.isAddition = dataList.isAddition + "|" + "0补单业绩记入单据日期,1补单业绩计入补单日期";
+ // }
dataList.storeId = sessionStorage.getItem("storeId")
if(dataList.superPasswd){
dataList.superPasswd = dataList.superPasswd + "|" + "超级支付密码";
@@ -1042,17 +1040,6 @@ export default {
} else {
dataList.cashier = 0;
}
- // if (dataList.refundCourse == true) {
- // dataList.refundCourse = 1;
- // } else {
- // dataList.refundCourse = 0;
- // }
-
- // if (dataList.buycourse == true) {
- // dataList.buycourse = 1;
- // } else {
- // dataList.buycourse = 0;
- // }
dataList.buycourse = 0;
if (dataList.guide == true) {
@@ -1133,13 +1120,6 @@ export default {
dataList.refundCard +
"|" +
"0充值卡退款不需要将原来的消费按原价重新计算,1消费按原价重新计算";
- // dataList.refundCourse =
- // dataList.refundCourse +
- // "|" +
- // "0不控制,1疗程退款时的疗程单价不能超过购买疗程时的成交单价";
- // dataList.refundCourseNum =
- // dataList.refundCourseNum + "|" + "0按次数退,1按金额退";
-
dataList.refillCard =
dataList.refillCard + "|" + "0不允许充值卡购买疗程,1允许";
@@ -1152,9 +1132,6 @@ export default {
"|" +
"0=自动按充值的单据扣除，1=手工录入扣除，2=按充值单比例扣除";
- // dataList.replacementOderChia =
- // dataList.replacementOderChia + "|" + "0补单日期计算,1录单日期计算";
-
dataList.serviceTicke =
dataList.serviceTicke + "|" + "数字服务单可以作废控制的天数";
dataList.editOrderNum =
diff --git a/src/router/index.js b/src/router/index.js
index fdb9cca..3e24e6c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -609,7 +609,15 @@ const router = new VueRouter({
index: "cardCollection"
}
},
- //门店日报 storeDaily
+ {
+ path: "/smsSetup",
+ component: () =>
+ import("../pages/statistics/smsSetup/index.vue"),
+ meta: {
+ title: "短信设置",
+ index: "smsSetup"
+ }
+ },
{
path: "/storeDaily",
component: () =>
@@ -659,6 +667,16 @@ const router = new VueRouter({
index: "negativeCard"
}
},
+ // 负卡金结存 negativeCardBalance
+ {
+ path: "/negativeCardBalance",
+ component: () =>
+ import("../pages/statistics/negativeCardBalance"),
+ meta: {
+ title: "负卡金结存",
+ index: "negativeCardBalance"
+ }
+ },
//月度营业额 monthlyTaking
{
path: "/monthlyTaking",
@@ -806,6 +824,22 @@ const router = new VueRouter({
index: "subbranch"
}
},
+ {
+ path: "/storeCollection",
+ component: () => import("../pages/branch/storeCollection/index"),
+ meta: {
+ title: "分店收款账户",
+ index: "storeCollection"
+ }
+ },
+ {
+ path: "/receivingPaying",
+ component: () => import("../pages/branch/receivingPaying/index"),
+ meta: {
+ title: "收付款",
+ index: "receivingPaying"
+ }
+ },
{
path: "/map",
component: () => import("../pages/branch/map/index"),
@@ -830,6 +864,14 @@ const router = new VueRouter({
index: "room"
}
},
+ {
+ path: "/reconciliation",
+ component: () => import("../pages/financialReconciliation/reconciliation/index"),
+ meta: {
+ title: "财务对账",
+ index: "reconciliation"
+ }
+ },
{
path: "/dept",
component: () => import("../pages/storeManage/dept/index"),
@@ -1213,6 +1255,42 @@ const router = new VueRouter({
}
},
// 报表统计结束----
+ {
+ path: "/parthnersArchives",
+ component: () =>
+ import("../pages/partners/parthnersArchives/index.vue"),
+ meta: {
+ title: "合作商档案",
+ index: "parthnersArchives"
+ }
+ },
+ {
+ path: "/partnersProject",
+ component: () =>
+ import("../pages/partners/partnersProject/index.vue"),
+ meta: {
+ title: "合作项目",
+ index: "partnersProject"
+ }
+ },
+ {
+ path: "/partnersList",
+ component: () =>
+ import("../pages/partners/partnersList/index.vue"),
+ meta: {
+ title: "合作商报表",
+ index: "partnersList"
+ }
+ },
+ {
+ path: "/reconciliationDetails",
+ component: () =>
+ import("../pages/partners/reconciliationDetails/index.vue"),
+ meta: {
+ title: "对账明细表",
+ index: "reconciliationDetails"
+ }
+ },
]
}
]
diff --git a/src/utils/service.js b/src/utils/service.js
index a703c79..bd367f1 100644
--- a/src/utils/service.js
+++ b/src/utils/service.js
@@ -1,9 +1,8 @@
import axios from "axios";
import { Message, MessageBox } from "element-ui";
// import { getToken, removeToken, setToken } from "@/utils/token";
-import { getCookie, delCookie } from "./utils.js";
+import { delCookie } from "./utils.js";
import router from "../router/index.js";
-import { name } from "../../config/dev.env.js";
// let base = "/api";
// let baseURL = base;
// 根据环境变量对host进行判断
@@ -16,7 +15,7 @@ axios.defaults.headers.post["Content-Type"] = "application/json;charset=UTF-8";
// 创建axios实例
const service = axios.create({
// baseURL: baseURL,
- timeout: 300000 // 请求超时时间
+ timeout: 300000
});
// request拦截器
service.interceptors.request.use(