瀏覽代碼

bug 修复

bding 1 年之前
父節點
當前提交
bbbc8944b3
共有 2 個文件被更改,包括 36 次插入13 次删除
  1. 1 0
      src/views/dataReport_manage/configdata.js
  2. 35 13
      src/views/dataReport_manage/equityCustomStatistics.vue

+ 1 - 0
src/views/dataReport_manage/configdata.js

@@ -308,6 +308,7 @@ export const equityTableColums = (type) => {
           key: "CompanyName",
           widthsty: "300px",
           textsty: "color:#409EFF;cursor:pointer;",
+          link: true,
         },
         {
           label: "所属销售",

+ 35 - 13
src/views/dataReport_manage/equityCustomStatistics.vue

@@ -41,9 +41,9 @@
                     effect="dark"
                     :content="
                       item.label === '新签客户'
-                        ? '新签合同的起始日期包含在所选时间段内的客户'
+                        ? '新签合同的起始时间在所选时间段内的客户'
                         : item.label === '续约客户'
-                        ? '续约合同的起始日期包含在所选时间段内且不包含在新签合同存续期内的客户'
+                        ? '续约合同的起始时间在所选时间段内的客户'
                         : '筛选时间段内有过正式转试用记录,且当前为非正式、非永续状态的客户'
                     "
                     placement="top"
@@ -68,13 +68,12 @@
         </el-row>
       </div>
       <div class="tabs-box" v-if="filterObj.data_type == '续约客户'">
-        <el-radio-group v-model="PackageDifference" class="tabs-box-confirm" @change="notRenewedConfirmChange">
-          <el-radio-button label="增加套餐">增加套餐</el-radio-button>
-          <div class="center-line"></div>
-          <el-radio-button label="减少套餐">减少套餐</el-radio-button>
-          <div class="center-line"></div>
-          <el-radio-button label="维持套餐">维持套餐</el-radio-button>
-        </el-radio-group>
+        <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 class="tabs-box" v-if="filterObj.data_type == '未续约客户'">
         <el-radio-group v-model="isNotRenewedConfirm" class="tabs-box-confirm" @change="notRenewedConfirmChange">
@@ -122,7 +121,7 @@
               </div>
               <div v-else-if="item.key == 'PermissionName'">
                 <template v-if="scope.row.PermissionName.length">
-                  <el-tag size="mini"  style="margin:0 10px 10px 0" v-for="key in scope.row.PermissionName.split(',')" :key="key">{{ key }}</el-tag>
+                  <el-tag size="mini" style="margin: 0 10px 10px 0" v-for="key in scope.row.PermissionName.split(',')" :key="key">{{ key }}</el-tag>
                 </template>
               </div>
               <div v-else-if="item.key == 'StartDate'">
@@ -164,7 +163,7 @@
       @refreshReasonList="getNORenewalReasonList"
       @saveLabel="saveLabel"
     />
-    <previous-detail :previousDetailDlg.sync="previousDetailDlg" :rowInfo="rowInfo"/>
+    <previous-detail :previousDetailDlg.sync="previousDetailDlg" :rowInfo="rowInfo" />
   </div>
 </template>
 
@@ -176,7 +175,7 @@ import renewalListDia from "./components/renewalListDia.vue";
 import addRemark from "./components/noRenewalReasonDia/addRemark.vue";
 import viewRemark from "./components/noRenewalReasonDia/viewRemark.vue";
 import confirmedNoRenewal from "./components/noRenewalReasonDia/confirmedNoRenewal.vue";
-import PreviousDetail from './components/previousDetail.vue';
+import PreviousDetail from "./components/previousDetail.vue";
 
 var moment = require("moment");
 moment().format();
@@ -298,8 +297,9 @@ export default {
         detailReason: "",
       },
       incrementTableColums: [],
-      PackageDifference: "增加套餐",
+      PackageDifference: "",
       previousDetailDlg: false,
+      packageTypeList: ["增加套餐", "减少套餐", "维持套餐"],
     };
   },
   /* 页面跳转前记录参数 */
@@ -364,6 +364,15 @@ export default {
       this.page_no = 1;
       this.getTableData();
     },
+    notPackageDifferenceChange(type) {
+      if (this.PackageDifference == type) {
+        this.PackageDifference = "";
+      } else {
+        this.PackageDifference = type;
+      }
+      this.page_no = 1;
+      this.getTableData();
+    },
     /* 获取表格 */
     getTableData() {
       this.isShowloadding = true;
@@ -592,6 +601,19 @@ export default {
       background-color: #333333;
       margin: 0 20px;
     }
+    .confirm-box-li {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+      width: 120px;
+      height: 40px;
+      border-radius: 4px;
+    }
+    .active {
+      background-color: #409eff;
+      color: #fff;
+    }
   }
 }
 .operation-button {