From 74d2be15bceab34b4e4b6cf2aaa77e94d4dec3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E5=98=89=E4=BF=8A?= <2721129340@qq.com>
Date: Tue, 27 Jun 2023 16:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BFbug=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/storeManage.js                        |   3 +-
 src/components/repayment/index.vue            |   5 +
 src/components/trading/components/cash.vue    |   1 +
 src/components/trading/components/pro.vue     |   1 +
 src/components/trading/components/pros.vue    |   1 +
 src/layout/components/Emain.vue               |   2 +-
 src/layout/components/asider.vue              | 192 +++++++++---------
 src/layout/layout.vue                         |   4 +-
 src/pages/eashier/errorOrder/index.vue        |  17 +-
 .../raiseReatment/components/index.vue        |  19 +-
 .../eashier/reatment/components/detail.vue    |   5 +
 src/pages/eashier/reatment/reatment.vue       |   9 +-
 src/pages/eashier/refund/refund.vue           |   1 +
 src/pages/eashier/service/captcha.vue         |   4 +-
 src/pages/eashier/service/course.vue          |  17 +-
 src/pages/eashier/service/detail/editform.vue |   1 +
 src/pages/eashier/service/service.vue         |  14 +-
 .../statistics/storeDaily/storeDaily.vue      |   3 +-
 src/pages/statistics/storeSummary/index.vue   |   8 +-
 .../storeTotalPerformance/index.vue           |   7 +-
 .../storeParameters/component/store.vue       |  23 +--
 .../storeManage/trading/components/cash.vue   |   1 +
 .../storeManage/trading/components/pro.vue    |   1 +
 .../storeManage/trading/components/pros.vue   |   1 +
 24 files changed, 198 insertions(+), 142 deletions(-)

diff --git a/src/api/storeManage.js b/src/api/storeManage.js
index 676adff..27fbe65 100644
--- a/src/api/storeManage.js
+++ b/src/api/storeManage.js
@@ -1456,6 +1456,7 @@ export function groupCourse(params) {
   return service({
     url: "/api" + "/demay/ssm/course/groupCourse",
     method: "post",
-    data: params
+    data: params,
+    responseType:'blob'
   });
 }
diff --git a/src/components/repayment/index.vue b/src/components/repayment/index.vue
index 236f527..7d5eae0 100644
--- a/src/components/repayment/index.vue
+++ b/src/components/repayment/index.vue
@@ -83,6 +83,11 @@
             </template>
           </el-table-column>
           <el-table-column prop="tradeName" show-overflow-tooltip label="名称" align="center" min-width="90"></el-table-column>
+          <el-table-column prop="anotherName" show-overflow-tooltip label="别名" align="center" min-width="90">
+            <template slot-scope="scope">
+              <span> {{ scope.row.docType=='card_use'?scope.row.anotherName:'暂无' }} </span>
+            </template>
+          </el-table-column>
           <el-table-column prop="tradeMoney" label="成交额" align="center" width="75"></el-table-column>
           <el-table-column prop="debtMoney" label="欠款" align="center" width="75"></el-table-column>
           <el-table-column prop="paymentMoney" label="本次还款" align="center" width="75">
diff --git a/src/components/trading/components/cash.vue b/src/components/trading/components/cash.vue
index d69ae5d..83c4d11 100644
--- a/src/components/trading/components/cash.vue
+++ b/src/components/trading/components/cash.vue
@@ -25,6 +25,7 @@
       <el-table-column show-overflow-tooltip align="center" label="交易">
         <el-table-column show-overflow-tooltip align="center" min-width="100" prop="accountNum" label="编码"></el-table-column>
         <el-table-column show-overflow-tooltip align="center" min-width="130" prop="tradeName" label="名称"></el-table-column>
+        <el-table-column show-overflow-tooltip align="center" min-width="100" prop="anotherName" label="别名"></el-table-column>
         <el-table-column show-overflow-tooltip align="center" min-width="80" prop="price" label="单价">
           <template slot-scope="scope">
             <div>
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 @@
       <el-table-column type="index" width="40" align="center"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="courseProjectNum" label="编码"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="courseProjectName" label="名称"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="100" prop="anotherName" label="别名"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="80" prop="price" label="单价"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" label="余次">
         <el-table-column show-overflow-tooltip align="center" min-width="80" prop="courseRestCount" label="剩余"></el-table-column>
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 @@
       <el-table-column type="index" width="40" align="center"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="courseProjectNum" label="编码"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="courseProjectName" label="名称"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="100" prop="anotherName" label="别名"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="80" prop="price" label="单价"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" label="余次">
         <el-table-column show-overflow-tooltip align="center" min-width="80" prop="courseRestCount" label="剩余"></el-table-column>
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 @@
               <i :class="[isShow==true?'el-icon-s-unfold':'el-icon-s-fold']"></i>
             </div>
             <div @click='ruotes' style='cursor: pointer'>
-              <!-- <span class="headertitle">门店业务</span> -->
-              <span class="headertitle">代收业务</span>
+              <span class="headertitle">门店业务</span>
+              <!-- <span class="headertitle">代收业务</span> -->
               <span class="text-white ">
                 {{storeNum}}
               </span>
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 @@
               </el-table-column>
               <el-table-column label="项目编码" align="center" prop="courseProjectNum" min-width="80"></el-table-column>
               <el-table-column label="账户名称" align="center" prop="courseProjectName" min-width="140"></el-table-column>
+              <el-table-column label="别名" align="center" prop="anotherName" min-width="140">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.anotherName"></el-input>
+                </template>
+              </el-table-column>
               <el-table-column label="剩余金额" align="center" min-width="80" prop="courseRestPrice"></el-table-column>
               <el-table-column label="剩余次数" align="center"  min-width="80" prop="courseRestCount"></el-table-column>
               <el-table-column label="可用次数" align="center" prop="courseConsumeCount" min-width="80"></el-table-column>
@@ -161,6 +166,11 @@
               </el-table-column>
               <el-table-column label="账户名称" show-overflow-tooltip align="center" prop="projectName" min-width="110">
               </el-table-column>
+              <el-table-column label="别名" align="center" prop="anotherName" min-width="140">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.anotherName"></el-input>
+                </template>
+              </el-table-column>
               <el-table-column label="标准单价" align="center" prop="priceMember" min-width="70"></el-table-column>
               <el-table-column label="最低单价" align="center" prop="minumumPriceMember" min-width="70"></el-table-column>
               <el-table-column label="扣率" align="center" prop="deductionRate" min-width="70">
@@ -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 @@
       <el-table-column align="center" prop="mobilePhone" label="手机号码" min-width="100"> </el-table-column>
       <el-table-column align="center" prop="projectNum" label="疗程编码" min-width="100"> </el-table-column>
       <el-table-column align="center" prop="projectName" label="疗程名称" min-width="100"> </el-table-column>
+      <el-table-column align="center" prop="anotherName" label="别名" min-width="100">
+        <!-- <template slot-scope="scope">
+          <el-input v-model="scope.row.anotherName"></el-input>
+        </template> -->
+      </el-table-column>
       <el-table-column align="center" prop="priceMember" label="单价" min-width="80"> </el-table-column>
       <el-table-column align="center" prop="salesPrice" label="成交单价" min-width="80"> </el-table-column>
       <el-table-column align="center" prop="numberTimes" label="购买次数" min-width="80"> </el-table-column>
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 @@
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip min-width="120" align="center" prop="projectName" label="疗程名称"></el-table-column>
+        <el-table-column show-overflow-tooltip min-width="120" align="center" prop="anotherName" label="别名">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.anotherName" v-if="scope.row.projectNum"></el-input>
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="priceMember" label="单次标价" min-width="120">
           <template slot-scope="scope">
             <div class="form-width-xs pointer"><span class="text-price text-red">{{scope.row.priceMember?scope.row.priceMember:0}}</span></div>
@@ -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 @@
             <template slot-scope="scope">{{scope.row.memberName?scope.row.memberName:'散客'}}</template>
           </el-table-column>
           <el-table-column align="center" min-width="150" prop="projectName" label="消费项目"></el-table-column>
+          <el-table-column align="center" min-width="120" prop="anotherName" label="别名"></el-table-column>
           <el-table-column align="center" min-width="80" label="项目数目">
             <template slot-scope="scope">
               <div>{{scope.row.projectList.length}}</div>
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 @@
   <div class="maxbox" v-if="radio==2">
     <div class="box">
         <div class="center">
-            <el-form ref="form" :model="form" label-width="55px" label-position='left'>
+            <el-form ref="form" :model="form" label-width="55px" label-position='left' @submit.native.prevent>
                 <el-form-item label="验证码">
                     <el-input v-model="inpt" placeholder="请输入验证码" style="width:150px"></el-input>
                 </el-form-item>
@@ -46,7 +46,7 @@
             <el-button style="height:0.2rem;margin-left:10px" @click="getCode" :class="{'disabled-style':getCodeBtnDisable}" :disabled="getCodeBtnDisable" type="primary">{{codeBtnWord}}</el-button>
         </div>
         <div class="center">
-            <el-form ref="form" :model="form" label-width="55px" label-position='left'>
+            <el-form ref="form" :model="form" label-width="55px" label-position='left' @submit.native.prevent>
                 <el-form-item label="新密码">
                     <el-input type="password" v-model="password" style="width:150px" placeholder="请输入新密码"></el-input>
                 </el-form-item>
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 @@
       <el-collapse-item title="项目：" :name="1">
         <el-table :data="list" max-height="350" @row-dblclick="rowClick" stripe>
           <el-table-column show-overflow-tooltip min-width="120" align="left" prop="courseProjectName" label="项目名称"></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="120" align="left" prop="anotherName" label="别名"></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="80" align="left" prop="courseProjectNum" label="项目编码"></el-table-column>
           <el-table-column show-overflow-tooltip min-width="75" align="center" prop="price" label="项目单价"></el-table-column>
-          <el-table-column show-overflow-tooltip min-width="75" align="center" prop="courseRestCount" label="剩余次数"></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="70" align="center" prop="courseRestCount" label="剩余次数"></el-table-column>
           <el-table-column show-overflow-tooltip min-width="75" align="center" prop="courseRestPrice" label="剩余金额"></el-table-column>
-          <el-table-column show-overflow-tooltip min-width="75" align="center" prop="courseConsumeCount" label="可用次数"></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="70" align="center" prop="courseConsumeCount" label="可用次数"></el-table-column>
           <el-table-column show-overflow-tooltip min-width="75" align="center" prop="courseConsumePrice" label="可用金额"></el-table-column>
-          <el-table-column show-overflow-tooltip min-width="105" align="center" prop="endTime" label="到期日期"></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="90" align="center" prop="kaiKaDate" label="开卡日期"></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="90" align="center" prop="endTime" label="到期日期"></el-table-column>
           <el-table-column show-overflow-tooltip min-width="75" align="center" prop="storeName" label="所属门店"></el-table-column>
         </el-table>
       </el-collapse-item>
       <el-collapse-item title="不可用项目：" :name="2">
         <el-table :data="lists" max-height="350" stripe>
           <el-table-column show-overflow-tooltip min-width="120" align="left" prop="courseProjectName" label="项目名称"></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="120" align="left" prop="courseProjectNum" label="项目编码"></el-table-column>
           <el-table-column show-overflow-tooltip min-width="75" align="center" prop="price" label="项目单价"></el-table-column>
-          <el-table-column show-overflow-tooltip min-width="75" align="center" prop="courseRestCount" label="剩余次数"></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="70" align="center" prop="courseRestCount" label="剩余次数"></el-table-column>
           <el-table-column show-overflow-tooltip min-width="75" align="center" prop="courseRestPrice" label="剩余金额"></el-table-column>
-          <el-table-column show-overflow-tooltip min-width="75" align="center" prop="courseConsumeCount" label="可用次数"></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="70" align="center" prop="courseConsumeCount" label="可用次数"></el-table-column>
           <el-table-column show-overflow-tooltip min-width="75" align="center" prop="courseConsumePrice" label="可用金额"></el-table-column>
-          <el-table-column show-overflow-tooltip min-width="105" align="center" prop="endTime" label="到期日期"></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="90" align="center" prop="kaiKaDate" label="开卡日期"></el-table-column>
+          <el-table-column show-overflow-tooltip min-width="90" align="center" prop="endTime" label="到期日期"></el-table-column>
           <el-table-column show-overflow-tooltip min-width="75" align="center" prop="storeName" label="所属门店"></el-table-column>
         </el-table>
       </el-collapse-item>
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 @@
             </el-table-column>
             <el-table-column show-overflow-tooltip min-width="100" align="center" prop="projectNum" label="项目编码"></el-table-column>
             <el-table-column show-overflow-tooltip min-width="120" align="center" prop="projectName" label="项目名称"></el-table-column>
+            <el-table-column show-overflow-tooltip min-width="120" align="center" prop="anotherName" label="别名"></el-table-column>
             <el-table-column show-overflow-tooltip min-width="100" align="center" prop="transactionPrice" label="项目金额"></el-table-column>
             <el-table-column show-overflow-tooltip min-width="100" align="center" prop="" label="支付类型">
               <template slot-scope="scope">
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 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            min-width="110"
+            min-width="120"
             align="center"
             prop="projectName"
             label="项目名称"
           >
           </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            min-width="140"
+            align="center"
+            prop="anotherName"
+            label="别名"
+          >
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.anotherName"></el-input>
+          </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="noDiscount"
@@ -2528,6 +2539,7 @@ export default {
             cardAchievementTechnician: res.data.cardAchievementTechnician,
             cardAchievementZhonggong: res.data.cardAchievementZhonggong,
             projectName: res.data.projectName,
+            anotherName: res.data.projectName, //别名
             projectNum: res.data.projectNum,
             courseAccountId: row.courseAccountId,
             courseMoney:row.courseAccountId?row.price:0,
diff --git a/src/pages/statistics/storeDaily/storeDaily.vue b/src/pages/statistics/storeDaily/storeDaily.vue
index 12000fd..ac734cd 100644
--- a/src/pages/statistics/storeDaily/storeDaily.vue
+++ b/src/pages/statistics/storeDaily/storeDaily.vue
@@ -70,7 +70,7 @@ export default {
     exit() {
       let date1 = this.formatTime(this.days[0], "YYYY-MM-DD");
       let date2 = this.formatTime(this.days[1], "YYYY-MM-DD");
-      let form = { startDate: date1, endDate: date2 };
+      let form = { startDate: date1, endDate: date2,roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId };
       exportachi(form).then((res) => {
         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 @@
 <script>
 import { exportStoreDailys,exportStore } from "@/api/statistics.js";
 export default {
+  name:"storeSummary",
   data() {
     return {
       disabled:false,
@@ -95,7 +96,6 @@ export default {
     };
   },
   created() {
-    // this.defaultDate()
     this.init()
   },
   methods: {
@@ -103,7 +103,8 @@ export default {
       this.butLoadIng = true
       let params = {
         startDate:this.days[0],
-        endDate:this.days[1]
+        endDate:this.days[1],
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
       }
       exportStore(params).then(res=>{
           this.butLoadIng = false
@@ -120,7 +121,8 @@ export default {
       this.loading = true
       let params = {
         startDate:this.days[0],
-        endDate:this.days[1]
+        endDate:this.days[1],
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
       }
       this.disabled = true
       exportStoreDailys(params).then(res=>{
diff --git a/src/pages/statistics/storeTotalPerformance/index.vue b/src/pages/statistics/storeTotalPerformance/index.vue
index f4c7055..38e6728 100644
--- a/src/pages/statistics/storeTotalPerformance/index.vue
+++ b/src/pages/statistics/storeTotalPerformance/index.vue
@@ -73,6 +73,7 @@
   <script>
   import { storeByDayDailys,exportStoreByDayDailys } from "@/api/statistics.js";
   export default {
+    name:"storeTotalPerformance",
     data() {
       return {
         disabled:false,
@@ -90,7 +91,8 @@
       },
       exit(){
         let params = {
-          storeId:sessionStorage.getItem("storeId")
+          storeId:sessionStorage.getItem("storeId"),
+          roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
         }
         if(this.Time!=null){
           params.startTime = this.formatTime(this.Time[0], "YYYY-MM-DD 00:00:00");
@@ -121,7 +123,8 @@
       init(){
         this.loading = true
         let params = {
-          storeId:sessionStorage.getItem("storeId")
+          storeId:sessionStorage.getItem("storeId"),
+          roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
         }
         if(this.Time!=null){
           params.startTime = this.formatTime(this.Time[0], "YYYY-MM-DD 00:00:00");
diff --git a/src/pages/storeManage/storeParameters/component/store.vue b/src/pages/storeManage/storeParameters/component/store.vue
index f988924..e35195f 100644
--- a/src/pages/storeManage/storeParameters/component/store.vue
+++ b/src/pages/storeManage/storeParameters/component/store.vue
@@ -44,28 +44,11 @@ export default {
   },
   methods:{
     handleConfirm(){
-      // if(!this.form.maximumAmount){
-      //   return this.$message({
-      //       type: "info",
-      //       message: "请先选择门店",
-      //     });
-      // }else{
-        let store = this.options[this.options.findIndex(item=>item.id === this.storeId)]
+        let store = this.options[this.options.findIndex(item=>item.storeId === this.storeId)]
         this.$emit('getData',null,this.storeId,true)
         this.$emit('updataStore',store.storeNum + '-' + store.storeName)
         sessionStorage.setItem('formData',JSON.stringify(this.form))
         this.handleCancel()
-        // this.loading = true
-        // totalData( this.form ).then(res=>{
-        //   if(res.code == '000000'){
-        //     this.loading = false
-        //     this.$message.success({ message: "操作成功" });
-        //     this.handleCancel()
-        //   }else{
-        //     this.loading = false
-        //   }
-        // })
-      // }
     },
     handleCancel(){
         this.showVisible = false
@@ -77,10 +60,10 @@ export default {
         done(); 
     },
     getData(id){
+      console.log(this.options)
       if(id){
           // 拿到店名
-          let storeName = this.options[this.options.findIndex(item=>item.id === id)].storeName
-          console.log(id)
+          let storeName = this.options[this.options.findIndex(item=>item.storeId === id)].storeName
           this.form =  { toreIds:id+'|'+storeName }
           this.getOtherStore(id)
       }else{
diff --git a/src/pages/storeManage/trading/components/cash.vue b/src/pages/storeManage/trading/components/cash.vue
index f653ea8..2351524 100644
--- a/src/pages/storeManage/trading/components/cash.vue
+++ b/src/pages/storeManage/trading/components/cash.vue
@@ -30,6 +30,7 @@
       <el-table-column show-overflow-tooltip align="center" label="交易">
         <el-table-column show-overflow-tooltip align="center" min-width="100" prop="accountNum" label="编码"></el-table-column>
         <el-table-column show-overflow-tooltip align="center" min-width="130" prop="tradeName" label="名称"></el-table-column>
+        <el-table-column show-overflow-tooltip align="center" min-width="100" prop="anotherName" label="别名"></el-table-column>
         <el-table-column show-overflow-tooltip align="center" min-width="80" prop="price" label="单价">
           <template slot-scope="scope">
             <div>
diff --git a/src/pages/storeManage/trading/components/pro.vue b/src/pages/storeManage/trading/components/pro.vue
index 788a825..7412bc3 100644
--- a/src/pages/storeManage/trading/components/pro.vue
+++ b/src/pages/storeManage/trading/components/pro.vue
@@ -4,6 +4,7 @@
       <el-table-column type="index" width="40" align="center"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="courseProjectNum" label="编码"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="courseProjectName" label="名称"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="100" prop="anotherName" label="别名"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="80" prop="price" label="单价"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" label="余次">
         <el-table-column show-overflow-tooltip align="center" min-width="80" prop="courseRestCount" label="剩余"></el-table-column>
diff --git a/src/pages/storeManage/trading/components/pros.vue b/src/pages/storeManage/trading/components/pros.vue
index af3c076..2927668 100644
--- a/src/pages/storeManage/trading/components/pros.vue
+++ b/src/pages/storeManage/trading/components/pros.vue
@@ -4,6 +4,7 @@
       <el-table-column type="index" width="40" align="center"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="courseProjectNum" label="编码"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="100" prop="courseProjectName" label="名称"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="100" prop="anotherName" label="别名"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="80" prop="price" label="单价"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" label="余次">
         <el-table-column show-overflow-tooltip align="center" min-width="80" prop="courseRestCount" label="剩余"></el-table-column>