From bff0936e80f35295bbea7e67139990e9c0d6a95d Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Wed, 21 Aug 2024 16:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix:update=E3=80=91-=E6=94=B6=E5=85=A5?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E9=A1=B9=E7=9B=AE=E3=80=81=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=AD=90=E9=A1=B9=E7=9B=AE=E7=9A=84=E7=BB=9F=E8=AE=A1=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/IncomeSortEcharts.vue  | 91 +++++++++++++++-------
 src/views/dashboard/NotReceivedEcharts.vue | 17 ++--
 2 files changed, 70 insertions(+), 38 deletions(-)

diff --git a/src/views/dashboard/IncomeSortEcharts.vue b/src/views/dashboard/IncomeSortEcharts.vue
index de75951..cb2f501 100644
--- a/src/views/dashboard/IncomeSortEcharts.vue
+++ b/src/views/dashboard/IncomeSortEcharts.vue
@@ -1,30 +1,39 @@
 <!-- 分类统计-->
 <template>
   <div class="container">
-    <div class="title">收入分类统计
-      <a-tree-select
-        :multiple="false"
-        show-search
-        :replaceFields="{value:'orgCode'}"
-        allowClear
-        tree-default-expand-all
-        tree-node-filter-prop="title"
-        @change="changeDepart"
-        style="width:20%"
-        :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflo-y': 'auto' }"
-        :treeData="treeDepartData"
-        v-model="queryParam.departCode"
-        placeholder="请选择部门">
-      </a-tree-select>
-      <j-year-date  style="width:20%" class="year" placeholder="请选择年份" v-model="queryParam.year" @change="loadData"></j-year-date>
-    </div>
+    <div class="title">收入分类统计</div>
     <div class="operator">
+      <span @click="projectToggleEcharts('packProject')" class="operator-left"
+            :class="{'active':projectActiveIndex === 'packProject'}">打包项目</span>
+      <span @click="projectToggleEcharts('childProject')" class="operator-right"
+            :class="{'active':projectActiveIndex === 'childProject'}">子项目</span>
+    </div>
+    <div class="search-class">
+      <div class="title">
+        <a-tree-select
+          :multiple="false"
+          show-search
+          :replaceFields="{value:'orgCode'}"
+          allowClear
+          tree-default-expand-all
+          tree-node-filter-prop="title"
+          @change="changeDepart"
+          style="width:20%"
+          :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflo-y': 'auto' }"
+          :treeData="treeDepartData"
+          v-model="queryParam.departCode"
+          placeholder="请选择部门">
+        </a-tree-select>
+        <j-year-date  style="width:20%" class="year" placeholder="请选择年份" v-model="queryParam.year" @change="loadData"></j-year-date>
+      </div>
+      <div class="operator sub-operator">
       <span @click="toggleEcharts('income')" class="operator-left"
             :class="{'active':activeIndex === 'income'}">收入分析</span>
-      <span @click="toggleEcharts('allMoney')" class="operator-left"
-            :class="{'active':activeIndex === 'allMoney'}">应收</span>
-      <span @click="toggleEcharts('confirmAmount')" class="operator-right"
-            :class="{'active':activeIndex === 'confirmAmount'}">确收</span>
+        <span @click="toggleEcharts('allMoney')" class="operator-left"
+              :class="{'active':activeIndex === 'allMoney'}">应收</span>
+        <span @click="toggleEcharts('confirmAmount')" class="operator-right"
+              :class="{'active':activeIndex === 'confirmAmount'}">确收</span>
+      </div>
     </div>
     <div class="echarts-box" id="incomeSort"></div>
     <!--   表格区域beign -->
@@ -108,6 +117,7 @@ export default {
   data() {
     return {
       activeIndex: 'income',
+      projectActiveIndex: 'childProject', // 打包项目、打包子项目选中的索引
       echartsInstace: null,
       columns,
       url: {
@@ -124,6 +134,15 @@ export default {
   },
   methods: {
     formatMoney,
+    projectToggleEcharts(key) {
+      if (key === this.projectActiveIndex) {
+        return
+      } else {
+        this.projectActiveIndex = key
+        this.loadData()
+        this.$forceUpdate()
+      }
+    },
     toggleEcharts(key) {
       if (key === this.activeIndex) {
         return
@@ -169,7 +188,11 @@ export default {
         confirmAmount: 2,
         income: 3
       }
-      getAction(this.url.list, {type: typeEnum[this.activeIndex],departCode:this.queryParam.departCode,year:this.queryParam.year}).then(res => {
+      const projectTypeEnum = {
+        packProject: 1,
+        childProject: 2
+      }
+      getAction(this.url.list, {type: typeEnum[this.activeIndex], projectType: projectTypeEnum[this.projectActiveIndex], departCode:this.queryParam.departCode,year:this.queryParam.year}).then(res => {
         if (res.success) {
           let dataSource = res.result
           this.initColumns(res.result)
@@ -355,24 +378,36 @@ export default {
   right: 20px;
   top: 20px;
   width: 180px;
-  height: 35px;
-  line-height: 35px;
+  height: 32px;
+  line-height: 32px;
   border: 1px solid #069F99;
   border-radius: 4px;
   cursor: pointer;
 
   &-left {
-    width: 33.3%;
+    width: 50%;
     text-align: center;
     border-right: 1px solid #069F99;
   }
 
   &-right {
-    width: 33.4%;
+    width: 50%;
     text-align: center;
   }
 }
-
+.search-class {
+  position: relative;
+  padding-top: 21px;
+}
+.sub-operator.operator {
+  right: 0;
+  .operator-left {
+    width: 33.3%;
+  }
+  .operator-right {
+    width: 33.4%;
+  }
+}
 .active {
   background: #069F99;
   color: #fff;
@@ -381,7 +416,7 @@ export default {
 .echarts-box {
   min-width: 300px;
   width: 100%;
-  height: 400px;
+  height: 440px;
 }
 
 .point {
diff --git a/src/views/dashboard/NotReceivedEcharts.vue b/src/views/dashboard/NotReceivedEcharts.vue
index 03365df..de11196 100644
--- a/src/views/dashboard/NotReceivedEcharts.vue
+++ b/src/views/dashboard/NotReceivedEcharts.vue
@@ -1,7 +1,8 @@
 <!-- 未收账款统计-->
 <template>
   <div class="container">
-    <div class="title">应收账款
+    <div class="title">应收账款</div>
+    <div class="search-class">
       <a-tree-select
         :multiple="false"
         show-search
@@ -17,14 +18,6 @@
         placeholder="请选择部门">
       </a-tree-select>
     </div>
-<!--    <div class="operator">-->
-<!--      <span @click="toggleEcharts('income')" class="operator-left"-->
-<!--            :class="{'active':activeIndex === 'income'}">收入分析</span>-->
-<!--      <span @click="toggleEcharts('allMoney')" class="operator-left"-->
-<!--            :class="{'active':activeIndex === 'allMoney'}">应收</span>-->
-<!--      <span @click="toggleEcharts('confirmAmount')" class="operator-right"-->
-<!--            :class="{'active':activeIndex === 'confirmAmount'}">确收</span>-->
-<!--    </div>-->
     <div class="echarts-box" id="notReceived"></div>
     <!--   表格区域beign -->
         <div style="width: 100%">
@@ -371,6 +364,10 @@ export default {
     text-align: center;
   }
 }
+.search-class {
+  position: relative;
+  padding-top: 21px;
+}
 
 .active {
   background: #069F99;
@@ -380,7 +377,7 @@ export default {
 .echarts-box {
   min-width: 300px;
   width: 100%;
-  height: 400px;
+  height: 440px;
 }
 
 .point {