Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/DataAnalysis/components/Echart/IncomeShare.vue

@@ -28,7 +28,7 @@ export default {
   data() {
     return {
       MonthList: [],//月份列表
-      LineAnalysisData: [],//各线路统计
+      LineAnalysisDataHZ: [],//各线路统计
       CostAnalysisData: [],//各成本统计
       colorList:['#089bab','#FFA171','#72b8ff','#ff9cc6','#7b78ff','#28cc90','#ee8fff','#5cf2ff','#ff9a00','#4fc4f7','#738eff','#b0edff',
       'rgba(228,57,57,.9)','rgba(248,126,46,1)','rgba(252,196,34,.7)','#3DD948','#39CAE4','rgba(44,49,241,.6)','rgba(122,57,228,.5)','#E65FC1','#D0B478','#BABABA',
@@ -46,7 +46,7 @@ export default {
     StatisticalData:{
       handler(n,o){
         this.MonthList = n.MonthList//月份列表
-        this.LineAnalysisData = n.LineAnalysisData//各线路统计
+        this.LineAnalysisDataHZ = n.LineAnalysisDataHZ//各线路统计
         this.CostAnalysisData = n.CostAnalysisData//各成本统计
         this.CurrentMonth = this.MonthList[this.MonthList.length-1]
         this.getEchart()
@@ -80,7 +80,7 @@ export default {
       let titles = []
       let Stocklegend = {}
       let Newobj = {}
-      this.LineAnalysisData.forEach((x,indexs)=>{
+      this.LineAnalysisDataHZ.forEach((x,indexs)=>{
 
         let Name = `${x.Name}`
         if(Name!='合计'){

src/components/SalesModule/CustomerAnalysis.vue

@@ -32,7 +32,7 @@
               <div class="des">
                 <div class="Img"><img style="width:31px;height:36px" src="../../assets/img/saleRank/rt.png" alt=""></div>
               <div>
-                  <p style="color:#34BFA3;font-size:24px"><span style="font-size:28px;font-weight:600">{{datainfo.TotalGuestNum}}</span>人</p>
+                  <p style="color:#34BFA3;font-size:24px"><span style="font-size:28px;font-weight:600" @click="getUrl()">{{datainfo.TotalGuestNum}}</span>人</p>
               </div>
               </div>
               
@@ -196,6 +196,16 @@ export default {
       
   },
   methods: {
+    getUrl() {
+        this.$router.push({
+          name: "enrollTotal",
+          query: {
+            "CustomerId": this.customerId,
+            "CustomerName":this.datainfo.Contact,
+            blank: 'y'
+          }
+        })
+      },
       goCoupons(id){
           this.$router.push({
             name: 'CouponsList',

src/components/SalesModule/customerTransfer.vue

@@ -80,6 +80,19 @@
           <treeselect class="w200 fl" :options="departmentList" @select="getEmployeeList" v-model="DepartmentId"
             :placeholder="$t('pub.unlimitedSel')" :normalizer="normalizer" />
         </li>
+        <li>
+          <span class="fl mt10">
+            <em><el-switch
+  style="display: block"
+  v-model="msg.fanYong"
+  active-text="特惠专案客户"
+  inactive-text=""
+  active-value="1"
+ inactive-value="0">
+</el-switch></em>
+          </span>
+          
+        </li>
         <li style="float:right;padding-top:10px;color:#111111">{{$t('salesModule.JYETJ')}}：{{datainfo.sumMoney}}</li>
         <li>
           <input type="button" class="hollowFixedBtn" :value="$t('ground.kehuditu')" @click="getMap()">
@@ -445,6 +458,7 @@
           rtsSort: '',
           orderBy: 'TradeMoney desc',
           ExceptionCount: 0,
+          fanYong:0,
         },
         RecipientMsg: {
           CustomerIdArr: [],

src/components/SalesModule/enrollTotal.vue

@@ -869,7 +869,7 @@
     },
     methods: {
 
-      GetCustomerListByKeyWord(query) {
+      GetCustomerListByKeyWord(query,Type) {
         if (query !== '') {
          // this.employeeMsg.KeyWord = query;
           this.apipost(
@@ -878,6 +878,7 @@
             res => {
               if (res.data.resultCode == 1) {
                 this.customerList = res.data.data;
+                if(this.customerList.length>0&&Type)this.msg.CustomerId = this.customerList[0].customerId
               }
             },
             err => {}
@@ -1191,6 +1192,7 @@
       if (this.$route.query.OrderId) {
         this.msg.tempOrderId = this.$route.query.OrderId
       }
+    
       this.getCompany();
 
       this.getCtlxList();
@@ -1228,6 +1230,10 @@
         this.msg.QStartDate = "";
         this.msg.QEndDate = "";
       }
+      if(this.$route.query.CustomerName){
+        this.GetCustomerListByKeyWord(this.$route.query.CustomerName,1);
+       
+      }
       this.getList();
     },
   };

src/router/config.js

@@ -1512,12 +1512,21 @@ export default {
                 title: '餐厅套餐查询'
               },
             },
+            ,
             {
-              path: '/domesticRestaurantList', //国内餐厅列表
-              name: 'domesticRestaurantList',
-              component: resolve => require(['@/components/Restaurant/domesticRestaurantList'], resolve),
+              path: '/RestaurantPackage', //餐厅套餐查询
+              name: 'RestaurantPackage',
+              component: resolve => require(['@/components/Restaurant/RestaurantPackage'], resolve),
+              meta: {
+                title: '餐厅套餐查询'
+              },
+            },
+            {
+              path: '/restaurantRankingList', //餐厅使用排行
+              name: 'restaurantRankingList',
+              component: resolve => require(['@/components/Restaurant/restaurantRankingList'], resolve),
               meta: {
-                title: '国内餐厅列表'
+                title: '餐厅使用排行'
               },
             },
             {