需求次1021

src/views/dataReport_manage/configdata.js

@@ -463,6 +463,11 @@ export const equityTableColums = (type) => {
       key: "SellerName",
       widthsty: "150px",
     },
+    {
+      label: "新增类型",
+      key: "Operation",
+      widthsty: "150px",
+    },
     {
       label: "新增时间",
       key: "CreateTime",

src/views/dataReport_manage/equityCustomStatistics.vue

@@ -38,7 +38,7 @@
                 <el-tooltip class="item" effect="dark" :content="item.label === '新签客户' ? '<br />' : item.label === '续约客户' ? '起始时间在所选时间段内的续约合同' : ''" placement="top">
                   <template slot="content">
                     <div v-if="item.label === '新增试用客户'">
-                      <p>新建试用客户的时间，包含在所选时间段内的客户数（流失领取的不计入）</p>
+                      <p>试用客户的时间，包含在所选时间段内的客户数</p>
                     </div>
                     <div v-else-if="item.label === '新签客户'">
                       <p>起始时间在所选时间段内的新签合同</p>
@@ -71,15 +71,14 @@
         </div>
       </div>
       <div class="tabs-box">
-        <div class="tabs-box-confirm"  v-if="filterObj.data_type == '续约客户'">
+        <div class="tabs-box-confirm" v-if="filterObj.data_type == '续约客户'">
           <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>
-            <el-tooltip style="margin-right: 16px" class="item" effect="dark" content="今年续约合同总金额与上年度合同总金额对比" placement="top-start">
-             
-              <i class="el-icon-info" style="color: #999"></i>
-            </el-tooltip>
+          <el-tooltip style="margin-right: 16px" class="item" effect="dark" content="今年续约合同总金额与上年度合同总金额对比" placement="top-start">
+            <i class="el-icon-info" style="color: #999"></i>
+          </el-tooltip>
         </div>
       </div>
       <div class="tabs-box" v-if="filterObj.data_type == '未续约客户'">
@@ -116,6 +115,12 @@
           </el-select>
         </div>
       </div>
+      <div v-if="filterObj.data_type == '新增试用客户'">
+        <el-select v-model="typeOperation" placeholder="请选择新增类型" clearable @change="getTableData" style="width: 240px; margin-right: 50px">
+          <el-option label="新建" value="新建"></el-option>
+          <el-option label="领取" value="领取"></el-option>
+        </el-select>
+      </div>
       <el-table :data="tableData" border style="margin-top: 20px; min-height: 400px" v-loading="isShowloadding" element-loading-text="数据加载中...">
         <template v-for="item in incrementTableColums">
           <el-table-column :key="item.label" :label="item.label" :width="item.widthsty" align="center" v-if="item.key != 'AscribeContent'">
@@ -360,6 +365,7 @@ export default {
       historicalNotesId: 0,
 
       isNotRenewedDlg: false, //未续约 弹框
+      typeOperation: "", // 新增类型筛选
     };
   },
   /* 页面跳转前记录参数 */
@@ -424,7 +430,7 @@ export default {
       this.page_no = 1;
       this.getTableData();
     },
-    notPackageDifferenceChange(type) {      
+    notPackageDifferenceChange(type) {
       if (this.PackageDifference == type) {
         this.PackageDifference = "";
       } else {
@@ -455,6 +461,7 @@ export default {
         IsConfirm: this.filterObj.data_type == "未续约客户" ? this.isNotRenewedConfirm : -1,
         CompanyAscribeId: this.noRenewalReasonId,
         PackageDifference: this.PackageDifference,
+        Operation: this.typeOperation,
       };
       dataMainInterface.incrementalEquityList(params).then((res) => {
         if (res.Ret === 200) {
@@ -503,8 +510,6 @@ export default {
     },
     /* 切换数据类型 */
     toggleType(label) {
-      console.log(this.filterObj.data_type);
-      
       this.filterObj.data_type = label;
       this.incrementTableColums = equityTableColums(this.filterObj.data_type);
       this.noRenewalReasonId = "";
@@ -512,6 +517,7 @@ export default {
         this.getIncrementalCompanyContractPercentageList();
         this.getNORenewalReasonList();
       }
+      this.typeOperation = "";
       this.tabsActiveName = "";
       this.page_no = 1;
       this.getTableData();
@@ -636,7 +642,6 @@ export default {
       this.previousDetailDlg = true;
     },
     lableTextDisplay(text) {
-      
       let str = text == "新增试用客户" ? "新增试用客户" : text == "新签客户" ? "新签合同" : text == "续约客户" ? "续约合同" : "未续约客户";
       return str;
     },