no message

src/components/SalesModule/customerTransfer.vue

@@ -107,7 +107,26 @@
                   value-format="yyyy-MM-dd">
                 </el-date-picker>
         </li>
-        
+        <li style="margin-left: 10px">
+          <span>
+            <em>{{$t('objFill.v102.appjihuozhuant')}}：</em>
+            <el-select class="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>
+        <li style="margin-left: 40px">
+          <span>
+            <em>
+              激活时间
+            </em>
+          </span>
+          <el-date-picker class="h34 w220" v-model="activationTime" @change="timeAdd(3)" type="daterange"
+                  value-format="yyyy-MM-dd">
+                </el-date-picker>
+        </li>
         <li>
           <input type="button" class="hollowFixedBtn" :value="$t('ground.kehuditu')" @click="getMap()">
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()">
@@ -152,6 +171,7 @@
           <th width="14%">{{$t('salesModule.storeName')}}
             <!--<label><input type="checkbox"  v-model="isCkedAll"  @click='checkedAll()'  style="vertical-align: middle;"/>{{$t('salesModule.storeName')}}</label>-->
           </th>
+          <th width="7%">激活状态</th>
           <th width="7%">{{$t('hotel.suplier_contact')}}</th>
           <th width="8%">{{$t('restaurant.res_ContactNumber')}}</th>
           <th width="10%">{{$t('admin.admin_address')}}</th>
@@ -214,6 +234,10 @@
               <span v-if="item.ExceptionCount > 0" slot="reference" class="yichangde" @click="yichangde(item)">异</span>
             </el-popover>
           </td>
+          <td>
+            <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>
           <td>
             <i class="iconfont icon-img_dianhua fz14" style="color:#09D49D;margin-right: 5px;"></i>
@@ -469,7 +493,7 @@
           DepartmentId: "-1",
           Brand: -1,
           allDepartment: 0,
-          CustomerStatus: '',
+          CustomerStatus: 2,
           OperationStatus: '',
           jySort: 'desc',
           rtsSort: '',
@@ -480,6 +504,9 @@
           ETime: '',
           StartCreate: '',
           EndCreate: '',
+          OpenIdStatus: '',
+          ActivateStartDate: '',
+          ActivateEndDate: '',
         },
         RecipientMsg: {
           CustomerIdArr: [],
@@ -617,11 +644,40 @@
         employeeList2: [],
         HightUnitPrice: '2',
         departState: false,
+        OpenStatusList:[
+          { Name: this.$t('objFill.v102.yijihuo'),Id: 1 },
+          { Name: this.$t('objFill.v102.weijihuo'),Id: 2 },
+        ],
+        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
+      },
+    },
     methods: {
       timeAdd(t) { // 日期格式
-        if(t){
+        if(t==2){
           if (!this.EnterTime) {
             this.msg.StartCreate = '';
             this.msg.EndCreate = '';
@@ -629,6 +685,14 @@
           }
           this.msg.StartCreate = this.EnterTime[0];
           this.msg.EndCreate = this.EnterTime[1];
+        }else if(t==3){
+          if (!this.activationTime) {
+            this.msg.ActivateStartDate = '';
+            this.msg.ActivateEndDate = '';
+            return
+          }
+          this.msg.ActivateStartDate = this.activationTime[0];
+          this.msg.ActivateEndDate = this.activationTime[1];
         }else{
           if (!this.missionDate) {
             this.msg.STime = '';

src/components/SalesModule/enrollTotal.vue

@@ -883,6 +883,73 @@
         customerList:[]
       };
     },
+    '$route': {
+        handler (val, oldVal) {
+          // crm自动登陆传过来的参数
+          if (this.$route.query.crmOrderObj) {
+            let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+            this.msg.tempOrderId = crmOrderObj.OrderId
+          }
+          if (this.$route.query.OrderId) {
+            this.msg.tempOrderId = this.$route.query.OrderId
+          }
+
+          this.getCompany();
+
+          this.getCtlxList();
+          this.getEmployee();
+          this.getLineList();
+          this.getDepartment();
+          this.getDdztList();
+          if (this.$route.query.id) {
+            this.msg.tempOrderId = this.$route.query.id;
+          }
+          if (this.$route.query.isOwn) {
+            this.isOwn = true;
+            this.msg.SellFormEmp = 1;
+          }
+          this.msg.CreateBy =
+            this.$route.query.EmployeeId === undefined ?
+            "-1" :
+            this.$route.query.EmployeeId;
+          this.msg.QStartDate =
+            this.$route.query.starTime === undefined ?
+            "" :
+            this.$route.query.starTime;
+          this.msg.QEndDate =
+            this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
+          if (
+            this.msg.QStartDate === "" &&
+            this.msg.QEndDate === "" &&
+            !this.msg.tempOrderId
+          ) {
+            this.msg.QStartDate = new Date();
+            this.msg.QEndDate = new Date();
+          }
+          if (this.$route.query.orderId) {
+            this.msg.tempOrderId = this.$route.query.orderId;
+            this.msg.QStartDate = "";
+            this.msg.QEndDate = "";
+          }
+          if(this.$route.query.CStartDate||this.$route.query.CEndDate){
+            this.msg.QStartDate = "";
+            this.msg.QEndDate = "";
+            this.msg.CStartDate = this.$route.query.CStartDate
+            this.msg.CEndDate = this.$route.query.CEndDate
+            if(this.$route.query.discount) this.msg.IsUseCoupon = this.$route.query.discount
+          }
+          if(this.$route.query.CustomerName){
+            this.GetCustomerListByKeyWord(this.$route.query.CustomerName,1);
+            if(this.$route.query.CustomerId){
+              this.msg.CustomerId = parseInt(this.$route.query.CustomerId);
+
+            }
+          }
+          this.getList();
+        },
+        deep: true,
+        immediate: true
+    },
     methods: {
 
       GetCustomerListByKeyWord(query) {
@@ -1246,6 +1313,13 @@
         this.msg.QStartDate = "";
         this.msg.QEndDate = "";
       }
+      if(this.$route.query.CStartDate||this.$route.query.CEndDate){
+          this.msg.QStartDate = "";
+          this.msg.QEndDate = "";
+          this.msg.CStartDate = this.$route.query.CStartDate
+          this.msg.CEndDate = this.$route.query.CEndDate
+          if(this.$route.query.discount) this.msg.IsUseCoupon = this.$route.query.discount
+        }
       if(this.$route.query.CustomerName){
         this.GetCustomerListByKeyWord(this.$route.query.CustomerName,1);
         if(this.$route.query.CustomerId){

src/components/rank/dataCount.vue

@@ -53,7 +53,7 @@
           </div>
         </div>
         <div class="q-mt-md row items-center">
-          <div class="data-items col">
+          <div class="data-items col NumCursorP" @click="goUrl(1)">
             <div>客户总数</div>
             <div class="num" style="margin: 6px 0;">
               <span class="datanum">
@@ -69,7 +69,7 @@
             direction="vertical"
             style="margin: 0 12px;height: 80%;"
           ></el-divider>
-          <div class="data-items col">
+          <div class="data-items col NumCursorP" @click="goUrl(2)">
             <div>今日新增客户</div>
             <div class="num" style="margin: 6px 0;">
               <span class="datanum">
@@ -96,7 +96,7 @@
             </div>
           </div>
           <el-divider direction="vertical" style="margin: 0 12px;"></el-divider>
-          <div class="data-items col">
+          <div class="data-items col NumCursorP" @click="goUrl(3)">
             <div>小程序激活数</div>
             <div class="num" style="margin: 6px 0;">
               <span class="datanum">
@@ -110,7 +110,7 @@
           </div>
 
           <el-divider direction="vertical" style="margin: 0 12px;"></el-divider>
-          <div class="data-items col">
+          <div class="data-items col NumCursorP" @click="goUrl(4)">
             <div>今日激活数</div>
             <div class="num" style="margin: 6px 0;">
               <span class="datanum"
@@ -168,7 +168,7 @@
           </el-select> -->
         </div>
         <div class="q-mt-md row items-center">
-          <div class="data-items col">
+          <div class="data-items col NumCursorP" @click="goUrl(5)">
             <div>交易金额</div>
             <div class="num" style="margin: 6px 0;">
               <span class="datanum">
@@ -183,7 +183,7 @@
             direction="vertical"
             style="margin: 0 12px;height: 80%;"
           ></el-divider>
-          <div class="data-items col">
+          <div class="data-items col NumCursorP" @click="goUrl(6)">
             <div>收客人数</div>
             <div class="num" style="margin: 6px 0;">
               <span class="datanum">
@@ -195,7 +195,7 @@
             </div>
           </div>
           <el-divider direction="vertical" style="margin: 0 12px;"></el-divider>
-          <div class="data-items col">
+          <div class="data-items col NumCursorP" @click="goUrl(7)">
             <div>订单数</div>
             <div class="num" style="margin: 6px 0;">
               <span class="datanum">
@@ -208,7 +208,7 @@
           </div>
 
           <el-divider direction="vertical" style="margin: 0 12px;"></el-divider>
-          <div class="data-items col">
+          <div class="data-items col NumCursorP" @click="goUrl(8)">
             <div>用卷订单数</div>
             <div class="num" style="margin: 6px 0;">
               <span class="datanum">     <template v-if="customerObj">
@@ -826,6 +826,72 @@ export default {
   },
   mounted() {},
   methods: {
+    goUrl(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<5){
+        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.$router.push({
+          name: 'customerTransfer',
+          query
+        });
+      }
+      if(type>4&&type<9){
+        if(type==5){
+          query = {
+            CStartDate: this.parameters.dateRange[0],
+            CEndDate: this.parameters.dateRange[1],
+            blank: "y",
+          }
+        }else if(type==6){
+          query = {
+            CStartDate: this.parameters.dateRange[0],
+            CEndDate: this.parameters.dateRange[1],
+            blank: "y",
+          }
+        }else if(type==7){
+          query = {
+            CStartDate: this.parameters.dateRange[0],
+            CEndDate: this.parameters.dateRange[1],
+            blank: "y",
+            
+          }
+        }else if(type==8){
+          query = {
+            CStartDate: this.parameters.dateRange[0],
+            CEndDate: this.parameters.dateRange[1],
+            discount: 1,
+            blank: "y",
+          }
+        }
+        this.$router.push({
+          name: 'enrollTotal',
+          query
+        });
+      }
+      
+    },
     handleDateChange() {
       this.getCustomerStatic();
       this.getHomeChat();
@@ -955,6 +1021,9 @@ export default {
 };
 </script>
 <style>
+.NumCursorP {
+  cursor: pointer;
+}
 .full-box {
   width: 100%;
   height: 100%;