From ca59d5fd502a9ba0e80c85a9b89aad845106118d Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 24 Jul 2025 16:52:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XyTable/index.vue              |   4 +
 .../contract/components/contractSign.vue      |  30 +-
 .../contract/components/detailContract.vue    |   2 +-
 .../components/paymentRegistration.vue        |  34 +-
 src/views/contract/seeContract.vue            |  87 ++-
 src/views/dashboard/components/barChart.vue   | 125 ++++
 .../dashboard/components/carryStatic.vue      | 690 +++++++++++-------
 .../statisticalReport/budgetProgress.vue      | 142 ++--
 8 files changed, 751 insertions(+), 363 deletions(-)
 create mode 100644 src/views/dashboard/components/barChart.vue

diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index 44404ad..2365beb 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -186,6 +186,7 @@ export default {
                       header-align={item.headerAlign ?? 'center'}
                       label={item.label}
                       prop={item.prop}
+                      show-overflow-tooltip={true}
                       scopedSlots={{
                         default(scope) {
                           return item.customFn(scope.row, scope)
@@ -210,6 +211,7 @@ export default {
                               width={item1.width ?? 'auto'}
                               min-width={item1.minWidth ?? item1.width}
                               sortable={item1.sortable ?? true}
+                              show-overflow-tooltip={true}
                               scopedSlots={{
                                 default(scope) {
                                   return item1.customFn(scope.row, scope)
@@ -228,6 +230,7 @@ export default {
                               width={item1.width ?? 'auto'}
                               min-width={item1.minWidth ?? item1.width}
                               sortable={item1.sortable ?? true}
+                              show-overflow-tooltip={true}
                               type={item1.type ?? ''}
                               formatter={item1.formatter}>
                             </el-table-column>
@@ -249,6 +252,7 @@ export default {
                       label={item.label}
                       prop={item.prop}
                       label-class-name={item.labelClassName}
+                      show-overflow-tooltip={true}
                       sortable={item.sortable ?? true}
                       type={item.type}
                       reserve-selection={item.reserveSelection}
diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index d8ebff0..f60a85c 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -67,7 +67,7 @@
           <div class="xy-table-item-label" style="width: 200px">是否收取履约保函
           </div>
           <div class="xy-table-item-content">
-            <el-switch style="width: 300px" v-model="form.is_assurance" />
+            <el-switch active-text="是" inactive-text="否" style="width: 300px" v-model="form.is_assurance" />
           </div>
         </div>
       </template>
@@ -141,7 +141,7 @@
       <template v-if="contract.is_contract===1" v-slot:other_tender_name>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>其他投标单位
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>其他参与投标单位名称
           </div>
           <div class="xy-table-item-content ">
             <el-button type="primary" style="margin-bottom:10px" size="small" @click="addRow">新增</el-button>
@@ -166,8 +166,16 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>事前询价情况
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.quotation_situation" type="textarea" placeholder="第三方造价咨询单位出具的报告或标底/供应商提供的报价"
-              style="width: 300px;" />
+            <el-select v-model="form.quotation_situation" placeholder="请选择" style="width:300px">
+              <el-option
+                v-for="(item,index) in ['第三方造价咨询单位出具的报告或标底','供应商提供的报价']"
+                :key="index"
+                :label="item"
+                :value="item">
+              </el-option>
+            </el-select>
+            <!-- <el-input v-model="form.quotation_situation" type="textarea" placeholder="第三方造价咨询单位出具的报告或标底/供应商提供的报价"
+              style="width: 300px;" /> -->
           </div>
         </div>
       </template>
@@ -177,8 +185,16 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>事后审计情况
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.audit_situation" type="textarea" placeholder="外部财政局或审计局审计/内部自行委托的第三方审计/未审计。"
-              style="width: 300px;" />
+            <el-select v-model="form.audit_situation" placeholder="请选择" style="width:300px">
+              <el-option
+                v-for="(item,index) in ['外部财政局或审计局审计','内部自行委托的第三方审计','未审计']"
+                :key="index"
+                :label="item"
+                :value="item">
+              </el-option>
+            </el-select>
+            <!-- <el-input v-model="form.audit_situation" type="textarea" placeholder="外部财政局或审计局审计/内部自行委托的第三方审计/未审计。"
+              style="width: 300px;" /> -->
           </div>
         </div>
       </template>
@@ -621,7 +637,7 @@
         console.log("other",this.form.other_tender_name)
         if(this.contract.is_contract===1){
           if(this.form.other_tender_name.length<1){
-            this.$Message.warning(`请添加其他投标单位`)
+            this.$Message.warning(`请添加其他参与投标单位名称`)
             return
           }
           if(!this.form.quotation_situation){
diff --git a/src/views/contract/components/detailContract.vue b/src/views/contract/components/detailContract.vue
index fcaf3a2..bdc68a0 100644
--- a/src/views/contract/components/detailContract.vue
+++ b/src/views/contract/components/detailContract.vue
@@ -70,7 +70,7 @@
           </div>
           <div v-if='detail.is_contract===1'>
             <div class="sign-info-item">
-              <div class="sign-info-item-title">其他投标单位</div>
+              <div class="sign-info-item-title">其他参与投标单位名称</div>
               <div class="sign-info-item-content">
                 <div v-for="item in detail.other_tender_name">{{item}}</div>
               </div>
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index f3852f6..23aa84b 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -47,8 +47,8 @@
             <div class="payment-registration-row-title">已付笔数</div>
             <div class="payment-registration-row-content">{{ actNumsTotal() }}</div>
             <div class="payment-registration-row-content" style="color: #ff0000;padding-left: 16px;cursor: pointer;">
-              <Poptip 
-                :transfer="true" 
+              <Poptip
+                :transfer="true"
                 :close-on-click-outside="false"
                 :close-on-press-escape="false"
                 :close-on-close="false"
@@ -140,7 +140,7 @@
         </div>
       </template>
 
-      <template v-slot:act_date>
+      <!-- <template v-slot:act_date>
         <div v-if="contract_category && contract_category.show_apply_money === 1 && (!hasPostPaymentForm || (hasPostPaymentForm && currentStep === 2))" class="xy-table-item">
           <div class="xy-table-item-label">
             <span v-if="contract_category && contract_category.required_act_date === 1" style="color: red;font-weight: 600;padding-right: 4px;">*</span>
@@ -150,7 +150,7 @@
             <el-date-picker v-model="paymentRegistrationForm.act_date" type="date" value-format="yyyy-MM-dd" style="width: 150px;" />
           </div>
         </div>
-      </template>
+      </template> -->
 
       <template v-slot:applyMoney>
         <div v-if="contract_category && contract_category.show_apply_money === 1 && (!hasPostPaymentForm || (hasPostPaymentForm && currentStep === 2))" class="xy-table-item">
@@ -459,7 +459,7 @@ function numberToChinese(num) {
   if (num === 0) {
     return '零元'
   }
-  
+
   const units = ['', '拾', '佰', '仟', '万', '拾', '佰', '仟', '亿', '拾', '佰', '仟', '万']
   const digits = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
   const [integer, decimal] = num.toString().split('.')
@@ -505,7 +505,7 @@ function numberToChinese(num) {
       }
     }
   }
-  
+
   if (!decimal || parseInt(decimal) === 0) {
     result += '整'
   }
@@ -977,12 +977,12 @@ export default {
             message: '必填'
           }
         ],
-        act_date: [
-          {
-            required: this.contract_category.required_act_date === 1,
-            message: '必填'
-          }
-        ]
+        // act_date: [
+        //   {
+        //     required: this.contract_category.required_act_date === 1,
+        //     message: '必填'
+        //   }
+        // ]
       }
       const res = await getFundLog({
         contract_id: this.contract.id,
@@ -1456,7 +1456,7 @@ export default {
           input.addEventListener('change', this.calculateTotal)
           input.addEventListener('blur', this.calculateTotal)
         })
-        
+
         // 获取所有以 fen 开头的输入框
         const fenAmountInputs = dom.querySelectorAll('input[data-field^="fen"]')
         // 移除旧的监听器
@@ -1496,7 +1496,7 @@ export default {
           totalInput.removeEventListener('input', (e) => this.updateUpperCaseFromTotal(e, dom))
           totalInput.removeEventListener('change', (e) => this.updateUpperCaseFromTotal(e, dom))
           totalInput.removeEventListener('blur', (e) => this.updateUpperCaseFromTotal(e, dom))
-          
+
           totalInput.addEventListener('input', (e) => this.updateUpperCaseFromTotal(e, dom))
           totalInput.addEventListener('change', (e) => this.updateUpperCaseFromTotal(e, dom))
           totalInput.addEventListener('blur', (e) => this.updateUpperCaseFromTotal(e, dom))
@@ -1558,7 +1558,7 @@ export default {
         const value = parseFloat(input.value) || 0
         wanTotal += value
       })
-      
+
       const wanInput = dom.querySelector('input[data-field="wTotal"]')
       if (wanInput) {
           wanInput.value = wanTotal===0?'0':wanTotal
@@ -1737,7 +1737,7 @@ export default {
 
       const totalInput = dom.querySelector('input[data-field="total"]')
       const upperCaseInput = dom.querySelector('input[data-field="upperCaseAmount"]')
-      
+
       if (totalInput && upperCaseInput) {
         this.total = parseFloat(totalInput.value.replace(/￥/g, '')) || 0
         upperCaseInput.value = numberToChinese(this.total)
@@ -2098,7 +2098,7 @@ export default {
     display: flex;
     flex-direction: column;
     max-height: 80vh;
-    
+
     ::v-deep .el-dialog__body {
       flex: 1;
       overflow-y: auto;
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index a19ba24..e0639c6 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -4,32 +4,6 @@
       <div slot="content" />
       <slot>
         <div class="selects">
-          <div>
-            <span style="padding: 0 6px;word-break: keep-all;">
-              合同分类
-            </span>
-            <Select v-model="select.contract_category" disabled placeholder="请选择合同分类" style="width:140px;" @on-change="handleCategoryChange">
-              <Option v-for="item in categoryOptions" :key="item.id" :value="item.id">{{ item.value || item.name }}</Option>
-            </Select>
-          </div>
-
-          <div>
-            <span style="padding: 0 6px;word-break: keep-all;">
-              事务类型
-            </span>
-            <Select v-model="select.work_type" multiple clearable placeholder="请选择事务类型" style="width:180px;" :max-tag-count="1" @on-change="handleTransactionTypeChange">
-              <Option v-for="item in transactionTypes" :key="item.id" :value="item.id">{{ item.value || item.name }}</Option>
-            </Select>
-          </div>
-
-          <div>
-            <span style="padding: 0 6px;word-break: keep-all;">
-              合同类型
-            </span>
-            <Select v-model="select.contract_type" multiple clearable placeholder="请选择合同类型" style="width:160px;" :max-tag-count="1" @on-change="handleContractTypeChange">
-              <Option v-for="item in contractTypes" :key="item.id" :value="item.id">{{ item.value || item.name }}</Option>
-            </Select>
-          </div>
 
           <div>
             <span style="padding: 0 6px;word-break: keep-all;">关键字</span>
@@ -69,6 +43,51 @@
                 @on-change="(e)=>select.year = e"
               />
             </span>
+          </div>
+          <div v-if="type!=1">
+            <span style="padding: 0 6px;word-break: keep-all;">
+              预算金额
+            </span>
+            <InputNumber v-model="select.start_plan_price" :min="0" placeholder="最小金额" style="width: 100px;" />
+            <span style="padding: 0 5px;">-</span>
+            <InputNumber v-model="select.end_plan_price" :min="0" placeholder="最大金额" style="width: 100px;" />
+          </div>
+
+          <!-- 更多按钮 -->
+          <div>
+            <Button type="text" @click="showMoreSearch = !showMoreSearch">
+              {{ showMoreSearch ? '收起' : '更多' }}
+            </Button>
+          </div>
+
+
+          <!-- 其余搜索项，v-if="showMoreSearch" -->
+          <template v-if="showMoreSearch">
+          <div>
+            <span style="padding: 0 6px;word-break: keep-all;">
+              合同分类
+            </span>
+            <Select v-model="select.contract_category" disabled placeholder="请选择合同分类" style="width:140px;" @on-change="handleCategoryChange">
+              <Option v-for="item in categoryOptions" :key="item.id" :value="item.id">{{ item.value || item.name }}</Option>
+            </Select>
+          </div>
+
+          <div>
+            <span style="padding: 0 6px;word-break: keep-all;">
+              事务类型
+            </span>
+            <Select v-model="select.work_type" multiple clearable placeholder="请选择事务类型" style="width:180px;" :max-tag-count="1" @on-change="handleTransactionTypeChange">
+              <Option v-for="item in transactionTypes" :key="item.id" :value="item.id">{{ item.value || item.name }}</Option>
+            </Select>
+          </div>
+
+          <div>
+            <span style="padding: 0 6px;word-break: keep-all;">
+              合同类型
+            </span>
+            <Select v-model="select.contract_type" multiple clearable placeholder="请选择合同类型" style="width:160px;" :max-tag-count="1" @on-change="handleContractTypeChange">
+              <Option v-for="item in contractTypes" :key="item.id" :value="item.id">{{ item.value || item.name }}</Option>
+            </Select>
           </div>
           <div v-if="type!=1">
             <span style="padding: 0 6px;word-break: keep-all;">创建日期</span>
@@ -144,14 +163,6 @@
             </Select>
           </div>
 
-          <div v-if="type!=1">
-            <span style="padding: 0 6px;word-break: keep-all;">
-              预算金额
-            </span>
-            <InputNumber v-model="select.start_plan_price" :min="0" placeholder="最小金额" style="width: 100px;" />
-            <span style="padding: 0 5px;">-</span>
-            <InputNumber v-model="select.end_plan_price" :min="0" placeholder="最大金额" style="width: 100px;" />
-          </div>
 
           <div v-if="type!=1">
             <span style="padding: 0 6px;word-break: keep-all;">
@@ -218,7 +229,8 @@
               <Option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }}
               </Option>
             </Select>
-          </div>
+          </div>
+          </template>
 
           <Button style="margin-left: 10px" type="primary" @click="searchContracts">查询</Button>
           <Button
@@ -553,7 +565,8 @@ export default {
       }
     }
     return {
-      pageTitle: '合同列表',
+      pageTitle: '合同列表',
+      showMoreSearch:false,
       type: 0, // pageType 合同列表_0 和 履约保函收取登记_1 公用
       userList: ['liuxiangyu', 'zhushulan', 'admin', 'jiangjiao'],
       window: {
@@ -891,7 +904,7 @@ export default {
         prop: 'date',
         formatter: (cell, data, value) => {
           if (value) {
-            return parseTime(new Date(value), '{y}-{m}-{d}') 
+            return parseTime(new Date(value), '{y}-{m}-{d}')
           }
         }
       },
diff --git a/src/views/dashboard/components/barChart.vue b/src/views/dashboard/components/barChart.vue
new file mode 100644
index 0000000..c7f920d
--- /dev/null
+++ b/src/views/dashboard/components/barChart.vue
@@ -0,0 +1,125 @@
+<template>
+  <div class="bar-chart">
+    <!-- 图表容器 -->
+    <div ref="chartDom" class="chart-container"></div>
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'; // 需安装：npm install echarts@4.9.0
+
+export default {
+  name: 'BarChart',
+  props: {
+    // X轴数据（必传，数组格式，如：['项目A', '项目B']）
+    xAxisData: {
+      type: Array,
+      required: true,
+      default: () => []
+    },
+    // Y轴数据（必传，包含三组数据，格式如下）
+    seriesData: {
+      type: Array,
+      required: true,
+      // 格式示例：
+      // [
+      //   { name: '年初预算合计金额', data: [5000, 8000] },
+      //   { name: '调整后预算合计金额', data: [6000, 7500] },
+      //   { name: '已使用', data: [3000, 5000] }
+      // ]
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      chartInstance: null // 图表实例
+    };
+  },
+  watch: {
+    // 监听数据变化，实时更新图表
+    xAxisData: {
+      deep: true,
+      handler() {
+        this.updateChart();
+      }
+    },
+    seriesData: {
+      deep: true,
+      handler() {
+        this.updateChart();
+      }
+    }
+  },
+  mounted() {
+    // 初始化图表
+    this.$nextTick(() => {
+        this.initChart();
+      });
+  },
+  beforeDestroy() {
+    // 销毁图表实例
+    if (this.chartInstance) {
+      this.chartInstance.dispose();
+    }
+  },
+  methods: {
+    // 初始化图表
+    initChart() {
+      this.chartInstance = echarts.init(this.$refs.chartDom);
+      this.updateChart();
+    },
+
+    // 更新图表数据
+    updateChart() {
+      if (!this.chartInstance) return;
+
+      const option = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { type: 'shadow' } // 阴影指示器
+        },
+        legend: {
+          // 图例使用 seriesData 中的 name
+          data: this.seriesData.map(item => item.name),
+          top: 10
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true // 包含坐标轴刻度标签
+        },
+        xAxis: {
+          type: 'category',
+          data: this.xAxisData // X轴数据（通过prop传入）
+        },
+        yAxis: {
+          type: 'value',
+          name: '金额（元）',
+          axisLabel: {
+            formatter: '{value}' // 格式化Y轴标签
+          }
+        },
+        series: this.seriesData.map(item => ({
+          ...item,
+          type: 'bar' // 固定为柱状图类型
+        }))
+      };
+
+      this.chartInstance.setOption(option);
+    }
+  }
+};
+</script>
+
+<style scoped>
+.bar-chart {
+  width: 100%;
+  min-width: 600px;
+}
+
+.chart-container {
+  width: 100%;
+  height: 400px; /* 固定高度，可根据需求调整 */
+}
+</style>
diff --git a/src/views/dashboard/components/carryStatic.vue b/src/views/dashboard/components/carryStatic.vue
index 3c85614..54ac7d0 100644
--- a/src/views/dashboard/components/carryStatic.vue
+++ b/src/views/dashboard/components/carryStatic.vue
@@ -1,256 +1,434 @@
-<template>
-  <div>
-
-    <el-drawer
-      size="880px"
-      title="执行统计"
-      :visible.sync="drawer"
-      direction="rtl">
-      <div style="padding: 0 20px;">
-        <template v-if="type === 1">
-          <Card>
-            <el-checkbox :indeterminate="isIndeterminate"
-                         v-model="checkAll"
-                         @change="e => {
-                         departmentSelect = e ? departments.map(i => (i.plan_department_id)) : [];
-                         isIndeterminate = false;
-                       }">全选</el-checkbox>
-            <el-checkbox-group v-model="departmentSelect"
-                               size="small"
-                               @change="e => {
-                               let count = e.length;
-                               checkAll = count === departments.length;
-                               isIndeterminate = count > 0 && count < departments.length;
-                             }">
-              <el-checkbox v-for="item in departments" :label="item.plan_department_id" :key="item.plan_department_id">{{item.plan_department ? item.plan_department.name : item.plan_department_id}}</el-checkbox>
-            </el-checkbox-group>
-          </Card>
-
-          <Card style="margin-top: 20px;">
-            <div class="content">
-              <div class="item">
-                <p class="item__title">年初预算合计金额（元）</p>
-                <div class="item__value">{{moneyFormatter(totalMoneyTotal1)}}</div>
-              </div>
-              <div class="item">
-                <p class="item__title">调整后预算合计金额（元）</p>
-                <div class="item__value">{{moneyFormatter(totalMoneyTotal2)}}</div>
-              </div>
-              <div class="item">
-                <p class="item__title">已使用（元）</p>
-                <div class="item__value">{{moneyFormatter(totalUseMoneyTotal)}}</div>
-              </div>
-              <div class="item">
-                <p class="item__title">执行情况</p>
-                <el-progress class="item__value" text-inside :stroke-width="20" :percentage="totalPercent"></el-progress>
-              </div>
-            </div>
-          </Card>
-        </template>
-        <template v-else>
-          <Card>
-            <el-checkbox :indeterminate="isIndeterminate2"
-                         v-model="checkAll2"
-                         @change="e => {
-                         typeSelect = e ? types.map(i => (i.id)) : [];
-                         isIndeterminate = false;
-                       }">全选</el-checkbox>
-            <el-checkbox-group v-model="typeSelect"
-                               size="small"
-                               @change="e => {
-                               let count = e.length;
-                               checkAll2 = count === types.length;
-                               isIndeterminate2 = count > 0 && count < types.length;
-                             }">
-              <el-checkbox v-for="item in types" :label="item.id" :key="item.id">{{item.name}}</el-checkbox>
-            </el-checkbox-group>
-          </Card>
-
-          <Card style="margin-top: 20px;">
-            <div class="content">
-              <div class="item">
-                <p class="item__title">年初预算合计金额（元）</p>
-                <div class="item__value">{{moneyFormatter(totalMoneyTotal1Type)}}</div>
-              </div>
-              <div class="item">
-                <p class="item__title">调整后预算合计金额（元）</p>
-                <div class="item__value">{{moneyFormatter(totalMoneyTotal2Type)}}</div>
-              </div>
-              <div class="item">
-                <p class="item__title">已使用（元）</p>
-                <div class="item__value">{{moneyFormatter(totalUseMoneyTotalType)}}</div>
-              </div>
-              <div class="item">
-                <p class="item__title">执行情况</p>
-                <el-progress class="item__value" text-inside :stroke-width="20" :percentage="totalPercent"></el-progress>
-              </div>
-            </div>
-          </Card>
-        </template>
-      </div>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-import { moneyFormatter } from "@/utils"
-import { typeCarry } from "@/api/dashboard/notice"
-export default {
-  props: {
-    departments: Array,
-    year: [Number,String]
-  },
-  data() {
-    return {
-      type: 1,//1科室2类型
-      drawer: false,
-      isIndeterminate: false,
-      checkAll: false,
-
-      departmentSelect: [],
-
-
-      isIndeterminate2: false,
-      checkAll2: false,
-      types: [],
-      typeSelect: [],
-    }
-  },
-  methods: {
-    moneyFormatter,
-    show () {
-      this.drawer = true
-    },
-    hide () {
-      this.drawer = false
-    },
-    setType (type) {
-      this.type = type
-    }
-  },
-  computed: {
-    selectedDepartments () {
-      return this.departments?.filter(i => this.departmentSelect.find(j => j === i.plan_department_id)) || []
-    },
-    totalMoneyTotal1 () {
-     return this.selectedDepartments.reduce((pre,cur)=>(pre+Number(cur.money_total_1||0)),0) || 0
-    },
-    totalMoneyTotal2 () {
-      return this.selectedDepartments.reduce((pre,cur)=>(pre+Number(cur.money_total_2||0)),0) || 0
-    },
-    totalUseMoneyTotal () {
-      return this.selectedDepartments.reduce((pre,cur)=>(pre+Number(cur.use_money_total||0)),0) || 0
-    },
-    totalPercent () {
-      if (this.type === 1) {
-        return (Number(this.totalMoneyTotal2 !== 0) ? (Math.round(Number(this.totalUseMoneyTotal) / Number(this.totalMoneyTotal2) * 10000)/100) : (Math.round(Number(this.totalUseMoneyTotal) / Number(this.totalMoneyTotal1) * 10000)/100)) || 0
-      } else {
-        return (Number(this.totalMoneyTotal2Type !== 0) ? (Math.round(Number(this.totalUseMoneyTotalType) / Number(this.totalMoneyTotal2Type) * 10000)/100) : (Math.round(Number(this.totalUseMoneyTotalType) / Number(this.totalMoneyTotal1Type) * 10000)/100)) || 0
-      }
-    },
-
-    selectedTypes () {
-      return this.types?.filter(i => this.typeSelect.find(j => j === i.id)) || []
-    },
-    totalMoneyTotal1Type () {
-      return this.selectedTypes?.reduce((pre,cur)=>(pre+Number(cur.money_total_1||0)),0) || 0
-    },
-    totalMoneyTotal2Type () {
-      return this.selectedTypes?.reduce((pre,cur)=>(pre+Number(cur.money_total_2||0)),0) || 0
-    },
-    totalUseMoneyTotalType () {
-      return this.selectedTypes?.reduce((pre,cur)=>(pre+Number(cur.use_money_total||0)),0) || 0
-    },
-  },
-  watch: {
-    year: {
-      handler:function(val) {
-        typeCarry({
-          year: val
-        }).then(res => {
-          this.types = res
-          console.log(res)
-        })
-      },
-      immediate: true
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-$color: linear-gradient(to top left, #ff6641, #ec3634),
-linear-gradient(to top left, #4bfbb2, #49f2ac),
-linear-gradient(to top left, #efd458, #ba840a),
-linear-gradient(to top left, #05e6ff, #0069fe),
-linear-gradient(to top left, #a5ffff, #8fccd9),
-linear-gradient(to top left, #fca7ff, #7a519a),
-linear-gradient(to top left, #a4e829, #06ac2e);
-
-@for $index from 1 through length($color) {
-  .card#{$index} {
-    color: #fff;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    background: nth($color, $index);
-    grid-area: card#{$index};
-    border-radius: 4px;
-    filter: drop-shadow(0 2px 8px #0004);
-
-    padding: 20px;
-
-    .item__title {
-      font-weight: 600;
-      text-align: center;
-
-      padding-bottom: 20px;
-      position: relative;
-
-      &::after {
-        content: '';
-        height: 2px;
-        background: linear-gradient(to right,#fff 40%,#0000);
-
-        position: absolute;
-        bottom: -1px;
-        left: 0;
-        right: 0;
-      }
-    }
-    .item__value {
-      text-align: center;
-      flex: 1;
-      padding-top: 20px;
-    }
-  }
-}
-.content {
-  display: grid;
-  grid-template-columns: repeat(4,1fr);
-  grid-gap: 20px;
-
-  padding: 20px 0;
-  .item__title {
-    text-align: center;
-  }
-  .item__value {
-    font-weight: 600;
-    font-size: 17px;
-    text-align: center;
-
-    padding-top: 20px;
-  }
-}
-
-::v-deep .el-checkbox {
-  display: block;
-  margin-bottom: 6px;
-}
-::v-deep .el-checkbox-group {
-  max-height: 300px;
-  overflow-y: scroll;
-
-  margin-left: 20px;
-}
-</style>
+<template>
+  <div>
+
+    <el-drawer size="880px" title="执行统计" :visible.sync="drawer" direction="rtl">
+      <div style="padding: 0 20px;">
+        <template v-if="type === 1">
+          <Card>
+            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="e => {
+                         departmentSelect = e ? departments.map(i => (i.plan_department_id)) : [];
+                         isIndeterminate = false;
+                       }">全选</el-checkbox>
+            <el-checkbox-group  style="max-height:200px" v-model="departmentSelect" size="small" @change="e => {
+                               let count = e.length;
+                               checkAll = count === departments.length;
+                               isIndeterminate = count > 0 && count < departments.length;
+                             }">
+              <el-checkbox v-for="item in departments" :label="item.plan_department_id"
+                :key="item.plan_department_id">{{item.plan_department ? item.plan_department.name : item.plan_department_id}}</el-checkbox>
+            </el-checkbox-group>
+          </Card>
+
+          <Card style="margin-top: 20px;">
+            <div class="content">
+              <div class="item">
+                <p class="item__title">年初预算合计金额（元）</p>
+                <div class="item__value">{{moneyFormatter(totalMoneyTotal1)}}</div>
+              </div>
+              <div class="item">
+                <p class="item__title">调整后预算合计金额（元）</p>
+                <div class="item__value">{{moneyFormatter(totalMoneyTotal2)}}</div>
+              </div>
+              <div class="item">
+                <p class="item__title">已使用（元）</p>
+                <div class="item__value">{{moneyFormatter(totalUseMoneyTotal)}}</div>
+              </div>
+              <div class="item">
+                <p class="item__title">执行情况</p>
+                <el-progress class="item__value" text-inside :stroke-width="20"
+                  :percentage="totalPercent"></el-progress>
+              </div>
+            </div>
+          </Card>
+        </template>
+        <template v-else>
+          <Card >
+            <el-checkbox :indeterminate="isIndeterminate2" v-model="checkAll2" @change="e => {
+                         typeSelect = e ? types.map(i => (i.id)) : [];
+                         isIndeterminate = false;
+                       }">全选</el-checkbox>
+
+
+            <el-checkbox-group   style="max-height:200px" v-model="typeSelect" size="small" @change="e => {
+                               let count = e.length;
+                               checkAll2 = count === types.length;
+                               isIndeterminate2 = count > 0 && count < types.length;
+                             }">
+              <el-checkbox v-for="item in types" :label="item.id" :key="item.id">{{item.name}}</el-checkbox>
+            </el-checkbox-group>
+          </Card>
+
+          <Card style="margin-top: 20px;">
+            <div class="content">
+              <div class="item">
+                <p class="item__title">年初预算合计金额（元）</p>
+                <div class="item__value">{{moneyFormatter(totalMoneyTotal1Type)}}</div>
+              </div>
+              <div class="item">
+                <p class="item__title">调整后预算合计金额（元）</p>
+                <div class="item__value">{{moneyFormatter(totalMoneyTotal2Type)}}</div>
+              </div>
+              <div class="item">
+                <p class="item__title">已使用（元）</p>
+                <div class="item__value">{{moneyFormatter(totalUseMoneyTotalType)}}</div>
+              </div>
+              <div class="item">
+                <p class="item__title">执行情况</p>
+                <el-progress class="item__value" text-inside :stroke-width="20"
+                  :percentage="totalPercent"></el-progress>
+              </div>
+            </div>
+          </Card>
+        </template>
+
+        <!-- <barChart v-if="drawer" :xAxisData="xAxis" :seriesData="seriesData" /> -->
+        <div class="bar-chart" v-if="drawer">
+          <!-- 图表容器 -->
+          <div ref="chartDom" class="chart-container" style="background: #fff; min-height: 400px;"></div>
+        </div>
+
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+  import * as echarts from 'echarts'
+  import {
+    moneyFormatter
+  } from "@/utils"
+  import {
+    typeCarry
+  } from "@/api/dashboard/notice"
+  // import barChart from "@/views/dashboard/components/barChart.vue"
+  export default {
+    props: {
+      departments: Array,
+      year: [Number, String]
+    },
+    components: {
+      // barChart
+    },
+    data() {
+      return {
+        type: 1, //1科室2类型
+        drawer: false,
+        isIndeterminate: false,
+        checkAll: false,
+
+        departmentSelect: [],
+
+
+        isIndeterminate2: false,
+        checkAll2: false,
+        types: [],
+        typeSelect: [],
+        chartInstance: null,
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      moneyFormatter,
+      show() {
+        this.drawer = true
+      },
+      hide() {
+        this.drawer = false
+      },
+      setType(type) {
+        this.type = type
+      },
+      // 初始化图表
+      initChart() {
+        this.chartInstance = echarts.init(this.$refs.chartDom);
+        console.log("this.chartInstance", this.chartInstance)
+        this.updateChart()
+      },
+
+      // 更新图表数据
+      updateChart() {
+        if (!this.chartInstance) return;
+        console.log('xAxisData', this.xAxisData);
+        console.log('ydata1', this.ydata1);
+        const option = {
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow'
+            }, // 阴影指示器
+            formatter: function(params) {
+              console.log("params",params)
+              let result = params[0].axisValue + '<br/>';
+              params.forEach(item => {
+                result += item.marker + item.seriesName + ': ' + item.value + '<br/>';
+              });
+              return result;
+            }
+          },
+          legend: {
+            // 图例使用 seriesData 中的 name
+            data: ['年初预算合计金额', '调整后预算合计金额', '已使用'],
+            top: 10
+          },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true // 包含坐标轴刻度标签
+          },
+          xAxis: {
+            type: 'category',
+            data: this.xAxisData, // 用 computed 的 xAxisData
+            axisLabel: {
+                interval: 0,
+                rotate: 30 // 可根据实际情况调整角度
+              }
+          },
+          yAxis: {
+            type: 'value',
+            // name: '金额（元）',
+            axisLabel: {
+              formatter: '{value}' // 格式化Y轴标签
+            }
+          },
+          series: [{
+              type:'bar',
+              name: '年初预算合计金额',
+              data: this.ydata1, // 对应X轴每项的数值
+              itemStyle: {
+                color: '#5470C6'
+              } // 自定义颜色
+            },
+            {
+              type:'bar',
+              name: '调整后预算合计金额',
+              data: this.ydata2,
+              itemStyle: {
+                color: '#91CC75'
+              }
+            },
+            {
+              type:'bar',
+              name: '已使用',
+              data: this.ydata3,
+              itemStyle: {
+                color: '#FAC858'
+              }
+            }
+          ],
+        };
+        this.$nextTick(() => {
+          this.chartInstance.setOption(option);
+        })
+
+      }
+    },
+    computed: {
+      selectedDepartments() {
+        return this.departments?.filter(i => this.departmentSelect.find(j => j === i.plan_department_id)) || []
+      },
+      totalMoneyTotal1() {
+        return this.selectedDepartments.reduce((pre, cur) => (pre + Number(cur.money_total_1 || 0)), 0) || 0
+      },
+      totalMoneyTotal2() {
+        return this.selectedDepartments.reduce((pre, cur) => (pre + Number(cur.money_total_2 || 0)), 0) || 0
+      },
+      totalUseMoneyTotal() {
+        return this.selectedDepartments.reduce((pre, cur) => (pre + Number(cur.use_money_total || 0)), 0) || 0
+      },
+      totalPercent() {
+        if (this.type === 1) {
+          return (Number(this.totalMoneyTotal2 !== 0) ? (Math.round(Number(this.totalUseMoneyTotal) / Number(this
+            .totalMoneyTotal2) * 10000) / 100) : (Math.round(Number(this.totalUseMoneyTotal) / Number(this
+            .totalMoneyTotal1) * 10000) / 100)) || 0
+        } else {
+          return (Number(this.totalMoneyTotal2Type !== 0) ? (Math.round(Number(this.totalUseMoneyTotalType) / Number(
+            this.totalMoneyTotal2Type) * 10000) / 100) : (Math.round(Number(this.totalUseMoneyTotalType) / Number(
+            this.totalMoneyTotal1Type) * 10000) / 100)) || 0
+        }
+      },
+
+      selectedTypes() {
+        return this.types?.filter(i => this.typeSelect.find(j => j === i.id)) || []
+      },
+      totalMoneyTotal1Type() {
+        return this.selectedTypes?.reduce((pre, cur) => (pre + Number(cur.money_total_1 || 0)), 0) || 0
+      },
+      totalMoneyTotal2Type() {
+        return this.selectedTypes?.reduce((pre, cur) => (pre + Number(cur.money_total_2 || 0)), 0) || 0
+      },
+      totalUseMoneyTotalType() {
+        return this.selectedTypes?.reduce((pre, cur) => (pre + Number(cur.use_money_total || 0)), 0) || 0
+      },
+
+      xAxisData() {
+        if (this.type == 1) {
+          return this.selectedDepartments.map(item => item.plan_department?.name || '');
+        } else {
+          return this.selectedTypes.map(item => item?.name || '');
+        }
+      },
+      ydata1() {
+        if (this.type == 1) {
+          return this.selectedDepartments.map(item => Number(item.money_total_1) || 0)
+        } else {
+          return this.selectedTypes.map(item => Number(item.money_total_1) || 0)
+        }
+      },
+      ydata2() {
+        if (this.type == 1) {
+          return this.selectedDepartments.map(item => Number(item.money_total_2) || 0)
+        } else {
+          return this.selectedTypes.map(item => Number(item.money_total_2) || 0)
+        }
+      },
+      ydata3() {
+        if (this.type == 1) {
+          return this.selectedDepartments.map(item => Number(item.use_money_total) || 0)
+        } else {
+          return this.selectedTypes.map(item => Number(item.use_money_total) || 0)
+        }
+      }
+
+    },
+    watch: {
+      year: {
+        handler: function(val) {
+          typeCarry({
+            year: val
+          }).then(res => {
+            this.types = res
+            // this.xAxisData = types.map(item=>item.name?item.name:'') // 移除这行，xAxisData 由 computed 负责
+            console.log(res)
+          })
+        },
+        immediate: true
+      },
+      departments:{
+        handler: function(val) {
+          // this.xAxisData = val.map(item=>item.plan_department?item.plan_department.name:'') // 移除这行，xAxisData 由 computed 负责
+        },
+        immediate: true
+      },
+      drawer(newVal) {
+        if (newVal) {
+          this.$nextTick(() => {
+            // this.updateChart();
+            this.initChart()
+          })
+        } else {
+          if (this.chartInstance) {
+            this.chartInstance.dispose();
+          }
+        }
+      },
+      departmentSelect: {
+        handler() {
+          if (this.drawer && this.chartInstance) {
+            this.updateChart();
+          }
+        },
+        deep: true
+      },
+      typeSelect: {
+        handler() {
+          if (this.drawer && this.chartInstance) {
+            this.updateChart();
+          }
+        },
+        deep: true
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .chart-container {
+    width: 80%;
+    height: 250px;
+    margin:0 auto;
+    /* 固定高度，可根据需求调整 */
+  }
+
+  $color: linear-gradient(to top left, #ff6641, #ec3634),
+    linear-gradient(to top left, #4bfbb2, #49f2ac),
+    linear-gradient(to top left, #efd458, #ba840a),
+    linear-gradient(to top left, #05e6ff, #0069fe),
+    linear-gradient(to top left, #a5ffff, #8fccd9),
+    linear-gradient(to top left, #fca7ff, #7a519a),
+    linear-gradient(to top left, #a4e829, #06ac2e);
+
+  @for $index from 1 through length($color) {
+    .card#{$index} {
+      color: #fff;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      background: nth($color, $index);
+      grid-area: card#{$index};
+      border-radius: 4px;
+      filter: drop-shadow(0 2px 8px #0004);
+
+      padding: 20px;
+
+      .item__title {
+        font-weight: 600;
+        text-align: center;
+
+        padding-bottom: 20px;
+        position: relative;
+
+        &::after {
+          content: '';
+          height: 2px;
+          background: linear-gradient(to right, #fff 40%, #0000);
+
+          position: absolute;
+          bottom: -1px;
+          left: 0;
+          right: 0;
+        }
+      }
+
+      .item__value {
+        text-align: center;
+        flex: 1;
+        padding-top: 20px;
+      }
+    }
+  }
+
+  .content {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    grid-gap: 20px;
+
+    padding: 20px 0;
+
+    .item__title {
+      text-align: center;
+    }
+
+    .item__value {
+      font-weight: 600;
+      font-size: 17px;
+      text-align: center;
+
+      padding-top: 20px;
+    }
+  }
+
+  ::v-deep .el-checkbox {
+    display: block;
+    margin-bottom: 6px;
+  }
+
+  ::v-deep .el-checkbox-group {
+    max-height: 300px;
+    overflow-y: scroll;
+
+    margin-left: 20px;
+  }
+</style>
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index beac2dd..51a2e99 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -60,16 +60,18 @@
         <Button type="primary" style="margin-left: 10px" @click="getPlanProgress">查询</Button>
       </slot>
     </lx-header>
-
-    <xy-table ref="xyTable" :object-span-method="objectSpanMethod" :table-item="table" :list="list" :show-summary="true" :summary-method="summary">
+<!-- :object-span-method="objectSpanMethod" -->
+    <xy-table ref="xyTable"
+    :defaultExpandAll="false" row-key="id"
+    :table-item="table" :list="list" :show-summary="true" :summary-method="summary">
       <template v-slot:btns>
         <div />
       </template>
     </xy-table>
 
-    <div style="display: flex;justify-content: flex-end;">
-      <Page :total="total" show-elevator @on-change="pageChange" />
-    </div>
+    <!-- <div style="display: flex;justify-content: flex-end;">
+      <Page :total="total" :page-size="select.page_size" show-elevator @on-change="pageChange" />
+    </div> -->
   </div>
 </template>
 
@@ -96,6 +98,7 @@ export default {
       type: [], // 预算类型
       departments: [],
       select: {
+        page_size:999,
         pageIndex: 1,
         year: '',
         type: '',
@@ -126,33 +129,6 @@ export default {
         align: 'left',
         fixed: 'left'
       },
-      {
-        prop: 'type',
-        label: '预算类型',
-        width: 120,
-        formatter: (cell, data, value) => {
-          const res = this.type.filter(item => {
-            return item.id === value
-          })
-          return res[0]?.value || '未知'
-        }
-      },
-      {
-        prop: 'year',
-        label: '所属年份',
-        width: 160
-      },
-      {
-        prop: 'plan_department.name',
-        label: '相关科室',
-        width: 180
-      },
-      {
-        prop: 'content',
-        label: '描述',
-        align: 'left',
-        minWidth: 300
-      },
       {
         prop: 'money',
         width: 180,
@@ -199,7 +175,34 @@ export default {
             } > </el-progress> </div>
           )
         }
-      }
+      },
+      {
+        prop: 'type',
+        label: '预算类型',
+        width: 120,
+        formatter: (cell, data, value) => {
+          const res = this.type.filter(item => {
+            return item.id === value
+          })
+          return res[0]?.value || '未知'
+        }
+      },
+      {
+        prop: 'year',
+        label: '所属年份',
+        width: 160
+      },
+      {
+        prop: 'plan_department.name',
+        label: '相关科室',
+        width: 180
+      },
+      {
+        prop: 'content',
+        label: '描述',
+        align: 'left',
+        width: 300
+      },
       ]
     }
   },
@@ -296,7 +299,7 @@ export default {
 
     async getPlanProgress() {
       const res = await getProgress({
-        page_size: 10,
+        page_size: this.select.page_size,
         page: this.select.pageIndex,
         year: this.select.year,
         type: this.select.type,
@@ -304,23 +307,72 @@ export default {
         top_pid: 1,
         ...this.select
       })
-      for (var m of res.list.data) {
-        m.pid_info_name = m.pid_info?.name
-      }
-      this.list =
-          mergeTableRow({
-            data: res.list.data,
-            mergeColNames: ['pid_info_name'], // 需要合并的列，默认合并列相同的数据
-            firstMergeColNames: ['pid_info_name'], // 受影响的列，只合并以firstMerge为首的同类型数据
-            firstMerge: 'pid_info_name' // 以哪列为基础进行合并，一般为第一列
-          })
+      // for (var m of res.list.data) {
+      //   m.pid_info_name = m.pid_info?.name
+      // }
+      // this.list =
+      //     mergeTableRow({
+      //       data: res.list.data,
+      //       mergeColNames: ['pid_info_name'], // 需要合并的列，默认合并列相同的数据
+      //       firstMergeColNames: ['pid_info_name'], // 受影响的列，只合并以firstMerge为首的同类型数据
+      //       firstMerge: 'pid_info_name' // 以哪列为基础进行合并，一般为第一列
+      //     })
+      this.list = this.concactPid(res.list.data)
       this.total = res.list.total
       this.useMoneyTotal = res.use_money_total
       this.moneyTotal = res.money
       this.updateMoneyTotal = res.update_money
       this.rateTotal = this.toper(this.updateMoneyTotal, this.moneyTotal, this.useMoneyTotal)
 
-      console.log(res)
+      console.log("list",this.list)
+    },
+    concactPid(arr){
+      const groupByPid = {};
+      arr.forEach(item => {
+        const key = item.pid;
+        if (!groupByPid[key]) {
+          groupByPid[key] = [];
+        }
+        groupByPid[key].push(item);
+      });
+
+      // 2. 构建合并后的数组
+      const mergedResult = Object.values(groupByPid).map(children => {
+        // 从分组的第一项中获取 pid_info（因同 pid 的 pid_info 相同）
+        const pidInfo = children[0].pid_info;
+
+        // 计算父级的 use_money_total（children 中 use_money_total 之和，null 视为 0）
+        const useMoneyTotal = children.reduce((sum, child) => {
+          const value = child.use_money_total ?? 0; // 处理 null
+          return parseFloat(sum) + parseFloat(value);
+        }, 0);
+
+        // 构建父级对象
+        return {
+          pid: children[0].pid, // 父级 pid 与分组的 pid 一致
+          id:pidInfo.pid+'-'+pidInfo.id,
+          pid_info_name: pidInfo.name,
+          money: parseFloat(pidInfo.money).toFixed(2),
+          type: pidInfo.type,
+          update_money: parseFloat(pidInfo.update_money).toFixed(2),
+          use_money_total: parseFloat(useMoneyTotal).toFixed(2), // 子项总和
+          children: children // 保留所有子项
+        };
+      });
+
+      const arrayWithPer = mergedResult.map(row => {
+        // 计算 per（公式：use_money_total / (update_money || money)，处理 null 和 NaN）
+        const useMoneyTotal = Number(row.use_money_total ?? 0); // null 视为 0，转换为数字
+        const denominator = Number(row.update_money) || Number(row.money); // 取 update_money 或 money
+        const calculation_result = isNaN(useMoneyTotal / denominator) ? 0 : useMoneyTotal / denominator;
+
+        return {
+          ...row,
+          calculation_result: calculation_result // 新增 per 字段
+        };
+      });
+      const sortedArray = arrayWithPer.sort((a, b) => b.calculation_result - a.calculation_result);
+      return sortedArray
     }
   }
 }