销售数据、线索数据调整

src/style/style.css

@@ -266,5 +266,5 @@ ul{
   float: left
 }
 .div-new-box-new .chart{
-  height: 300px;position: relative;
+  height: 400px;position: relative;
 }

src/views/clueData/modules/clueAdd.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
     <div class="chart">
-      <div id="clueAddAnalysisChart" style="height: 300px;"></div>
+      <div id="clueAddAnalysisChart" style="height: 400px;"></div>
     </div>
 
   </div>

src/views/clueData/modules/clueChange.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
     <div class="chart">
-      <div id="clueChangeAnalysisChart" style="height: 300px;"></div>
+      <div id="clueChangeAnalysisChart" style="height: 400px;"></div>
     </div>
   </div>
 </template>

src/views/clueData/modules/clueFollow.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
     <div class="chart">
-      <div id="clueFollowAnalysisChart" style="height: 300px;"></div>
+      <div id="clueFollowAnalysisChart" style="height: 400px;"></div>
     </div>
   </div>
 </template>

src/views/clueData/modules/clueUnFollow.vue

@@ -22,11 +22,11 @@
       </div>
     </div>
     <div class="chart">
-      <div id="clueUnFollowAnalysisChart" style="height: 300px;"></div>
+      <div id="clueUnFollowAnalysisChart" style="height: 400px;"></div>
     </div>
     <div style="font-size: 16px;color: #333333;margin: 10px 0 10px 0">{{param.content.dateType?param.content.dateType:'全部'}}</div>
-    <div :style="{height:list.length < 5 ? '373px':'974px'}">
-      <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="list.length < 5 ? '242px':'842px'">
+    <div style="height: 400px">
+      <tableTemplate  ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="356px">
         <template v-slot:customcol="scope">
           <p v-if="scope.column.columnname === 'province'">
             {{scope.column.data.province !== '' && scope.column.data.city !== '' && scope.column.data.county !== ''?scope.column.data.province+scope.column.data.city+scope.column.data.county:'--'}}

src/views/salesData/components/salesTemplate.vue

@@ -48,7 +48,7 @@
       </div>
     </div>
     <div style="margin-top: 20px;margin-bottom: 10px">
-      <tableTemplate ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" >
+      <tableTemplate ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="356px">
         <template v-slot:customcol="scope">
           <p v-if="scope.column.columnname === 'amount'" >
             <span class="highlight-color" v-if="title === '订单'"> ¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>

src/views/salesData/components/table.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
-    <el-table :loading="loading" ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini"  :height="height ==''?data.length <= 4?'260px':data.length <= 20?'':'calc(100vh - 420px)':height"  @row-click="rowClick"
+    <el-table :loading="loading" ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini"  :height="height"  @row-click="rowClick"
               style="width:100%;" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
               :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange" >
       <el-table-column

src/views/salesData/index.vue

@@ -33,7 +33,7 @@
           <!--  订单趋势分析      -->
           <orderTrendAnalysis ref="orderTrendAnalysis" :dataid="departmentid"></orderTrendAnalysis>
           <!--  订单类型占比分析      -->
-          <orderType ref="orderType" :dataid="departmentid"></orderType>
+          <orderType ref="orderType" :dataid="departmentid" style="height: 429px"></orderType>
           <!--  订单产品类别占比分析      -->
           <!--        <orderProductCategory ref="orderProductCategory" :dataid="departmentid"></orderProductCategory>-->
           <!--  出货趋势分析      -->

src/views/salesData/modules/customerAccountBalanceAnalysis.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="margin: 37px 24px 0 24px;">
+  <div style="margin: 40px 24px 0 24px;">
     <div class="div-line"></div>
     <div style="line-height: 20px;height: 20px;vertical-align: auto;margin-left: 16px"> 客户账户余额分析</div>
     <div class="container-div">
@@ -7,7 +7,7 @@
         <boxLine :title="item.accountname" :data="item.balance" :content="'统计到当前查询时间为止的客户'+item.accountname+'总余额'" ></boxLine>
       </div>
     </div>
-    <div style="height: 351px;margin-top: 10px">
+    <div style="height: 451px;margin-top: 10px">
       <div style="height: 32px">
         <div style="float: left">近12月客户账户余额分析</div>
         <div style="float: right">
@@ -29,8 +29,8 @@
           <accountBalanceDetail ref="accountBalanceDetail" :type="param.content.type" :dataid="param.content.dataid" :enddate="param.content.enddate"></accountBalanceDetail>
         </div>
       </div>
-      <div style="height: 300px;position: relative;">
-        <div id="customerAccountBalanceAnalysisChart" style="height: 300px;"></div>
+      <div style="height: 400px;position: relative;">
+        <div id="customerAccountBalanceAnalysisChart" style="height: 400px;"></div>
       </div>
     </div>
   </div>

src/views/salesData/modules/delayedShipmentAnalysis.vue

@@ -22,11 +22,11 @@
       </div>
     </div>
     <div class="chart">
-      <div id="delayedShipmentAnalysisChart" style="height: 300px;"></div>
+      <div id="delayedShipmentAnalysisChart" style="height: 400px;"></div>
     </div>
     <div style="font-size: 16px;color: #333333;margin: 10px 0 10px 0">{{param.content.dateType?param.content.dateType:'全部'}}</div>
-    <div :style="{height:list.length < 5 ? '295px':'888px'}">
-      <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="list.length < 5 ? '242px':'842px'">
+    <div style="height: 400px">
+      <tableTemplate  ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="356px">
         <template v-slot:customcol="scope">
           <p v-if="scope.column.columnname === 'province'">
             {{scope.column.data.province+scope.column.data.city+scope.column.data.county}}

src/views/salesData/modules/financialCollectionAnalysis.vue

@@ -8,11 +8,11 @@
       </div>
     </div>
     <div class="chart">
-      <div id="financialCollectionAnalysisChart" style="height: 300px;" ref="chartRef"></div>
+      <div id="financialCollectionAnalysisChart" style="height: 400px;" ref="chartRef"></div>
     </div>
     <div style="font-size: 16px">{{tableParam.content.unwriteoffamounttype?tableParam.content.unwriteoffamounttype:''}}</div>
-    <div :style="{height:list.length < 5 ? '366px':'985px'}">
-      <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="list.length < 5 ? '242px':'862px'" fixedName="operation">
+    <div style="height:400px">
+      <tableTemplate  ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="356px" fixedName="operation">
         <template v-slot:customcol="scope">
           <p v-if="scope.column.columnname === 'total'">
             ¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}

src/views/salesData/modules/invoiceAmountAnalysis.vue

@@ -19,7 +19,7 @@
     </div>
 
     <div class="chart">
-      <div id="invoiceAmountAnalysisChart" style="height: 300px;"></div>
+      <div id="invoiceAmountAnalysisChart" style="height: 400px;"></div>
     </div>
   </div>
 </template>

src/views/salesData/modules/orderTrendAnalysis.vue

@@ -18,7 +18,7 @@
       </div>
     </div>
     <div class="chart">
-      <div id="orderAnalysisChart" style="height: 300px;"></div>
+      <div id="orderAnalysisChart" style="height: 400px;"></div>
     </div>
   </div>
 </template>

src/views/salesData/modules/orderType.vue

@@ -28,9 +28,9 @@
       </div>
     </div>
     <div class="chart">
-      <div id="orderTypeChart" style="height: 300px;width: 30%;float: left;margin-right: 2%"></div>
+      <div id="orderTypeChart" style="height: 400px;width: 30%;float: left;margin-right: 2%"></div>
       <div style="float: right;width: 68%">
-        <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="260px" fixedName="operation">
+        <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="356px" fixedName="operation">
           <template v-slot:customcol="scope">
             <p v-if="scope.column.columnname === 'operation'">
             </p>

src/views/salesData/modules/quotationAnalysis.vue

@@ -10,7 +10,7 @@
       <boxLine title="客户报价金额" :data="cusamount" content="统计到当前查询时间为止的客户报价金额（审核状态）" :windowWidth="windowWidth"></boxLine>
       <boxLine title="项目报价金额" :data="proamount" content="统计到当前查询时间为止的项目报价金额（审核状态）" :windowWidth="windowWidth"></boxLine>
     </div>
-    <div style="height: 351px;margin-top: 10px" id="quotationAnalysis">
+    <div style="height: 451px;margin-top: 10px" id="quotationAnalysis">
       <div style="height: 35px">
         <div style="float: left">近12月报价次数趋势分析</div>
         <div style="float: right">
@@ -31,8 +31,8 @@
 <!--          <fullScreen class="inline-16" domId="quotationAnalysisChart"></fullScreen>-->
         </div>
       </div>
-      <div style="height: 300px;margin-top: 10px">
-        <div id="quotationAnalysisChart" style="height: 300px;background: #FFFFFF"></div>
+      <div style="height: 400px;margin-top: 10px">
+        <div id="quotationAnalysisChart" style="height: 400px;background: #FFFFFF"></div>
       </div>
     </div>
   </div>

src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -24,7 +24,7 @@
       </div>
     </div>
     <div class="chart">
-      <div id="shippingTrendAnalysisChart" style="height: 300px;"></div>
+      <div id="shippingTrendAnalysisChart" style="height: 400px;"></div>
     </div>
   </div>
 </template>

src/views/salesData/modules/shippingUninvoiceAnalysis.vue

@@ -8,10 +8,10 @@
       </div>
     </div>
     <div class="chart">
-      <div id="shippingUninvoiceAnalysisChart" style="height: 300px;"></div>
+      <div id="shippingUninvoiceAnalysisChart" style="height: 400px;"></div>
     </div>
-    <div :style="{height:list.length < 5 ? '295px':'904px'}">
-      <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="list.length < 5 ? '242px':'862px'" fixedName="operation">
+    <div style="height:400px">
+      <tableTemplate  ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="356px" fixedName="operation">
         <template v-slot:customcol="scope">
           <p v-if="scope.column.columnname === 'total'">
                 <span v-if="scope.column.data[scope.column.columnname]">

src/views/salesData/modules/uninvoiceAmountAnalysis.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
     <div class="chart">
-      <div id="uninvoiceAmountChart" style="height: 300px;"></div>
+      <div id="uninvoiceAmountChart" style="height: 400px;"></div>
     </div>
   </div>
 </template>