diff --git a/src/components/trading/components/pro.vue b/src/components/trading/components/pro.vue
index 1bb29d3..1c48c7e 100644
--- a/src/components/trading/components/pro.vue
+++ b/src/components/trading/components/pro.vue
@@ -4,6 +4,7 @@
+
diff --git a/src/components/trading/components/pros.vue b/src/components/trading/components/pros.vue
index 192cc35..de076ec 100644
--- a/src/components/trading/components/pros.vue
+++ b/src/components/trading/components/pros.vue
@@ -4,6 +4,7 @@
+
diff --git a/src/layout/components/Emain.vue b/src/layout/components/Emain.vue
index a9b862b..764b191 100644
--- a/src/layout/components/Emain.vue
+++ b/src/layout/components/Emain.vue
@@ -36,7 +36,7 @@
export default {
data() {
return {
- keepList:['services','collectionList','reatment','storeDaily','dept','staffBrokerage'], //reatment
+ keepList:['services','collectionList','reatment','storeDaily','dept','staffBrokerage','storeSummary','storeTotalPerformance'], //reatment
cancelList:['首页','充值','疗程','直接收银'],
tagsList: [
{ path: "/home", title: "首页" },
diff --git a/src/layout/components/asider.vue b/src/layout/components/asider.vue
index 8100eb2..1294138 100644
--- a/src/layout/components/asider.vue
+++ b/src/layout/components/asider.vue
@@ -724,102 +724,102 @@ export default {
number: "600900",
id:"1001101",
},
- {
- name: "头皮疗程明细",
- icon: "el-icon-suitcase",
- route: "/scalpCourse",
- index: "scalpCourse",
- number: "600900",
- id:"1001102",
- },
- {
- name: "美容大项目疗程表",
- icon: "el-icon-suitcase",
- route: "/projectCourse",
- index: "projectCourse",
- number: "600900",
- id:"1001103",
- },
- {
- name: "管理层工资表",
- icon: "el-icon-suitcase",
- route: "/manageWages",
- index: "manageWages",
- number: "600900",
- id:"1001104",
- },
- {
- name: "员工业绩表",
- icon: "el-icon-suitcase",
- route: "/IndividualPerformance",
- index: "IndividualPerformance",
- number: "600900",
- id:"1001105",
- },
- {
- name: "头皮项目登记表",
- icon: "el-icon-suitcase",
- route: "/scalpProject",
- index: "scalpProject",
- number: "600900",
- id:"1001106",
- },
- {
- name: "门店业绩每日明细表",
- icon: "el-icon-suitcase",
- route: "/monCommission",
- index: "monCommission",
- number: "600900",
- id:"1001107",
- },
- {
- name: "门店现金奖励明细表",
- icon: "el-icon-suitcase",
- route: "/cashReward",
- index: "cashReward",
- number: "600900",
- id:"1001108",
- },
- {
- name: "奖励明细表",
- icon: "el-icon-suitcase",
- route: "/monthlyRegistrationDetails",
- index: "monthlyRegistrationDetails",
- number: "600900",
- id:"1001109",
- },
- {
- name: "大项目销卡表",
- icon: "el-icon-suitcase",
- route: "/projectPinCard",
- index: "projectPinCard",
- number: "600900",
- id:"10011010",
- },
- {
- name: "管理层每日业绩表",
- icon: "el-icon-suitcase",
- route: "/storeConsultant",
- index: "storeConsultant",
- number: "600900",
- id:"10011011",
- },
- {
- name: "门店营业额登记表",
- icon: "el-icon-suitcase",
- route: "/storeTurnover",
- index: "storeTurnover",
- number: "600900",
- id:"10011012",
- },
- {
- name: "产品统计",
- icon: "el-icon-suitcase",
- route: "/productStatistics",
- index: "productStatistics",
- number: "600900",
- id:"10011013",
- },
+ // {
+ // name: "头皮疗程明细",
+ // icon: "el-icon-suitcase",
+ // route: "/scalpCourse",
+ // index: "scalpCourse",
+ // number: "600900",
+ // id:"1001102",
+ // },
+ // {
+ // name: "美容大项目疗程表",
+ // icon: "el-icon-suitcase",
+ // route: "/projectCourse",
+ // index: "projectCourse",
+ // number: "600900",
+ // id:"1001103",
+ // },
+ // {
+ // name: "管理层工资表",
+ // icon: "el-icon-suitcase",
+ // route: "/manageWages",
+ // index: "manageWages",
+ // number: "600900",
+ // id:"1001104",
+ // },
+ // {
+ // name: "员工业绩表",
+ // icon: "el-icon-suitcase",
+ // route: "/IndividualPerformance",
+ // index: "IndividualPerformance",
+ // number: "600900",
+ // id:"1001105",
+ // },
+ // {
+ // name: "头皮项目登记表",
+ // icon: "el-icon-suitcase",
+ // route: "/scalpProject",
+ // index: "scalpProject",
+ // number: "600900",
+ // id:"1001106",
+ // },
+ // {
+ // name: "门店业绩每日明细表",
+ // icon: "el-icon-suitcase",
+ // route: "/monCommission",
+ // index: "monCommission",
+ // number: "600900",
+ // id:"1001107",
+ // },
+ // {
+ // name: "门店现金奖励明细表",
+ // icon: "el-icon-suitcase",
+ // route: "/cashReward",
+ // index: "cashReward",
+ // number: "600900",
+ // id:"1001108",
+ // },
+ // {
+ // name: "奖励明细表",
+ // icon: "el-icon-suitcase",
+ // route: "/monthlyRegistrationDetails",
+ // index: "monthlyRegistrationDetails",
+ // number: "600900",
+ // id:"1001109",
+ // },
+ // {
+ // name: "大项目销卡表",
+ // icon: "el-icon-suitcase",
+ // route: "/projectPinCard",
+ // index: "projectPinCard",
+ // number: "600900",
+ // id:"10011010",
+ // },
+ // {
+ // name: "管理层每日业绩表",
+ // icon: "el-icon-suitcase",
+ // route: "/storeConsultant",
+ // index: "storeConsultant",
+ // number: "600900",
+ // id:"10011011",
+ // },
+ // {
+ // name: "门店营业额登记表",
+ // icon: "el-icon-suitcase",
+ // route: "/storeTurnover",
+ // index: "storeTurnover",
+ // number: "600900",
+ // id:"10011012",
+ // },
+ // {
+ // name: "产品统计",
+ // icon: "el-icon-suitcase",
+ // route: "/productStatistics",
+ // index: "productStatistics",
+ // number: "600900",
+ // id:"10011013",
+ // },
// 统计报表结束
{
name: "门店日总业绩",
diff --git a/src/layout/layout.vue b/src/layout/layout.vue
index 8aa0e55..ac8b55b 100644
--- a/src/layout/layout.vue
+++ b/src/layout/layout.vue
@@ -10,8 +10,8 @@
-
-
+
+
{{storeNum}}
diff --git a/src/pages/eashier/errorOrder/index.vue b/src/pages/eashier/errorOrder/index.vue
index 720394b..4ab90df 100644
--- a/src/pages/eashier/errorOrder/index.vue
+++ b/src/pages/eashier/errorOrder/index.vue
@@ -136,11 +136,22 @@ export default {
}
});
},
+ defaultDate(){ //默认当前月第一天至今
+ let date = new Date()
+ let year = date.getFullYear().toString()
+ let month = date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1).toString():(date.getMonth()+1).toString()
+ let da = date.getDate() < 10 ? '0'+date.getDate().toString():date.getDate().toString()
+ let end = year + '-' + month + '-' + da
+ let beg = year + '-' + month + '-01'
+ this.days = [beg+' 00:00:00',end+' 23:59:59']
+ console.log(this.days)
+ },
},
created() {
- let sDate = this.formatTime(new Date(), "YYYY-MM-DD 00:00:00");
- let eDate = this.formatTime(new Date(), "YYYY-MM-DD 23:59:59");
- this.days = [sDate, eDate];
+ // let sDate = this.formatTime(new Date(), "YYYY-MM-DD 00:00:00");
+ // let eDate = this.formatTime(new Date(), "YYYY-MM-DD 23:59:59");
+ // this.days = [sDate, eDate];
+ this.defaultDate()
this.getData();
if (this.headOffice == 1) {
this.$nextTick(() => {
diff --git a/src/pages/eashier/raiseReatment/components/index.vue b/src/pages/eashier/raiseReatment/components/index.vue
index 00d6b6a..965bb57 100644
--- a/src/pages/eashier/raiseReatment/components/index.vue
+++ b/src/pages/eashier/raiseReatment/components/index.vue
@@ -106,6 +106,11 @@
+
+
+
+
+
@@ -161,6 +166,11 @@
+
+
+
+
+
@@ -529,6 +539,7 @@ export default {
row.index = rowIndex;
},
projectData(form,rows) {
+ console.log(form,rows)
this.storeName = form.storeName
this.storeId = form.storeId
form.memberId = this.proForm.memberId;
@@ -538,7 +549,7 @@ export default {
form.storeName = this.proForm.storeName;
form.memberIdentityCard = this.proForm.identityCard;
console.log( this.openProText )
- if (this.openProText == 0) {
+ if (this.openProText == 0) { //转入
(form.priceMember * form.minumumTimes).toFixed(2) * 1;
form.prices = form.priceMember
form.changeInTime = 0;
@@ -548,7 +559,8 @@ export default {
form.changeInMoneyShow = false;
form.debtMoneyShow = false;
form.changeInCaseTimeShow = false;
- form.deductionRate = ((( form.prices/form.priceMember )*100).toFixed(2)*1 + '%')
+ form.deductionRate = ((( form.prices/form.priceMember )*100).toFixed(2)*1 + '%'),
+ form.anotherName = form.courseProjectName
if (this.inList.length < 1) {
this.inList.push(form);
this.inMoneys = 0;
@@ -562,7 +574,7 @@ export default {
});
}
}
- if (this.openProText == 1) {
+ if (this.openProText == 1) { //转出
form.unitMoney =
(form.courseProjectMoney / form.courseCount).toFixed(2) * 1;project
form.changeOutMoney = 0;
@@ -574,6 +586,7 @@ export default {
form.cardCommissionAmount=rows[0].cardCommissionAmount
form.cardSalesAchievement=rows[0].cardSalesAchievement
form.cardSalesCommission=rows[0].cardSalesCommission
+ form.anotherName = form.courseProjectName
let index = this.outList.findIndex(item=>item.id == form.id)
if(index == -1){
this.outList.push(form);
diff --git a/src/pages/eashier/reatment/components/detail.vue b/src/pages/eashier/reatment/components/detail.vue
index f89a1e0..07d7534 100644
--- a/src/pages/eashier/reatment/components/detail.vue
+++ b/src/pages/eashier/reatment/components/detail.vue
@@ -17,6 +17,11 @@
+
+
+
diff --git a/src/pages/eashier/reatment/reatment.vue b/src/pages/eashier/reatment/reatment.vue
index c4f1875..17ff189 100644
--- a/src/pages/eashier/reatment/reatment.vue
+++ b/src/pages/eashier/reatment/reatment.vue
@@ -72,6 +72,11 @@
+
+
+
+
+
{{scope.row.priceMember?scope.row.priceMember:0}}
@@ -830,7 +835,8 @@ export default {
amount:0,
integralCheckbox:false,
debtAmount:0,
- nowAmount:0
+ nowAmount:0,
+ anotherName:''
})
},
routePush(){
@@ -1338,6 +1344,7 @@ export default {
this.proForm = pros;
if (this.form.memberId) {
this.list[this.selectIndex].projectName = this.proForm.projectName;
+ this.list[this.selectIndex].anotherName = this.proForm.projectName;
this.list[this.selectIndex].projectNum = this.proForm.projectNum;
this.list[this.selectIndex].projctId = this.proForm.id;
this.list[this.selectIndex].price = this.proForm.price;
diff --git a/src/pages/eashier/refund/refund.vue b/src/pages/eashier/refund/refund.vue
index 9b82d69..085da0c 100644
--- a/src/pages/eashier/refund/refund.vue
+++ b/src/pages/eashier/refund/refund.vue
@@ -275,6 +275,7 @@
{{scope.row.memberName?scope.row.memberName:'散客'}}
+
{{scope.row.projectList.length}}
diff --git a/src/pages/eashier/service/captcha.vue b/src/pages/eashier/service/captcha.vue
index bb88310..7fd87b4 100644
--- a/src/pages/eashier/service/captcha.vue
+++ b/src/pages/eashier/service/captcha.vue
@@ -38,7 +38,7 @@
-
+
@@ -46,7 +46,7 @@
{{codeBtnWord}}
-
+
diff --git a/src/pages/eashier/service/course.vue b/src/pages/eashier/service/course.vue
index 8d48bf1..eea6108 100644
--- a/src/pages/eashier/service/course.vue
+++ b/src/pages/eashier/service/course.vue
@@ -4,24 +4,29 @@
+
+
-
+
-
+
-
+
+
+
-
+
-
+
-
+
+
diff --git a/src/pages/eashier/service/detail/editform.vue b/src/pages/eashier/service/detail/editform.vue
index 498f3b8..b823243 100644
--- a/src/pages/eashier/service/detail/editform.vue
+++ b/src/pages/eashier/service/detail/editform.vue
@@ -125,6 +125,7 @@
+
diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue
index e47c941..4699ceb 100644
--- a/src/pages/eashier/service/service.vue
+++ b/src/pages/eashier/service/service.vue
@@ -164,12 +164,23 @@
+
+
+
+
+
{
let blob = new Blob([res]);
var a = document.createElement("a");
@@ -112,6 +112,7 @@ export default {
this.queryForm.startDate = this.days[0];
this.queryForm.endDate = this.days[1];
this.queryForm.storeId = sessionStorage.getItem("storeId");
+ this.queryForm.roleId = JSON.parse(sessionStorage.getItem("userInfo")).roleId
storeDailys(this.queryForm).then((res) => {
this.$refs.form.loading = false
this.disabled = false
diff --git a/src/pages/statistics/storeSummary/index.vue b/src/pages/statistics/storeSummary/index.vue
index 02f179d..763f04c 100644
--- a/src/pages/statistics/storeSummary/index.vue
+++ b/src/pages/statistics/storeSummary/index.vue
@@ -54,6 +54,7 @@