From b0887c0f34cb6fd9251638998bb838347d7ddf43 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 7 Jul 2025 16:20:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Progress/index.vue |  2 +-
 src/views/budget/budgetList.vue   |  1 +
 src/views/budget/planType.vue     |  1 -
 src/views/dashboard/index.vue     | 37 ++++++++++++++++++++++++++++---
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/components/Progress/index.vue b/src/components/Progress/index.vue
index 56de546..acaefba 100644
--- a/src/components/Progress/index.vue
+++ b/src/components/Progress/index.vue
@@ -57,7 +57,7 @@
     mounted() {
       this.$nextTick(() => {
         this.initChart()
-        this.bindEvents()
+        // this.bindEvents()
       })
     },
     beforeDestroy() {
diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue
index 06a5880..63d685a 100644
--- a/src/views/budget/budgetList.vue
+++ b/src/views/budget/budgetList.vue
@@ -55,6 +55,7 @@
               v-model="select.department"
               placeholder="科室选择"
               clearable
+              multiple
               size="small"
               style="width: 160px"
             >
diff --git a/src/views/budget/planType.vue b/src/views/budget/planType.vue
index 578507d..721b336 100644
--- a/src/views/budget/planType.vue
+++ b/src/views/budget/planType.vue
@@ -42,7 +42,6 @@
               </Button>
               <Button
                 style="margin-left: 10px"
-                "
                 class="slot-btns-item"
                 size="small"
                 type="primary"
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 1700f18..0155235 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -242,7 +242,7 @@
                   </div>
                 </div>
               </div>
-              <xy-table :height="280" :list="sitem[1].departments" :table-item="departmentTable">
+              <xy-table :height="253" :list="sitem[1].departments" :table-item="departmentTable">
                 <template v-slot:btns>
                   <el-table-column
                     :width="80"
@@ -260,6 +260,33 @@
                   </el-table-column>
                 </template>
               </xy-table>
+
+              <div>
+                <div slot="header" class="box-card-header" style="padding-bottom:11px">
+                  <SvgIcon style="color: #2D8cF0;width: 24px;height: 24px;" icon-class="caidan" />
+                  <span style="padding-left:10px;">{{ sitem[2].type_text }}</span>
+                  <i class="el-icon-more" style="margin-left: auto; font-size: 20px" />
+                </div>
+                <xy-table :height="254" :list="sitem[2].departments" :table-item="departmentTable">
+                  <template v-slot:btns>
+                    <el-table-column
+                      :width="80"
+                      fixed="right"
+                      label="操作"
+                      header-align="center"
+                      align="center"
+                    >
+                      <template slot-scope="scope">
+                        <router-link
+                          :to="`/statisticalReport/budgetProgress?departmentId=${scope.row.department_id}&type=${sitem[2].type}`"
+                        >查看
+                        </router-link>
+                      </template>
+                    </el-table-column>
+                  </template>
+                </xy-table>
+              </div>
+
             </el-card>
           </el-col>
         </template>
@@ -1320,7 +1347,7 @@ export default {
       this.statistic = res
       if (res.typeList) {
         var arr = []
-        for (var i = 0; i < res.typeList.length; i = i + 2) {
+        for (var i = 0; i < res.typeList.length; i = i + 3) {
           if (res.typeList[i]) {
             res.typeList[i].per = this.getPer(res.typeList[i])
             // arr.push(res.typeList[i])
@@ -1328,8 +1355,12 @@ export default {
           if (res.typeList[i + 1]) {
             res.typeList[i + 1].per = this.getPer(res.typeList[i + 1])
             // arr.push(res.typeList[i + 1])
+          }
+          if (res.typeList[i + 2]) {
+            res.typeList[i + 2].per = this.getPer(res.typeList[i + 2])
+            // arr.push(res.typeList[i + 1])
           }
-          arr.push([res.typeList[i], res.typeList[i + 1]])
+          arr.push([res.typeList[i], res.typeList[i + 1],res.typeList[i + 2]])
         }
         this.typeList = arr
       }