修改项目预算的预算表，新增项目流转的核定工作

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallSafeActivityExecutionListener.java

@@ -15,6 +15,5 @@ public class CallSafeActivityExecutionListener implements ExecutionListener {
         SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
         String userId = userPostMapper.selectUserListByPostName("专职安全员").get(0).getUserId().toString();
         Authentication.setAuthenticatedUserId(userId);
-        delegateExecution.setVariable("approval", userId);
     }
 }

oa-ui/src/main.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-05 09:39:10
+ * @LastEditTime: 2024-07-08 10:58:08
  */
 import Vue from 'vue'
 
@@ -25,7 +25,7 @@ import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, 
-  handleTree, getUserName, getFileName, reviewWord,getDeptName,getUserNames } from "@/utils/ruoyi";
+  handleTree, getUserName, getFileName, reviewWord,getDeptName,getUserNames,getDeptNames } from "@/utils/ruoyi";
 // 标题组件
 import RowTitle from '@/components/RowTitle'
 
@@ -67,6 +67,7 @@ Vue.prototype.handleTree = handleTree
 Vue.prototype.publicData = publicData
 Vue.prototype.getUserName = getUserName
 Vue.prototype.getUserNames = getUserNames
+Vue.prototype.getDeptNames = getDeptNames
 Vue.prototype.getDeptName = getDeptName
 Vue.prototype.getFileName = getFileName
 Vue.prototype.reviewWord = reviewWord

oa-ui/src/utils/ruoyi.js

@@ -281,6 +281,18 @@ export function getDeptName(deptId) {
   }
 }
 
+export function getDeptNames(ids) {
+  if (!ids) {
+    return '';
+  }
+  return ids.split(',').map(id => {
+    // 使用trim去除id两侧的空白字符  
+    const trimmedId = id.trim();
+    let dept = this.$store.state.user.deptList.find(item => item.deptId === Number(trimmedId));
+    return dept ? dept.deptName.trim() : ''; // 如果user不存在，返回一个空字符串或者其他默认值  
+  }).join(',');
+}
+
 export function getFileName(name) {
   if (name) {
     let arr = name.split("/");

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-13 15:53:25
+ * @LastEditTime: 2024-07-08 10:45:42
 -->
 <template>
   <div>
@@ -463,7 +463,7 @@ import {
   delegate,
   flowTaskForm,
 } from "@/api/flowable/todo";
-import { getUsersDeptLeaderByDept } from "@/api/system/post";
+import { getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from "@/api/system/post";
 export default {
   components: {
     choosePeople,
@@ -814,16 +814,25 @@ export default {
       this.budgetForm.carCost = carCost;
       this.budgetForm.deviceCost = deviceCost;
     },
-    submitComplete() {
+    async submitComplete() {
       const params = { taskId: this.taskForm.taskId };
-      getNextFlowNode(params).then(res => {
-        getUsersDeptLeaderByDept({ deptId: 107 }).then(res => {
-          let userId = res.data.userId;
-          this.$set(this.taskForm.variables, "approval", userId);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit("goBack");
+      const deptIdsStr = this.projectForm.undertakingDept;
+      const deptIdsArr = (deptIdsStr.split(',')).map(Number);
+      let approvalList = []
+      for (let deptId of deptIdsArr) {
+        let res = await getUsersManageLeaderByDept({ deptId })
+        if (res.code == 200 && res.data) {
+          res.data.forEach(element => {
+            approvalList.push(element.userId)
           });
+        }
+      }
+      this.$set(this.taskForm.variables, "approvalList", approvalList); //得到各部门的分管领导列表
+      // 提交到下一个流程
+      getNextFlowNode(params).then(res => {
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit("goBack");
         });
       });
     },

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

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2024-04-08 16:08:33
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-05 10:16:54
+ * @LastEditTime: 2024-07-08 14:20:03
 -->
 <template>
   <div>
     <add-budget :taskName="taskName" :taskForm="taskForm" @goBack="goBack" v-if="taskName == '预算编制'"></add-budget>
-    <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="goBack" v-if="taskName == '预算审核' || taskName == '预算批准'"></budget-info>
+    <budget-info :taskName="taskName" :taskForm="taskForm" @goBack="goBack" v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'"></budget-info>
   </div>
 </template>
 

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

@@ -1,13 +1,15 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-20 18:31:18
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-08 14:27:10
 -->
 <template>
   <div class="main">
-    <div v-if="taskName == '预算审核'">
-      <h2 class="text-center">项目信息</h2>
+    <div>
+      <h2 class="text-center">项目直接生产成本预算表</h2>
+      <p style="text-align: center;">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }} | 审核人：{{
+        budgetForm.auditorUser ? budgetForm.auditorUser.nickName : '' }}</p>
       <el-descriptions :column="3" border class="descriptions">
         <el-descriptions-item label="项目编号">
           {{ projectForm.projectNumber }}
@@ -18,13 +20,16 @@
         <el-descriptions-item label="项目负责人">
           {{ getUserName(projectForm.projectLeader) }}
         </el-descriptions-item>
+        <el-descriptions-item label="承担部门">
+          {{ getDeptNames(projectForm.undertakingDept) }}
+        </el-descriptions-item>
         <el-descriptions-item label="项目备注" :span="3">
           {{ projectForm.remark }}
         </el-descriptions-item>
-        <el-descriptions-item label="项目概况">
+        <el-descriptions-item label="项目概况" :span="3">
           <div>
             <table border="1" style="width: 100%;">
-              <tr>
+              <tr style="background-color:#f8f8f9">
                 <td style="width: 250px">工作内容</td>
                 <td style="width: 100px">等级或比例尺</td>
                 <td style="width: 100px">单位</td>
@@ -55,321 +60,212 @@
             </table>
           </div>
         </el-descriptions-item>
+        <el-descriptions-item label="直接成本" :span="3">
+          <table border="1" style="width:100%">
+            <tr style="background-color:#f8f8f9">
+              <td :rowspan="workLen + 2">直接成本</td>
+              <td>工作简述</td>
+              <td>工作内容</td>
+              <td>数量</td>
+              <td>单价</td>
+              <td>单位</td>
+              <td>系数</td>
+              <td>金额</td>
+              <td style="min-width: 150px;">备注</td>
+            </tr>
+            <tr v-for="work in workList">
+              <td>{{ work.content }}</td>
+              <td>{{ work.cmcPrice ? work.cmcPrice.workItem : '' }}</td>
+              <td v-if="taskName == '分管审核' || taskName == '总经理审核'">
+                <el-input-number :controls="false" style="width:100px;" v-model="work.workload"
+                  @change="computeWorkSettle(work)"></el-input-number>
+              </td>
+              <td v-else>
+                {{ work.workload }}
+              </td>
+              <td>{{ work.price }}</td>
+              <td>{{ work.unit }}</td>
+              <td v-if="taskName == '分管审核' || taskName == '总经理审核'">
+                <el-input-number :controls="false" style="width:100px;" v-model="work.coefficient"
+                  @change="computeWorkSettle(work)"></el-input-number>
+                <el-button type="text" @click="getCoefficientRemark(work)">系数备注</el-button>
+              </td>
+              <td v-else>
+                {{ work.coefficient }}
+              </td>
+              <td>{{ work.settle }}</td>
+              <td>{{ work.remark ? work.remark : '' }}</td>
+            </tr>
+            <tr>
+              <td :colspan="6" class="head">直接成本合计</td>
+              <td :colspan="1" class="head">{{ budgetForm.settleExpense }}</td>
+              <td></td>
+            </tr>
+          </table>
+        </el-descriptions-item>
+        <el-descriptions-item label="间接成本" :span="3">
+          <table border="1" style="width:100%">
+            <tr v-if="userLen != 1" style="background-color:#f8f8f9">
+              <td :rowspan="userLen">人员</td>
+              <td>姓名</td>
+              <td>基本工资</td>
+              <td>岗位工资</td>
+              <td>人员成本（天）</td>
+              <td>预算天数</td>
+              <td>金额</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="user in chooseUser" :key="'user' + user.userId">
+              <td>{{ user.user ? user.user.nickName : '' }}</td>
+              <td>1780</td>
+              <td>{{ user.salary.salary }}</td>
+              <td>{{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}</td>
+              <td v-if="taskName == '分管审核' || taskName == '总经理审核'">
+                <el-input-number :controls="false" style="width:100px;" v-model="user.days"
+                  @blur="computedFixCostSettle(user, 'user')"></el-input-number>
+              </td>
+              <td v-else>
+                {{ user.days }}
+              </td>
+              <td>{{ user.staffCost }}</td>
+              <td></td>
+            </tr>
+            <tr v-if="carLen != 1" style="background-color:#f8f8f9">
+              <td :rowspan="carLen">车辆</td>
+              <td>车牌号</td>
+              <td>油耗</td>
+              <td>总里程</td>
+              <td>折旧成本（天）</td>
+              <td>预算天数</td>
+              <td>金额</td>
+            </tr>
+            <tr v-for="car in chooseCar" :key="'car' + car.carId">
+              <td>{{ car.car ? car.car.licensePlate : '' }}</td>
+              <td>{{ car.mileage }}</td>
+              <td v-if="taskName == '分管审核' || taskName == '总经理审核'">
+                <el-input-number :controls="false" style="width:100px;" v-model="car.distance"
+                  @blur="computedFixCostSettle(car, 'car')"></el-input-number>
+              </td>
+              <td v-else>
+                {{ car.distance }}
+              </td>
+              <td>{{ car.car ? car.car.dayCost : '' }}</td>
+              <td v-if="taskName == '分管审核' || taskName == '总经理审核'">
+                <el-input-number :controls="false" style="width:100px;" v-model="car.days"
+                  @blur="computedFixCostSettle(car, 'car')"></el-input-number>
+              </td>
+              <td v-else>
+                {{ car.days }}
+              </td>
+              <td>{{ car.expense }}</td>
+              <td></td>
+            </tr>
+            <tr v-if="deviceLen != 1" style="background-color:#f8f8f9">
+              <td :rowspan="deviceLen">设备</td>
+              <td>设备名称</td>
+              <td>规格型号</td>
+              <td>品牌</td>
+              <td>折旧成本（天）</td>
+              <td>预算天数</td>
+              <td>金额</td>
+            </tr>
+            <tr v-for="device in chooseDevice" :key="'device' + device.deviceId">
+              <td>{{ device.device ? device.device.name : '' }}</td>
+              <td>{{ device.device ? device.device.series : '' }}</td>
+              <td>{{ device.device ? device.device.brand : '' }}</td>
+              <td>{{ device.device ? device.device.dayCost : '' }}</td>
+              <td v-if="taskName == '分管审核' || taskName == '总经理审核'">
+                <el-input-number :controls="false" style="width:100px;" v-model="device.days"
+                  @blur="computedFixCostSettle(device, 'device')"></el-input-number>
+              </td>
+              <td v-else>
+                {{ device.days }}
+              </td>
+              <td>{{ device.depreciation }}</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td :colspan="6" class="head">间接成本合计</td>
+              <td :colspan="1" class="head">{{ budgetForm.fixCost }}</td>
+              <td></td>
+            </tr>
+          </table>
+        </el-descriptions-item>
+        <el-descriptions-item label="外协费用" :span="3">
+          <div v-if="taskName == '分管审核' || taskName == '总经理审核'">
+            <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.outExpense"
+              @blur="computedDirectExpense()"></el-input-number>
+          </div>
+          <div v-else class="text-center">
+            {{ budgetForm.outExpense }}
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="车船租赁" :span="3">
+          <div v-if="taskName == '分管审核' || taskName == '总经理审核'">
+            <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.rentExpense"
+              @blur="computedDirectExpense()"></el-input-number>
+          </div>
+          <div v-else class="text-center">
+            {{ budgetForm.rentExpense }}
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="其他费用" :span="3">
+          <div v-if="taskName == '分管审核' || taskName == '总经理审核'">
+            <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.otherExpense"
+              @blur="computedDirectExpense()"></el-input-number>
+          </div>
+          <div v-else class="text-center">
+            {{ budgetForm.otherExpense }}
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="税费成本" :span="3">
+          <div v-if="taskName == '分管审核' || taskName == '总经理审核'">
+            <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.taxExpense"
+              @blur="computedDirectExpense()"></el-input-number>
+          </div>
+          <div v-else class="text-center">
+            {{ budgetForm.taxExpense }}
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="经营管理费用" :span="3">
+          <div v-if="taskName == '分管审核' || taskName == '总经理审核'">
+            <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.businessExpense"
+              @blur="computedDirectExpense()"></el-input-number>
+          </div>
+          <div v-else class="text-center">
+            {{ budgetForm.businessExpense }}
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="预算成本合计" :span="3">
+          <div class="text-center" style="font-weight:bold;font-size:18px;color:orange">
+            {{ budgetForm.totalBudget }}
+          </div>
+          <div class="text-center">
+            （简写：{{ (budgetForm.totalBudget / 10000).toFixed(4) + '万' }}）
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="合同总价约" :span="3"
+          v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'">
+          <div class="text-center" style="font-weight:bold;font-size:18px;color:#409EFF">
+            {{ contract.contractId ? contract.amount : '' }}
+          </div>
+          <div class="text-center">
+            （简写：{{ contract.contractId ? (contract.amount / 10000).toFixed(4) + '万' : '' }}）
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="利润" :span="3"
+          v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'">
+          <div class="text-center" style="font-weight:bold;font-size:18px;color:#67C23A">
+            {{ profit.toFixed(2) }}
+          </div>
+          <div class="text-center">
+            （简写：{{ (profit / 10000).toFixed(4) + '万' }}）
+          </div>
+        </el-descriptions-item>
       </el-descriptions>
     </div>
-    <h2 style="text-align: center">项目直接生产成本预算表</h2>
-    <p style="text-align: center;">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }} | 审核人：{{
-      budgetForm.auditorUser ? budgetForm.auditorUser.nickName : '' }}</p>
-    <table border="1" class="table" v-if="taskName == '预算审核'">
-      <tr>
-        <td style="width: 100px;">项目名称</td>
-        <td colspan="6">{{ budgetForm.project ? budgetForm.project.projectName : '' }}</td>
-        <td style="min-width: 100px;">项目编号</td>
-        <td colspan="1">{{ budgetForm.project ? budgetForm.project.projectNumber : '' }}</td>
-      </tr>
-      <tr>
-        <td :rowspan="workLen + 2">直接成本</td>
-        <td>工作简述</td>
-        <td>工作内容</td>
-        <td>数量</td>
-        <td>单价</td>
-        <td>单位</td>
-        <td>系数</td>
-        <td>金额</td>
-        <td style="min-width: 150px;">备注</td>
-      </tr>
-      <tr v-for="work in workList">
-        <td>{{ work.content }}</td>
-        <td>{{ work.cmcPrice ? work.cmcPrice.workItem : '' }}</td>
-        <td>
-          <el-input-number :controls="false" style="width:100px;" v-model="work.workload"
-            @change="computeWorkSettle(work)"></el-input-number>
-        </td>
-        <td>{{ work.price }}</td>
-        <td>{{ work.unit }}</td>
-        <td>
-          <el-input-number :controls="false" style="width:100px;" v-model="work.coefficient"
-            @change="computeWorkSettle(work)"></el-input-number>
-          <el-button type="text" @click="getCoefficientRemark(work)">系数备注</el-button>
-        </td>
-        <td>{{ work.settle }}</td>
-        <td>{{ work.remark ? work.remark : '' }}</td>
-      </tr>
-      <tr>
-        <td :colspan="6" class="head">直接成本合计</td>
-        <td :colspan="1" class="head">{{ budgetForm.settleExpense }}</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td :rowspan="userLen + carLen + deviceLen + 2">间接成本</td>
-      </tr>
-      <tr v-if="userLen != 1">
-        <td :rowspan="userLen">人员</td>
-        <td>姓名</td>
-        <td>基本工资</td>
-        <td>岗位工资</td>
-        <td>人员成本（天）</td>
-        <td>预算天数</td>
-        <td>金额</td>
-        <td></td>
-      </tr>
-      <tr v-for="user in chooseUser" :key="'user' + user.userId">
-        <td>{{ user.user ? user.user.nickName : '' }}</td>
-        <td>1780</td>
-        <td>{{ user.salary.salary }}</td>
-        <td>{{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}</td>
-        <td>
-          <el-input-number :controls="false" style="width:100px;" v-model="user.days"
-            @blur="computedFixCostSettle(user, 'user')"></el-input-number>
-        </td>
-        <td>{{ user.staffCost }}</td>
-        <td></td>
-      </tr>
-      <tr v-if="carLen != 1">
-        <td :rowspan="carLen">车辆</td>
-        <td>车牌号</td>
-        <td>油耗</td>
-        <td>总里程</td>
-        <td>折旧成本（天）</td>
-        <td>预算天数</td>
-        <td>金额</td>
-      </tr>
-      <tr v-for="car in chooseCar" :key="'car' + car.carId">
-        <td>{{ car.car ? car.car.licensePlate : '' }}</td>
-        <td>{{ car.mileage }}</td>
-        <td>
-          <el-input-number :controls="false" style="width:100px;" v-model="car.distance"
-            @blur="computedFixCostSettle(car, 'car')"></el-input-number>
-        </td>
-        <td>{{ car.car ? car.car.dayCost : '' }}</td>
-        <td>
-          <el-input-number :controls="false" style="width:100px;" v-model="car.days"
-            @blur="computedFixCostSettle(car, 'car')"></el-input-number>
-        </td>
-        <td>{{ car.expense }}</td>
-        <td></td>
-      </tr>
-      <tr v-if="deviceLen != 1">
-        <td :rowspan="deviceLen">设备</td>
-        <td>设备名称</td>
-        <td>规格型号</td>
-        <td>品牌</td>
-        <td>折旧成本（天）</td>
-        <td>预算天数</td>
-        <td>金额</td>
-      </tr>
-      <tr v-for="device in chooseDevice" :key="'device' + device.deviceId">
-        <td>{{ device.device ? device.device.name : '' }}</td>
-        <td>{{ device.device ? device.device.series : '' }}</td>
-        <td>{{ device.device ? device.device.brand : '' }}</td>
-        <td>{{ device.device ? device.device.dayCost : '' }}</td>
-        <td>
-          <el-input-number :controls="false" style="width:100px;" v-model="device.days"
-            @blur="computedFixCostSettle(device, 'device')"></el-input-number>
-        </td>
-        <td>{{ device.depreciation }}</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td :colspan="6" class="head">间接成本合计</td>
-        <td :colspan="1" class="head">{{ budgetForm.fixCost }}</td>
-        <td></td>
-      </tr>
-      <tr class="head">
-        <td :colspan="3">外协费用</td>
-        <td :colspan="5">
-          <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.outExpense"
-            @blur="computedDirectExpense()"></el-input-number>
-        </td>
-        <td>
-          <el-input type="textarea" v-model="budgetForm.outRemark"></el-input>
-        </td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">车船租赁</td>
-        <td :colspan="5">
-          <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.rentExpense"
-            @blur="computedDirectExpense()"></el-input-number>
-        </td>
-        <td>
-          <el-input type="textarea" v-model="budgetForm.rentRemark"></el-input>
-        </td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">其他费用</td>
-        <td :colspan="5">
-          <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.otherExpense"
-            @blur="computedDirectExpense()"></el-input-number>
-        </td>
-        <td>
-          <el-input type="textarea" v-model="budgetForm.otherRemark"></el-input>
-        </td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">税费成本</td>
-        <td :colspan="5">
-          <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.taxExpense"
-            @blur="computedDirectExpense()"></el-input-number>
-        </td>
-        <td>
-          <el-input type="textarea" v-model="budgetForm.taxRemark"></el-input>
-        </td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">经营管理费用</td>
-        <td :colspan="5">
-          <el-input-number :controls="false" style="width:100%;" v-model="budgetForm.businessExpense"
-            @blur="computedDirectExpense()"></el-input-number>
-        </td>
-        <td>
-          <el-input type="textarea" v-model="budgetForm.businessRemark"></el-input>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="3" class="head">成本合计</td>
-        <td colspan="5" class="head">{{ budgetForm.totalBudget }}</td>
-      </tr>
-      <tr v-if="contract.contractId">
-        <td colspan="3" class="head">利润</td>
-        <td colspan="2" class="head">{{ profit.toFixed(2) }}</td>
-        <td colspan="3" class="head">合同总价约</td>
-        <td colspan="1" class="head">{{ contract.contractId ? contract.amount : '' }}</td>
-      </tr>
-    </table>
-    <table border="1" class="table" v-else>
-      <tr>
-        <td style="width: 100px;">项目名称</td>
-        <td colspan="6">{{ budgetForm.project ? budgetForm.project.projectName : '' }}</td>
-        <td style="min-width: 100px;">项目编号</td>
-        <td colspan="1">{{ budgetForm.project ? budgetForm.project.projectNumber : '' }}</td>
-      </tr>
-      <tr>
-        <td :rowspan="workLen + 2">直接成本</td>
-        <td>工作简述</td>
-        <td>工作内容</td>
-        <td>数量</td>
-        <td>单价</td>
-        <td>单位</td>
-        <td>系数</td>
-        <td>金额</td>
-        <td style="min-width: 150px;">备注</td>
-      </tr>
-      <tr v-for="work in workList">
-        <td>{{ work.content }}</td>
-        <td>{{ work.cmcPrice ? work.cmcPrice.workItem : '' }}</td>
-        <td>{{ work.workload }}</td>
-        <td>{{ work.price }}</td>
-        <td>{{ work.unit }}</td>
-        <td>{{ work.coefficient }}</td>
-        <td>{{ work.settle }}</td>
-        <td>{{ work.remark ? work.remark : '' }}</td>
-      </tr>
-      <tr>
-        <td :colspan="6" class="head">直接成本合计</td>
-        <td :colspan="1" class="head">{{ budgetForm.settleExpense }}</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td :rowspan="userLen + carLen + deviceLen + 2">间接成本</td>
-      </tr>
-      <tr v-if="userLen != 1">
-        <td :rowspan="userLen">人员</td>
-        <td>姓名</td>
-        <td>基本工资</td>
-        <td>岗位工资</td>
-        <td>人员成本（天）</td>
-        <td>预算天数</td>
-        <td>金额</td>
-        <td></td>
-      </tr>
-      <tr v-for="user, index in chooseUser" :key="'user' + index">
-        <td>{{ user.user ? user.user.nickName : '' }}</td>
-        <td>1780</td>
-        <td>{{ user.salary.salary }}</td>
-        <td>{{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}</td>
-        <td>{{ user.days }}</td>
-        <td>{{ user.staffCost }}</td>
-        <td></td>
-      </tr>
-      <tr v-if="carLen != 1">
-        <td :rowspan="carLen">车辆</td>
-        <td>车牌号</td>
-        <td>油耗</td>
-        <td>总里程</td>
-        <td>折旧成本（天）</td>
-        <td>预算天数</td>
-        <td>金额</td>
-      </tr>
-      <tr v-for="car, index in chooseCar" :key="'car' + index">
-        <td>{{ car.car ? car.car.licensePlate : '' }}</td>
-        <td>{{ car.mileage }}</td>
-        <td>{{ car.distance }}</td>
-        <td>{{ car.car ? car.car.dayCost : '' }}</td>
-        <td>{{ car.days }}</td>
-        <td>{{ car.expense }}</td>
-        <td></td>
-      </tr>
-      <tr v-if="deviceLen != 1">
-        <td :rowspan="deviceLen">设备</td>
-        <td>设备名称</td>
-        <td>规格型号</td>
-        <td>品牌</td>
-        <td>折旧成本（天）</td>
-        <td>预算天数</td>
-        <td>金额</td>
-      </tr>
-      <tr v-for="device, index in chooseDevice" :key="'device' + index">
-        <td>{{ device.device ? device.device.name : '' }}</td>
-        <td>{{ device.device ? device.device.series : '' }}</td>
-        <td>{{ device.device ? device.device.brand : '' }}</td>
-        <td>{{ device.device ? device.device.dayCost : '' }}</td>
-        <td>{{ device.days }}</td>
-        <td>{{ device.depreciation }}</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td :colspan="6" class="head">间接成本合计</td>
-        <td :colspan="1" class="head">{{ budgetForm.fixCost }}</td>
-        <td></td>
-      </tr>
-      <tr class="head">
-        <td :colspan="3">外协费用</td>
-        <td :colspan="5">{{ budgetForm.outExpense }}</td>
-        <td>{{ budgetForm.outRemark }}</td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">车船租赁</td>
-        <td :colspan="5">{{ budgetForm.rentExpense }}</td>
-        <td>{{ budgetForm.rentRemark }}</td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">其他费用</td>
-        <td :colspan="5">{{ budgetForm.otherExpense }}</td>
-        <td>{{ budgetForm.otherRemark }}</td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">税费成本</td>
-        <td :colspan="5">{{ budgetForm.taxExpense }}</td>
-        <td>{{ budgetForm.taxRemark }}</td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">经营管理费用</td>
-        <td :colspan="5">{{ budgetForm.businessExpense }}</td>
-        <td>{{ budgetForm.businessRemark }}</td>
-      </tr>
-      <tr>
-        <td colspan="3" class="head">预算总额</td>
-        <td colspan="5" class="head">{{ budgetForm.totalBudget }}</td>
-      </tr>
-      <tr v-if="contract.contractId">
-        <td colspan="3" class="head">利润</td>
-        <td colspan="2" class="head">{{ profit.toFixed(2) }}</td>
-        <td colspan="3" class="head">合同总价约</td>
-        <td colspan="1" class="head">{{ contract.contractId ? contract.amount : '' }}</td>
-      </tr>
-    </table>
-    <el-row v-if="taskName == '预算审核' || taskName == '预算批准'" class="text-center mt20 mb20">
-      <el-button type="success" size="mini" @click="confirmSucess(taskName)">审批通过</el-button>
+    <el-row v-if="taskName == '分管审核' || taskName == '总经理审核' || taskName == '预算批准'" class="text-center mt20 mb20">
+      <el-button type="success" @click="confirmSucess(taskName)">审批通过</el-button>
     </el-row>
   </div>
 </template>
@@ -389,6 +285,7 @@ import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate
 import { getUser } from '@/api/system/user'
 import { getUsersManageLeaderByDept } from '@/api/system/post'
 import { getPriceRemarkByWorkType } from '@/api/oa/price/price'
+import { getUserByPost } from "@/api/system/post";
 export default {
   computed: {
     ...mapGetters(["name", "userId"]),
@@ -484,14 +381,6 @@ export default {
     getProjectList() {
       getProject(this.taskForm.formId).then(response => {
         this.projectForm = response.data;
-        let deptId = response.data.undertakingDept.split(',');
-        for (let d of deptId) {
-          getUsersManageLeaderByDept({ deptId: Number(d) }).then(res => {
-            if (res.data) {
-              this.managerList.push(res.data.userId)
-            }
-          })
-        }
       });
     },
     getProjectWorkList() {
@@ -501,16 +390,31 @@ export default {
     },
     confirmSucess(taskName) {
       const params = { taskId: this.taskForm.taskId };
-      if (taskName == '预算审核') {
+      if (taskName == '分管审核') {
         this.updateBudgetForm();
         getNextFlowNode(params).then(res => {
-          this.$set(this.taskForm.variables, "approvalList", this.managerList);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit("goBack");
-          });
+          getUserByPost({ postName: "总经理" }).then(res => {
+            const userId = res.data[0].userId;
+            this.$set(this.taskForm.variables, "approval", userId);
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit("goBack");
+            });
+          })
+
         })
-      } else if (taskName == '预算批准') {
+      } else if (taskName == '总经理审核') {
+        getNextFlowNode(params).then(res => {
+          getUserByPost({ postName: "董事长" }).then(res => {
+            const userId = res.data[0].userId;
+            this.$set(this.taskForm.variables, "approval", userId);
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit("goBack");
+            });
+          })
+        })
+      } else {
         getNextFlowNode(params).then(res => {
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
@@ -671,7 +575,7 @@ table {
 }
 
 .descriptions {
-  width: 1200px;
+  width: 100%;
   margin: 0 auto;
 }
 
@@ -683,8 +587,9 @@ table {
 ::v-deep .el-descriptions-item__label.is-bordered-label {
   color: #5a5757;
   background: rgba($color: #a9adb3, $alpha: 0.1);
-  width: 150px;
-  min-width: 150px;
+  width: 110px;
+  text-align: center;
+  min-width: 110px;
 }
 
 ::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {

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

@@ -739,7 +739,6 @@ export default {
                 if (comment.deptId == 105)
                   getDeptLeadersByDeptId({ deptId: comment.deptId }).then(res => {
                     comment.userId = res.data[1].userId;
-                    console.log(comment.userId);
                   })
                 else
                   getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {

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

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-05 18:13:54
+ * @LastEditTime: 2024-07-08 18:19:39
 -->
 <template>
   <div class="project-wrapper">
     <!-- 项目登记 -->
-    <h2 style="text-align: center" id="scrollToMe">项目登记及安排</h2>
+    <h2 style="text-align: center" id="scrollToMe">项目登记</h2>
     <el-form ref="projectAdd" :model="addForm" :rules="rules" label-width="110px" :disabled="disabled">
       <el-form-item label="项目编号：" prop="projectNumber">
         <el-input v-model="addForm.projectNumber"></el-input>
@@ -48,7 +48,7 @@
       <el-form-item label="联系电话：" prop="telephone">
         <el-input v-model="addForm.telephone"></el-input>
       </el-form-item>
-      <el-form-item label="项目概况：">
+      <!-- <el-form-item label="项目概况：">
         <table border="1">
           <tr>
             <td style="width: 180px">工作内容</td>
@@ -94,9 +94,9 @@
         </table>
 
         <el-button icon="el-icon-plus" size="mini" @click="addWorkList"></el-button>
-      </el-form-item>
+      </el-form-item> -->
       <!-- 项目安排 -->
-      <arrange-project ref="arrange" :taskForm="taskForm" :taskName="'项目登记'" :disabled="disabled"></arrange-project>
+      <!-- <arrange-project ref="arrange" :taskForm="taskForm" :taskName="'项目登记'" :disabled="disabled"></arrange-project> -->
       <!--  -->
       <el-form-item label="任务书上传：" prop="taskDocument">
         <div v-if="addForm.taskDocument" class="upload-list">
@@ -133,9 +133,8 @@
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer" style="text-align: center">
-      <el-button type="warning" @click="save" :disabled="disabled">暂 存</el-button>
+      <el-button type="warning" @click="save" :disabled="disabled">保 存</el-button>
       <el-button type="primary" @click="confirmAddForm" :disabled="disabled">提 交</el-button>
-      <!-- <el-button @click="cancel" :disabled="disabled">取 消</el-button> -->
     </div>
     <el-dialog title="选择合同" :visible.sync="openContract" width="1000px" append-to-body>
       <choose-contract @choose="setContract" @close="openContract = false"></choose-contract>
@@ -148,8 +147,8 @@ import { parseTime } from "@/utils/ruoyi";
 import { mapGetters } from "vuex";
 import { listProject, getProject, addProject, updateProject, delProject } from "@/api/oa/project/project";
 import { getUser } from "@/api/system/user";
-import { getUsersDeptLeaderByDept, getDeptLeadersByDeptId } from "@/api/system/post";
-import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
+import { getUsersDeptLeaderByDept } from "@/api/system/post";
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { listProjectWork, addProjectWork, delProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
@@ -253,7 +252,7 @@ export default {
       if (datas.rows.length > 0) {
         this.formTotal = 1
         this.getProjectInfo(this.taskForm.formId)
-        this.getProjectWorkList();
+        // this.getProjectWorkList();
       } else {
         this.addForm.projectRegistrant = this.userId;
         this.registrantUser = this.name;
@@ -297,23 +296,15 @@ export default {
     },
     // 暂存
     async save() {
-      // 新增数据
+      // 新增项目数据
       if (this.formTotal == 0) {
         this.$refs['projectAdd'].validate((vaild) => {
           if (vaild) {
             this.addForm.projectId = this.taskForm.formId;
-            for (let work of this.workList) {
-              work.projectId = this.taskForm.formId;
-              addProjectWork(work);
-            }
-            let addLog = addProject(this.addForm).then(response => {
-              this.$modal.msgSuccess("新增成功");
+            addProject(this.addForm).then(response => {
+              this.$modal.msgSuccess("项目登记成功");
               this.getList();
-              this.$refs.arrange.save();
             });
-            if (addLog.code == 200) {
-              this.$refs.arrange.save()
-            }
             let contractId = this.chooseContractInfo.contractId ? this.chooseContractInfo.contractId : ''
             let pcobj = { projectId: this.taskForm.formId, contractId }
             if (contractId != '') {
@@ -327,56 +318,28 @@ export default {
           }
         })
       } else {
-        let updateLog = await updateProject(this.addForm).then(
+        // 修改项目数据
+        updateProject(this.addForm).then(
           this.$modal.msgSuccess("保存成功")
         );
-        if (updateLog.code == 200) {
-          this.$refs.arrange.save()
-        }
-        await delProjectWork(this.taskForm.formId).then(res => {
-          this.workList.forEach(work => {
-            work.projectId = this.taskForm.formId;
-            addProjectWork(work);
-          })
-        })
       }
     },
     async confirmAddForm() {
-      let leaderData = await getDeptLeadersByDeptId({ deptId: 105 })
-      let approvalId = [];
+      let leaderData = await getUsersDeptLeaderByDept({ deptId: 109 })
+      let approvalId;
       if (leaderData.data) {
-        leaderData.data.forEach(item => {
-          approvalId.push(item.userId)
-        })
+        approvalId = leaderData.data.userId
       }
-      this.$set(this.taskForm.variables, "approvalList", approvalId);
+      this.$set(this.taskForm.variables, "approval", approvalId);
+      this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
       this.save()
-      this.$confirm('项目安排之后会自动发起预算编制、技术方案、技术交底、安全交底四个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        let budgetInitiator = this.$refs.arrange.peopleForm
-        if (this.addForm.projectLeader) {
-          budgetInitiator = this.addForm.projectLeader
-        } else {
-          budgetInitiator = this.$refs.arrange.peopleForm.userId
-        }
-        if(budgetInitiator == '' || budgetInitiator == null || budgetInitiator == undefined){
-          return this.$message.error('请选择项目负责人！')
-        }
-        console.log(budgetInitiator);
-        this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-        this.$set(this.taskForm.variables, "budgetInitiator", budgetInitiator);
-        const params = { taskId: this.taskForm.taskId };
-        // 获取下一个流程节点
-        getNextFlowNode(params).then(res => {
-          console.log(this.taskForm);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack');
-          });
-        })
+      const params = { taskId: this.taskForm.taskId };
+      // 获取下一个流程节点
+      getNextFlowNode(params).then(res => {
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit('goBack');
+        });
       })
     },
     // 查询业主单位列表

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

@@ -2,11 +2,11 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-05 18:04:35
+ * @LastEditTime: 2024-07-08 18:52:08
 -->
 <template>
   <div class="app-container">
-    <!-- <h2 style="text-align: center;">项目安排</h2> -->
+    <h2 style="text-align: center;">项目安排</h2>
     <el-form ref="arrangeForm" :model="form" :rules="rules" label-width="120px" :disabled="disabled">
       <el-row :gutter="20">
         <el-col :span="12" :xs="24">
@@ -66,7 +66,7 @@
                 <span class="el-icon-download">下载文件</span>
               </el-link>
             </div>
-            <FileUpload v-if="taskName == '项目登记'" ref="orz" :limit="1" :filePathName="'组织交底文件'"
+            <FileUpload v-if="taskName == '项目安排'" ref="orz" :limit="1" :filePathName="'组织交底文件'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setOrganizeDocument">
             </FileUpload>
           </el-form-item>
@@ -96,17 +96,17 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-    <!-- <div slot="footer" class="dialog-footer" style="text-align: center;">
+    <div slot="footer" class="dialog-footer" style="text-align: center;">
+      <!-- <el-button type="warning" @click="save" :disabled="disabled">保 存</el-button> -->
       <el-button type="primary" @click="confirmPlanForm" :disabled="disabled">提 交</el-button>
-      <el-button @click="cancel" :disabled="disabled">取 消</el-button>
-    </div> -->
+    </div>
   </div>
 </template>
 
 <script>
 import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
-import { getUsersDeptLeaderByDept } from '@/api/system/post'
+import { getUsersDeptLeaderByDept, getDeptLeadersByDeptId } from '@/api/system/post'
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { listProject, getProject, addProject, updateProject, delProject, submitProject, modifyProject } from "@/api/oa/project/project";
 export default {
@@ -245,21 +245,25 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
+      }).then(async () => {
         this.save();
+        let resData = await getDeptLeadersByDeptId({ deptId: 105 });
+        let approvalId;
+        if (resData.data) {
+          approvalId = resData.data[0].userId;
+        }
+        console.log(approvalId);
         const params = { taskId: this.taskForm.taskId };
         // 获取下一个流程节点
         getNextFlowNode(params).then(res => {
-          this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-          this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
-          getUsersDeptLeaderByDept({ deptId: 105 }).then(res => {
-            let userId = res.data.userId;
-            this.$set(this.taskForm.variables, "approval", userId);
-            complete(this.taskForm).then(response => {
-              this.$modal.msgSuccess(response.msg);
-              this.$emit('goBack');
-            });
-          })
+        this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+        this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId || this.form.projectLeader);
+        this.$set(this.taskForm.variables, "planInitiator", this.peopleForm.userId || this.form.projectLeader);
+        this.$set(this.taskForm.variables, "approval", approvalId);
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit('goBack');
+          });
         })
       })
 

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

@@ -0,0 +1,207 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-07-08 16:16:27
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-08 18:16:07
+-->
+<template>
+  <div class="app-container">
+    <h2 style="text-align: center" id="scrollToMe">核定工作</h2>
+    <el-form :model="form" :disabled="disabled" label-width="100px">
+      <el-form-item label="项目任务书：">
+        <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.taskDocument}`)">
+          {{ getFileName(form.taskDocument) }}
+        </el-link>
+        <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.taskDocument}`"
+          :underline="false" target="_blank">
+          <span class="el-icon-download">下载文件</span>
+        </el-link>
+      </el-form-item>
+      <el-form-item label="核定工作量：">
+        <table class="table" border="1">
+          <tr>
+            <td style="width: 180px">工作内容</td>
+            <td>等级或比例尺</td>
+            <td>单位</td>
+            <td>工作量</td>
+            <td style="width: 100px">要求完成时间</td>
+            <td>备注</td>
+          </tr>
+          <tr v-for="(work, index) in workList" :key="index">
+            <td>
+              <el-input v-model="work.content" type="textarea" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+            </td>
+            <td>
+              <el-select v-model="work.scale" placeholder="请选择" clearable>
+                <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+                  :value="dict.label" />
+              </el-select>
+            </td>
+            <td>
+              <el-select v-model="work.unit" placeholder="请选择" clearable>
+                <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label"
+                  :value="dict.label" />
+              </el-select>
+            </td>
+            <td>
+              <el-input v-model="work.workload" clearable></el-input>
+            </td>
+            <td>
+              <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期">
+              </el-date-picker>
+            </td>
+            <td>
+              <el-input v-model="work.remark" type="textarea" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+            </td>
+            <td>
+              <el-button type="text" style="color:#F56C6C" size="mini" @click="deletWorkItem(index)">删除行</el-button>
+            </td>
+          </tr>
+        </table>
+        <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addWorkList"></el-button>
+      </el-form-item>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer" style="text-align: center;">
+      <el-button type="warning" @click="save" :disabled="disabled">保 存</el-button>
+      <el-button type="primary" @click="confirm" :disabled="disabled">提 交</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listProject, getProject, addProject, updateProject, delProject } from "@/api/oa/project/project";
+import { listProjectWork, addProjectWork, delProjectWork } from "@/api/oa/project/projectWork";
+import { getUsersDeptLeaderByDept, getDeptLeadersByDeptId } from "@/api/system/post";
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+export default {
+  dicts: ['cmc_scale_grade', 'cmc_unit'],
+  props: {
+    disabled: {
+      type: Boolean
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    },
+    taskName: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      form: {},
+      total: 0,
+      workList: [
+        {
+          content: "",
+          scale: "",
+          unit: "",
+          workload: "",
+          deadline: undefined,
+          remark: "",
+        },
+      ],
+
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    if (this.taskName != '项目登记')
+      this.initForm();
+  },
+  methods: {
+    async initForm() {
+      let projectRes = await getProject(this.taskForm.formId)
+      if (projectRes.code == 200 && projectRes.data) {
+        this.form = projectRes.data
+        this.total = 1
+        this.getProjectWorkList();
+      }
+    },
+    getProjectWorkList() {
+      listProjectWork({ projectId: this.taskForm.formId }).then(res => {
+        this.workList = res.rows;
+      })
+    },
+    addWorkList() {
+      this.workList.push({
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: undefined,
+        remark: "",
+      });
+    },
+    deletWorkItem(index) {
+      let arr = this.workList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    // 更新工作量
+    updateWorkList() {
+      delProjectWork(this.taskForm.formId).then(res => {
+        this.workList.forEach(work => {
+          work.projectId = this.taskForm.formId;
+          addProjectWork(work);
+        })
+        this.$message.success('保存成功')
+      })
+    },
+    // 保存按钮
+    save() {
+      if (!this.total) {
+        this.workList.forEach(work => {
+          work.projectId = this.taskForm.formId;
+          addProjectWork(work).then(res => {
+            this.$message.success('保存成功')
+          });
+        })
+      } else {
+        this.updateWorkList();
+      }
+    },
+    async confirm() {
+      this.save();
+      let resData = await getDeptLeadersByDeptId({ deptId: 105 });
+      let approval;
+      if (resData.data) {
+        approval = resData.data[1].userId;
+      }
+      this.$set(this.taskForm.variables, "approval", approval);
+      const params = { taskId: this.taskForm.taskId };
+      getNextFlowNode(params).then(res => {
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit('goBack');
+        });
+      })
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+table {
+  /*居中*/
+  margin: 0 auto;
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-05 15:28:33
+ * @LastEditTime: 2024-07-08 17:48:47
 -->
 <template>
   <div class="app-container">
@@ -96,17 +96,19 @@ export default {
     },
     getDeptManageLeader() {
       getProject(this.taskForm.formId).then(res => {
-        let deptId = res.data.undertakingDept.split(',');
-        this.$store.commit('SET_UNDERDEPTID', deptId);
-        this.managerList = []
-        for (let d of deptId) {
-          getUsersManageLeaderByDept({ deptId: Number(d) }).then(resopnse => {
-            if (resopnse.data) {
-              resopnse.data.forEach(element => {
-                this.managerList.push(element.userId)
-              });
-            }
-          })
+        if (res.data && res.data.undertakingDept) {
+          let deptId = res.data.undertakingDept.split(',');
+          this.$store.commit('SET_UNDERDEPTID', deptId);
+          this.managerList = []
+          for (let d of deptId) {
+            getUsersManageLeaderByDept({ deptId: Number(d) }).then(resopnse => {
+              if (resopnse.data) {
+                resopnse.data.forEach(element => {
+                  this.managerList.push(element.userId)
+                });
+              }
+            })
+          }
         }
       })
     },

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-05 09:31:03
+ * @LastEditTime: 2024-07-08 16:19:34
 -->
 
 <template>
@@ -14,21 +14,12 @@
             <addproject :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目登记'" @goBack="goBack">
             </addproject>
           </el-tab-pane>
-          <!-- <el-tab-pane label="项目安排" name="项目安排">
+          <el-tab-pane label="核定工作" name="核定工作">
+            <assess-work :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '核定工作'" @goBack="goBack"></assess-work>
+          </el-tab-pane>
+          <el-tab-pane label="项目安排" name="项目安排">
             <arrangeProject :taskForm="taskForm" :taskName="'项目安排'" :disabled="taskName != '项目安排'" @goBack="goBack">
             </arrangeProject>
-          </el-tab-pane> -->
-          <el-tab-pane label="项目预算" name="项目预算">
-            <budget-tab :taskForm="taskForm" @goBack="goBack"></budget-tab>
-          </el-tab-pane>
-          <el-tab-pane label="安全交底" name="安全交底">
-            <safe-tab :taskForm="taskForm" @goBack="goBack"></safe-tab>
-          </el-tab-pane>
-          <el-tab-pane label="技术交底" name="技术交底">
-            <technical-tab :taskForm="taskForm" @goBack="goBack"></technical-tab>
-          </el-tab-pane>
-          <el-tab-pane label="技术方案" name="技术方案">
-            <plan-tab :taskForm="taskForm" :taskName="taskName" @goBack="goBack"></plan-tab>
           </el-tab-pane>
           <el-tab-pane label="经营审核" name="经营审核">
             <business-review :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '经营审核'"
@@ -46,6 +37,18 @@
             <in-progress :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目生产'"
               @goBack="goBack"></in-progress>
           </el-tab-pane>
+          <el-tab-pane label="项目预算" name="项目预算">
+            <budget-tab :taskForm="taskForm" @goBack="goBack"></budget-tab>
+          </el-tab-pane>
+          <el-tab-pane label="安全交底" name="安全交底">
+            <safe-tab :taskForm="taskForm" @goBack="goBack"></safe-tab>
+          </el-tab-pane>
+          <el-tab-pane label="技术交底" name="技术交底">
+            <technical-tab :taskForm="taskForm" @goBack="goBack"></technical-tab>
+          </el-tab-pane>
+          <el-tab-pane label="技术方案" name="技术方案">
+            <plan-tab :taskForm="taskForm" :taskName="taskName" @goBack="goBack"></plan-tab>
+          </el-tab-pane>
         </el-tabs>
       </el-col>
       <el-col :span="6" :xs="24">
@@ -77,6 +80,7 @@ import BudgetTab from './budgetTab.vue'
 import planTab from './planTab.vue'
 import SafeTab from './safeTab.vue'
 import technicalTab from './technicalTab.vue'
+import AssessWork from './assessWork.vue'
 export default {
   props: {
     taskName: {
@@ -86,7 +90,7 @@ export default {
       type: Object,
     }
   },
-  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress, BudgetTab, planTab, SafeTab, technicalTab },
+  components: { addproject, arrangeProject, businessReview, flow, ManageReview, ScConfirm, InProgress, BudgetTab, planTab, SafeTab, technicalTab, AssessWork },
   data() {
     return {
       activeName: '项目登记',

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

@@ -283,7 +283,6 @@ export default {
         } else {
           this.$set(variables, "approval", this.checkValues);
         }
-        console.log(variables, "流程发起提交表单数据")
         // 启动流程并将表单数据加入流程变量
         definitionStart(this.procDefId, JSON.stringify(variables)).then(res => {
           this.$modal.msgSuccess(res.msg);

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

@@ -225,7 +225,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (!this.isAdd) {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-25 14:50:36
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-08 14:36:12
 -->
 <template>
   <div class="project-wrapper">
@@ -14,7 +14,8 @@
             @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
-          <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
+          <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable
+            @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="项目负责人" prop="projectLeader">
           <el-select v-model="queryParams.projectLeader" clearable filterable placeholder="请输入项目负责人" size="large"
@@ -129,7 +130,7 @@
         <el-form-item label="项目负责人：" prop="projectLeader">
           <el-tag effect="plain" type="warning" style="margin-right: 10px;"
             v-if="addForm.projectLeaderName != undefined">{{
-              addForm.projectLeaderName }}</el-tag>
+        addForm.projectLeaderName }}</el-tag>
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
         </el-form-item>
         <el-form-item label="项目类型：" prop="projectType">
@@ -294,32 +295,33 @@ export default {
   },
   methods: {
     // 查询项目列表
-    getList() {
+    async getList() {
       this.loading = true
-      getIsDeptLeader({ deptId: this.deptId }).then(res => {
-        if (this.deptId > 107 && res.data == false) {
+      if (this.deptId > 107) {
+        let response = await getIsDeptLeader({ deptId: this.deptId })
+        if (response.data == false) {
           this.queryParams.undertakingDept = this.deptId
         }
-        listProject(this.queryParams).then(response => {
-          this.projectList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-          for (let project of this.projectList) {
-            getProjectProgress(project.projectId).then(res => {
-              if (res.data) {
-                let len = res.data.length
-                if (len != 0) {
-                  this.$set(project, 'percentage', Number(res.data[len - 1].percentage))
-                } else {
-                  this.$set(project, 'percentage', 0)
-                }
-                if (project.isFinished == '1') {
-                  this.$set(project, 'percentage', 100)
-                }
+      }
+      listProject(this.queryParams).then(response => {
+        this.projectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+        for (let project of this.projectList) {
+          getProjectProgress(project.projectId).then(res => {
+            if (res.data) {
+              let len = res.data.length
+              if (len != 0) {
+                this.$set(project, 'percentage', Number(res.data[len - 1].percentage))
+              } else {
+                this.$set(project, 'percentage', 0)
               }
-            })
-          }
-        })
+              if (project.isFinished == '1') {
+                this.$set(project, 'percentage', 100)
+              }
+            }
+          })
+        }
       })
     },
     getDeptList() {