预算和核算新增分包合同信息；

修改员工工资下载模版错误

oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-21 09:17:51
+ * @LastEditTime: 2025-05-21 14:10:34
 -->
 <template>
   <div class="main" v-loading="loading">
@@ -158,6 +158,44 @@
       <el-descriptions-item label="现场开支" :span="3">
         <site-cost :siteList.sync="siteList" :taskName="taskName" @update:siteList="handleSiteChange"></site-cost>
       </el-descriptions-item>
+      <el-descriptions-item label="合同总价" :span="3" v-hasRole="['leader', 'finance', 'nfinance', 'admin']">
+        <table border="1" style="width:100%;" v-if="contractList.length > 0">
+          <tr style="background-color:#f8f8f9">
+            <td>序号</td>
+            <td>合同名称</td>
+            <td>合同总价</td>
+          </tr>
+          <tr v-for="contract, index in contractList" :key="contract.contractId">
+            <td>{{ index + 1 }}</td>
+            <td>{{ contract.contractName }}</td>
+            <td>{{ contract.amount }}</td>
+          </tr>
+        </table>
+        <div v-else>
+          <div class="alert alert-warning">
+            暂无合同信息
+          </div>
+        </div>
+      </el-descriptions-item>
+      <el-descriptions-item label="分包合同总价" :span="3" v-hasRole="['leader', 'finance', 'nfinance', 'admin']">
+        <table border="1" style="width:100%;" v-if="subContractList.length > 0">
+          <tr style="background-color:#f8f8f9">
+            <td>序号</td>
+            <td>分包合同名称</td>
+            <td>分包合同总价</td>
+          </tr>
+          <tr v-for="subContract, index in subContractList" :key="subContract.subContractId">
+            <td>{{ index + 1 }}</td>
+            <td>{{ subContract.subContractName }}</td>
+            <td>{{ subContract.subAmount }}</td>
+          </tr>
+        </table>
+        <div v-else>
+          <div class="alert alert-warning">
+            暂无分包合同信息
+          </div>
+        </div>
+      </el-descriptions-item>
       <el-descriptions-item label="经营相关" :span="3">
         <business-cost :budgetForm.sync="budgetForm" :taskName="taskName"
           @update:budgetForm="handleBusinessChange"></business-cost>
@@ -223,25 +261,6 @@
           </tr>
         </table>
       </el-descriptions-item>
-      <el-descriptions-item label="合同总价" :span="3" v-hasRole="['leader', 'finance', 'nfinance', 'admin']">
-        <table border="1" style="width:100%;" v-if="contractList.length > 0">
-          <tr style="background-color:#f8f8f9">
-            <td>序号</td>
-            <td>合同名称</td>
-            <td>合同总价</td>
-          </tr>
-          <tr v-for="contract, index in contractList" :key="contract.contractId">
-            <td>{{ index + 1 }}</td>
-            <td>{{ contract.contractName }}</td>
-            <td>{{ contract.amount }}</td>
-          </tr>
-        </table>
-        <div v-else>
-          <div class="alert alert-warning">
-            暂无合同信息
-          </div>
-        </div>
-      </el-descriptions-item>
       <el-descriptions-item label="核算说明" :span="3">
         <div v-if="taskName == '核算编制' && !checkForm.checkComment" class="alert alert-warning"
           style="padding: 10px; border: 1px solid #f0ad4e; background-color: #fcf8e3; color: #8a6d3b;">
@@ -349,7 +368,9 @@ import { getDevice } from "@/api/oa/device/device";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { getUsersManageLeader, getUserByPost, getUsersViceDeptLeaderByDept } from "@/api/system/post";
 import { listProjectContract } from "@/api/oa/contract/projectContract";
+import { listProjectSubcontract } from "@/api/oa/contract/projectSubcontract";
 import { getContract } from "@/api/oa/contract/contract";
+import { getSubContract } from "@/api/oa/contract/subContract";
 import InnerStaffCost from './components/InnerStaffCost.vue';
 import OuterStaffCost from './components/OuterStaffCost.vue';
 import CarCost from './components/CarCost.vue';
@@ -394,11 +415,13 @@ export default {
           this.initBudgetForm();
           this.initCheckForm();
           this.getContractInfo();
+          this.getSubContractInfo();
         });
       } else {
         this.initBudgetForm();
         this.initCheckForm();
         this.getContractInfo();
+        this.getSubContractInfo();
       }
 
     }
@@ -434,7 +457,7 @@ export default {
         participateList: []
       },
       contractList: [],
-      contract: {}
+      subContractList: [],
     }
   },
   async created() {
@@ -445,6 +468,7 @@ export default {
     this.initBudgetForm();
     this.initCheckForm();
     this.getContractInfo();
+    this.getSubContractInfo();
   },
   methods: {
     initBudgetForm() {
@@ -642,6 +666,17 @@ export default {
         }
       })
     },
+    getSubContractInfo() {
+      listProjectSubcontract({ projectId: this.row.projectId }).then(res => {
+        let subContractIds = res.rows;
+        this.subContractList = [];
+        for (let subContract of subContractIds) {
+          getSubContract(subContract.subContractId).then(response => {
+            this.subContractList.push(response.data);
+          })
+        }
+      })
+    },
     async initActualInfo(project) {
       let deviceIds = project.devices.split(',');
       let carIds = project.cars.split(',');

oa-ui/src/views/flowable/form/budget/adjust/newBudgetInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-21 09:18:59
+ * @LastEditTime: 2025-05-21 14:16:47
 -->
 <template>
   <div class="main" v-loading="loading">
@@ -411,6 +411,25 @@
           </div>
         </div>
       </el-descriptions-item>
+      <el-descriptions-item label="分包合同总价" :span="3" v-hasRole="['leader', 'finance', 'nfinance', 'admin']">
+        <table border="1" style="width:100%;" v-if="subContractList.length > 0">
+          <tr style="background-color:#f8f8f9">
+            <td>序号</td>
+            <td>分包合同名称</td>
+            <td>分包合同总价</td>
+          </tr>
+          <tr v-for="subContract, index in subContractList" :key="subContract.subContractId">
+            <td>{{ index + 1 }}</td>
+            <td>{{ subContract.subContractName }}</td>
+            <td>{{ subContract.subAmount }}</td>
+          </tr>
+        </table>
+        <div v-else>
+          <div class="alert alert-warning">
+            暂无分包合同信息
+          </div>
+        </div>
+      </el-descriptions-item>
       <el-descriptions-item label="分管领导审核意见" :span="3">
         <div v-if="taskName == '分管审核' && !budgetForm.managerComment" class="alert alert-warning"
           style="padding: 10px; border: 1px solid #f0ad4e; background-color: #fcf8e3; color: #8a6d3b;">
@@ -466,7 +485,9 @@ import { getProject } from "@/api/oa/project/project";
 import { getUsersManageLeader, getUserByPost } from "@/api/system/post";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { listProjectContract } from "@/api/oa/contract/projectContract";
+import { listProjectSubcontract } from "@/api/oa/contract/projectSubcontract";
 import { getContract } from "@/api/oa/contract/contract";
+import { getSubContract } from "@/api/oa/contract/subContract";
 import InnerStaffCost from './components/InnerStaffCost.vue';
 import OuterStaffCost from './components/OuterStaffCost.vue';
 import CarCost from './components/CarCost.vue';
@@ -497,6 +518,7 @@ export default {
       this.initBudgetForm();
       this.getProjectWorkList();
       this.getContractInfo();
+      this.getSubContractInfo();
     }
   },
   data() {
@@ -515,12 +537,14 @@ export default {
       returnOpen: false,
       contractList: [],
       showAlter: true,
+      subContractList: [],
     }
   },
   created() {
     this.initBudgetForm();
     this.getProjectWorkList();
     this.getContractInfo();
+    this.getSubContractInfo();
   },
   methods: {
     initBudgetForm() {
@@ -641,6 +665,17 @@ export default {
         }
       })
     },
+    getSubContractInfo() {
+      listProjectSubcontract({ projectId: this.taskForm.formId }).then(res => {
+        let subContractIds = res.rows;
+        this.subContractList = [];
+        for (let subContract of subContractIds) {
+          getSubContract(subContract.subContractId).then(response => {
+            this.subContractList.push(response.data);
+          })
+        }
+      })
+    },
     safeNumber(value) {
       const num = Number(value);
       return isNaN(num) ? 0 : num;
@@ -846,7 +881,7 @@ table {
 }
 
 .total-budget {
-  font-size: 1.5em;
+  font-size: 16px;
   font-weight: bold;
   color: #4CAF50;
   text-align: center;

oa-ui/src/views/oa/wage/index.vue

@@ -420,14 +420,11 @@ export default {
     },
     /* 下载模板 */
     importTemplate() {
-      // const path = "http://127.0.0.1:8080/profile/template/userWage.xlsx"
-      const path = `${baseUrl}${'/profile/upload/template/userWage.xlsx'}`
+      const path = '/profile/upload/template/userWage.xlsx'
       downloadTemplate(path).then(res => {
         const blob = new Blob([res])
         saveAs(blob, '社保公积金模版.xlsx');
       });
-      // this.download("file/achievement/importTemplate", {
-      // }, `成果表模板.xlsx`);
     },
   }
 };