收银修改--

src/api/storeManage.js

@@ -275,7 +275,7 @@ export function propageNew(params) {
 //查询开疗程时人员
 export function selectRatioInfo(params) {
   return service({
-    url: "/api" + "/demay/ssm/staff/selectRatioInfo",
+    url: "/api" + "/demay/ssm/pro/copyProject",
     method: "post",
     data: params
   });

src/components/perform/detail/index.vue

@@ -31,7 +31,6 @@
     </el-table>
     <span slot="footer" class="dialog-footer">
       <el-button size="mini" type="primary" @click="dialogVisible = false">关闭</el-button>
-      </el-button>
     </span>
   </el-dialog>
 </template>
@@ -98,6 +97,10 @@ export default {
           docType: "promotion_card_repay",
           docTypeName: "促销还款",
         },
+        {
+          docType: 'recharge_groupon',
+          docTypeName: "团购卡"
+        },
       ],
       form: {}, //主对象
     };

src/components/perform/index.vue

@@ -59,6 +59,10 @@ export default {
           typeName: "促销",
           typeIndex: 7,
         },
+        {
+          typeName: "团购卡",
+          typeIndex: 10,
+        },
       ],
     };
   },

src/components/project/index.vue

@@ -196,6 +196,15 @@ export default {
             this.rows=res.rows
             // this.radioForm.rows=res.rows
             this.$emit("projectData", this.radioForm,this.rows);
+            this.$message.success({ message: "操作成功" });
+          }else{
+            this.$alert(res.message, "提示", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "warning",
+              center: true,
+              callback: (action) => {},
+            });
           }
         })
       }

src/pages/eashier/service/course.vue

@@ -77,10 +77,10 @@ export default {
       couAccountList(ids).then((res) => {
         if (res.code == "000000") {
           this.list = res.rows;
-          var shopname=sessionStorage.getItem("storeName")
+          var storeId=sessionStorage.getItem("storeId")
-          this.lists =this.list.filter(item=>item.storeName != shopname)
+          console.log('shopname--->',shopname)
-          this.list = this.list.filter(item=>item.storeName == shopname)
+          this.lists =this.list.filter(item=>item.storeId != storeId)
-          
+          this.list = this.list.filter(item=>item.storeId == storeId)
         } else {
           this.$alert(res.message, "查询会员疗程", {
             confirmButtonText: "确定",

src/pages/eashier/service/service.vue

@@ -1351,10 +1351,8 @@ export default {
             collectionRechargeAmount += item.spendMoney*1
             collectionAmounts += ( ( (item.spendMoney*1)/ ((item.discount?item.discount:100)/100) ) + ((item.giftSpendMoney?item.giftSpendMoney*1:0)/(item.discountFreeAmount?item.discountFreeAmount/100:1)))
         })
-        collectionRechargeAmount = collectionRechargeAmount.toFixed(2)*1
+        this.$set(this.list[this.projectIndex],'collectionRechargeAmount',collectionRechargeAmount.toFixed(2)*1)
-        collectionAmounts = collectionAmounts.toFixed(2)*1
+        this.$set(this.list[this.projectIndex],'collectionAmounts', collectionAmounts.toFixed(2)*1)
-        this.$set(this.list[this.projectIndex],'collectionRechargeAmount',collectionRechargeAmount)
-        this.$set(this.list[this.projectIndex],'collectionAmounts',collectionAmounts)
         // 误差
         if((this.list[this.projectIndex].transactionPrice-this.list[this.projectIndex].collectionAmounts)<=this.balance*1 ){
           this.list[this.projectIndex].collectionAmounts = (this.list[this.projectIndex].transactionPrice).toFixed(2)*1
@@ -1365,10 +1363,8 @@ export default {
           collectionRechargeAmount += item.spendMoney*1
           collectionAmounts += ((item.spendMoney*1) + (item.giftSpendMoney?item.giftSpendMoney*1:0))
         })
-        collectionRechargeAmount = collectionRechargeAmount.toFixed(2)*1
+        this.$set(this.list[this.projectIndex],'collectionRechargeAmount',(collectionRechargeAmount).toFixed(2)*1)
-        collectionAmounts = collectionAmounts.toFixed(2)*1
+        this.$set(this.list[this.projectIndex],'collectionAmounts', (collectionAmounts).toFixed(2)*1)
-        this.$set(this.list[this.projectIndex],'collectionRechargeAmount',collectionRechargeAmount)
-        this.$set(this.list[this.projectIndex],'collectionAmounts',collectionAmounts)
         if((this.list[this.projectIndex].transactionPrice-this.list[this.projectIndex].collectionAmounts)<=this.balance*1 ){
           this.list[this.projectIndex].collectionAmounts = (this.list[this.projectIndex].transactionPrice).toFixed(2)*1
         } //误差
@@ -1417,7 +1413,7 @@ export default {
             }else{
               // 当前金额大于当前值
               console.log('当前剩余金额-->',appearPrice,'折扣是多少-->',row.discount)
-              row.spendMoney = appearPrice*(row.discount*1/100).toFixed(2)*1
+              row.spendMoney = (appearPrice*(row.discount*1/100)).toFixed(2)*1
               // this.updataList()
             }
           }else{
@@ -1425,15 +1421,16 @@ export default {
             let total = (row.cardOvers/(row.discount*1)*100 + ( row.cardGiftOvers/( (row.discountFreeAmount?row.discountFreeAmount:100)*1 )*100 )).toFixed(2)*1
             let balanceProportion = (row.cardConsumeMoney*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //可用余额比例
             let giveProportion = (row.cardGiftOvers*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //赠送金额比例
-            balanceProportion = balanceProportion.toFixed(4)*1
+            let balanceConverted = balanceProportion/(row.discount?(row.discount*1/100):1) //可用折算 (比例除以折扣)
-            giveProportion = giveProportion.toFixed(4)*1
+            let giveConverted = giveProportion/(row.discountFreeAmount?(row.discountFreeAmount*1/100):1) //赠送折算
+            let convertedNum = appearPrice/(balanceConverted+giveConverted) //消费金额折算份数
             console.log('可用比例-->',balanceProportion,'赠送比例--->',giveProportion)
             if(appearPrice<total){
               // 够用按比例扣除
-              row.spendMoney = (appearPrice*balanceProportion*((row.discount?row.discount*1:100)/100)).toFixed(2)*1
+              row.spendMoney = (convertedNum*balanceProportion).toFixed(2)*1
-              row.giftSpendMoney = (appearPrice*giveProportion*((row.discountFreeAmount?row.discountFreeAmount*1:100)/100)).toFixed(2)
+              row.giftSpendMoney = (convertedNum*giveProportion).toFixed(2)*1
               row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
-              console.log('来了这里--->')
+              console.log('剩了多少--->',row.cardGiftOvers)
               // this.updataList()
             }else{
               // 如果总额不够付,扣掉所有的折扣可用余额并且把剩余金额也扣掉
@@ -1453,11 +1450,11 @@ export default {
             // 够付的情况按照比例扣除
             let balanceProportion = (row.cardConsumeMoney*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //可用余额比例
             let giveProportion = (row.cardGiftOvers*1)/(row.cardConsumeMoney*1 + row.cardGiftOvers*1) //赠送金额比例
-            balanceProportion = balanceProportion.toFixed(2)*1
+            // row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1
-            giveProportion = giveProportion.toFixed(2)*1
+            // row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1
-            row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1
+            row.spendMoney = (appearPrice*row.cardOvers/( row.cardGiftOvers+row.cardOvers )).toFixed(2)*1
-            row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1
+            row.giftSpendMoney = (appearPrice*row.cardGiftOvers/( row.cardGiftOvers+row.cardOvers )).toFixed(2)*1
-            row.cardGiftOvers = row.cardGiftOvers - row.giftSpendMoney
+            row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
           }else{ 
             row.spendMoney = row.cardOvers
             row.giftSpendMoney = row.cardGiftOvers
@@ -1465,6 +1462,7 @@ export default {
             // this.updataList()
           }
         }
+        this.spendMoney = row.spendMoney
       }else{ //先用实冲，再用赠送
         console.log('来到了门店参数2--->')
         //做法 扣除本次支付/赠送支付/赠送剩余 
@@ -1535,7 +1533,7 @@ export default {
         console.log('上一次的值是多少呢------>',this.spendMoney)
       }
     },
-    endEditcard(row, index) { //看不懂别乱改!!!!!! 
+    endEditcard(row, index) { //计算比较复杂，仔细看每一步 
       //  卡付抵扣金额collectionAmounts  卡付金额collectionRechargeAmount
       //  本次支付spendMoney 可用金额cardConsumeMoney  可用余额cardOvers 可用折扣discount  赠送折扣discountFreeAmount  赠送支付giftSpendMoney 赠送剩余cardGiftOvers 
       //  type:0折扣卡 1赠送卡 2活动卡  noDiscount 0 能打折 1 不打折 
@@ -1549,7 +1547,8 @@ export default {
       let appearPrice = this.list[this.projectIndex].transactionPrice - (this.list[this.projectIndex].collectionAmounts?this.list[this.projectIndex].collectionAmounts*1:0) //本次需要支付的钱
       if(this.useRecharge == 1){ //门店参数 按比例支付
         //  上一次输入的没变
-        if((this.spendMoney*1) === row.spendMoney*1){
+        console.log('上一次--->',this.spendMoney,'现在--->',row.spendMoney)
+        if(this.spendMoney === row.spendMoney){
           console.log('我会到这里呀！！！！')
           // 上一次没改变
           row.cardOvers = (row.cardOvers - (row.spendMoney*1)).toFixed(2)*1
@@ -1571,11 +1570,13 @@ export default {
               //  够支付，按比例扣除,可能赠送存在或者不存在
               let balanceProportion = row.cardOvers*1/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 ))  //可用余额比例
               let giveProportion =  (row.cardGiftOvers*1 + (row.giftSpendMoney?row.giftSpendMoney*1:0))/(row.cardOvers*1+( (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 ))//赠送金额比例
-              balanceProportion = balanceProportion.toFixed(4)*1
+              console.log('--------->比例',balanceProportion,giveProportion)
-              giveProportion = giveProportion.toFixed(4)*1
+              let balanceConverted = balanceProportion/(row.discount?(row.discount*1/100):1) //可用折算 (比例除以折扣)
-              row.spendMoney = (appearPrice*balanceProportion*(row.discount/100)).toFixed(2)*1 //得到支付金额
+              let giveConverted = giveProportion/(row.discountFreeAmount?(row.discountFreeAmount*1/100):1) //赠送折算
+              let convertedNum = appearPrice/(balanceConverted+giveConverted) //消费金额折算份数
+              row.spendMoney = ( convertedNum*balanceProportion ).toFixed(2)*1 //支付金额
               row.cardGiftOvers = (row.giftSpendMoney?row.giftSpendMoney*1:0) + row.cardGiftOvers*1 //还原赠送支付
-              row.giftSpendMoney = ((appearPrice*giveProportion)*(row.discountFreeAmount/100)).toFixed(2)*1 //
+              row.giftSpendMoney =( convertedNum*giveProportion ).toFixed(2)*1 //赠送金额
               row.cardGiftOvers = (row.cardGiftOvers*1 - row.giftSpendMoney*1).toFixed(2)*1 // 赠送剩余= 赠送剩余原始值-赠送支付
               // 有误差
               if(row.cardGiftOvers<0){
@@ -1598,18 +1599,18 @@ export default {
             row.giftSpendMoney = 0 //还原赠送支付
             let balanceProportion =  row.cardOvers/(row.cardOvers + (row.cardGiftOvers?row.cardGiftOvers*1:0)) //  可用金额比例
             let giveProportion = (row.cardGiftOvers?row.cardGiftOvers*1:0)/(row.cardOvers + (row.cardGiftOvers?row.cardGiftOvers*1:0)) //  可用赠送比例
-            balanceProportion = balanceProportion.toFixed(4)*1
+            let balanceConverted = balanceProportion/(row.discount?(row.discount*1/100):1) //可用折算 (比例除以折扣)
-            giveProportion = giveProportion.toFixed(4)*1
+            let giveConverted = giveProportion/(row.discountFreeAmount?(row.discountFreeAmount*1/100):1) //赠送折算
+            let convertedNum = appearPrice/(balanceConverted+giveConverted) //消费金额折算份数
             // 先要判断输入金额是否大于项目金额
             if(row.spendMoney > appearPrice){ // 输入的金额大于项目金额
               this.$message.warning({ message: "支付金额大于成交金额" });
               //  当输入金额大于项目金额时（就是比如说输入400的时候,而这个项目总价是350），帮它自动计算（比例扣除）
               console.log('瞅瞅比例','可用---',balanceProportion,'赠送---',giveProportion)
               // 自动计算
-              row.spendMoney = (appearPrice*balanceProportion*(row.discount/100)).toFixed(2)*1
+              row.spendMoney = (convertedNum*balanceProportion).toFixed(2)*1
               row.cardOvers = (row.cardOvers - row.spendMoney).toFixed(2)*1
-              console.log('可用余额为--->',row.cardOvers)
+              row.giftSpendMoney = (convertedNum*giveProportion).toFixed(2)*1
-              row.giftSpendMoney = ((appearPrice*giveProportion)*(row.discountFreeAmount?row.discountFreeAmount/100:1)).toFixed(2)*1
               row.cardGiftOvers =( row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1
               // 有误差
               if(row.cardGiftOvers<0){
@@ -1625,9 +1626,9 @@ export default {
               console.log('总价--->',total)
               if(total > appearPrice){ //当前输入值折扣大于支付金额
                //  按比例自动计算
-               this.$message.warning({ message: "支付金额大于成交金额" });
+               this.$message.warning({ message: "支付金额大于项目金额" });
-               row.spendMoney = ((appearPrice*balanceProportion)*((row.discount?row.discount*1:100)/100)).toFixed(2)*1  //支付金额
+               row.spendMoney =( convertedNum*balanceProportion ).toFixed(2)*1 //支付金额
-               row.giftSpendMoney = ((appearPrice*giveProportion)*((row.discountFreeAmount?row.discountFreeAmount*1:100)/100)).toFixed(2)*1 //赠送支付
+               row.giftSpendMoney = ( convertedNum*giveProportion ).toFixed(2)*1 //赠送支付
                row.cardOvers = ( row.cardOvers - row.spendMoney ).toFixed(2)*1 //可用余额
                row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余
                if(row.cardGiftOvers<0){
@@ -1638,12 +1639,13 @@ export default {
               //  判断比例支付是否大于支付金额，如果大于，提示它并且帮它自动计算,不大于则扣除相应比例金额
               let giveCase = (((row.spendMoney/(row.discount?row.discount/100:1))/balanceProportion)*giveProportion).toFixed(2)*1 //按照比例算出赠送金额为多少
               console.log('你是多少--->',giveCase,total)
-              if( (giveCase+total)>= appearPrice ){ //如果输入金额折扣跟赠送折扣之和大于待支付金额,重新按照比例计算
+              // giveCase+total)>= appearPrice
+              if( row.spendMoney>(convertedNum*balanceProportion) ){ //输入的值大于需要支付金额
               console.log('误差是多少--->',giveCase+total,'待支付是多少--->',appearPrice)
-                if(((giveCase+total)-appearPrice)>= this.balance*1)this.$message.warning({ message: "输入金额金额跟赠送金额之和大于成交金额" });
+                this.$message.warning({ message: "支付金额大于项目金额" });
-                // 重新帮忙计算
+                // 重新计算
-                row.spendMoney = ((appearPrice*balanceProportion)*((row.discount?row.discount*1:100)/100)).toFixed(2)*1 //支付金额
+                row.spendMoney = (convertedNum*balanceProportion).toFixed(2)*1 //支付金额
-                row.giftSpendMoney = ((appearPrice*giveProportion)*((row.discountFreeAmount?row.discountFreeAmount*1:100)/100)).toFixed(2)*1 //赠送支付
+                row.giftSpendMoney = (convertedNum*giveProportion).toFixed(2)*1 //赠送支付
                 row.cardOvers = ( row.cardOvers - row.spendMoney ).toFixed(2)*1 //赠送支付
                 row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余
                 // 有误差
@@ -1652,9 +1654,12 @@ export default {
                 }
                 this.updataList()
               }else{ //按照输入扣除
-                  console.log('我到了这里呀！！！',giveProportion,balanceProportion)
+                  // console.log('我到了这里呀！！！',giveProportion,balanceProportion)
+                  let zsbl = row.spendMoney/(convertedNum*balanceProportion)
+                  console.log('比例是多少---->',zsbl,'这个呢--->',convertedNum)
                   row.cardOvers = ( row.cardOvers - row.spendMoney ).toFixed(2)*1 //可用余额
-                  row.giftSpendMoney = ((((row.spendMoney/(row.discount?row.discount/100:1))/balanceProportion)*giveProportion)*((row.discountFreeAmount?row.discountFreeAmount*1:100)/100)).toFixed(2)*1  //赠送支付(按比例公式--- 支付金额/支付折扣/支付比例*赠送比例*赠送折扣 ---)
+                  row.giftSpendMoney = (convertedNum*giveProportion*zsbl).toFixed(2)*1
+                  // row.giftSpendMoney = ((((row.spendMoney/(row.discount?row.discount/100:1))/balanceProportion)*giveProportion)*((row.discountFreeAmount?row.discountFreeAmount*1:100)/100)).toFixed(2)*1  //赠送支付(按比例公式--- 支付金额/支付折扣/支付比例*赠送比例*赠送折扣 ---)
                   console.log('赠送支付为多少---->',row.giftSpendMoney)
                   row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余
                   // 有误差
@@ -1681,9 +1686,12 @@ export default {
           let total = row.cardOvers + row.cardGiftOvers
           console.log('为多少--->',row.cardOvers,row.cardGiftOvers)
           if(total>appearPrice){ //当（可用余额加上可用赠送）大于项目金额时，按比例自动扣除
-            row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1 //支付金额
+            // row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1 //支付金额
+            // row.cardOvers = row.cardOver - row.spendMoney //可用余额= 可用余额-支付金额
+            // row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1 //赠送支付金额
+            row.spendMoney = (appearPrice*row.cardOver/(row.cardOver+row.cardGiftOvers)).toFixed(2)*1
             row.cardOvers = row.cardOver - row.spendMoney //可用余额= 可用余额-支付金额
-            row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1 //赠送支付金额
+            row.giftSpendMoney = (appearPrice*row.cardGiftOvers/(row.cardOver+row.cardGiftOvers)).toFixed(2)*1
             row.cardGiftOvers =( row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余 = 赠送剩余-赠送支付
             this.updataList()
           }else{ //（可用余额跟赠送支付）小于项目金额,自动扣除全部
@@ -1698,29 +1706,35 @@ export default {
             if(row.spendMoney > appearPrice){ //如果支付金额大于项目金额
               this.$message.warning({ message: "支付金额不能大于成交金额" });
               // 大于的话自动计算
-              row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1 //支付金额
+              // row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1 //支付金额
+              // row.cardOvers = row.cardOvers - row.spendMoney //可用余额=可用余额-支付金额
+              // row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1 //赠送支付金额
+              row.spendMoney = (appearPrice*row.cardOvers/(row.cardOvers + row.cardGiftOvers)).toFixed(2)*1 //本次支付
+              row.giftSpendMoney = (appearPrice*row.cardGiftOvers/(row.cardGiftOvers + row.cardOvers)).toFixed(2)*1  //本次赠送支付
               row.cardOvers = row.cardOvers - row.spendMoney //可用余额=可用余额-支付金额
-              row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1 //赠送支付金额
               row.cardGiftOvers = (row.cardOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余= 赠送剩余-赠送支付
               this.updataList()
             }else{ //输入的金额不大于项目金额
               // 需要判断比例总和是否大于项目金额
-              let giveCase = ((row.spendMoney/balanceProportion)*giveProportion).toFixed(2)*1 //按比例算出的赠送支付
+              // let giveCase = ((row.spendMoney/balanceProportion)*giveProportion).toFixed(2)*1 //按比例算出的赠送支付
+              let giveCase = 0 //按照比例需要付赠送多少钱
+              let spendMoney= (appearPrice*row.cardOvers/(row.cardOvers + row.cardGiftOvers)).toFixed(2)*1
+              giveCase = ((row.spendMoney/spendMoney)*((appearPrice*row.cardGiftOvers/(row.cardGiftOvers + row.cardOvers))).toFixed(2)*1)
+              console.log('按比例是多少----->',row.spendMoney/spendMoney,'赠送呢--->',giveCase)
               if(((row.spendMoney*1 + giveCase)*1) > appearPrice){ 
                 // 如果按比例之和大于项目金额，大于的情况一定是够支付的！！！
-                console.log((((row.spendMoney*1 + giveCase)*1) - appearPrice),'---<为多少')
+                this.$message.warning({ message: "支付金额大于项目金额" }); //判断误差
-                if((((row.spendMoney*1 + giveCase)*1) - appearPrice)>=this.balance*1)this.$message.warning({ message: "按比例支付总和大于成交金额" }); //判断误差
                 // 自动计算
                 console.log('是多少-->',row.spendMoney,'总额-->',row.cardOvers)
-                row.spendMoney = (appearPrice*balanceProportion).toFixed(2)*1 //支付金额
+                row.spendMoney = (appearPrice*row.cardOvers/(row.cardOvers + row.cardGiftOvers)).toFixed(2)*1 //支付金额
+                row.giftSpendMoney = (appearPrice*row.cardGiftOvers/(row.cardGiftOvers + row.cardOvers)).toFixed(2)*1 //赠送支付金额
                 row.cardOvers = row.cardOvers - row.spendMoney //可用余额=可用余额-支付金额
-                row.giftSpendMoney = (appearPrice*giveProportion).toFixed(2)*1 //赠送支付金额
                 row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余= 赠送剩余-赠送支付
                 this.updataList()
               }else{ //按比例支付总和不大于项目金额
                 row.spendMoney = row.spendMoney*1
+                row.giftSpendMoney = ((appearPrice*row.cardGiftOvers/(row.cardGiftOvers + row.cardOvers))*(row.spendMoney/spendMoney)).toFixed(2)*1 //赠送支付
                 row.cardOvers = row.cardOvers - row.spendMoney //可用余额
-                row.giftSpendMoney = ((row.spendMoney/balanceProportion)*giveProportion).toFixed(2)*1 //赠送支付
                 row.cardGiftOvers = (row.cardGiftOvers - row.giftSpendMoney).toFixed(2)*1 //赠送剩余
                 this.updataList()
               }

src/pages/promotion/recpromotion/components/edit.vue

@@ -7,13 +7,12 @@
       <el-form-item required label="类别名称" prop="rechargeTypeName">
         <el-input class="form-width" :disabled="title == '明细'" v-model.trim="form.rechargeTypeName" autocomplete="off" placeholder="请输入类别名称" maxlength="50"></el-input>
       </el-form-item>
-      <el-form-item required label="有效期(月)" prop="validTime">
+      <el-form-item label="有效期(月)" >
         <el-input class="form-width" :disabled="title == '明细'" v-model.trim="form.validTime" autocomplete="off" placeholder="请选择有效期(月)">
         </el-input>
       </el-form-item>
       <el-form-item label="到期日期：" title="会员卡包统一到期日期" prop="unifiedDue">
         <el-date-picker class="form-width" v-model="form.unifiedDue" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择到期日期"></el-date-picker>
-        </div>
       </el-form-item>
       <el-form-item required label="开始日期" prop="startDates">
         <el-date-picker class="form-width" :disabled="title == '明细'" v-model.trim="form.startDates" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"></el-date-picker>

src/pages/statistics/staffBrokerage/detail/index.vue

@@ -35,7 +35,6 @@
     <orderdetail ref="orderdetail"></orderdetail>
     <span slot="footer" class="dialog-footer">
       <el-button size="mini" type="primary" @click="dialogVisible = false">关闭</el-button>
-      </el-button>
     </span>
   </el-dialog>
 </template>
@@ -58,6 +57,10 @@ export default {
           docType: "card_recharge",
           docTypeName: "充值开卡",
         },
+        {
+          docType: 'recharge_groupon',
+          docTypeName: "团购卡"
+        },
         {
           docType: "recharge_roll_course",
           docTypeName: "疗程转充值卡",

src/pages/statistics/storeDaily/form.vue

@@ -6,6 +6,18 @@
               color: '#eeeeee',
             }" show-summary border max-height="600">
             <el-table-column align="center" min-width="75" prop="date" label="日期"></el-table-column>
+            <!-- <el-table-column align="center" label="总营业额"></el-table-column>
+            <el-table-column align="center" label="充值业绩"></el-table-column>
+            <el-table-column align="center" label="疗程业绩"></el-table-column>
+            <el-table-column align="center" label="充值卡购买疗程"  min-width="100"></el-table-column> -->
+            <el-table-column align="center" label="服务">
+              <el-table-column align="center"  prop="cashMoney" label="总金额">
+              </el-table-column>
+              <el-table-column align="center" prop="cashierCashMoney" label="现付">
+              </el-table-column>
+              <el-table-column align="center" prop="cashierCardMoney" label="卡付">
+              </el-table-column>
+            </el-table-column>
             <el-table-column align="center" label="客单数">
               <el-table-column align="center" min-width="60" prop="rechargeOrderNum" label="充值">
               </el-table-column>
@@ -20,14 +32,6 @@
             <el-table-column align="center" prop="coursexMoney" label="现付"></el-table-column>
             <el-table-column align="center" prop="coursekMoney" label="卡付"></el-table-column>
             </el-table-column>
-            <el-table-column align="center" label="服务">
-              <el-table-column align="center"  prop="cashMoney" label="总金额">
-              </el-table-column>
-              <el-table-column align="center" prop="cashierCashMoney" label="现付金额">
-              </el-table-column>
-              <el-table-column align="center" prop="cashierCardMoney" label="卡付金额">
-              </el-table-column>
-            </el-table-column>
             <el-table-column align="center" label="项目男女客数">
               <el-table-column align="center" min-width="60" prop="man" label="男客">
               </el-table-column>
@@ -41,12 +45,12 @@
             </el-table-column>
             <el-table-column align="center" min-width="60" prop="refundMoney" label="退款金额">
             </el-table-column>
-            <el-table-column align="center" min-width="60"  label="会员">
+            <!-- <el-table-column align="center" min-width="60"  label="消费退">
+            </el-table-column> -->
+            <el-table-column align="center"   label="会员">
             <el-table-column align="center" min-width="60" prop="newMemberNum" label="新增"></el-table-column>
-            <el-table-column align="center" min-width="60" prop="startMemberNum" label="启用" v-if="headOffice==1">
+            <el-table-column align="center" min-width="60" prop="startMemberNum" label="启用" v-if="headOffice==1"></el-table-column>
-            </el-table-column>
+            <!-- <el-table-column align="center" min-width="60" prop="memberNum" label="总数" v-if="headOffice==1"></el-table-column> -->
-            <el-table-column align="center" min-width="60" prop="memberNum" label="总数" v-if="headOffice==1">
-            </el-table-column>
             </el-table-column>
           </el-table>
         </div>

src/pages/storeManage/baseProject/components/edit.vue

@@ -3,7 +3,7 @@
     <div class="max-height-60">
       <el-form :model="form" ref="form" inline label-width="100px" :rules="rules">
         <el-form-item label="项目类别：" prop="projectTypeName">
-          <el-select class="form-width" :disabled="title=='明细'" filterable default-first-option filterable default-first-option v-model="form.projectTypeName" clearable placeholder="请选择">
+          <el-select class="form-width" :disabled="title=='明细'" filterable default-first-option  v-model="form.projectTypeName" clearable placeholder="请选择">
             <el-option v-for="item in projecttypenames" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
@@ -34,7 +34,7 @@
             <el-radio :disabled="title=='明细'" v-model="form.noDiscount" :label="1">否</el-radio>
           </div>
         </el-form-item>
-        <el-form-item label="有效期限：" prop="validTime" v-if="
+        <el-form-item label="有效期限：" v-if="
                       sessionStorageData.allowValid == 1 && !form.directConsumption==1
                     ">
           <el-input class="form-width" :disabled="title=='明细'" oninput="this.value=this.value.replace(/\D/g,'')" placeholder='请输入有效期限(月)' pattern="[0-9]*" v-model="form.validTime" autocomplete="on"></el-input>

src/pages/storeManage/trading/components/cash.vue

@@ -250,9 +250,12 @@ export default {
             if (item.type == "card_repay") {
               item.docTypeName = "还款";
             }
+            if(item.accountType == 'recharge_groupon·'){
+              item.docTypeName = '团购卡'
+            }
             if (item.type == "card_repay") {
               if (item.orderType == "course") {
-                item.docTypeName = "疗程" + item.docTypeName+'测试----';
+                item.docTypeName = "疗程" + item.docTypeName;
               }
               if (item.orderType == "recharge") {
                 item.docTypeName = "充值" + item.docTypeName;

src/pages/storeManage/trading/components/recdetail.vue

@@ -163,6 +163,10 @@ export default {
           docType: "promotion_card_repay",
           docTypeName: "促销还款",
         },
+        {
+          docType: 'recharge_groupon',
+          docTypeName: "团购卡"
+        }
       ],
     };
   },
@@ -217,6 +221,9 @@ export default {
             });
           });
           res.pageInfo.list.forEach((item) => {
+            if( item.accountType == 'recharge_groupon'){
+                item.docTypeName = "团购卡";
+            }
             if (item.type == "card_repay") {
               item.docTypeName = "还款";
             }