保留一个

src/views/dataReport_manage/components/RenewalRateDetail.vue

@@ -107,10 +107,7 @@ export default {
         CurrentIndex: this.pageNo,
         ContractDataType: this.activeName,
       };
-      const res =
-        this.renewalRateDetailForm.isType == "v2"
-          ? await dataMainInterface.incrementalCompanyContractPercentageListV2(params)
-          : await dataMainInterface.incrementalCompanyContractPercentageList(params);
+      const res = await dataMainInterface.incrementalCompanyContractPercentageListV2(params);
       if (res.Ret === 200) {
         this.RenewalDataFormSon = res.Data;
         this.total = res.Data.Paging.Totals;

src/views/dataReport_manage/equityCustomStatistics.vue

@@ -64,7 +64,6 @@
             </div>
           </el-card>
         </div>
-        <!-- 保留什么样的待定 -->
         <div class="annual-select-content">
           <div class="select-content">
             <div class="lable-text">
@@ -80,11 +79,11 @@
               </el-tooltip>
             </div>
             <el-date-picker
-              v-model="yearValueV2"
+              v-model="yearValue"
               type="daterange"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
-              @change="getIncrementalCompanyContractPercentageListV2"
+              @change="getIncrementalCompanyContractPercentageList"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -93,40 +92,11 @@
           </div>
           <div class="select-content">
             <div class="lable-text">合同金额续约率:</div>
-            <span class="editsty" v-if="RenewalDataFormV2.RenewalRateMoney" @click="renewalRateLableHandlerV2">&nbsp;&nbsp;{{ RenewalDataFormV2.RenewalRateMoney }}&nbsp;&nbsp;</span>
-            {{ RenewalDataFormV2.RenewalRateTotalContent ? `(${RenewalDataFormV2.RenewalRateTotalContent})` : " -  -" }}
+            <span class="editsty" v-if="RenewalDataForm.RenewalRateMoney" @click="renewalRateLableHandler">&nbsp;&nbsp;{{ RenewalDataForm.RenewalRateMoney }}&nbsp;&nbsp;</span>
+            {{ RenewalDataForm.RenewalRateTotalContent ? `(${RenewalDataForm.RenewalRateTotalContent})` : " -  -" }}
           </div>
         </div>
       </div>
-      <!-- 保留什么样的待定 -->
-      <div class="annual-select-content" style="margin-top: 20px">
-        <div class="select-content">
-          <div class="lable-text">
-            年度续约率
-            <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 style="display: flex; align-items: center">
-            <el-select style="width: 105px; margin-right: 6px" v-model="yearValue" @change="getIncrementalCompanyContractPercentageList" placeholder="选择年">
-              <el-option v-for="item in yearList" :key="item" :label="item" :value="item"> </el-option>
-            </el-select>
-            <span @click="annualSelectHandler(item)" :class="['select-lable', annualSelectActivue == item.name && 'act-select-lable']" v-for="item in annualSelectList" :key="item.name">
-              {{ item.name }}
-            </span>
-          </div>
-        </div>
-        <div class="select-content">
-          <div class="lable-text">合同金额续约率:</div>
-          <span class="editsty" @click="renewalRateLableHandler">&nbsp;&nbsp;{{ RenewalDataForm.RenewalRateMoney }}&nbsp;&nbsp;</span>
-          ({{ RenewalDataForm.RenewalRateTotalContent }})
-        </div>
-        <!-- <div class="select-content">
-          <div class="lable-text">合同数量续约率:</div>
-          <span class="editsty" @click="renewalRateLableHandler">&nbsp;&nbsp;{{ RenewalDataForm.RenewalRateTotal }}&nbsp;&nbsp;</span>
-          ({{ RenewalDataForm.RenewalRateMoneyContent }})
-        </div> -->
-      </div>
       <div class="tabs-box" v-if="filterObj.data_type == '续约客户'">
         <div class="tabs-box-confirm">
           <div style="margin-bottom: 0px" class="tabs-box-confirm" v-for="(item, index) in packageTypeList" :key="item">
@@ -369,37 +339,10 @@ export default {
       PackageDifference: "",
       previousDetailDlg: false,
       packageTypeList: ["增加套餐", "减少套餐", "维持套餐"],
-      yearValue: new Date().getFullYear().toString(),
-      yearList: [],
-      annualSelectList: [
-        {
-          name: "全年",
-          startTime: "-01-01",
-          endTime: "-12-31",
-        },
-        {
-          name: "第一季度",
-          startTime: "-01-01",
-          endTime: "-03-31",
-        },
-        {
-          name: "前二季度",
-          startTime: "-01-01",
-          endTime: "-06-30",
-        },
-        {
-          name: "前三季度",
-          startTime: "-01-01",
-          endTime: "-09-30",
-        },
-      ],
-      annualSelectActivue: "全年",
+      yearValue: '',
       showRenewalRateDetailDlg: false,
       renewalRateDetailForm: {},
       RenewalDataForm: {},
-      // 处于测试阶段 等保留再更改变量名
-      yearValueV2: [],
-      RenewalDataFormV2: {},
     };
   },
   /* 页面跳转前记录参数 */
@@ -683,45 +626,12 @@ export default {
       this.showRenewalRateDetailDlg = true;
       this.renewalRateDetailForm = this.initCompanyContractPercentageList();
     },
-    renewalRateLableHandlerV2() {
-      this.showRenewalRateDetailDlg = true;
-      let salesArr = [];
-      if (this.filterObj.sale.length) {
-        salesArr = this.filterObj.sale.map((item) => {
-          return item[item.length - 1];
-        });
-      }
-      let params = {
-        EndDate: this.yearValueV2.length > 0 ? this.yearValueV2[1] : "",
-        StartDate: this.yearValueV2.length > 0 ? this.yearValueV2[0] : "",
-        AdminId: salesArr.join(","),
-        isType: "v2",
-      };
-      this.renewalRateDetailForm = params;
-    },
     // 获取年度续约的数据
     async getIncrementalCompanyContractPercentageList() {
       let params = this.initCompanyContractPercentageList();
-      const res = await dataMainInterface.incrementalCompanyContractPercentageList(params);
-      if (res.Ret === 200) {
-        this.RenewalDataForm = res.Data;
-      }
-    },
-    async getIncrementalCompanyContractPercentageListV2() {
-      let salesArr = [];
-      if (this.filterObj.sale.length) {
-        salesArr = this.filterObj.sale.map((item) => {
-          return item[item.length - 1];
-        });
-      }
-      let params = {
-        EndDate: this.yearValueV2.length > 0 ? this.yearValueV2[1] : "",
-        StartDate: this.yearValueV2.length > 0 ? this.yearValueV2[0] : "",
-        AdminId: salesArr.join(","),
-      };
       const res = await dataMainInterface.incrementalCompanyContractPercentageListV2(params);
       if (res.Ret === 200) {
-        this.RenewalDataFormV2 = res.Data;
+        this.RenewalDataForm = res.Data;
       }
     },
     // 处理年度续约的数据
@@ -732,27 +642,16 @@ export default {
           return item[item.length - 1];
         });
       }
-      let arr = this.annualSelectList.find((item) => item.name == this.annualSelectActivue);
       let params = {
-        EndDate: this.yearValue ? this.yearValue + arr.endTime : "",
-        StartDate: this.yearValue ? this.yearValue + arr.startTime : "",
+        EndDate: this.yearValue.length > 0 ? this.yearValue[1] : "",
+        StartDate: this.yearValue.length > 0 ? this.yearValue[0] : "",
         AdminId: salesArr.join(","),
       };
       return params;
     },
-    // 获取年份
-    async getYearList() {
-      const res = await dataMainInterface.incrementalCompanyContractGetYearList();
-      if (res.Ret === 200) {
-        this.yearList = res.Data.List.reverse();
-        this.yearValue = this.yearList[0];
-      }
-    },
   },
   created() {},
   mounted() {
-    this.getYearList();
-    this.getIncrementalCompanyContractPercentageList();
     this.incrementTableColums = equityTableColums(this.filterObj.data_type);
     this.getSale();
     if (sessionStorage.getItem("incrementBack")) {