网页端：借款表单新增查看历史借款和查看预算按钮

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -122,12 +122,14 @@
               <span class="low-money">{{ siteExpenses.toFixed(2) }}</span>
               <span class="up-money">（大写：{{ formatNumberWithWan(siteExpenses) }}）</span>
             </el-tag>
+            <el-button type="primary" size="mini" @click="openBudget = true" v-hasPermi="['cmc:budget:list']">查看预算</el-button>
           </el-form-item>
           <el-form-item label="已申请借款" v-if="isSelect">
             <el-tag type="danger">
               <span class="low-money">{{ hasBorrow.toFixed(2) }}</span>
               <span class="up-money">（大写：{{ formatNumberWithWan(hasBorrow) }}）</span>
             </el-tag>
+            <el-button type="primary" size="mini" @click="openBorrow = true">查看历史借款</el-button>
           </el-form-item>
           <el-form-item label="可用借款" v-if="isSelect">
             <el-tag type="success">
@@ -333,6 +335,12 @@
         <el-button @click="openNewExpense = false">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="查看预算" :visible.sync="openBudget" width="65%" append-to-body>
+      <new-budget-info :taskForm="budgetTaskForm" :taskName="''"></new-budget-info>
+    </el-dialog>
+    <el-drawer title="查看历史借款" :visible.sync="openBorrow" direction="rtl" size="35%" append-to-body>
+      <history-borrow :historyBorrowList="historyBorrowList"></history-borrow>
+    </el-drawer>
     <el-button type="success" @click="printOpen = true">打印</el-button>
   </div>
 </template>
@@ -356,6 +364,8 @@ import FileItem from '../business/fileItem.vue';
 import BorrowPrint from '../components/print/borrowPrint.vue';
 import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
 import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
+import newBudgetInfo from '@/views/flowable/form/budget/adjust/newBudgetInfo.vue';
+import HistoryBorrow from './historyBorrow.vue';
 
 export default {
   dicts: ['cmc_borrow_expense', 'cmc_unit'],
@@ -365,7 +375,9 @@ export default {
     FileItem,
     BorrowPrint,
     ReturnComment,
-    ReturnBtn
+    ReturnBtn,
+    newBudgetInfo,
+    HistoryBorrow
   },
   name: "Borrow",
   props: {
@@ -455,7 +467,13 @@ export default {
         name: [
           { required: true, message: '请输入开支项名称', trigger: 'blur' }
         ]
-      }
+      },
+      openBudget: false,
+      budgetTaskForm: {
+        formId: '',
+      },
+      openBorrow: false,
+      historyBorrowList: [],
     };
   },
   created() {
@@ -591,6 +609,7 @@ export default {
       let budgetData = await listBudget({ projectId: this.form.projectId })
       if (budgetData.total == 1) {
         let budget = budgetData.rows[0];
+        this.budgetTaskForm.formId = this.form.projectId;
         let siteRes = await listSite({ budgetId: budget.budgetId });
         let maxExpense = siteRes.rows.reduce((sum, site) => sum + (Number(site.amount) || 0), 0);
         this.siteExpenses = maxExpense
@@ -602,7 +621,8 @@ export default {
       if (borrow.total != 0) {
         let borrowList = borrow.rows;
         let hasBorrow = 0;
-        borrowList = borrowList.filter(item => item.borrowId != this.taskForm.formId)
+        borrowList = borrowList.filter(item => item.borrowId != this.taskForm.formId);
+        this.historyBorrowList = borrowList; //获取历史借款的列表
         borrowList.forEach(element => {
           if (element.managerAmount) {
             hasBorrow = hasBorrow + element.managerAmount

oa-ui/src/views/flowable/form/finance/historyBorrow.vue

@@ -0,0 +1,183 @@
+<template>
+  <div class="app-container">
+    <template v-if="historyBorrowList.length > 0">
+      <div v-for="item in historyBorrowList" :key="item.borrowId" class="borrow-card">
+        <div class="card-header">
+          <span class="applier">申请人：{{ item.applierUser.nickName }}</span>
+          <span class="apply-date">申请日期：{{ item.applyDate }}</span>
+        </div>
+        <div class="card-body">
+          <div class="detail-table" v-if="borrowDetailsMap[item.borrowId]">
+            <template v-if="borrowDetailsMap[item.borrowId].length > 0">
+              <div class="detail-header detail-row">
+                <span>开支项目</span>
+                <span>单位</span>
+                <span>单价</span>
+                <span>数量</span>
+                <span>申请金额</span>
+                <span>核准金额</span>
+              </div>
+              <div v-for="detail in borrowDetailsMap[item.borrowId]" :key="detail.id" class="detail-row">
+                <span>{{ detail.borrowItem }}</span>
+                <span>{{ detail.unit }}</span>
+                <span>{{ detail.price }}</span>
+                <span>{{ detail.quantity }}</span>
+                <span>{{ detail.applyAmount }}</span>
+                <span :class="{ 'not-approved': detail.managerAmount === undefined || detail.managerAmount === null || detail.managerAmount === '' }">
+                  {{ detail.managerAmount !== undefined && detail.managerAmount !== null && detail.managerAmount !== '' ? detail.managerAmount : '未核准' }}
+                </span>
+              </div>
+            </template>
+            <template v-else>
+              <span class="no-detail">暂无明细</span>
+            </template>
+          </div>
+          <div v-else>
+            <span class="no-detail">暂无明细</span>
+          </div>
+        </div>
+        <div class="card-footer">
+          <span class="apply-amount">申请金额：{{ item.applyAmount }}</span>
+          <span class="manager-amount">核准金额：{{ item.managerAmount !== undefined && item.managerAmount !== null && item.managerAmount !== '' ? item.managerAmount : '未核准' }}</span>
+        </div>
+      </div>
+    </template>
+    <template v-else>
+      <el-empty description="暂无历史借款"></el-empty>
+    </template>
+  </div>
+</template>
+
+<script>
+import { listBorrowDetail } from "@/api/oa/borrow/borrowDetail";
+export default {
+  props: {
+    historyBorrowList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      borrowDetailsMap: {}
+    };
+  },
+  watch: {
+    historyBorrowList: {
+      handler: 'getAllHistoryBorrowDetails',
+      immediate: true
+    }
+  },
+  methods: {
+    async getAllHistoryBorrowDetails() {
+      const map = {};
+      for (const item of this.historyBorrowList) {
+        if (item.borrowId) {
+          try {
+            const res = await listBorrowDetail({ borrowId: item.borrowId });
+            map[item.borrowId] = res.rows || [];
+          } catch (e) {
+            map[item.borrowId] = [];
+          }
+        }
+      }
+      this.borrowDetailsMap = map;
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 18px 0;
+  background: #f7f8fa;
+}
+.borrow-card {
+  margin: 0 5px;
+  background: #fff;
+  border-radius: 14px;
+  box-shadow: 0 2px 12px 0 rgba(0,0,0,0.06);
+  margin-bottom: 22px;
+  padding: 20px 22px 14px 22px;
+  transition: box-shadow 0.2s;
+  &:hover {
+    box-shadow: 0 4px 18px 0 rgba(0,0,0,0.10);
+  }
+  .card-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-weight: 500;
+    margin-bottom: 10px;
+    padding-bottom: 2px;
+    .applier {
+      color: #222;
+      font-size: 16px;
+    }
+    .apply-date {
+      color: #aaa;
+      font-size: 14px;
+      font-weight: 400;
+    }
+  }
+  .card-body {
+    .detail-table {
+      width: 100%;
+      .detail-header {
+        font-weight: 500;
+        background: #f8fafd;
+        color: #666;
+        border-radius: 6px 6px 0 0;
+      }
+      .detail-row {
+        display: grid;
+        grid-template-columns: 2fr 1fr 1fr 1fr 2fr 2fr;
+        align-items: center;
+        padding: 5px 0;
+        border-bottom: 1px solid #f0f0f0;
+        font-size: 15px;
+        span {
+          text-align: center;
+          word-break: break-all;
+          min-height: 22px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+        .not-approved {
+          color: #bbb;
+        }
+        &:last-child {
+          border-bottom: none;
+        }
+      }
+    }
+    .no-detail {
+      color: #bbb;
+      text-align: center;
+      display: block;
+      padding: 18px 0 8px 0;
+      font-size: 15px;
+    }
+  }
+  .card-footer {
+    display: flex;
+    justify-content: flex-end;
+    gap: 32px;
+    margin-top: 14px;
+    font-weight: 500;
+    font-size: 16px;
+    border-top: none;
+    padding-top: 0;
+    .apply-amount {
+      color: #2d8cf0;
+    }
+    .manager-amount {
+      color: #19be6b;
+    }
+    .manager-amount:after {
+      color: #bbb;
+    }
+  }
+}
+</style>

oa-ui/src/views/flowable/form/projectProcess/planWorkload.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-09-05 13:57:44
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-05 14:45:48
+ * @LastEditTime: 2025-07-01 09:59:36
 -->
 <template>
   <div style="width:100%">
@@ -94,8 +94,9 @@ export default {
     },
     getContractWorkList(contractId) {
       listContractWork({ pageNum: 1, pageSize: 100, contractId }).then(res => {
-        if (res.rows.length > 0)
-          this.workList = res.rows;
+        if (res.rows.length > 0) {
+          this.workList = res.rows.map(({ workId, ...rest }) => rest);
+        }
         else {
           this.workList = [{
             content: "",