16.7 提测

src/views/dataReport_manage/components/DataSummary.vue

@@ -1,8 +1,8 @@
 <template>
   <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">共xxx家客户，其中x家客户有多份合同</p>
-      <el-table :data="tableData" border style="margin: 20px 0; height: 400px">
+      <p v-if="isShowText">共{{ CompanyNum }}家客户，其中{{ CompanyMultiple }}家客户有多份合同</p>
+      <el-table :data="tableData" border style="margin: 20px 0; height: 400px;overflow: auto;">
         <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>
@@ -52,6 +52,8 @@ export default {
       total: 0,
       pageSize: 10,
       page_no: 1,
+      CompanyMultiple: 0,
+      CompanyNum: 0,
     };
   },
   computed: {
@@ -70,6 +72,14 @@ export default {
   mounted() {},
   methods: {
     closeDialog() {
+      this.tableData = [];
+      this.historicalNotesDlgVisible = false; //历史备注的弹框
+      this.historicalNotesId = 0;
+      this.total = 0;
+      this.pageSize = 10;
+      this.page_no = 1;
+      this.CompanyMultiple = 0;
+      this.CompanyNum = 0;
       this.$emit("update:visible", false);
     },
     // 点击了历史留言
@@ -83,8 +93,6 @@ export default {
     },
     // 获取数据
     async getData() {
-      console.log(this.columns);
-
       const res = await dataMainInterface.getRaiDataSummaryList({
         DataType: this.dataItem.DataType,
         SellerId: this.dataItem.SellerId,
@@ -94,9 +102,9 @@ export default {
       });
       if (res.Ret === 200) {
         this.tableData = res.Data.List;
-        console.log(this.tableData);
-
         this.total = res.Data.Paging.Totals;
+        this.CompanyMultiple = res.Data.CompanyMultiple;
+        this.CompanyNum = res.Data.CompanyNum;
       }
     },
   },

src/views/dataReport_manage/configdata.js

@@ -513,10 +513,10 @@ export const tableConfigs = {
   ],
   // 续约率
   RenewalRateData: [
-    { label: "", prop: "type" },
-    { label: "续约金额(续约客户数)", prop: "renewAmount" },
-    { label: "到期金额（到期客户数）", prop: "expireAmount" },
-    { label: "续约/到期", prop: "renewRate" },
+    { label: "", prop: "TbaleNameAText" },
+    { label: "续约金额(续约客户数)", prop: "RenewedContractMoney" },
+    { label: "到期金额（到期客户数）", prop: "ExpiredContractMoney" },
+    { label: "续约/到期", prop: "RenewalRate" },
   ],
   //确认不续约合同
   ConfirmedNoRenewalContractData: [
@@ -529,60 +529,60 @@ export const tableConfigs = {
   ],
   //确认不续约率
   ConfirmNonRenewalRateData: [
-    { label: "", prop: "type" },
-    { label: "不续约金额（不续约客户数）", prop: "notRenewAmount" },
-    { label: "到期金额（到期客户数）", prop: "expireAmount" },
-    { label: "不续约/到期", prop: "notRenewRate" },
+    { label: "", prop: "TbaleNameAText" },
+    { label: "不续约金额（不续约客户数）", prop: "RenewedContractMoney" },
+    { label: "到期金额（到期客户数）", prop: "ExpiredContractMoney" },
+    { label: "不续约/到期", prop: "RenewalRate" },
   ],
   // 签约客户数量
   SignedClientCount: [
-    { label: "新签客户数量", prop: "newCustomerCount" },
-    { label: "新签合同数量", prop: "newContractCount" },
-    { label: "续约客户数量", prop: "renewCustomerCount" },
-    { label: "续约合同数量", prop: "renewContractCount" },
+    { label: "新签客户数量", prop: "NewContractCompany" },
+    { label: "新签合同数量", prop: "NewContract" },
+    { label: "续约客户数量", prop: "RenewedContractCompany" },
+    { label: "续约合同数量", prop: "RenewedContract" },
   ],
   // 客单价
   AverageRevenueCount: [
-    { label: "签约总金额", prop: "totalSignedAmount" },
-    { label: "签约客户数", prop: "totalCustomers" },
+    { label: "签约总金额", prop: "ContractMoney" },
+    { label: "签约客户数", prop: "ContractNum" },
   ],
   // 开票金额
   InvoiceAmountCount: [
     { label: "客户名称", prop: "CompanyName" },
     { label: "所属销售", prop: "SellerName" },
-    { label: "合同编号", prop: "contractNumber" },
-    { label: "开票金额", prop: "invoiceAmount" },
-    { label: "开票日期", prop: "invoiceDate" },
+    { label: "合同编号", prop: "ContractCode" },
+    { label: "开票金额", prop: "InvoicedAmount" },
+    { label: "开票日期", prop: "CreateTime" },
   ],
   // 新客开票
   NewCustomerInvoicingCount: [
     { label: "客户名称", prop: "CompanyName" },
     { label: "所属销售", prop: "SellerName" },
-    { label: "合同编号", prop: "contractNumber" },
-    { label: "开票金额", prop: "invoiceAmount" },
-    { label: "开票日期", prop: "invoiceDate" },
+    { label: "合同编号", prop: "ContractCode" },
+    { label: "开票金额", prop: "InvoicedAmount" },
+    { label: "开票日期", prop: "CreateTime" },
   ],
   // 到款金额
   PaymentReceivedCount: [
     { label: "客户名称", prop: "CompanyName" },
     { label: "所属销售", prop: "SellerName" },
-    { label: "合同编号", prop: "contractNumber" },
-    { label: "到款金额", prop: "paymentAmount" },
-    { label: "到款日期", prop: "paymentDate" },
+    { label: "合同编号", prop: "ContractCode" },
+    { label: "到款金额", prop: "PaymentAmount" },
+    { label: "到款日期", prop: "CreateTime" },
   ],
   // 新客到款
   NewCustomerPaymentsReceivedCount: [
     { label: "客户名称", prop: "CompanyName" },
     { label: "所属销售", prop: "SellerName" },
-    { label: "合同编号", prop: "contractNumber" },
-    { label: "到款金额", prop: "paymentAmount" },
-    { label: "到款日期", prop: "paymentDate" },
+    { label: "合同编号", prop: "ContractCode" },
+    { label: "到款金额", prop: "PaymentAmount" },
+    { label: "到款日期", prop: "CreateTime" },
   ],
   // 未到款比例
   UnpaidRatioCount: [
-    { label: "开票日期", prop: "invoiceDate" },
-    { label: "到款金额", prop: "invoiceDate" },
-    { label: "未到款金额", prop: "invoiceDate" },
+    { label: "开票日期", prop: "CreateTime" },
+    { label: "到款金额", prop: "PaymentAmount" },
+    { label: "未到款金额", prop: "NotReceivedtAmount" },
   ],
 };
 export const tableDlgTitle = {

src/views/dataReport_manage/equityDataSummary.vue

@@ -30,7 +30,7 @@
         ></el-cascader>
         <el-cascader
           v-model="serviceGroupSalesAct"
-          :options="salesArrRai"
+          :options="serviceGroupSales"
           :props="salesArrProps"
           clearable
           @change="salesChangeHandedl"
@@ -224,7 +224,7 @@ export default {
       dataMainInterface.getListRaiSellerServer().then((res) => {
         if (res.Ret === 200) {
           this.salesArrRai = res.Data.List;
-          this.serviceGroupSales = res.Data.List;
+          this.serviceGroupSales = res.Data.ListServer;
         }
       });
     },