From 8db3c504b37aa228241b614032444f210e9b6e33 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 16 Jul 2025 18:46:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E8=B5=84=E9=87=91=E9=A2=84?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/departmentProgressDetail.vue   |  4 +--
 .../departmentProgress/components/detail.vue  | 29 +++++++++++++------
 src/views/departmentProgress/index.vue        |  4 +--
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/views/departmentProgress/components/departmentProgressDetail.vue b/src/views/departmentProgress/components/departmentProgressDetail.vue
index 85348a4..f9892cc 100644
--- a/src/views/departmentProgress/components/departmentProgressDetail.vue
+++ b/src/views/departmentProgress/components/departmentProgressDetail.vue
@@ -28,7 +28,7 @@
               <el-col :span="8">
                 <el-card class="summary-card" shadow="hover">
                   <div class="card-title">预算金额</div>
-                  <div class="execution-rate">{{ formatToWan(row.contract_plan_sum) }}</div>
+                  <div class="execution-rate">{{ formatToWan(row.money_total) }}</div>
                   <div class="card-desc">科室预算金额</div>
                 </el-card>
               </el-col>
@@ -137,7 +137,7 @@
           label: '经办人',
           width: 100,
         }, {
-          prop: 'contract_plan_sum',
+          prop: 'money_total',
           label: '预算金额',
           width: 100,
           formatter(v1, v2, value){
diff --git a/src/views/departmentProgress/components/detail.vue b/src/views/departmentProgress/components/detail.vue
index 2a07bea..2566daa 100644
--- a/src/views/departmentProgress/components/detail.vue
+++ b/src/views/departmentProgress/components/detail.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer :title="`${detailRow.name}`" :visible.sync="detailDrawerVisible" direction="rtl" size="800px">
+    <el-drawer :title="`${detailRow.name}`" :visible.sync="detailDrawerVisible" direction="rtl" size="50%">
       <div class="detail">
         <div>
           <div class="section-title">列支信息</div>
@@ -25,7 +25,7 @@
 
             </div>
             <div><span>预算金额：</span>
-              <div>{{ detailRow.contract_plan_sum?detailRow.contract_plan_sum:'0.00' }}</div>
+              <div>{{ detailRow.money_total?detailRow.money_total:'0.00' }}</div>
             </div>
             <div><span>已确认金额：</span>
               <div>{{ detailRow.contract_plan_act_sum?detailRow.contract_plan_act_sum:'0.00' }}
@@ -33,10 +33,10 @@
             </div>
             <div><span>当前状态：</span>
               <div>
-                <el-tag  size="small" v-if="type==='part'" type="warning">
+                <el-tag size="small" v-if="type==='part'" type="warning">
                   {{detailRow.funds_count>0?'部分支付中':'oa流程中'}}
                 </el-tag>
-                <el-tag  size="small" v-if="type==='end'" type="success">
+                <el-tag size="small" v-if="type==='end'" type="success">
                   已完成
                 </el-tag>
               </div>
@@ -50,7 +50,7 @@
             <div v-for="item in flowLinks">
               <div class="flows-name">{{item.custom_model_name}}流程</div>
               <div class="flows-title">{{item.flow_title}}</div>
-              <div class="flows-btn" @click="toOaDetail(item.id)">查看流程详情</div>
+              <div class="flows-btn" @click="toOaDetail(item.flow_id)">查看流程详情</div>
             </div>
           </div>
         </div>
@@ -98,6 +98,9 @@
   import {
     getFundLog,
   } from "@/api/paymentRegistration/fundLog.js";
+  import {
+    getToken
+  } from "@/utils/auth";
   export default {
     data() {
       return {
@@ -106,8 +109,8 @@
         type: '',
         flowLinks: [],
         signPlan: [],
-        oaUrl: '',
-        isShowOaModal:false
+        oaUrl: '',
+        isShowOaModal: false
       }
     },
     watch: {
@@ -148,14 +151,21 @@
       toOaDetail(id) {
         let url =
           `${process.env.VUE_APP_OUT_URL}/#/flow/detail?auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=${id}`
-        this.oaUrl = url
-        this.isShowOaModal = true
+        // this.oaUrl = url
+        // this.isShowOaModal = true
+        window.open(url, "_blank")
       }
     }
   }
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-drawer__header {
+    margin-bottom: 0;
+    font-size: 16px;
+    color: #000;
+  }
+
   .detail {
     padding: 20px;
     padding-top: 0;
@@ -228,6 +238,7 @@
       font-size: 16px;
       padding: 10px 20px;
       margin-bottom: 20px;
+
       &>div {
         display: flex;
         align-items: flex-start;
diff --git a/src/views/departmentProgress/index.vue b/src/views/departmentProgress/index.vue
index df7115c..365e719 100644
--- a/src/views/departmentProgress/index.vue
+++ b/src/views/departmentProgress/index.vue
@@ -35,7 +35,7 @@
               <el-row class="text-center" :gutter="0">
                 <el-col :span="8">
                   <div class="text-muted">预算总额</div>
-                  <div class="text-muted fw-bold">{{ formatToWan(dept.contract_plan_sum) }}</div>
+                  <div class="text-muted fw-bold">{{ formatToWan(dept.money_total) }}</div>
                 </el-col>
                 <el-col :span="8">
                   <div class="text-muted">已执行</div>
@@ -43,7 +43,7 @@
                 </el-col>
                 <el-col :span="8">
                   <div class="text-muted">进行中</div>
-                  <div class="text-muted fw-bold text-warning">{{ getDoingMoneyTotal(dept.contract_plan_sum,dept.use_money_total) }}</div>
+                  <div class="text-muted fw-bold text-warning">{{ getDoingMoneyTotal(dept.money_total,dept.use_money_total) }}</div>
                 </el-col>
               </el-row>
               <div class="mt-3 detail"  @click="goToDetail(dept)">