修改网页端预算提交错误的问题；

新增合同打印页面

oa-ui/src/utils/deleteResource.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-21 14:46:33
+ * @LastEditTime: 2025-05-29 14:29:39
  */
 import request from '@/utils/request'
 
@@ -120,16 +120,6 @@ const apiEndpoints = [
       '/oa/wage/batch/:id'
     ]
   },
-  {
-    procDefName: '项目预算',
-    apiUrl: [
-      '/oa/budget/:id',
-      '/oa/budgetSettle/:id',
-      '/oa/budgetCar/:id',
-      '/oa/budgetDevice/:id',
-      '/oa/budgetStaff/:id',
-    ]
-  },
   {
     procDefName: '技术方案',
     apiUrl: [

oa-ui/src/views/flowable/form/budget/addBudget.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-16 09:43:29
+ * @LastEditTime: 2025-05-29 13:55:21
 -->
 <template>
   <div class="app-container">
@@ -132,10 +132,10 @@
       <el-button type="warning" @click="preserve()">保存</el-button>
       <el-button type="danger" @click="returnOpen = true" v-if="taskName != '预算编制'">退 回</el-button>
       <el-button type="success" @click="viewForm()">预览表单</el-button>
-      <el-button type="primary" @click="submitNextFlow" v-if="taskName == '预算编制'">提交下一个流程</el-button>
+      <el-button type="primary" @click="submitNextFlow"
+        v-if="taskName == '预算编制' || taskName == '部门审核'">提交下一个流程</el-button>
     </div>
     <el-dialog title="表单预览" :visible.sync="viewOpen" width="75%" append-to-body>
-      <!-- <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="$emit('goBack')"></budget-info> -->
       <new-budget-info :taskName="taskName" :taskForm="taskForm"></new-budget-info>
     </el-dialog>
     <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
@@ -265,8 +265,7 @@ export default {
       this.$modal.confirm('是否提交到下一个流程？').then(async () => {
         if (this.taskName == "预算编制") {
           this.preserve();
-          let curUser = this.$store.getters.name;
-          let deptLeaderRes = await getUsersDeptLeader(curUser);
+          let deptLeaderRes = await getUsersDeptLeaderByDept({ deptId: this.$store.getters.deptId });
           let deptLeader = deptLeaderRes.data.userId;
           this.$set(this.taskForm.variables, 'approval', deptLeader)
         } else if (this.taskName == '部门审核') {

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-27 16:27:15
+ * @LastEditTime: 2025-05-29 14:36:02
 -->
 <template>
   <div class="main" v-loading="loading">
@@ -651,6 +651,12 @@ export default {
           // 获取现场开支
           let siteRes = await listSite({ pageSize: 100, budgetId });
           this.siteList = siteRes.rows;
+          this.siteList = this.siteList.map(site => {
+            return {
+              ...site,
+              amount: Number(site.amount).toFixed(2),
+            };
+          });
           this.budgetForm.siteSum = this.siteList.reduce((sum, site) => sum + (Number(site.amount) || 0), 0);
 
           // 检查内业人员绩效总额是否超过内业绩效总额

oa-ui/src/views/flowable/form/business/components/paymentTable.vue

@@ -96,6 +96,12 @@ export default {
       this.paymentList.forEach(payment => {
         this.calculatePaymentAmount(payment)
       })
+    },
+    paymentList: {
+      handler(newVal) {
+        this.$emit('update:paymentList', newVal)
+      },
+      deep: true
     }
   },
   created() {

oa-ui/src/views/flowable/form/business/components/workTable.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-08-29 15:21:42
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-25 17:08:46
+ * @LastEditTime: 2025-05-28 15:15:13
 -->
 <template>
   <div style="width:100%">
@@ -93,6 +93,12 @@ export default {
   watch: {
     contractId() {
       this.initTable()
+    },
+    workList: {
+      handler(newVal) {
+        this.$emit('update:workList', newVal)
+      },
+      deep: true
     }
   },
   created() {

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -2,10 +2,17 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-23 15:46:04
+ * @LastEditTime: 2025-05-28 14:47:35
 -->
 <template>
   <div class="app-container">
+    <!-- 承接合同打印 -->
+    <el-button type="primary" @click="printOpen = true">打印</el-button>
+    <el-dialog :title="title" :visible.sync="printOpen" width="60%" append-to-body>
+      <contract-print :form="form" :chooseProjectList="chooseProjectList" :commentList="commentList"
+        :partyAList="partyAList" :workList="workList" :paymentList="paymentList"
+        @cancel="printOpen = false"></contract-print>
+    </el-dialog>
     <el-row :gutter="20">
       <el-col :span="flowDisabled ? 18 : 24" :xs="24">
         <h2 class="text-center"><b>承接合同评审表</b></h2>
@@ -23,13 +30,13 @@
             <el-button type="primary" size="mini" @click="tbOpen = true" v-if="taskName == '合同拟稿'">选择投标项目</el-button>
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="3" direction="vertical">
               <el-descriptions-item label="投标项目名称" label-class-name="my-label" :span="3">{{ chooseTender.projectName
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目来源" label-class-name="my-label">{{ getProjectSource(chooseTender)
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="联系人" label-class-name="my-label">{{ chooseTender.aPerson
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="联系电话" label-class-name="my-label">{{ chooseTender.aPhone
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="合同名称" prop="contractName">
@@ -114,13 +121,14 @@
             </el-table>
           </el-form-item>
           <!-- 表1：合同计划工作量 -->
-          <work-table ref="workTableRef" :contractId="taskForm.formId" :taskName="taskName"></work-table>
+          <work-table ref="workTableRef" :contractId="taskForm.formId" :taskName="taskName"
+            @update:workList="updateWorkList"></work-table>
 
           <p class="mb20 mt20"></p>
 
           <!-- 表2：合同回款计划  -->
           <payment-table ref="paymentRef" :contractId="taskForm.formId" :amount="form.amount"
-            :taskName="taskName"></payment-table>
+            :taskName="taskName" @update:paymentList="updatePaymentList"></payment-table>
 
           <el-form-item label="合同备注" prop="remark">
             <el-input v-model="form.remark" :autosize="{ minRows: 4 }" type="textarea" placeholder="请输入合同备注"
@@ -432,12 +440,13 @@ import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
 import ChooseSubcontract from '@/views/flowable/form/components/chooseSubcontract.vue';
 import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
 import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
+import ContractPrint from '@/views/flowable/form/components/print/contractPrint.vue';
 
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
     flow, ChooseProject, ChooseTender, FileItem, ChoosePartyA, workTable, paymentTable,
-    projectInfo, ChooseSubcontract, subContract, ReturnComment, ReturnBtn
+    projectInfo, ChooseSubcontract, subContract, ReturnComment, ReturnBtn, ContractPrint
   },
   props: {
     taskName: {
@@ -563,6 +572,7 @@ export default {
       },
       showAlter: true,
       returnOpen: false,
+      printOpen: false,
     };
   },
   created() {
@@ -1292,6 +1302,12 @@ export default {
     },
     isReturn(val) {
       this.showAlter = val
+    },
+    updateWorkList(newWorkList) {
+      this.workList = newWorkList;
+    },
+    updatePaymentList(newPaymentList) {
+      this.paymentList = newPaymentList;
     }
   }
 }

oa-ui/src/views/flowable/form/components/print/contractPrint.vue

@@ -0,0 +1,291 @@
+<template>
+  <div>
+    <div id="printContract">
+      <h2 class="text-center title">承接合同评审表</h2>
+      <table border="1">
+        <tr>
+          <td :colspan="1" class="fontbold">合同名称</td>
+          <td :colspan="8">{{ form.contractName }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">甲方单位</td>
+          <td :colspan="8">{{ getPartyAName(form.partyAId) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">合同编码</td>
+          <td :colspan="4">{{ form.contractCode }}</td>
+          <td :colspan="1" class="fontbold">合同编号</td>
+          <td :colspan="3">{{ form.contractNumber }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">合同金额</td>
+          <td :colspan="4">{{ form.amount }}元</td>
+          <td :colspan="1" class="fontbold">履约保证金</td>
+          <td :colspan="3">{{ form.deposit }}元</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">合同文件</td>
+          <td :colspan="8">{{ getFileName(form.contractDocument) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">关联项目</td>
+          <td :colspan="8">
+            <div v-for="(project, index) in chooseProjectList" :key="index">
+              {{ index + 1 }}. {{ project.projectName }} ({{ project.projectNumber }})
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">合同计划工作量</td>
+          <td :colspan="8">
+            <table border="1" style="width:100%;">
+              <tr>
+                <td style="width:50px;">序号</td>
+                <td style="min-width:100px;">工作内容</td>
+                <td style="min-width:120px;">等级或比例尺</td>
+                <td style="min-width:80px;">单位</td>
+                <td style="min-width:80px;">工作量</td>
+                <td style="min-width:120px;">要求完成时间</td>
+                <td style="min-width:150px;">备注</td>
+              </tr>
+              <tr v-for="(work, idx) in workList" :key="idx">
+                <td>{{ idx + 1 }}</td>
+                <td>{{ work.content }}</td>
+                <td>{{ work.scale }}</td>
+                <td>{{ work.unit }}</td>
+                <td>{{ work.workload }}</td>
+                <td>{{ work.deadline }}</td>
+                <td>{{ work.remark }}</td>
+              </tr>
+              <tr v-if="!workList || workList.length === 0">
+                <td colspan="7">无</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">合同回款计划</td>
+          <td :colspan="8">
+            <table border="1" style="width:100%;">
+              <tr>
+                <td style="width:50px;">序号</td>
+                <td style="min-width:100px;">回款条件</td>
+                <td style="min-width:100px;">回款比例（%）</td>
+                <td style="min-width:100px;">回款金额（元）</td>
+                <td style="min-width:100px;">预计时间</td>
+                <td style="min-width:100px;">备注</td>
+              </tr>
+              <tr v-for="(payment, idx) in paymentList" :key="idx">
+                <td>{{ idx + 1 }}</td>
+                <td>{{ payment.paymentCondition }}</td>
+                <td>{{ payment.paymentPercentage }}</td>
+                <td>{{ payment.paymentAmount }}</td>
+                <td>{{ payment.paymentTime }}</td>
+                <td>{{ payment.remark }}</td>
+              </tr>
+              <tr v-if="!paymentList || paymentList.length === 0">
+                <td colspan="6">无</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">合同备注</td>
+          <td :colspan="8" style="white-space: pre-wrap;">{{ form.remark }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">拟稿人</td>
+          <td :colspan="4">{{ form.draftUser ? form.draftUser.nickName : '' }}</td>
+          <td :colspan="1" class="fontbold">日期</td>
+          <td :colspan="3">{{ form.draftTime }}</td>
+        </tr>
+        <tr v-if="form.commentType === '1'">
+          <td :colspan="1" class="fontbold">会议评审</td>
+          <td :colspan="8">
+            <div>评审时间：{{ meetingForm.meetingTime }}</div>
+            <div>评审地点：{{ getPlaceName(meetingForm.place) }}</div>
+            <div>评审主持人：{{ meetingForm.hostUser ? meetingForm.hostUser.nickName : '' }}</div>
+            <div>评审结论：{{ meetingForm.conclusion }}</div>
+            <div>主持人签名：{{ meetingForm.hostUser ? meetingForm.hostUser.nickName : '' }}</div>
+            <div>日期：{{ meetingForm.commentTime }}</div>
+          </td>
+        </tr>
+        <tr v-if="form.commentType === '2'">
+          <td :colspan="1" class="fontbold">线上会审</td>
+          <td :colspan="8">
+            <table border="1" style="width:100%;margin:0;">
+              <tr>
+                <td style="width:50px;">序号</td>
+                <td>会审部门</td>
+                <td>会审人</td>
+                <td>会审意见</td>
+                <td style="min-width:50px;">签名</td>
+                <td style="min-width:90px;">日期</td>
+              </tr>
+              <tr v-for="(comment, index) in commentList" :key="index">
+                <td>{{ index + 1 }}</td>
+                <td>{{ getDeptName(comment.deptId) }}</td>
+                <td>{{ comment.commentUser ? comment.commentUser.nickName : '' }}</td>
+                <td style="white-space: pre-wrap;">{{ comment.comment }}</td>
+                <td><span class="auditor">{{ comment.commentUser ? comment.commentUser.nickName : '' }}</span></td>
+                <td>{{ comment.commentTime }}</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">分管审批意见</td>
+          <td :colspan="4">{{ form.managerComment }}</td>
+          <td :colspan="1" class="fontbold">签名</td>
+          <td :colspan="2"><span class="auditor">{{ form.managerUser ? form.managerUser.nickName : '' }}</span></td>
+          <td :colspan="1" style="min-width:90px;">{{ form.managerTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">总经理审批意见</td>
+          <td :colspan="4">{{ form.gmComment }}</td>
+          <td :colspan="1" class="fontbold">签名</td>
+          <td :colspan="2"><span class="auditor">{{ form.gmUser ? form.gmUser.nickName : '' }}</span></td>
+          <td :colspan="1" style="min-width:90px;">{{ form.gmTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">签订备注</td>
+          <td :colspan="4">{{ form.signRemark }}</td>
+          <td :colspan="1" class="fontbold">签订日期</td>
+          <td :colspan="3" style="min-width:90px;">{{ form.signDate }}</td>
+        </tr>
+      </table>
+    </div>
+    <div class="text-center mt20">
+      <el-button type="primary" v-print="print">确认打印</el-button>
+      <el-button @click="$emit('cancel')">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ContractPrint',
+  props: {
+    form: {
+      type: Object,
+      required: true
+    },
+    chooseTender: {
+      type: Object,
+      default: () => ({})
+    },
+    chooseProjectList: {
+      type: Array,
+      default: () => []
+    },
+    connectSubContractList: {
+      type: Array,
+      default: () => []
+    },
+    meetingForm: {
+      type: Object,
+      default: () => ({})
+    },
+    commentList: {
+      type: Array,
+      default: () => []
+    },
+    partyAList: {
+      type: Array,
+      default: () => []
+    },
+    deptList: {
+      type: Array,
+      default: () => []
+    },
+    placeList: {
+      type: Array,
+      default: () => []
+    },
+    workList: {
+      type: Array,
+      default: () => []
+    },
+    paymentList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      print: {
+        id: 'printContract',
+        popTitle: '承接合同打印', // 打印配置页上方标题
+        extraHead: '', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
+        preview: false, // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
+        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
+        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
+        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
+        previewBeforeOpenCallback() { }, //预览窗口打开之前的callback（开启预览模式调用）
+        previewOpenCallback() { }, // 预览窗口打开之后的callback（开启预览模式调用）
+        beforeOpenCallback() { }, // 开启打印前的回调事件
+        openCallback() { }, // 调用打印之后的回调事件
+        closeCallback() { }, //关闭打印的回调事件（无法确定点击的是确认还是取消）
+        url: '',
+        standard: '',
+        extraCss: ''
+      }
+    }
+  },
+  methods: {
+    getPartyAName(partyAId) {
+      const partyA = this.partyAList.find(item => item.partyAId === partyAId)
+      return partyA ? partyA.partyAName : ''
+    },
+    getPlaceName(placeId) {
+      const place = this.placeList.find(item => item.id === placeId)
+      return place ? place.name : ''
+    },
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1]
+      }
+      return ''
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+table {
+  width: 90%;
+  text-align: left;
+  border-collapse: collapse;
+  margin: 0 auto;
+  border: 1px solid #a5abb0;
+
+  td {
+    padding: 15px;
+  }
+}
+
+.title {
+  font-family: '黑体';
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.fontbold {
+  font-weight: bold;
+  min-width: 100px;
+  text-align: center;
+}
+
+@page {
+  size: auto;
+  margin-bottom: 0;
+}
+
+@media print {
+  #printContract table {
+    width: 100%;
+  }
+}
+</style>

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: wrh
- * @LastEditTime: 2025-05-21 14:27:45
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-29 14:27:58
 -->
 <template>
   <div class="app-container">
@@ -471,7 +471,7 @@ export default {
     },
     // 子流程不可以删除
     beDeleted(row) {
-      if (row.procDefName == '项目预算' || row.procDefName == '技术方案' || row.procDefName == '安全交底' || row.procDefName == '技术交底' || row.finishTime != null) {
+      if (row.procDefName == '技术方案' || row.procDefName == '安全交底' || row.procDefName == '技术交底' || row.finishTime != null) {
         return true
       } else if (row.procDefName == '项目流转' && row.taskName != '项目登记') {
         return true

oa-ui/src/views/flowable/task/myProcess/progressTree.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-18 15:14:45
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-14 15:40:11
+ * @LastEditTime: 2025-05-29 15:09:06
 -->
 <template>
   <div>
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import { listProject } from '@/api/oa/project/project';
+import { listProject,getProject } from '@/api/oa/project/project';
 export default {
   props: {
     definitionList: {
@@ -163,7 +163,7 @@ export default {
         this.projectList = res.rows;
       })
     },
-    handleProjectConfirm() {
+    async handleProjectConfirm() {
       if (!this.projectId) {
         this.$message.warning('请选择项目');
         return;
@@ -172,6 +172,12 @@ export default {
         ...this.clickNode,
         projectId: this.projectId,
       };
+      let res = await getProject(this.projectId);
+      let prijectLeader = res.data.projectLeader;
+      if (prijectLeader != this.$store.getters.userId) {
+        this.$message.warning('抱歉，您不是该项目的项目负责人，无法发起该预算');
+        return;
+      }
       this.$emit('confirm', selectedData);
       this.projectDialogVisible = false;
     }