Merge branch 'crm_16.1' into debug

src/views/dataReport_manage/equityCustomStatistics.vue

@@ -70,14 +70,14 @@
           </el-card>
         </div>
       </div>
-      <div class="tabs-box">
+      <!-- <div class="tabs-box">
         <div class="tabs-box-confirm">
           <div style="margin-bottom: 0px" class="tabs-box-confirm" v-for="(item, index) in packageTypeList" :key="item">
             <div :class="['confirm-box-li', PackageDifference == item && 'active']" @click="notPackageDifferenceChange(item)">{{ item }}</div>
             <div v-if="index != 2" class="center-line"></div>
           </div>
         </div>
-      </div>
+      </div> -->
       <div class="tabs-box" v-if="filterObj.data_type == '未续约客户'">
         <div style="display: flex; align-items: cente; margin-bottom: 20px">
           <el-radio-group v-model="isNotRenewedConfirm" style="margin: 0px 20px 0 0" class="tabs-box-confirm" @change="notRenewedConfirmChange">
@@ -103,7 +103,7 @@
             <el-button v-if="canConfirmNotRenewed" type="primary" size="mini" style="margin-left: 20px" @click="isNotRenewedDlg = true">下载</el-button>
           </div>
         </div>
-        <div class="tabs-box-status" v-show="isNotRenewedConfirm">
+        <div v-show="isNotRenewedConfirm">
           <el-select v-model="noRenewalReasonId" placeholder="请选择不续约归因" clearable @change="getTableData" style="width: 240px; margin-right: 50px">
             <el-option :label="item.AscribeContent" :value="item.CompanyAscribeId" v-for="item in noRenewalReasonList" :key="item.reasonId"></el-option>
           </el-select>
@@ -629,7 +629,8 @@ export default {
       this.previousDetailDlg = true;
     },
     lableTextDisplay(text) {
-      let str = text == "新签客户" ? "新签合同" : text == "续约客户" ? "续约合同" : "未续约客户";
+      
+      let str = text == "新增试用客户" ? "新增试用客户" : text == "新签客户" ? "新签合同" : text == "续约客户" ? "续约合同" : "未续约客户";
       return str;
     },
     // // 年度续约的标签点击事件