1

src/components/FinancialModule/DataAnalysis/components/MemberRebate.vue

@@ -22,7 +22,7 @@
           label="返幸福存折"
           min-width="120" align="center" sortable>
           <template slot-scope="scope">
-              {{scope.row.BalanceFan}}
+              <span style="cursor: pointer;" @click="goUrlHappy(0,scope.row.OutBranchId)">{{scope.row.BalanceFan}}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -64,7 +64,7 @@
           label="返积分数量"
           min-width="120" align="center" sortable>
           <template slot-scope="scope">
-              {{scope.row.IntegralFan}}
+              <span style="cursor: pointer;" @click="goUrlIntegral(0,scope.row.OutBranchId)">{{scope.row.IntegralFan}}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -134,7 +134,7 @@
           label="返幸福存折"
           min-width="120" align="center" sortable>
           <template slot-scope="scope">
-              {{scope.row.Money}}
+              <span style="cursor: pointer;" @click="goUrlHappy(scope.row.CustomerId,-1)">{{scope.row.Money}}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -176,7 +176,7 @@
           label="返积分数量"
           min-width="120" align="center" sortable>
           <template slot-scope="scope">
-              {{scope.row.IntegralNum}}
+              <span style="cursor: pointer;" @click="goUrlIntegral(scope.row.CustomerId,-1)">{{scope.row.IntegralNum}}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -207,14 +207,42 @@ export default {
     return {
       MonthList: [],//月份列表
       BranchAnalysisData: [],
-      CustomerAnalysisData: []
+      CustomerAnalysisData: [],
+      OutBranchId:0,
+      QStartDate:'',
+      QEndDate:''
     }
   },
   mounted() {
 
   },
   methods: {
-
+    goUrlHappy(customerId,OutBranchId){
+      if(OutBranchId==-1){OutBranchId=this.OutBranchId;}
+        this.$router.push({
+          name: "HappyPassbook",
+          query: {
+            CustomerId: customerId,
+            OutBranchId: OutBranchId,
+            QStartDate: this.QStartDate,
+            QEndDate: this.QEndDate,
+            blank: "y",
+          }
+        });
+      },
+      goUrlIntegral(customerId,OutBranchId){
+      if(OutBranchId==-1){OutBranchId=this.OutBranchId;}
+        this.$router.push({
+          name: "IntegralQuery",
+          query: {
+            CustomerId: customerId,
+            OutBranchId: OutBranchId,
+            QStartDate: this.QStartDate,
+            QEndDate: this.QEndDate,
+            blank: "y",
+          }
+        });
+      },
   },
   watch: {
     StatisticalData:{
@@ -222,6 +250,9 @@ export default {
         this.MonthList = n.MonthList//月份列表
         this.BranchAnalysisData = n.BranchAnalysisData
         this.CustomerAnalysisData = n.CustomerAnalysisData
+        this.OutBranchId= n.OutBranchId
+        this.QStartDate= n.QStartDate
+        this.QEndDate= n.QEndDate
       },
       deep: true,
       immediate: false,

src/components/SalesModule/HappyPassbook.vue

@@ -153,6 +153,18 @@
                 </el-date-picker>
             </span>
         </li>
+        <li>
+            <span><em>{{$t('scen.sc_cp')}}</em>
+                    <el-select filterable  v-model='msg.OutBranchId' :placeholder="$t('pub.pleaseSel')">
+                    <el-option
+                      v-for="item in companyList"
+                      :label="item.BName"
+                      :value="item.Id"
+                      :key="item.Id"
+                    ></el-option>
+                </el-select>
+            </span>
+        </li>
 
         <li>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
@@ -214,7 +226,8 @@
           LineId:"",
           EmployeeId:"",
           RB_Branch_Id:"",
-          TCID:0
+          TCID:0,
+          OutBranchId:""
         },
         currentPage:1,
         DataList:[],
@@ -235,6 +248,13 @@
       if(this.$route.query.TCID && this.$route.query.TCID>0){
         this.msg.TCID=this.$route.query.TCID;
       }
+      if(this.$route.query.OutBranchId){
+        this.msg.OutBranchId=this.$route.query.OutBranchId;
+      }
+      if(this.$route.query.QStartDate && this.$route.query.QEndDate){
+        this.dateList[0]=this.$route.query.QStartDate;
+        this.dateList[1]=this.$route.query.QEndDate;
+      }
     },
     mounted() {
       let userInfo = this.getLocalStorage();

src/components/SalesModule/IntegralQuery.vue

@@ -136,6 +136,18 @@
                 </el-date-picker>
             </span>
         </li>
+        <li>
+            <span><em>{{$t('scen.sc_cp')}}</em>
+                    <el-select filterable  v-model='msg.OutBranchId' :placeholder="$t('pub.pleaseSel')">
+                    <el-option
+                      v-for="item in companyList"
+                      :label="item.BName"
+                      :value="item.Id"
+                      :key="item.Id"
+                    ></el-option>
+                </el-select>
+            </span>
+        </li>
 
         <li>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
@@ -189,7 +201,8 @@
           QEndDate:"",
           LineId:"",
           RB_Branch_Id:"",
-          TCID:0
+          TCID:0,
+          OutBranchId:""
         },
         currentPage:1,
         DataList:[],
@@ -209,6 +222,13 @@
       if(this.$route.query.TCID && this.$route.query.TCID>0){
         this.msg.TCID=this.$route.query.TCID;
       }
+      if(this.$route.query.OutBranchId){
+        this.msg.OutBranchId=this.$route.query.OutBranchId;
+      }
+      if(this.$route.query.QStartDate && this.$route.query.QEndDate){
+        this.dateList[0]=this.$route.query.QStartDate;
+        this.dateList[1]=this.$route.query.QEndDate;
+      }
     },
     mounted() {
       let userInfo = this.getLocalStorage();