14.2

src/views/dataReport_manage/components/previousDetail.vue

@@ -1,7 +1,8 @@
 <template>
-  <el-dialog v-dialogDrag :visible.sync="previousDetailDlg" @close="handleClose" :modal-append-to-body="false" center title="未续约说明">
-    <el-table :data="dataList" border max-height="250" style="margin-bottom: 20px">
-      <el-table-column label="合同期限" prop="StartDate" align="center">
+  <el-dialog v-dialogDrag :visible.sync="previousDetailDlg" @close="handleClose" :modal-append-to-body="false" center title="维持套餐">
+    <p>上一份合同信息</p>
+    <el-table :data="dataList" border max-height="250" style="margin: 20px 0">
+      <el-table-column label="合同期限" prop="StartDate" align="center" width="220">
         <template slot-scope="{ row }">
           <span> {{ row.StartDate }} ~ {{ row.EndDate }} </span>
         </template>
@@ -10,7 +11,7 @@
       <el-table-column label="签约套餐" prop="PermissionName" align="center">
         <template slot-scope="{ row }">
           <template v-if="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 row.PermissionName.split(',')" :key="key">{{ key }}</el-tag>
           </template>
         </template>
       </el-table-column>
@@ -45,11 +46,14 @@ export default {
       const res = await dataMainInterface.mergeCompanyPreviousDetail({
         ComPanyId: this.rowInfo.CompanyId,
       });
-      if (res.Ret == 200) this.dataList = [res.Data.Detail];
+      if (res.Ret == 200) {
+        this.dataList = [res.Data.Detail];
+        console.log(this.dataList);
+      }
     },
   },
   watch: {
-    isShow(val) {
+    previousDetailDlg(val) {
       if (val) {
         this.getrenewalReasonList();
       } else {

src/views/dataReport_manage/configdata.js

@@ -326,7 +326,7 @@ export const equityTableColums = (type) => {
           dataType: "新签客户",
         },
         {
-          label: "续约套餐",
+          label: type === "新签客户" ? "签约套餐" : "续约套餐",
           align: "center",
           key: "PermissionName",
         },