修复弹框问题

src/views/dataReport_manage/components/DataSummary.vue

@@ -2,11 +2,11 @@
   <div>
     <el-dialog v-dialogDrag :title="title" :visible.sync="visible" :close-on-click-modal="false" :modal-append-to-body="false" width="60%" @close="closeDialog">
       <p v-if="isShowText">共{{ CompanyNum }}家客户，其中{{ CompanyMultiple }}家客户有多份合同</p>
-      <el-table :data="tableData" border style="margin: 20px 0; height: 400px;overflow: auto;">
+      <el-table :data="tableData" border style="margin: 20px 0" height="400">
         <el-table-column v-for="(col, index) in columns" :key="index" :prop="col.prop" :label="col.label" align="center">
           <template slot-scope="{ row }">
             <span v-if="col.label === '操作'" style="color: #409eff; cursor: pointer; font-size: 14px; margin-right: 20px" @click="historicalNotesClickHandler(row)">历史备注</span>
-            <span v-else>{{ row[col.prop] }}</span>
+            <span v-else>{{ handleRowContent(row, col) }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -81,6 +81,7 @@ export default {
       this.CompanyMultiple = 0;
       this.CompanyNum = 0;
       this.$emit("update:visible", false);
+      this.$emit("update:dataItem", {});
     },
     // 点击了历史留言
     historicalNotesClickHandler(row) {
@@ -107,6 +108,13 @@ export default {
         this.CompanyNum = res.Data.CompanyNum;
       }
     },
+    // 处理表格内容
+    handleRowContent(row, col) {
+      if (col.label === "合同期限") {
+        return `${row.StartDate} ~ ${row.EndDate}`;
+      }
+      return row[col.prop];
+    },
   },
 };
 </script>

src/views/dataReport_manage/configdata.js

@@ -580,7 +580,7 @@ export const tableConfigs = {
   ],
   // 未到款比例
   UnpaidRatioCount: [
-    { label: "开票日期", prop: "CreateTime" },
+    { label: "开票金额", prop: "InvoicedAmount" },
     { label: "到款金额", prop: "PaymentAmount" },
     { label: "未到款金额", prop: "NotReceivedtAmount" },
   ],

src/views/dataReport_manage/equityDataSummary.vue

@@ -67,7 +67,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <DataSummary :visible.sync="showDlg" :title="titleDlg" :columns="columnsDlg" :dataItem="dataItem" />
+    <DataSummary :visible.sync="showDlg" :title="titleDlg" :columns="columnsDlg" :dataItem.sync="dataItem" />
   </div>
 </template>
 
@@ -195,10 +195,10 @@ export default {
     },
     // 点击表格
     handlerRowClick(row, key) {
-      console.log(row);
-      
       this.showDlg = true;
       this.dataItem = row;
+      console.log(this.dataItem);
+      
       this.titleDlg = tableDlgTitle[key];
       this.columnsDlg = tableConfigs[key];
     },