Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/views/crm/tongji.vue

@@ -60,11 +60,13 @@
         <dv-decoration-10 v-if="authority" style="width:100%;height:1%;"/>
         <div class="customerD" v-if="authority">
           <dv-border-box-7 style="width:32.67%;" backgroundColor="rgba(6, 30, 93, 0.5)">
-            <div class="middleFontC">月度客户销售量</div>
-            <dv-scroll-board style="height: 87%;"
-              v-if="tableData.data && tableData.data.length"
-              :config="tableData"
+            <div class="ttitle">
+              <div class="middleFontC">月度客户销售量</div>
+              <dv-scroll-board style="height: 87%;"
+                v-if="tableData.data && tableData.data.length"
+                :config="tableData"
             />
+            </div>
           </dv-border-box-7>
           <dv-decoration-2 :reverse="true" style="width:1%;height:100%;" />
           <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
@@ -136,8 +138,8 @@
         pmArr:[],
         peArr:[],
         tableData:{
-          header: ['公司名称', '付款方式', '销售金额（元）'],
-          rowNum: 8,
+          header: ['<span style="font-size:12px">公司名称</span>', '<span style="font-size:12px">付款方式</span>', '<span style="font-size:12px">销售金额（元）</span>'],
+          rowNum: 9,
           columnWidth: [260, 'auto',260],
           align: ['left','left','right'],
           data: [
@@ -277,7 +279,8 @@
         curdPost('sql',sql).then(res=>{
           let arr = res.variables.data
           for (var i = 0; i < arr.length; i++) {
-            let changeArr = [arr[i].zhuan_huan_ke_hu_,arr[i].fu_kuan_fang_shi_,this.moneyFormat(arr[i].jiage)]
+            // let changeArr = [arr[i].zhuan_huan_ke_hu_,arr[i].fu_kuan_fang_shi_,this.moneyFormat(arr[i].jiage)]
+            let changeArr = ['<span style="font-size:12px">' + arr[i].zhuan_huan_ke_hu_ + '</span>','<span style="font-size:12px">'+arr[i].fu_kuan_fang_shi_+ '</span>','<span style="font-size:12px">'+this.moneyFormat(arr[i].jiage)+ '</span>']
             this.tableData.data.push(changeArr)
           }
           // }
@@ -463,10 +466,10 @@
     }
   }
   .middleFontC{
-      font-size: 120%;
-      font-weight: 600;
+      // font-size: 120%;
+      // font-weight: 600;
       text-align: center;
-      height: 13%;
+      height: 13% !important;
       display: flex;
 		  align-items: center;
       justify-content: center;