销售数据、线索数据调整

src/views/clueData/modules/clueUnFollow.vue

@@ -79,7 +79,6 @@ export default {
       currentPage:0,
       total:0,
       hoverData:[],
-      dataidNow:''
     }
   },
   methods:{
@@ -110,7 +109,6 @@ export default {
 
     },
     async queryModel(val){
-      this.dataidNow = val
       this.param.content.dataid = val || this.dataid
       this.param.content.enddate = this.enddate
       this.param.content.pageNumber = 1
@@ -155,11 +153,10 @@ export default {
         this.hoverData = ev.data.items[0]
       })*/
       this.chartColumn.on('plot:click',ev=>{
-        console.log(this.dataidNow,'val')
         const states = this.chartColumn.getStates()
         this.param.content.dateType = states.length === 0 ? '':ev.data.data.key
         this.param.content.pageNumber = 1
-        this.queryTable(this.dataidNow)
+        this.queryTable(this.param.content.dataid)
       })
       this.chartColumn.render();
       this.queryModel(val)
@@ -171,14 +168,12 @@ export default {
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.dataidNow = val
       this.queryModel(val)
     },
     /*选择业务员*/
     personSelect(val){
       this.param.content.type = 0
       this.param.content.dataid = val
-      this.dataidNow = val
       this.queryModel(val)
     },
     handleSizeChange(val) {

src/views/clueData/modules/digitalSigns.vue

@@ -12,7 +12,7 @@
           <span class="content-font-new">待分配线索数</span>
           <el-tooltip placement="top">
             <div slot="content">待分配线索数：公海线索应用中，待分配状态的线索数量。</div>
-            <img width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
         <div class="item">
@@ -20,7 +20,7 @@
           <span class="content-font-new">待跟进线索数</span>
           <el-tooltip placement="top">
             <div slot="content">待跟进线索数：销售线索应用中，已分配给业务员，待跟进状态的线索数量。</div>
-            <img width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
         <div class="item">
@@ -28,7 +28,7 @@
           <span class="content-font-new">跟进中线索数</span>
           <el-tooltip placement="top">
             <div slot="content">跟进中线索数：销售线索应用中，已分配给业务员，跟进中状态的线索数量。</div>
-            <img width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
         <div class="item">
@@ -37,7 +37,7 @@
           <el-tooltip placement="top">
             <div slot="content">①已转化线索数：销售线索应用中，已分配给业务员，已转化状态的线索数量。<br/>
               ②一条线索可进行两次转化：转化客户、转化项目，因此，已转化线索数≠转化客户线索数+转化项目线索数。</div>
-            <img width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
         <div class="item">
@@ -45,7 +45,7 @@
           <span class="content-font-new">已无效线索数</span>
           <el-tooltip placement="top">
             <div slot="content">已无效线索数：销售线索应用中，已分配给业务员，已无效状态的线索数量。</div>
-            <img width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
         <div class="item">
@@ -53,7 +53,7 @@
           <span class="content-font-new">已过期线索数</span>
           <el-tooltip placement="top">
             <div slot="content">已过期线索数：公海线索应用中，未分配到期的已过期状态的线索数量。</div>
-            <img width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
         <div class="item">
@@ -61,7 +61,7 @@
           <span class="content-font-new">过期比例</span>
           <el-tooltip placement="top">
             <div slot="content">过期比例=已过期线索数÷待分配线索数×100%</div>
-            <img width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
         <div class="item">
@@ -69,7 +69,7 @@
           <span class="content-font-new">转化客户线索数</span>
           <el-tooltip placement="top">
             <div slot="content">转化客户线索数：统计有转化客户操作的线索数</div>
-            <img width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
         <div class="item">
@@ -77,7 +77,7 @@
           <span class="content-font-new">转化项目线索数</span>
           <el-tooltip placement="top">
             <div slot="content">转化客户线索数：统计有转化项目操作的线索数</div>
-            <img width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
         <div class="item">
@@ -85,7 +85,7 @@
           <span class="content-font-new">线索转化率</span>
           <el-tooltip placement="top">
             <div slot="content">线索转化率=已转化线索数÷线索总数×100%</div>
-            <img width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
         <div class="item">
@@ -93,7 +93,7 @@
           <span class="content-font-new">线索成交率</span>
           <el-tooltip placement="top">
             <div slot="content">线索成交率=转化后有下订单的线索数÷线索总数×100%</div>
-            <img width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+            <img style="vertical-align: middle" width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
           </el-tooltip>
         </div>
       </div>
@@ -139,7 +139,7 @@ export default {
   }
   .div-border-new .item{
     height: 50%;
-    width: 12.5%;
+    width: 16.6%;
     float: left;
   }
   .div-border-new .item .title{

src/views/salesData/components/accountBalanceDetail.vue

@@ -79,7 +79,7 @@
             <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
           </template>
           <template v-slot:opreation="scope">
-           <balanceDetail :sa_accountclassid="scope.data.sa_accountclassid" :sys_enterpriseid="scope.data.sys_enterpriseid" :enddate="endDate"></balanceDetail>
+           <balanceDetail :sa_accountclassid="scope.data.sa_accountclassid" :sys_enterpriseid="scope.data.sys_enterpriseid" :enddate="nowEndDate"></balanceDetail>
           </template>
         </tableTemplate>
         <div  v-for="item in counts" :key="item.index">

src/views/salesData/modules/customerAccountBalanceAnalysis.vue

@@ -30,7 +30,7 @@
         </div>
       </div>
       <div style="height: 300px;position: relative;">
-              <div id="customerAccountBalanceAnalysisChart" style="height: 300px;"></div>
+        <div id="customerAccountBalanceAnalysisChart" style="height: 300px;"></div>
       </div>
     </div>
   </div>
@@ -99,8 +99,8 @@ export default {
       this.balance = res.data.balance.map((item)=>{
         return {
           "date":item.date,
-          "name":item.name + '(万元)',
-          "value":Math.round(((item.value/10000)*100)/100)
+          "name":item.name + '万元',
+          "value":item.value > 10000 ?Math.round(((item.value/10000)*100)/100):item.value < 10000?Math.round(((item.value /10000 )* 100)/100):Math.round((item.value * 100)/100)
         }
       })
       this.tbzzl = res.data.tbzzl.map((item)=>{
@@ -133,9 +133,10 @@ export default {
         ],
         tooltip: {
           formatter: (datum) => {
+            console.log(datum,'datum')
             return {
               name:datum.name,
-              value:datum.name != '同比增长率(%)'?'¥' + this.tool.formatAmount(datum.value,2):datum.value
+              value:datum.name != '同比增长率(%)'?'¥' + this.tool.formatAmount(datum.value,2) :datum.value
             }
           }
         }

src/views/salesData/modules/delayedShipmentAnalysis.vue

@@ -158,7 +158,7 @@ export default {
         const states = this.chartBar.getStates()
         this.param.content.dateType = states.length === 0 ?'':ev.data.data.key
         this.param.content.pageNumber = 1
-        this.queryTable(val)
+        this.queryTable(this.param.content.dataid)
       })
       this.chartBar.render();
       this.queryModel(val)

src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -3,6 +3,13 @@
     <div class="content-new-content">
       <div class="div-line"></div>
       <div class="title"> 出货趋势分析</div>
+      <el-tooltip placement="top">
+        <div slot="content">①月度的准交率=月度的准交的订单行数÷月度的总订单行数x100%;<br>
+          ②准交率计算在回复交期时间之前完全出货 (物流单审核依据) 的订单行;<br>
+          ③准交的订单行数: 回复交期在当月，且完全出货日期在回复交期之前的订单行数;<br>
+          ④总订单行数: 回复交期在当月的，有审核的订单行数:</div>
+        <img style="vertical-align: middle;margin-left: 10px"  width="14px" height="14px" src="../../../assets/icons/prompt_icon.svg" >
+      </el-tooltip>
       <div style="float: right">
         <departmentSalesperson ref="departmentSalesperson" class="inline-16" @depSelect="depSelect" @personSelect="personSelect"></departmentSalesperson>
         <span class="search__label inline-16">年度:</span>

src/views/salesData/modules/shippingUninvoiceAnalysis.vue

@@ -145,7 +145,7 @@ export default {
         const states = this.chartBar.getStates()
         this.param.content.where.uninvicetype = states.length === 0 ? '': ev.data.data.key
         this.param.content.pageNumber = 1
-        this.queryTable(val)
+        this.queryTable(this.param.content.dataid)
       })
       this.chartBar.render()
       this.queryModel(val)