1

src/assets/common/lang/EN/fill.js

@@ -1505,6 +1505,7 @@ export const obj = {
   guoneilyjp: 'Domestic through Air Tickets',
   jishunzengs: 'Machine loss increases revenue',
   kaipiaofeiyong: 'Billing fee',
+  memberRebate: 'Member Rebate',
   peichangbjlr: 'Compensation (not profit)',
   baoxianfei: 'Insurance premium',
   qitazhichu: 'Other expenditures',
@@ -1810,7 +1811,7 @@ export const obj = {
   zhuchengbdjzets: 'Note: Total cost documents + commission - Tip income - ground income',
   lirunjsgzqkzs: 'Profit',
   dangqianlirun: 'Current profit',
-  zhushisjtkts: 'Note: Actual collection - refund -(cost payable/actual payment)+ commission income + self-expense income + other income - Intertransit cost + total amount charged - Total amount charged + Total amount charged - Total amount charged - Machine damage increase - Billing fee',
+  zhushisjtkts: 'Note: Actual collection - refund -(cost payable/actual payment)+ commission income + self-expense income + other income - Intertransit cost + total amount charged - Total amount charged + Total amount charged - Total amount charged - Machine damage increase - Billing fee - Member rebate',
   piaowutic: 'Ticket commission',
   guaizhangxx: 'Hanging Information',
   guaizhangzsr: 'Total Pending Income',

src/assets/common/lang/Japan/fill.js

@@ -1505,6 +1505,7 @@ export const obj = {
     guoneilyjp: '国内連絡航空券',
     jishunzengs: '損しました',
     kaipiaofeiyong: '開票費用',
+    memberRebate: '会员返利',
     peichangbjlr: '補償(不進利潤)',
     baoxianfei: '保険料',
     qitazhichu: 'その他の支出',
@@ -1810,7 +1811,7 @@ export const obj = {
     zhuchengbdjzets: '注:コスト帳票の総額+歩合の収入-チップ収入-を受け取って',
     lirunjsgzqkzs: '利潤',
     dangqianlirun: '現在の利益',
-    zhushisjtkts: '注:実収-払い戻し-(コスト対応/実収)+口銭収入+自費収入+その他の収入-連絡運輸コスト+掛金総収入-掛金総支出-掛金総支出-机損増収-開票費用',
+    zhushisjtkts: '注:実収-払い戻し-(コスト対応/実収)+口銭収入+自費収入+その他の収入-連絡運輸コスト+掛金総収入-掛金総支出-掛金総支出-机損増収-開票費用-会员返利',
     piaowutic: 'チケット代',
     guaizhangxx: 'お掛けします',
     guaizhangzsr: '総収入を掛けます',

src/assets/common/lang/zhCN/fill.js

@@ -1505,6 +1505,7 @@ export const obj = {
     guoneilyjp: '国内联运机票',
     jishunzengs: '机损增收',
     kaipiaofeiyong: '开票费用',
+    memberRebate: '会员返利',
     peichangbjlr: '赔偿(不进利润)',
     baoxianfei: '保险费',
     qitazhichu: '其他支出',
@@ -1810,7 +1811,7 @@ export const obj = {
     zhuchengbdjzets: '注：成本单据总额+提成-小费收入-地接收入',
     lirunjsgzqkzs: '利润',
     dangqianlirun: '当前利润',
-    zhushisjtkts: '注：实收-退款-(成本应付/实付)+佣金收入+自费收入+其他收入-联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出-机损增收-开票费用',
+    zhushisjtkts: '注：实收-退款-(成本应付/实付)+佣金收入+自费收入+其他收入-联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出-机损增收-开票费用-会员返利',
     piaowutic: '票务提成',
     guaizhangxx: '挂账信息',
     guaizhangzsr: '挂账总收入',

src/assets/common/lang/zhTW/fill.js

@@ -1505,6 +1505,7 @@ export const obj = {
   guoneilyjp: '國內聯運機票',
   jishunzengs: '機損增收',
   kaipiaofeiyong: '開票費用',
+  memberRebate: '会员返利',
   peichangbjlr: '賠償(不進利潤)',
   baoxianfei: '保險費',
   qitazhichu: '其他支出',
@@ -1810,7 +1811,7 @@ export const obj = {
   zhuchengbdjzets: '注：成本單據總額+提成-小費收入-地接收入',
   lirunjsgzqkzs: '利潤',
   dangqianlirun: '當前利潤',
-  zhushisjtkts: '注：實收-退款-(成本應付/實付)+佣金收入+自費收入+其他收入-聯運成本+掛賬總收入-掛賬總支出+衝抵總收入-衝抵總支出-機損增收-開票費用',
+  zhushisjtkts: '注：實收-退款-(成本應付/實付)+佣金收入+自費收入+其他收入-聯運成本+掛賬總收入-掛賬總支出+衝抵總收入-衝抵總支出-機損增收-開票費用-会员返利',
   piaowutic: '票務提成',
   guaizhangxx: '掛賬信息',
   guaizhangzsr: '掛賬總收入',

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1750,6 +1750,16 @@ export default {
           isResize: true,
           componentName: "TCIDJumpWang"
         },
+        {
+          field: "MemberRebate",
+          formatter: this.moneyFormat,
+          title: this.$t('objFill.memberRebate'),
+          width: 120,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
         {
           field: "QiTa",
           formatter: this.moneyFormat,
@@ -3175,6 +3185,7 @@ export default {
       if (field === "GuoNeiLianYunJiPiao") return this.moneyFormatN(rowData.GuoNeiLianYunJiPiao);
       if (field === "AirLossIncome") return this.moneyFormatN(rowData.AirLossIncome);
       if (field === "AirServiceCharge") return this.moneyFormatN(rowData.AirServiceCharge);
+      if (field === "MemberRebate") return this.moneyFormatN(rowData.MemberRebate);
       if (field === "Visa") return this.moneyFormatN(rowData.Visa);
       if (field === "TiCheng") return this.moneyFormatN(rowData.TiCheng);
       if (field === "CompensationMoney")
@@ -3259,6 +3270,9 @@ export default {
       if(rowData.AirServiceCharge < 0 && columnName=="AirServiceCharge"){
         return "column-cell-class-name-test-red"
       }
+      if(rowData.MemberRebate < 0 && columnName=="MemberRebate"){
+        return "column-cell-class-name-test-red"
+      }
       if(rowData.Visa < 0 && columnName=="Visa"){
         return "column-cell-class-name-test-red"
       }

src/components/SalesModule/HappyPassbook.vue

@@ -214,7 +214,7 @@
           LineId:"",
           EmployeeId:"",
           RB_Branch_Id:"",
-
+          TCID:0
         },
         currentPage:1,
         DataList:[],
@@ -232,6 +232,9 @@
       if(this.$route.query.CustomerId){
         this.msg.CustomerId=this.$route.query.CustomerId;
       }
+      if(this.$route.query.TCID && this.$route.query.TCID>0){
+        this.msg.TCID=this.$route.query.TCID;
+      }
     },
     mounted() {
       let userInfo = this.getLocalStorage();

src/components/SalesModule/IntegralQuery.vue

@@ -189,6 +189,7 @@
           QEndDate:"",
           LineId:"",
           RB_Branch_Id:"",
+          TCID:0
         },
         currentPage:1,
         DataList:[],
@@ -205,6 +206,9 @@
       if(this.$route.query.CustomerId){
         this.msg.CustomerId=this.$route.query.CustomerId;
       }
+      if(this.$route.query.TCID && this.$route.query.TCID>0){
+        this.msg.TCID=this.$route.query.TCID;
+      }
     },
     mounted() {
       let userInfo = this.getLocalStorage();

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -413,6 +413,22 @@
                 </div>
               </div>
             </el-col>
+            <el-col :span="3" v-if="DataList&&DataList.TeamBalance&&(DataList.TeamBalance.BalanceCost>0||DataList.TeamBalance.IntegralNum>0)">
+              <div class="Team_DList">
+                <div class="Team_firstTitle">
+                  <span class="Team_comCoinType Team_shou">
+                    <i class="iconfont icon-qian"></i>
+                  </span>会员返利
+                </div>
+                <div class="Team_Incontent">
+                  <div>幸福存折：<span class="Team_Coins" style="cursor: pointer;" @click="goBalanceIntegral('HappyPassbook')">￥{{DataList.TeamBalance.BalanceCost}}</span></div>
+                  <div>积分数量：<span class="Team_Coins" style="cursor: pointer;" @click="goBalanceIntegral('IntegralQuery')">{{DataList.TeamBalance.IntegralNum}}</span></div>
+                  <div>积分成本：<span class="Team_Coins" style="cursor: pointer;" @click="goBalanceIntegral('IntegralQuery')">￥{{DataList.TeamBalance.IntegralCost}}</span></div>
+                  <div>
+                  </div>
+                </div>
+              </div>
+            </el-col>
           </el-row>
         </div>
       </div>
@@ -455,6 +471,22 @@
                 </div>
               </div>
             </el-col>
+            <el-col :span="3" v-if="DataList&&DataList.TeamBalance&&(DataList.TeamBalance.BalanceCost>0||DataList.TeamBalance.IntegralNum>0)">
+              <div class="Team_DList">
+                <div class="Team_firstTitle">
+                  <span class="Team_comCoinType Team_shou">
+                    <i class="iconfont icon-qian"></i>
+                  </span>会员返利
+                </div>
+                <div class="Team_Incontent">
+                  <div>幸福存折：<span class="Team_Coins" style="cursor: pointer;" @click="goBalanceIntegral('HappyPassbook')">￥{{DataList.TeamBalance.BalanceCost}}</span></div>
+                  <div>积分数量：<span class="Team_Coins" style="cursor: pointer;" @click="goBalanceIntegral('IntegralQuery')">{{DataList.TeamBalance.IntegralNum}}</span></div>
+                  <div>积分成本：<span class="Team_Coins" style="cursor: pointer;" @click="goBalanceIntegral('IntegralQuery')">￥{{DataList.TeamBalance.IntegralCost}}</span></div>
+                  <div>
+                  </div>
+                </div>
+              </div>
+            </el-col>
           </el-row>
         </div>
       </div>
@@ -2998,6 +3030,15 @@
           }
         });
       },
+      goBalanceIntegral(path){
+        this.$router.push({
+          name: path,
+          query: {
+            TCID: this.TCID,
+            blank: "y"
+          }
+        });
+      }
     },
     mounted() {
       this.TCID = this.$route.query.id;