预算和核算新增合同总价行，修改工资下载模版地址

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-20 17:08:40
+ * @LastEditTime: 2025-05-21 09:17:51
 -->
 <template>
   <div class="main" v-loading="loading">
@@ -219,10 +219,29 @@
             <td style="text-align:right;"><b>{{ isNaN(budgetForm.totalBudget) ? 0 : budgetForm.totalBudget }}</b></td>
             <td style="text-align:right;"><b>{{ isNaN(totalBudgetAdjust) ? 0 : totalBudgetAdjust }}</b></td>
             <td style="text-align:right;"><b>{{ (Number(totalBudgetAdjust) - Number(budgetForm.totalBudget)).toFixed(2)
-            }}</b></td>
+                }}</b></td>
           </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;">
@@ -329,6 +348,8 @@ import { getCar } from "@/api/oa/car/car";
 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 { getContract } from "@/api/oa/contract/contract";
 import InnerStaffCost from './components/InnerStaffCost.vue';
 import OuterStaffCost from './components/OuterStaffCost.vue';
 import CarCost from './components/CarCost.vue';
@@ -372,12 +393,12 @@ export default {
           this.row.projectId = res.data.projectId;
           this.initBudgetForm();
           this.initCheckForm();
-          // this.getProjectWorkList();
+          this.getContractInfo();
         });
       } else {
         this.initBudgetForm();
         this.initCheckForm();
-        // this.getProjectWorkList();
+        this.getContractInfo();
       }
 
     }
@@ -411,7 +432,9 @@ export default {
         deviceList: [],
         carList: [],
         participateList: []
-      }
+      },
+      contractList: [],
+      contract: {}
     }
   },
   async created() {
@@ -421,6 +444,7 @@ export default {
     }
     this.initBudgetForm();
     this.initCheckForm();
+    this.getContractInfo();
   },
   methods: {
     initBudgetForm() {
@@ -606,6 +630,18 @@ export default {
         }
       })
     },
+    // 获取合同信息
+    getContractInfo() {
+      listProjectContract({ projectId: this.row.projectId }).then(res => {
+        let contractIds = res.rows;
+        this.contractList = [];
+        for (let contractId of contractIds) {
+          getContract(contractId.contractId).then(response => {
+            this.contractList.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-19 17:03:41
+ * @LastEditTime: 2025-05-21 09:18:59
 -->
 <template>
   <div class="main" v-loading="loading">
@@ -392,8 +392,8 @@
           </tr>
         </table>
       </el-descriptions-item>
-      <el-descriptions-item label="合同总价" :span="3" v-if="$store.getters.roles.includes('leader')">
-        <table border="1" style="width:100%;">
+      <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>
@@ -405,6 +405,11 @@
             <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 == '分管审核' && !budgetForm.managerComment" class="alert alert-warning"

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

@@ -72,7 +72,7 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.payDay, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column> -->
+</el-table-column> -->
       <el-table-column label="发放月份" align="center" prop="payMonth" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.payMonth, '{y}-{m}') }}</span>
@@ -202,6 +202,7 @@ export default {
   name: "Wage",
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -419,8 +420,8 @@ export default {
     },
     /* 下载模板 */
     importTemplate() {
-      const path = "http://127.0.0.1:8080/profile/template/userWage.xlsx"
-      // const path = "http://oa.sccehui.com:6104/prod-api/profile/template/cg-template.xlsx"
+      // const path = "http://127.0.0.1:8080/profile/template/userWage.xlsx"
+      const path = `${baseUrl}${'/profile/upload/template/userWage.xlsx'}`
       downloadTemplate(path).then(res => {
         const blob = new Blob([res])
         saveAs(blob, '社保公积金模版.xlsx');