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

src/components/SalesModule/customerTransfer.vue

@@ -39,7 +39,7 @@
           <span>
             <em>{{$t('objFill.v101.Rest.guanlianztai')}}</em>
           </span>
-          <el-select filterable class='h34 multiple_input' v-model='msg.OperationStatus  '
+          <el-select filterable class='h34 multiple_input' v-model='msg.OperationStatus'
             :placeholder="$t('pub.pleaseSel')">
             <el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
             <el-option :label="$t('pub.normalSel')" :value="1"></el-option>
@@ -50,7 +50,8 @@
           <span>
             <em>{{$t('salesModule.CustomerStatus')}}</em>
           </span>
-          <el-select filterable class='h34 multiple_input' v-model='msg.CustomerStatus' :placeholder="$t('pub.pleaseSel')">
+          <el-select filterable class='h34 multiple_input' v-model='msg.CustomerStatus'
+            :placeholder="$t('pub.pleaseSel')">
             <el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
             <el-option :label="$t('fnc.a_wshenhe')" :value="1"></el-option>
             <el-option :label="$t('fnc.a_yshenhe')" :value="2"></el-option>
@@ -62,19 +63,18 @@
           <span>
             <em>{{$t('objFill.v101.Rest.shifouyichan')}}</em>
           </span>
-          <el-select filterable class='h34 multiple_input' v-model='msg.ExceptionCount' :placeholder="$t('pub.pleaseSel')">
+          <el-select filterable class='h34 multiple_input' v-model='msg.ExceptionCount'
+            :placeholder="$t('pub.pleaseSel')">
             <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
             <el-option :label="$t('pub.yes')" :value="1"></el-option>
             <el-option :label="$t('pub.no')" :value="2"></el-option>
           </el-select>
         </li>
-        <li >
-          <span >
+        <li>
+          <span>
             <em class="fl" style="margin-top: 10px !important">{{$t('admin.admin_Department')}}</em>
-            <treeselect class="w200 fl" :options="departmentList" @select="getEmployeeList" 
-            v-model="DepartmentId"
-            style="height: 25px;"
-            :placeholder="$t('pub.unlimitedSel')" :normalizer="normalizer" />
+            <treeselect class="w200 fl" :options="departmentList" @select="getEmployeeList" v-model="DepartmentId"
+              style="height: 25px;" :placeholder="$t('pub.unlimitedSel')" :normalizer="normalizer" />
           </span>
         </li>
         <li>
@@ -96,8 +96,8 @@
             </em>
           </span>
           <el-date-picker class="h34 w250" v-model="missionDate" @change="timeAdd()" type="daterange"
-                  value-format="yyyy-MM-dd">
-                </el-date-picker>
+            value-format="yyyy-MM-dd">
+          </el-date-picker>
         </li>
         <li>
           <span>
@@ -106,16 +106,14 @@
             </em>
           </span>
           <el-date-picker class="h34 w250" v-model="EnterTime" @change="timeAdd(2)" type="daterange"
-                  value-format="yyyy-MM-dd">
-                </el-date-picker>
+            value-format="yyyy-MM-dd">
+          </el-date-picker>
         </li>
         <li style="margin-left: 10px">
           <span>
-            <em>{{$t('objFill.v102.appjihuozhuant')}}：</em>
-            <el-select class="h34 w120" :placeholder="$t('pub.pleaseSel')" filterable 
-            v-model="msg.OpenIdStatus">
-              <el-option v-for="item in OpenStatusList" :label="item.Name" :value="item.Id"
-                :key="item.Id"></el-option>
+            <em>{{$t('objFill.v102.appjihuozhuant')}}</em>
+            <el-select class="h34 w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="msg.OpenIdStatus">
+              <el-option v-for="item in OpenStatusList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
             </el-select>
           </span>
         </li>
@@ -126,8 +124,8 @@
             </em>
           </span>
           <el-date-picker class="h34 w220" v-model="activationTime" @change="timeAdd(3)" type="daterange"
-                  value-format="yyyy-MM-dd">
-                </el-date-picker>
+            value-format="yyyy-MM-dd">
+          </el-date-picker>
         </li>
         <li>
           <input type="button" class="hollowFixedBtn" :value="$t('ground.kehuditu')" @click="getMap()">
@@ -164,7 +162,9 @@
         </li>
       </ul>
     </div>
-    <ul style="overflow: initial!important"><li style="float:right;padding-top:10px;color:#111111">{{$t('salesModule.JYETJ')}}：{{datainfo.sumMoney}}</li></ul>
+    <ul style="overflow: initial!important">
+      <li style="float:right;padding-top:10px;color:#111111">{{$t('salesModule.JYETJ')}}：{{datainfo.sumMoney}}</li>
+    </ul>
     <div class="clearfix"></div>
     <div class="_customerTransferTable" :class="addShow==true?'_edHeight':''">
       <table class="customerTransferTable customerTransferTable2 mt20" border="0" cellspacing="0" cellpadding="0"
@@ -237,7 +237,8 @@
             </el-popover>
           </td>
           <td>
-            <span :style="{'color':item.OpenIdStatus==1?'red':''}">{{item.OpenIdStatus==1?'已激活':item.OpenIdStatus==2?'未激活':'' }}</span>
+            <span
+              :style="{'color':item.OpenIdStatus==1?'red':''}">{{item.OpenIdStatus==1?'已激活':item.OpenIdStatus==2?'未激活':'' }}</span>
             <p v-if="item.ActivationTime">时间：{{ item.ActivationTime }}</p>
           </td>
           <td>{{item.Contact}}</td>
@@ -646,40 +647,45 @@
         employeeList2: [],
         HightUnitPrice: '2',
         departState: false,
-        OpenStatusList:[
-          { Name: this.$t('objFill.v102.yijihuo'),Id: 1 },
-          { Name: this.$t('objFill.v102.weijihuo'),Id: 2 },
+        OpenStatusList: [{
+            Name: this.$t('objFill.v102.yijihuo'),
+            Id: 1
+          },
+          {
+            Name: this.$t('objFill.v102.weijihuo'),
+            Id: 2
+          },
         ],
-        activationTime:[]
+        activationTime: []
       };
     },
     watch: {
       '$route': {
-          handler (val, oldVal) {
-            console.log(this.$route.query,'-------')
-              if (this.$route.query.EnterTime) {
-                this.EnterTime = this.$route.query.EnterTime
-                this.msg.StartCreate = this.EnterTime[0];
-                this.msg.EndCreate = this.EnterTime[1];
-              }
-              if (this.$route.query.activationTime) {
-                this.activationTime = this.$route.query.activationTime
-                this.msg.ActivateStartDate = this.activationTime[0];
-                this.msg.ActivateEndDate = this.activationTime[1];
-              }
-              if (this.$route.query.activation) {
-                this.msg.OpenIdStatus = this.$route.query.activation
-              }
-              this.getList();
-            
-          },
-          deep: true,
-          immediate: true
+        handler(val, oldVal) {
+          console.log(this.$route.query, '-------')
+          if (this.$route.query.EnterTime) {
+            this.EnterTime = this.$route.query.EnterTime
+            this.msg.StartCreate = this.EnterTime[0];
+            this.msg.EndCreate = this.EnterTime[1];
+          }
+          if (this.$route.query.activationTime) {
+            this.activationTime = this.$route.query.activationTime
+            this.msg.ActivateStartDate = this.activationTime[0];
+            this.msg.ActivateEndDate = this.activationTime[1];
+          }
+          if (this.$route.query.activation) {
+            this.msg.OpenIdStatus = this.$route.query.activation
+          }
+          this.getList();
+
+        },
+        deep: true,
+        immediate: true
       },
     },
     methods: {
       timeAdd(t) { // 日期格式
-        if(t==2){
+        if (t == 2) {
           if (!this.EnterTime) {
             this.msg.StartCreate = '';
             this.msg.EndCreate = '';
@@ -687,7 +693,7 @@
           }
           this.msg.StartCreate = this.EnterTime[0];
           this.msg.EndCreate = this.EnterTime[1];
-        }else if(t==3){
+        } else if (t == 3) {
           if (!this.activationTime) {
             this.msg.ActivateStartDate = '';
             this.msg.ActivateEndDate = '';
@@ -695,7 +701,7 @@
           }
           this.msg.ActivateStartDate = this.activationTime[0];
           this.msg.ActivateEndDate = this.activationTime[1];
-        }else{
+        } else {
           if (!this.missionDate) {
             this.msg.STime = '';
             this.msg.ETime = '';
@@ -1407,9 +1413,10 @@
 </script>
 
 <style>
-/deep/.customerTransfer .vue-treeselect__control{
-  height: 24px;
-}
+  /deep/.customerTransfer .vue-treeselect__control {
+    height: 24px;
+  }
+
   .customerTransferTable {
     width: 100%;
     font-size: 14px;

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -98,7 +98,7 @@
       SaveData(Type) {
         var nObj = {
           ID: this.$route.query.offerid,
-          BatchNum:this.$route.query.BatchNum,
+          BatchNum: this.$route.query.BatchNum,
           AuditContent: this.postData.CRemarks,
           TravelState: Type,
           OfferPayType: this.postData.OfferPayType,
@@ -132,11 +132,16 @@
       },
       getPostData() {
         let BatchNum = "";
+        let offerid = 0;
         if (this.$route.query.BatchNum) {
           BatchNum = this.$route.query.BatchNum;
         }
+        if (this.$route.query.offerid) {
+          offerid = this.$route.query.offerid;
+        }
         let msg = {
-          BatchNum: BatchNum
+          BatchNum: BatchNum,
+          offerId: offerid,
         };
         this.loading = true;
         this.apipost(

src/components/rank/dataCount.vue

@@ -961,7 +961,6 @@ export default {
       //   }
       //   this.OpenNewPage('/salesVolumeRank',query)
       // }
-
         query = {
           CStartDate: this.parameters.dateRange[0],
           CEndDate: this.parameters.dateRange[1],

src/components/rank/salesVolumeRank.vue

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane :label="$t('sm.Personalrank')" name="first"></el-tab-pane>
       <el-tab-pane :label="$t('sm.derprank')" name="second"></el-tab-pane>
-      <el-tab-pane :label="$t('sm.companyrank')" name="third" ></el-tab-pane>
+      <el-tab-pane :label="$t('sm.companyrank')" name="third"></el-tab-pane>
       <el-tab-pane :label="$t('sm.salerank')" name="four"></el-tab-pane>
     </el-tabs>
     <div class="query-box">
@@ -92,12 +92,24 @@
       <el-table-column property="zanBi" :label="$t('objFill.v101.SalesModule.xiaosouezb')" width="">
       </el-table-column>
       <el-table-column property="CustomerCount" label="客户总数" width="">
+        <template slot-scope="scope">
+          <div class="clickText" @click="gotoCustomer(scope.row,1)">{{scope.row.CustomerCount}}</div>
+        </template>
       </el-table-column>
       <el-table-column property="TodayAddCustomer" label="今日新增" width="">
+        <template slot-scope="scope">
+          <div class="clickText" @click="gotoCustomer(scope.row,2)">{{scope.row.TodayAddCustomer}}</div>
+        </template>
       </el-table-column>
       <el-table-column property="MiniAppCount" label="小程序激活数" width="">
+        <template slot-scope="scope">
+          <div class="clickText" @click="gotoCustomer(scope.row,3)">{{scope.row.MiniAppCount}}</div>
+        </template>
       </el-table-column>
       <el-table-column property="MiniAppAdd" label="今日激活数" width="">
+        <template slot-scope="scope">
+          <div class="clickText" @click="gotoCustomer(scope.row,4)">{{scope.row.MiniAppAdd}}</div>
+        </template>
       </el-table-column>
       <el-table-column property="OrderCount" label="团队订单数" width="">
       </el-table-column>
@@ -217,6 +229,40 @@
       goUrl(name, rowData) {
         if (name == 'salesVolumeRankEntryForm') this.customCompFunc(rowData)
       },
+      gotoCustomer(item, type) {
+        let Time = [this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")), this.getBeforeDate(0, new Date().Format(
+          "yyyy-MM-dd"))]
+        let query = {};
+        //客户总数
+        if (type == 1) {
+          query = {
+            blank: "y",
+          }
+        }
+        //今日新增 
+        else if (type == 2) {
+          query = {
+            EnterTime: Time,
+            blank: "y",
+          }
+        }
+        //小程序激活数 
+        else if (type == 3) {
+          query = {
+            activation: 1,
+            blank: "y",
+          }
+        }
+        //今日激活数
+        else if (type == 4) {
+          query = {
+            activationTime: Time,
+            activation: 1,
+            blank: "y",
+          }
+        }
+        this.OpenNewPage('/customerTransfer', query)
+      },
       customCompFunc(rowData) {
         this.$router.push({
           path: "/salesVolumeRankEntryForm",