Merge branch 'xiaoqin' into trycode1

src/HDrpManagement/projectData/index.vue

@@ -843,7 +843,7 @@
                     <el-select 
                       v-model="unfllowMapParam.content.where.projecttype" 
                       placeholder="请选择项目类型" 
-                      @change="$event => {if($event.length) {unfllowTableParam.content.where.projecttype=$event;$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowTableParam.content.where.project='';$refs.customerUnfllowTable.listData();customerUnfllowInit()}}" 
+                      @change="$event => {if($event.length) {unfllowTableParam.content.where.projecttype=$event;$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowTableParam.content.where.projecttype='';$refs.customerUnfllowTable.listData();customerUnfllowInit()}}" 
                       size="small" clearable>
                       <el-option
                           v-for="item in projectType"
@@ -917,7 +917,7 @@
               <div class="panel-header">
                 <div class="title">项目生命周期分析</div>
               </div>
-              <div class="progress">
+              <div class="progress" v-if="dateList.length">
                   <div class="progress-item" :style="[{'--bg':colorArr[index]},{'--width':item.avg}]" v-for="(item,index) in dateList" :key="index">
                     <div class="day">平均周期:{{ item.dateavg.toFixed(2) }}天</div>
                     <div class="start" v-if="index == 0">
@@ -939,12 +939,13 @@
                       <span v-else-if="item.end == '结案'">项目结案</span>
                     </div>
                   </div>
-                  <div></div>
               </div>
+              <el-empty description="描述文字" :image-size="80" v-else></el-empty>
               <div class="panel-select" style="margin-top:90px">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
                     <el-cascader
+                      clearable
                       ref="selectdep"
                       size="small"
                       v-model="dateParam.content.dataid"
@@ -1349,7 +1350,7 @@ export default {
         "id": 20231023092304,
         "content": {
           "type": 1,
-          "dataid": [54,59],
+          "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "begnode":"",//开始节点
           "endnode":"",//结束节点
@@ -2367,6 +2368,11 @@ export default {
   height: 50rem;
   margin-bottom: 60rem;
 }
+.progress::after {
+  content:'';
+  display: block;
+  clear:both;
+}
 .progress .progress-item {
   flex:var(--width);
   min-width: 150rem;
@@ -2415,4 +2421,7 @@ export default {
 .mt-10 {
   margin-right: 16px !important;
 }
+.el-empty {
+  padding: 0 !important;
+}
 </style>

src/store/index.js

@@ -27,7 +27,7 @@ export default new Vuex.Store({
     closeDrawerTemp:false,
     DrawerShow:false,
     historyRouter:null,
-    pageCache:[],
+    pageCache:['projectData'],
     svlistData:[]
   },
   getters: {

src/views/clueData/modules/clueUnFollow.vue

@@ -24,6 +24,7 @@
     <div class="chart">
       <div id="clueUnFollowAnalysisChart" style="height: 300px;"></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'">
         <template v-slot:customcol="scope">

src/views/salesData/modules/customerAccountBalanceAnalysis.vue

@@ -99,8 +99,8 @@ export default {
       this.balance = res.data.balance.map((item)=>{
         return {
           "date":item.date,
-          "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)
+          "name":item.name,
+          "value":Math.round((item.value * 100)/100)
         }
       })
       this.tbzzl = res.data.tbzzl.map((item)=>{
@@ -146,7 +146,6 @@ export default {
     },
 
     changeDate(){
-      console.log(this.endDate,'日期')
       this.queryModel(this.param.content.dataid)
     },
     /*选择部门*/

src/views/salesData/modules/delayedShipmentAnalysis.vue

@@ -24,6 +24,7 @@
     <div class="chart">
       <div id="delayedShipmentAnalysisChart" style="height: 300px;"></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'">
         <template v-slot:customcol="scope">

src/views/salesData/modules/financialCollectionAnalysis.vue

@@ -10,7 +10,7 @@
     <div class="chart">
       <div id="financialCollectionAnalysisChart" style="height: 300px;" ref="chartRef"></div>
     </div>
-    <div style="font-size: 16px">{{tableParam.content.unwriteoffamounttype}}</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'">
         <template v-slot:customcol="scope">
@@ -106,7 +106,7 @@ export default {
         return {
           key: item.key,
           typr: item.typr,
-          value: Math.round(((item.value /10000)*100)/100)
+          value: Math.round(((item.value)*100)/100)
         }
       })
       this.chartBar.changeData(this.chartData)
@@ -118,12 +118,22 @@ export default {
         xField: 'value',
         yField: 'typr',
         seriesField: 'key',
-        interactions: [{ type: 'element-single-selected' }],
+        tooltip: {
+          formatter: (datum) => {
+            console.log(datum,'datum')
+            return {
+              name:datum.key,
+              value:'¥'+this.tool.formatAmount(datum.value,2)
+            }
+          }
+        }
       })
       this.chartBar.render()
+      this.chartBar.on('tooltip:change',ev=>{
+        this.hoverData = ev.data.items[0]
+      })
       this.chartBar.on('plot:click',ev=>{
-        const states = this.chartBar.getStates();
-        this.tableParam.content.unwriteoffamounttype = states.length === 0 ? '' :  ev.data.data.typr
+        this.tableParam.content.unwriteoffamounttype = this.hoverData.data.typr
         this.tableParam.content.pageNumber = 1
         this.tableData(this.param.content.dataid)
       })

src/views/salesData/modules/invoiceAmountAnalysis.vue

@@ -65,16 +65,16 @@ export default {
       const res = await this.$api.requested(this.param)
       let amount = res.data.map(item=>{
         return {
-          "value":Math.round(((item.amount/10000)*100)/100),
+          "value":Math.round(((item.amount)*100)/100),
           "date":item.date,
-          "type":'本期金额(万元)'
+          "type":'本期金额'
         }
       })
       let oldamount = res.data.map(item=>{
         return {
           "date":item.date,
-          "value":Math.round(((item.oldamount/10000)*100)/100),
-          "type":'去年同期金额(万元)'
+          "value":Math.round(((item.oldamount)*100)/100),
+          "type":'去年同期金额'
         }
       })
       this.list = amount.concat(oldamount)

src/views/salesData/modules/orderTrendAnalysis.vue

@@ -68,15 +68,15 @@ export default {
       this.list2 = res.data.map(item=>{
         return {
           "date":item.date,
-          "value":Math.round(((item.oldamount/10000)*100)/100),
-          "type":'去年同期金额(万元)'
+          "value":Math.round(((item.oldamount)*100)/100),
+          "type":'去年同期金额'
         }
       })
       this.list1 = res.data.map(item=>{
         return {
-          "value":Math.round(((item.amount/10000)*100)/100),
+          "value":Math.round(((item.amount)*100)/100),
           "date":item.date,
-          "type":'本期金额(万元)',
+          "type":'本期金额',
           "tbzzl":Math.round(((item.tbzzl * 100)*100)/100)
         }
       })

src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -70,18 +70,17 @@ export default {
       this.param.content.year = new Date(this.yearNow).getFullYear()
       const res = await this.$api.requested(this.param)
       const amount = res.data.map(item=>{
-        console.log(Math.round(((item.amount / 10000)*100)/100),'123453355')
         return {
-          "value":Math.round(((item.amount / 10000)*100)/100),
+          "value":Math.round(((item.amount)*100)/100),
           "date":item.date,
-          "type":'本期金额(万元)'
+          "type":'本期金额'
         }
       })
       const oldamount = res.data.map(item=>{
         return {
-          "value":Math.round(((item.oldamount / 10000)*100)/100),
+          "value":Math.round(((item.oldamount)*100)/100),
           "date":item.date,
-          "type":'去年同期金额(万元)'
+          "type":'去年同期金额'
         }
       })
       this.list = amount.concat(oldamount)
@@ -100,8 +99,6 @@ export default {
         }
       })
       this.list1 = tbzzl.concat(zjl)
-      console.log(this.list,'list')
-      console.log(this.list1,'list1')
       this.chartDualAxes.changeData([this.list,this.list1])
     },
     renderPie(val){
@@ -125,7 +122,7 @@ export default {
           formatter: (datum) => {
             return {
               name:datum.type,
-              value:datum.type == '去年同期金额(万元)' || datum.type == '本期金额(万元)'  ?'¥' + this.tool.formatAmount(datum.value,2):datum.value
+              value:datum.type == '去年同期金额' || datum.type == '本期金额'  ?'¥' + this.tool.formatAmount(datum.value,2):datum.value
             }
           }
         }

src/views/salesData/modules/shippingUninvoiceAnalysis.vue

@@ -123,7 +123,7 @@ export default {
       this.chartData = res.data[0].Trend
       this.chartData = this.chartData.map(item=>{
         return {
-          "value": Math.round(((item.value / 10000)*100)/100),
+          "value": Math.round(((item.value)*100)/100),
           "key": item.key,
           "type":"出货未开票金额"
         }
@@ -139,14 +139,22 @@ export default {
         legend: {
           position: 'top-left',
         },
-        interactions: [{ type: 'element-single-selected' }]
+        tooltip: {
+          formatter: (datum) => {
+            console.log(datum,'datum')
+            return {
+              name:datum.key,
+              value:'¥'+this.tool.formatAmount(datum.value,2)
+            }
+          }
+        }
       })
-      this.chartBar.on('plot:click',ev=>{
+      /*this.chartBar.on('plot:click',ev=>{
         const states = this.chartBar.getStates()
         this.param.content.where.uninvicetype = states.length === 0 ? '': ev.data.data.key
         this.param.content.pageNumber = 1
         this.queryTable(this.param.content.dataid)
-      })
+      })*/
       this.chartBar.render()
       this.queryModel(val)
     },

src/views/salesData/modules/uninvoiceAmountAnalysis.vue

@@ -37,16 +37,16 @@ const meta = {
     alias: '日期',
   },
   zerotothree: {
-    alias: '0-3月出货未开票金额(万元)',
+    alias: '0-3月出货未开票金额',
   },
   threetosix: {
-    alias: '3-6月出货未开票金额(万元)',
+    alias: '3-6月出货未开票金额',
   },
   twelveup:{
-    alias: '6-12月出货未开票金额(万元)'
+    alias: '6-12月出货未开票金额'
   },
   sixtotwelve:{
-    alias: '一年以上出货未开票金额(万元)'
+    alias: '一年以上出货未开票金额'
   },
 };
 export default {
@@ -90,11 +90,11 @@ export default {
       const res = await this.$api.requested(this.param)
       this.list = res.data.map(item=>{
         return {
-          "zerotothree":Math.round(((item.zerotothree / 10000)*100)/100),
-          "threetosix":Math.round(((item.threetosix / 10000)*100)/100),
+          "zerotothree":Math.round(((item.zerotothree)*100)/100),
+          "threetosix":Math.round(((item.threetosix)*100)/100),
           "date":item.date,
-          "twelveup":Math.round(((item.twelveup / 10000)*100)/100),
-          "sixtotwelve":Math.round(((item.sixtotwelve / 10000)*100)/100)
+          "twelveup":Math.round(((item.twelveup)*100)/100),
+          "sixtotwelve":Math.round(((item.sixtotwelve)*100)/100)
         }
       })
       this.chartLine.changeData(this.processData(this.list, ['zerotothree', 'threetosix','twelveup','sixtotwelve'], meta))