Merge branch 'mergeBranch' into redUrgent

src/HDrpManagement/accountsReceivableMag/index.vue

@@ -31,7 +31,7 @@
                 <el-col :span="6" class="mt-10">
                   <div class="acccounet__panel" style="border:1px solid #d8dde8">
                     <p class="normal-margin">{{'总应收'}}</p>
-                    <p class="normal-title" style="font-size:1.825rem;color:#151515" >
+                    <p class="normal-title" style="font-size:29px;color:#151515" >
                       <small>{{allList.sumallaoverduemount || allList.sumallaoverduemount == '0'?'¥':''}}</small>
                       {{allList.sumallaoverduemount || allList.sumallaoverduemount == 0?tool.formatAmount(allList.sumallaoverduemount,2):'--'}}
                     </p>
@@ -40,7 +40,7 @@
                 <el-col :span="6" class="mt-10">
                   <div class="acccounet__panel" style="border:1px solid #d8dde8">
                     <p class="normal-margin">{{'逾期1月以内'}}</p>
-                    <p class="normal-title" style="font-size:1.825rem;color:#151515" >
+                    <p class="normal-title" style="font-size:29px;color:#151515" >
                       <small>{{allList.sumonemonthamount || allList.sumonemonthamount == '0'?'¥':''}}</small>
                       {{allList.sumonemonthamount || allList.sumonemonthamount == 0?tool.formatAmount(allList.sumonemonthamount,2):'--'}}</p>
                   </div>
@@ -48,7 +48,7 @@
                 <el-col :span="6" class="mt-10">
                   <div class="acccounet__panel" style="border:1px solid #d8dde8">
                     <p class="normal-margin">{{'逾期1-3月'}}</p>
-                    <p class="normal-title" style="font-size:1.825rem;color:#151515" >
+                    <p class="normal-title" style="font-size:29px;color:#151515" >
                       <small>{{allList.sumthreemonthamount || allList.sumthreemonthamount == '0'?'¥':''}}</small>
                       {{allList.sumthreemonthamount || allList.sumthreemonthamount == 0?tool.formatAmount(allList.sumthreemonthamount,2):'--'}}</p>
                   </div>
@@ -56,7 +56,7 @@
                 <el-col :span="6" class="mt-10">
                   <div class="acccounet__panel" style="border:1px solid #d8dde8">
                     <p class="normal-margin">{{'逾期3月及以上'}}</p>
-                    <p class="normal-title" style="font-size:1.825rem;color:#151515" >
+                    <p class="normal-title" style="font-size:29px;color:#151515" >
                       <small>{{allList.sumupthreemonthamount || allList.sumupthreemonthamount == '0'?'¥':''}}</small>
                       {{allList.sumupthreemonthamount || allList.sumupthreemonthamount == 0?tool.formatAmount(allList.sumupthreemonthamount,2):'--'}}</p>
                   </div>

src/SDrpManagement/accountsReceivable/index.vue

@@ -31,7 +31,7 @@
                 <el-col :span="6" class="mt-10">
                   <div class="acccounet__panel" style="border:1px solid #d8dde8">
                     <p class="normal-margin">{{'总应收'}}</p>
-                    <p class="normal-title" style="font-size:1.825rem;color:#151515" >
+                    <p class="normal-title" style="font-size:29px;color:#151515" >
                       <small>{{allList.sumallaoverduemount || allList.sumallaoverduemount == '0'?'¥':''}}</small>
                       {{allList.sumallaoverduemount || allList.sumallaoverduemount == 0?tool.formatAmount(allList.sumallaoverduemount,2):'--'}}
                     </p>
@@ -40,7 +40,7 @@
                 <el-col :span="6" class="mt-10">
                   <div class="acccounet__panel" style="border:1px solid #d8dde8">
                     <p class="normal-margin">{{'逾期1月以内'}}</p>
-                    <p class="normal-title" style="font-size:1.825rem;color:#151515" >
+                    <p class="normal-title" style="font-size:29px;color:#151515" >
                       <small>{{allList.sumonemonthamount || allList.sumonemonthamount == '0'?'¥':''}}</small>
                       {{allList.sumonemonthamount || allList.sumonemonthamount == 0?tool.formatAmount(allList.sumonemonthamount,2):'--'}}</p>
                   </div>
@@ -48,7 +48,7 @@
                 <el-col :span="6" class="mt-10">
                   <div class="acccounet__panel" style="border:1px solid #d8dde8">
                     <p class="normal-margin">{{'逾期1-3月'}}</p>
-                    <p class="normal-title" style="font-size:1.825rem;color:#151515" >
+                    <p class="normal-title" style="font-size:29px;color:#151515" >
                       <small>{{allList.sumthreemonthamount || allList.sumthreemonthamount == '0'?'¥':''}}</small>
                       {{allList.sumthreemonthamount || allList.sumthreemonthamount == 0?tool.formatAmount(allList.sumthreemonthamount,2):'--'}}</p>
                   </div>
@@ -56,7 +56,7 @@
                 <el-col :span="6" class="mt-10">
                   <div class="acccounet__panel" style="border:1px solid #d8dde8">
                     <p class="normal-margin">{{'逾期3月及以上'}}</p>
-                    <p class="normal-title" style="font-size:1.825rem;color:#151515" >
+                    <p class="normal-title" style="font-size:29px;color:#151515" >
                       <small>{{allList.sumupthreemonthamount || allList.sumupthreemonthamount == '0'?'¥':''}}</small>
                       {{allList.sumupthreemonthamount || allList.sumupthreemonthamount == 0?tool.formatAmount(allList.sumupthreemonthamount,2):'--'}}</p>
                   </div>