财务2.8提测

src/api/crm.js

@@ -16,18 +16,18 @@ export function getPermissionList(data) {
       params:data
   })
 }
-// 获取销售列表（包括禁用的销售）
- /**
-  * @param {
-  * } data 
-  * @returns 
-  */
-export function getSellerList() {
-  return request({
-      url:'/crm/company_seller/list',
-      method:'get'
-  })
-}
+// 获取销售列表（包括禁用的销售） -- 已替换为 getSellerTeamList()
+//  /**
+//   * @param {
+//   * } data 
+//   * @returns 
+//   */
+// export function getSellerList() {
+//   return request({
+//       url:'/crm/company_seller/list',
+//       method:'get'
+//   })
+// }
 // 获取销售列表 - 无分组
  /**
   * @param {
@@ -40,6 +40,18 @@ export function getSellerListNoG() {
      method:'get'
  })
 }
+// 获取详细的销售列表（包含小组以及禁用的小组）
+ /**
+  * @param {
+ * } data 
+ * @returns 
+ */
+export function getSellerTeamList() {
+ return request({
+     url:'/crm/company_seller/team_list',
+     method:'get'
+ })
+}
 
 // 根据合同编号搜索合同列表
  /**

src/api/financialStatistics.js

@@ -99,4 +99,24 @@ export function setServiceAmount(data) {
         method:'post',
         data
     })
-}
+}
+
+// 业务收入金额统计
+ /**
+ * 获取业务收入金额
+ * @param data.start_date - 开始时间
+ * @param data.end_date - 结束时间
+ * @param data.is_export - 是否是导出 0-否 1-是
+ * @param data.list_param - 统计类型: 0-月度; 1-季度; 2-半年度；3-年度；4-月度累计
+ * @param data.company_type - 客户类型 0全部 1新客户 2老客户
+ * @param data.seller_ids - 销售ids
+ * @returns 
+ */
+ export function getIncomeChartData(data) {
+    return request({
+        url:'/census/invoice_payment/income/list',
+        method:'get',
+        params:data,
+        responseType:data.is_export==1?'blob':'text',
+    })
+   }

src/components/echart/index.vue

@@ -39,6 +39,7 @@
       default:''
     }
   })
+  // 侧边导航栏收缩/展开值
   const isCollapse=inject('isCollapse')
 
   watch(()=>isCollapse.value,(value)=>{
@@ -55,19 +56,22 @@
   }
 
   const chartDraw=(option)=>{
-    nextTick(()=>{
-      barChart = echarts.init(barChartRef.value)
+    // nextTick(()=>{
       barChart.setOption(option)
-      window.addEventListener('resize', resizeChart);
-    })
+    // })
   }
 
   watch(()=>chartProp.options,(newVal)=>{
-    console.log(newVal,'newVal');
+    // console.log(newVal,'newVal');
     if(!newVal.series) return 
     chartDraw(newVal)
   },{deep:true})
 
+  onMounted(()=>{
+    barChart = echarts.init(barChartRef.value)
+    window.addEventListener('resize', resizeChart);
+  })
+
   onUnmounted(()=>{
     barChart?.dispose()
     window.removeEventListener('resize', resizeChart);

src/views/financialManagement/invoice/invoiceList.vue

@@ -1,5 +1,5 @@
 <script setup>
-import {getSellerList} from '@/api/crm'
+import {getSellerTeamList} from '@/api/crm'
 import getCom from '../composition/IandPList'
 import '../style/iandPList.scss'
 
@@ -9,7 +9,7 @@ const data = invoice.data
 const sellerArray=ref([])
 
 const getSellerListFun=()=>{
-  getSellerList().then(res=>{
+  getSellerTeamList().then(res=>{
     sellerArray.value = res.data?.all_list || []
     // console.log(res);
   })

src/views/financialManagement/placement/placementList.vue

@@ -1,5 +1,5 @@
 <script setup>
-import {getSellerList} from '@/api/crm'
+import {getSellerTeamList} from '@/api/crm'
 import getCom from '../composition/IandPList'
 import '../style/iandPList.scss'
 
@@ -11,7 +11,7 @@ const sellerArray=ref([])
 // ---------------method
 
 const getSellerListFun=()=>{
-  getSellerList().then(res=>{
+  getSellerTeamList().then(res=>{
     sellerArray.value = res.data?.all_list || []
     // console.log(res);
   })

src/views/financialStatistics/businessIncome.vue

@@ -1,24 +1,30 @@
 <script setup>
   import {downloadByFlow} from '@/utils/common-methods'
-  import {getSellerList} from '@/api/crm'
-
+  import {getSellerTeamList} from '@/api/crm'
+  import {getIncomeChartData} from '@/api/financialStatistics'
   import chart from '@/components/echart/index.vue'
   import {baseOptions} from '@/components/echart/baseOptions'
 
   const basicOptions=baseOptions()
 
-  const dimensionArray=[{label:'月度',tag:1},{label:'季度',tag:2},{label:'半年度',tag:3},{label:'年度',tag:4},{label:'月度累计',tag:5}]
-  const customerTypeArray=[{label:'全部',value:-1},{label:'新客户',value:1},{label:'老客户',value:0}]
+  const dimensionArray=[{label:'月度',tag:0},{label:'季度',tag:1},{label:'半年度',tag:2},{label:'年度',tag:3},{label:'月度累计',tag:4}]
+  const customerTypeArray=[{label:'全部',value:0},{label:'新客户',value:1},{label:'老客户',value:2}]
   const sellerArray=ref(null)
 
   const searchParams=reactive({
-    dimension:1,
-    customerType:-1,
+    list_param:0,
+    company_type:0,
     start_date:'',
     end_date:'',
-    sellerIds:''
+    seller_ids:'',
+    is_export:0
+  })
+  // 加载状态
+  const loading=reactive({
+    list:true,
+    export:false
   })
-  const chartOptions=ref(null)
+  const chartOptions=ref(basicOptions)
   
   const invoiceTime=ref(null)
   watch(invoiceTime,(value)=>{
@@ -34,117 +40,119 @@
   const sellersCheckList=ref(null)
   watch(sellersCheckList,(value)=>{
     if(!value){
-      searchParams.sellerIds = ''
+      searchParams.seller_ids = ''
     }else{
-      searchParams.sellerIds = value.join(',')
+      searchParams.seller_ids = value.join(',')
     }
     getList()
   })
 
   const getSellerData=()=>{
-    getSellerList().then(res=>{
+    getSellerTeamList().then(res=>{
       sellerArray.value = res.data?.all_list || []
     })
   }
 
-  const getList=()=>{
-    console.log(searchParams);
-    setChartOptions()
-  }
-  const setChartOptions=()=>{
-    nextTick(()=>{
-      basicOptions.title.text = "业务收入金额统计图"
-      basicOptions.title.textStyle.color='#333333'
-      // x轴配置
-      basicOptions.xAxis.axisLabel.align='center' 
-      basicOptions.xAxis.axisLabel.rotate=45
-      basicOptions.xAxis.axisLabel.margin=27
-      // Y轴配置
-      basicOptions.yAxis[0].splitLine={
+  const initOptions=()=>{
+    chartOptions.value.title.text = "业务收入金额统计图"
+    chartOptions.value.title.textStyle.color='#333333'
+    chartOptions.value.color=['#FF903E', '#409EFF']
+    // x轴配置
+    chartOptions.value.xAxis.axisLabel.align='center' 
+    chartOptions.value.xAxis.axisLabel.rotate=45
+    chartOptions.value.xAxis.axisLabel.margin=27
+    // Y轴配置
+    chartOptions.value.yAxis[0].splitLine={
+      lineStyle:{
+        type:'dashed'
+      }
+    }
+    chartOptions.value.yAxis[0].splitNumber=8
+    chartOptions.value.yAxis[1]={
+      alignTicks:true,
+      axisLabel:{
+        color:'#999'
+      },
+      splitLine:{
         lineStyle:{
           type:'dashed'
         }
-      }
-      basicOptions.yAxis[0].splitNumber=8
-      basicOptions.yAxis.push({
-        alignTicks:true,
-        axisLabel:{
-          color:'#999'
-        },
-        splitLine:{
-          show:false
-        },
-        splitNumber:8
-      })
-       
-      // 数据配置
-      basicOptions.series=[
-        {
-          data: [['2020/01',100],['2020/02',345],['2020/03',100],['2020/04',345],['2020/05',100],['2020/06',345],['2020/07',100],['2020/08',345],
-          ['2020/09',100],['2020/10',345],['2020/11',100],['2020/12',345],['2021/01',100],['2021/02',345],
-          ['2021/03',100],['2021/04',345],['2021/05',100],['2021/06',345],['2021/07',100],['2021/08',345],
-          ['2021/09',100],['2021/10',345],['2021/11',100],['2021/12',345],['2022/01',100],['2022/02',345],
-          ['2022/03',100],['2022/04',345],['2022/05',100],['2022/06',345],['2022/07',100],['2022/08',345],
-          ['2022/09',100],['2022/10',345],['2022/11',100],['2022/12',345],['2023/01',100],['2023/02',345],['2023/03',100],['2023/04',345],['2023/05',100]],
-          type: 'bar',
-          name:'业务收入金额'
+      },
+      splitNumber:8
+    }
+      
+    // 数据配置
+    chartOptions.value.series=[
+      {
+        data: [],
+        type: 'bar',
+        name:'业务收入金额'
+      },
+      {
+        data: [],
+        type: 'line',
+        lineStyle:{
+          width:3
         },
-        {
-          data: [['2020/01',0.5],['2020/02',-0.3],['2020/03',0.5],['2020/04',-0.3],['2020/05',0.5],['2020/06',-0.3],['2020/07',0.5],['2020/08',-0.3],
-          ['2020/09',0.5],['2020/10',-0.3],['2020/11',0.5],['2020/12',-0.3],['2021/01',0.5],['2021/02',-0.3],
-          ['2021/03',0.5],['2021/04',-0.3],['2021/05',0.5],['2021/06',-0.3],['2021/07',0.5],['2021/08',-0.3],
-          ['2021/09',0.5],['2021/10',-0.3],['2021/11',0.5],['2021/12',-0.3],['2022/01',0.5],
-          ['2022/02',-0.3],['2022/03',0.5],['2022/04',-0.3],['2022/05',0.5],['2022/06',-0.3],['2022/07',-0.3],['2022/08',0.5],
-          ['2022/09',-0.3],['2022/10',0.5],['2022/11',-0.3],['2022/12',0.5],['2023/01',-0.3],['2023/02',0.5],['2023/03',-0.3],['2023/04',0.5],['2023/05',-0.3]],
-          type: 'line',
-          lineStyle:{
-            width:5
-          },
-          yAxisIndex:1,
-          name:'同比值',
-          symbolSize:5,
-        }
-      ]
-      chartOptions.value=basicOptions
-      // console.log(chartOptions.value);
+        yAxisIndex:1,
+        name:'同比值',
+        connectNulls:true,
+        symbol:'circle',
+        symbolSize:2
+      }
+    ]
+  }
+
+  const getList=()=>{
+    getIncomeChartData(searchParams).then(res=>{
+      // console.log(res);
+      let dates = res.data.Date || []
+      chartOptions.value.series[0].data=dates.map((item,index)=> [item,res.data.TotalMoney[index]])
+      chartOptions.value.series[1].data=dates.map((item,index)=> [item,res.data.Yoy[index]])
+    }).finally(()=>{
+      loading.list=false
     })
   }
 
   const exportData=()=>{
-    console.log(searchParams);
-    downloadByFlow(null,'xlxs','业务收入金额统计')
+    loading.export=true
+    getIncomeChartData({...searchParams,is_export:1}).then(res=>{
+      downloadByFlow(res,'xlxs','业务收入金额统计')
+    }).finally(()=>{
+      loading.export=false
+    })
   }
 
+  initOptions()
   getSellerData()
   getList()
-
 </script>
 
 <template>
     <div class="business-income-container" id="business-income-container">
       <div class="business-income-top">
         <div class="business-income-search-zone">
-          <el-radio-group v-model="searchParams.dimension" size="large" @change="getList"
+          <el-radio-group v-model="searchParams.list_param" size="large" @change="getList"
           style="margin: 0 30px 8px 0;">
             <el-radio-button v-for="item in dimensionArray" :key="item.tag" class="dimension-radio"
             :label="item.tag" >{{ item.label }}</el-radio-button>
           </el-radio-group>
-          <el-radio-group v-model="searchParams.customerType" size="large" @change="getList"
+          <el-radio-group v-model="searchParams.company_type" size="large" @change="getList"
           style="margin: 0 30px 8px 0;">
             <el-radio-button v-for="item in customerTypeArray" :key="item.value" class="dimension-radio"
             :label="item.value" >{{ item.label }}</el-radio-button>
           </el-radio-group>
           <el-date-picker v-model="invoiceTime" type="monthrange"
           start-placeholder="开始日期" end-placeholder="结束日期" style="max-width: 238px;margin:0 30px 8px 0;"
-          value-format="YYYY-MM-DD"></el-date-picker>
+          value-format="YYYY-MM"></el-date-picker>
           <el-cascader :options="sellerArray" v-model="sellersCheckList" clearable placeholder="请选择销售"
           collapse-tags :show-all-levels="false" collapse-tags-tooltip key="seller" filterable 
           style="max-width: 238px;margin:0 30px 8px 0;"
           :props="{multiple:true,label:'seller_name',value:'seller_id',children:'child',emitPath:false}" ></el-cascader>
         </div>
-        <el-button @click="exportData" type="primary" size="large" style="width: 118px;">导出数据</el-button>
+        <el-button @click="exportData" type="primary" size="large" style="width: 118px;" :loading="loading.export">导出数据</el-button>
       </div>
-      <div class="business-income-chart">
+      <div class="business-income-chart" v-loading="loading.list" element-loading-text="图表加载中……">
         <chart :options="chartOptions" style="width: 75%;height: 80%;"/>
       </div>
     </div>

src/views/financialStatistics/commodityPayment.vue

@@ -2,7 +2,7 @@
 import { Search } from '@element-plus/icons-vue'
 // import dropdownText from '@/components/dropdown-text/index.vue'  
 import {getInvoicePaymentList,updatePayType,setServiceAmount} from '@/api/financialStatistics'
-import {getSellerGroupList,getSellerList} from '@/api/crm'
+import {getSellerGroupList,getSellerTeamList} from '@/api/crm'
 import {getSimpleServiceList} from '@/api/financialMana'
 import {downloadByFlow} from '@/utils/common-methods'
 import elementResizeDetectorMaker from 'element-resize-detector';
@@ -176,7 +176,7 @@ const moment = inject('$moment')
   }
   // 获取销售列表
   const getSellerListFun=()=>{
-    getSellerList().then(res=>{
+    getSellerTeamList().then(res=>{
       sellerArray.value = res.data?.all_list || []
       // console.log(res);
     })