From 37ea4f22e9a9953e648569a5931cfa75e82ff179 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Tue, 9 Jan 2024 15:02:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E5=85=A8=E6=89=80?=
 =?UTF-8?q?=E6=94=B6=E5=85=A5=E7=BB=9F=E8=AE=A1=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=20=E5=85=A8=E9=99=A2=E7=BB=8F=E8=90=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/Analysis.vue                  | 10 +++++-----
 src/views/dashboard/SingleMonthEcharts.vue        | 15 ++++++---------
 src/views/dashboard/SingleMonthTotalEcharts.vue   | 13 +++++--------
 .../screen/incomePayments/SingleMonthEcharts.vue  |  2 +-
 .../incomePayments/SingleMonthTotalEcharts.vue    |  2 +-
 src/views/screen/incomePayments/index.vue         |  8 ++++----
 6 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 182ff09..6295892 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -34,13 +34,13 @@
     <!--    所领导 部门领导展示统计图 -->
     <template v-else>
 
-      <!-- 全所收入统计 累计-->
+      <!-- 全院经营数据统计累计-->
       <single-month-total-echarts class="single-month-total "></single-month-total-echarts>
-      <!-- 全所收入统计 累计-->
+      <!-- 全院经营数据统计累计-->
 
-      <!--  全所收入统计 单月-->
+      <!--  全院经营数据统计单月-->
       <single-month-echarts class="single-month m-t-10"></single-month-echarts>
-      <!-- 全所收入统计 单月-->
+      <!-- 全院经营数据统计单月-->
 
       <!-- 科室总体统计 -->
       <department-total-echarts class="three-year m-t-10"></department-total-echarts>
@@ -177,7 +177,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-// 全所收入统计 单月
+// 全院经营数据统计单月
 .single-month,
 .single-month-total,
 .three-year {
diff --git a/src/views/dashboard/SingleMonthEcharts.vue b/src/views/dashboard/SingleMonthEcharts.vue
index a47e971..48470c7 100644
--- a/src/views/dashboard/SingleMonthEcharts.vue
+++ b/src/views/dashboard/SingleMonthEcharts.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="container">
     <!--    echarts-->
-    <div class="title">全所收入统计 (单月)</div>
+    <div class="title">全院经营数据统计(单月)</div>
     <div class="echarts-box" id="singleMonthEcharts"></div>
     <!--    echarts-->
 
@@ -139,7 +139,7 @@ export default {
           //  树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据
           let tableData = [
             // {indexName: '年度待确收金额'},
-            {indexName: '预计到账金额'},
+            {indexName: '预估收入金额'},
             {indexName: '确认收入金额'},
             {indexName: '开票金额'},
             {indexName: '到账金额'}
@@ -149,8 +149,7 @@ export default {
             let keyItem = MonthData.find(ele => Number(ele.value) === (index + 1))
             if (keyItem) {
               let key = keyItem.key
-              tableData[0][key] = item.estimatedArrivalMoney // todo 需要替换字段 预计到账金额--也可能放在第一条
-              // tableData[0][key] = Number(item.comeAllMoney) + 100000 // todo 需要替换字段 预计到账金额--也可能放在第一条
+              tableData[0][key] = item.estimatedArrivalMoney // 预估收入金额--也可能放在第一条
               // tableData[0][key] = item.allMoney // 年度待确收金额
               tableData[1][key] = item.confirmAmount // 确认收入金额
               tableData[2][key] = item.billMoney // 开票金额
@@ -159,7 +158,7 @@ export default {
             }
             // 单月总数
             if(index === 12){
-              tableData[0].key12 = item.estimatedArrivalMoney // 预计到账金额
+              tableData[0].key12 = item.estimatedArrivalMoney // 预估收入金额
               tableData[1].key12 = item.confirmAmount // 确认收入金额
               tableData[2].key12 = item.billMoney // 开票金额
               tableData[3].key12 = item.comeAllMoney // 到账金额
@@ -186,8 +185,6 @@ export default {
         this.echartsData.billMoney.push(item.billMoney)
         this.echartsData.comeAllMoney.push(item.comeAllMoney)
         this.echartsData.estimatedArrivalMoney.push(item.estimatedArrivalMoney)
-        // todo 后端开发完以后替换掉
-        // this.echartsData.estimatedArrivalMoney.push(Number(item.comeAllMoney) + 100000)
 
       })
     },
@@ -221,7 +218,7 @@ export default {
           }
         },
         legend: {
-          data: [ '预计到账金额', '确认收入金额', '开票金额', '到账金额'],
+          data: [ '预估收入金额', '确认收入金额', '开票金额', '到账金额'],
           right: '2%'
         },
         grid: {
@@ -302,7 +299,7 @@ export default {
           //   },
           // },
           {
-            name: '预计到账金额',
+            name: '预估收入金额',
             type: 'line',
             showSymbol: false,
             symbol: 'circle',
diff --git a/src/views/dashboard/SingleMonthTotalEcharts.vue b/src/views/dashboard/SingleMonthTotalEcharts.vue
index 248d0e0..a6431fd 100644
--- a/src/views/dashboard/SingleMonthTotalEcharts.vue
+++ b/src/views/dashboard/SingleMonthTotalEcharts.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="container">
     <!--    echarts-->
-    <div class="title">全所收入统计 (累计)</div>
+    <div class="title">全院经营数据统计 (累计)</div>
     <div class="echarts-box" id="singleMonthTotalEcharts"></div>
     <!--    echarts-->
 
@@ -132,7 +132,7 @@ export default {
           //  树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据
           let tableData = [
             // {indexName: '年度待确收金额'},
-            {indexName: '预计到账金额'},
+            {indexName: '预估收入金额'},
             {indexName: '确认收入金额'},
             {indexName: '开票金额'},
             {indexName: '到账金额'}
@@ -142,8 +142,7 @@ export default {
             let keyItem = MonthDataTotal.find(ele => Number(ele.value) === (index + 1))
             if (keyItem) {
               let key = keyItem.key
-              tableData[0][key] = item.estimatedArrivalMoney // todo 需要替换字段 预计到账金额--也可能放在第一条
-              // tableData[0][key] = Number(item.comeAllMoney) + 100000 // todo 需要替换字段 预计到账金额--也可能放在第一条
+              tableData[0][key] = item.estimatedArrivalMoney // 预估收入金额--也可能放在第一条
               // tableData[0][key] = item.allMoney // 年度待确收金额
               tableData[1][key] = item.confirmAmount // 确认收入金额
               tableData[2][key] = item.billMoney // 开票金额
@@ -172,8 +171,6 @@ export default {
         this.echartsData.billMoney.push(item.billMoney)
         this.echartsData.comeAllMoney.push(item.comeAllMoney)
         this.echartsData.estimatedArrivalMoney.push(item.estimatedArrivalMoney)
-        // todo 后端开发完以后替换掉
-        // this.echartsData.estimatedArrivalMoney.push(Number(item.comeAllMoney) + 100000)
       })
     },
     initEcharts() {
@@ -206,7 +203,7 @@ export default {
           }
         },
         legend: {
-          data: ['预计到账金额', '确认收入金额', '开票金额', '到账金额'],
+          data: ['预估收入金额', '确认收入金额', '开票金额', '到账金额'],
           right: '2%'
         },
         grid: {
@@ -287,7 +284,7 @@ export default {
           //   },
           // },
           {
-            name: '预计到账金额',
+            name: '预估收入金额',
             type: 'line',
             showSymbol: false,
             symbol: 'circle',
diff --git a/src/views/screen/incomePayments/SingleMonthEcharts.vue b/src/views/screen/incomePayments/SingleMonthEcharts.vue
index 1689d8c..f549f3c 100644
--- a/src/views/screen/incomePayments/SingleMonthEcharts.vue
+++ b/src/views/screen/incomePayments/SingleMonthEcharts.vue
@@ -3,7 +3,7 @@
   <div class="income-full-box">
     <img class="box-bg-img" src="../../../assets/screen/income_full_bg.png" alt="">
 
-    <div class="box-title">全所收入统计 (单月)</div>
+    <div class="box-title">全院经营数据统计(单月)</div>
     <div class="box-content">
       <div class="echarts-box" id="singleMonthEchartsScreen"></div>
       <!--   表格区域beign -->
diff --git a/src/views/screen/incomePayments/SingleMonthTotalEcharts.vue b/src/views/screen/incomePayments/SingleMonthTotalEcharts.vue
index 45dcc45..7b129b8 100644
--- a/src/views/screen/incomePayments/SingleMonthTotalEcharts.vue
+++ b/src/views/screen/incomePayments/SingleMonthTotalEcharts.vue
@@ -3,7 +3,7 @@
   <div class="income-full-box">
     <img class="box-bg-img" src="../../../assets/screen/income_full_bg.png" alt="">
 
-    <div class="box-title">全所收入统计 (累计)</div>
+    <div class="box-title">全院经营数据统计 (累计)</div>
     <div class="box-content">
       <!--    echarts-->
       <div class="echarts-box" id="singleMonthTotalEchartsScreen"></div>
diff --git a/src/views/screen/incomePayments/index.vue b/src/views/screen/incomePayments/index.vue
index 65d1bc2..07116cc 100644
--- a/src/views/screen/incomePayments/index.vue
+++ b/src/views/screen/incomePayments/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="screen-income-payment">
-    <!-- 全所收入统计 累计-->
+    <!-- 全院经营数据统计累计-->
     <single-month-total-echarts></single-month-total-echarts>
-    <!--  全所收入统计 单月-->
+    <!--  全院经营数据统计单月-->
     <single-month-echarts></single-month-echarts>
     <!-- 科室总体统计 -->
     <department-total-echarts ></department-total-echarts>
@@ -32,9 +32,9 @@ import AllMoneyTenEcharts from './AllMoneyTenEcharts'
 export default {
   name: 'index',
   components: {
-    // 全所收入统计 累计
+    // 全院经营数据统计累计
     SingleMonthTotalEcharts,
-    //  全所收入统计 单月
+    //  全院经营数据统计单月
     SingleMonthEcharts,
     DepartmentTotalEcharts,
     IncomeSortEcharts,