修改项目预算、项目生产

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectProgressController.java

@@ -74,7 +74,7 @@ public class CmcProjectProgressController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress)
     {
-        cmcProjectProgress.setProjectId(new SnowFlake().generateId());
+        cmcProjectProgress.setProgressId(new SnowFlake().generateId());
         return toAjax(cmcProjectProgressService.insertCmcProjectProgress(cmcProjectProgress));
     }
 

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectProgressMapper.xml

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcProjectProgressByProjectId" parameterType="String" resultMap="CmcProjectProgressResult">
         <include refid="selectCmcProjectProgressVo"/>
         where project_id = #{projectId}
+        order by date asc
     </select>
         
     <insert id="insertCmcProjectProgress" parameterType="CmcProjectProgress">

oa-ui/src/api/oa/project/projectProgress.js

@@ -2,11 +2,11 @@
  * @Author: ysh
  * @Date: 2024-04-07 15:29:32
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-16 10:04:18
+ * @LastEditTime: 2024-04-17 16:15:57
  */
 import request from '@/utils/request'
 
-// 查询cmc项目内容列表
+// 查询cmc项目进度列表
 export function listProjectProgress(query) {
   return request({
     url: '/oa/projectProgress/list',
@@ -15,7 +15,7 @@ export function listProjectProgress(query) {
   })
 }
 
-// 查询cmc项目内容详细
+// 查询cmc项目进度详细
 export function getProjectProgress(projectId) {
   return request({
     url: '/oa/projectProgress/' + projectId,
@@ -23,7 +23,7 @@ export function getProjectProgress(projectId) {
   })
 }
 
-// 新增cmc项目内容
+// 新增cmc项目进度
 export function addProjectProgress(data) {
   return request({
     url: '/oa/projectProgress',
@@ -32,7 +32,7 @@ export function addProjectProgress(data) {
   })
 }
 
-// 修改cmc项目内容
+// 修改cmc项目进度
 export function updateProjectProgress(data) {
   return request({
     url: '/oa/projectProgress',
@@ -41,7 +41,7 @@ export function updateProjectProgress(data) {
   })
 }
 
-// 删除cmc项目内容
+// 删除cmc项目进度
 export function delProjectProgress(projectId) {
   return request({
     url: '/oa/projectProgress/' + projectId,

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-09 15:48:22
+ * @LastEditTime: 2024-04-17 15:21:14
 -->
 <template>
   <div class="main">
@@ -17,17 +17,18 @@
       <tr>
         <td :rowspan="userLen" class="head vertical-text">人员</td>
         <td class="head" style="width:250px">姓名</td>
+        <td class="head">部门</td>
         <td class="head">岗位工资</td>
         <td class="head">人员成本（天）</td>
-        <td class="head">进出场单价</td>
+        <!-- <td class="head">进出场单价</td> -->
         <td class="head">预算天数</td>
         <td class="head">金额</td>
       </tr>
       <tr v-for="user, index in chooseUser" :key="'user' + index">
         <td>{{ user.user ? user.user.nickName : '' }}</td>
+        <td>{{ user.dept? user.dept.deptName : '' }}</td>
         <td>{{ user.salary.salary }}</td>
         <td>{{ parseFloat(user.salary.salary / 31).toFixed(2) }}</td>
-        <td>{{ user.inOutPrice }}</td>
         <td>{{ user.days }}</td>
         <td>{{ user.staffCost }}</td>
       </tr>
@@ -80,12 +81,16 @@
       </tr>
       <tr v-for="(work, index) in workList" :key="'work' + index">
         <td>{{ workContentList.length != 0 ? workContentList[index].content : "" }}</td>
-        <td>{{ work.cmcprice ? work.cmcprice : '' }}</td>
+        <td>{{ work.scaleGrade }}</td>
         <td>{{ work.workload }}</td>
         <td>{{ work.price }}</td>
         <td>{{ work.coefficient }}</td>
         <td>{{ work.settle }}</td>
       </tr>
+      <tr>
+        <td colspan="5" class="head">进出场津贴</td>
+        <td>{{ budgetForm.inOutPriceSum }}</td>
+      </tr>
       <tr>
         <td colspan="5" class="head">外协费用</td>
         <td>{{ budgetForm.outExpense }}</td>
@@ -169,24 +174,33 @@ export default {
         console.log(res);
         this.budgetForm = res.rows[0];
         getBudgetDevice(this.budgetForm.budgetId).then(res => {
-          console.log(res);
           this.chooseDevice = res.data;
           this.deviceLen = res.data.length + 1;
         })
         getBudgetStaff(this.budgetForm.budgetId).then(res => {
-          console.log(res);
           this.chooseUser = res.data;
           this.userLen = res.data.length + 1;
+          let days = 0;
+          for(let d of this.chooseUser){
+            days = days + d.days
+          }
+          this.budgetForm.inOutPriceSum = Number(days) * Number(this.chooseUser[0].inOutPrice)
         })
         getBudgetCar(this.budgetForm.budgetId).then(res => {
-          console.log(res);
           this.chooseCar = res.data;
           this.carLen = res.data.length + 1;
         })
         getBudgetSettle(this.budgetForm.budgetId).then(res => {
-          console.log(res);
           this.workList = res.data;
-          this.workLen = res.data.length + 5;
+          this.workLen = res.data.length + 6;
+          for(let work of this.workList){
+            if(work.groundType == '0'){
+              work.price = work.cmcPrice.commonPrice
+              work.scaleGrade = work.cmcPrice.scaleGrade
+            }else{
+              work.price = work.cmcPrice.complexPrice
+            }
+          }
           this.getProjectWorkList();
         })
       });

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-16 17:03:17
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-17 15:27:10
 -->
 
 <template>
@@ -159,6 +159,7 @@ export default {
         },
       ],
       restaurants: [{ value: "中国电建集团成都勘测设计研究院有限公司勘测设计分公司" }],
+      registrantUser:''
     };
   },
   created() {

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

@@ -2,110 +2,168 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-16 11:42:20
+ * @LastEditTime: 2024-04-17 17:58:35
 -->
 <template>
-  <div class="app-container">
-    <h2 style="text-align: center;">项目运作情况</h2>
-    <div class="headers">
-      基本作业情况记录
-      <div class="line"></div>
-    </div>
-    <el-form ref="progress" :model="form" :disabled="disabled" label-width="100px">
-      <el-row :gutter="20">
-        <el-col :span="11">
-          <el-form-item label="使用车辆（车牌号）：" label-width="153px">
-
-          </el-form-item>
-        </el-col>
-        <el-col :span="11">
-          <el-form-item label="驾驶员：">
+  <div>
+    <el-skeleton animated :rows="20" v-if="loading" class="app-container" />
+    <div class="app-container" v-if="!loading">
+      <h2 style="text-align: center">项目运作情况</h2>
+      <div class="headers">
+        基本作业情况记录
+        <div class="line"></div>
+      </div>
+      <el-form ref="progress" :model="form" :disabled="disabled" label-width="100px">
+        <el-row :gutter="20" v-if="!noBudget">
+          <el-col :span="11">
+            <el-form-item label="使用车辆（车牌号）：" label-width="153px">
+              {{ form.licensePlate }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="驾驶员：">
+              {{ form.driver }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="参与人员：" v-if="!noBudget">
+          {{ form.staff }}
+        </el-form-item>
+        <div v-if="noBudget">
+          <el-alert title="项目未做预算表，请先编制预算表" type="warning" effect="dark">
+          </el-alert>
+        </div>
+        <el-row :gutter="20">
+          <el-col :span="11">
+            <el-form-item label="进场时间：">
+              <el-date-picker
+                type="date"
+                placeholder="选择日期"
+                v-model="form.entryTime"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="撤场时间：">
+              <el-date-picker
+                type="date"
+                placeholder="选择日期"
+                v-model="form.exitTime"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="项目进度：">
+          <table border="1">
+            <tr>
+              <td style="width: 80px">序号</td>
+              <td>截止日期</td>
+              <td>累计总进度（%）</td>
+              <td style="width: 300px">情况说明</td>
+            </tr>
+            <tr v-for="(progress, index) in progressList" :key="index">
+              <td>
+                {{ index + 1 }}
+              </td>
+              <td>
+                <el-date-picker
+                  type="date"
+                  placeholder="选择日期"
+                  v-model="progress.date"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+              </td>
+              <td>
+                <el-input-number
+                  v-model="progress.percentage"
+                  :controls="false"
+                  style="width: 120px"
+                ></el-input-number
+                >%
+              </td>
+              <td>
+                <el-input v-model="progress.situation" type="textarea"></el-input>
+              </td>
+              <td>
+                <el-button
+                  type="danger"
+                  icon="el-icon-minus"
+                  size="mini"
+                  circle
+                  @click="deleProgressItem(index)"
+                ></el-button>
+              </td>
+            </tr>
+          </table>
+          <el-button
+            icon="el-icon-plus"
+            size="mini"
+            @click="addProgressList()"
+            type="primary"
+            plain
+          ></el-button>
+        </el-form-item>
+      </el-form>
+      <div class="headers">
+        项目借款
+        <div class="line"></div>
+      </div>
 
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item label="参与人员：">
-
-      </el-form-item>
-      <el-row :gutter="20">
-        <el-col :span="11">
-          <el-form-item label="进场时间：">
-            <el-date-picker type="date" placeholder="选择日期" v-model="form.entryTime"></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="11">
-          <el-form-item label="撤场时间：">
-            <el-date-picker type="date" placeholder="选择日期" v-model="form.exitTime"></el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item label="项目进度：">
-        <table border="1">
-          <tr>
-            <td style="width:80px">序号</td>
-            <td>截止日期</td>
-            <td>累计总进度（%）</td>
-            <td style="width:300px;">情况说明</td>
-          </tr>
-          <tr v-for="(progress, index) in progressList" :key="index">
-            <td>
-              {{ index + 1 }}
-            </td>
-            <td>
-              <el-date-picker type="date" placeholder="选择日期" v-model="progress.date"
-                value-format="yyyy-MM-dd"></el-date-picker>
-            </td>
-            <td>
-              <el-input-number v-model="progress.percentage" :controls="false" style="width:120px;"></el-input-number>%
-            </td>
-            <td>
-              <el-input v-model="progress.situation" type="textarea"></el-input>
-            </td>
-            <td>
-              <el-button type="danger" icon="el-icon-minus" size="mini" circle
-                @click="deleProgressItem(index)"></el-button>
-            </td>
-          </tr>
-        </table>
-        <el-button icon="el-icon-plus" size="mini" @click="addProgressList()" type="primary" plain></el-button>
-      </el-form-item>
-    </el-form>
-    <div class="headers">
-      项目借款
-      <div class="line"></div>
-    </div>
-
-    <div class="headers">
-      成果汇交
-      <div class="line"></div>
-    </div>
-    <div class="headers">
-      产值结算（内部）
-      <div class="line"></div>
-    </div>
-    <div slot="footer" class="dialog-footer" style="text-align: center">
-      <el-button @click="preserve()" :disabled="disabled" type="success">保 存</el-button>
-      <el-button type="primary" @click="confirmAddForm" :disabled="disabled">提交下一个流程</el-button>
+      <div class="headers">
+        成果汇交
+        <div class="line"></div>
+      </div>
+      <div class="headers">
+        产值结算（内部）
+        <div class="line"></div>
+      </div>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button @click="preserve()" :disabled="disabled" type="warning"
+          >保 存</el-button
+        >
+        <el-button type="primary" @click="submitNextFlow()" :disabled="disabled"
+          >提交下一个流程</el-button
+        >
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
+import { mapGetters } from "vuex";
 import { parseTime } from "@/utils/ruoyi";
-import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
-import { getProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
-import { getUsersDeptLeaderByDept } from '@/api/system/post'
-import { addProjectProgress } from '@/api/oa/project/projectProgress'
-import { Snowflake } from '@/utils/snowFlake.js'
+import {
+  complete,
+  rejectTask,
+  returnList,
+  returnTask,
+  getNextFlowNode,
+  delegate,
+  flowTaskForm,
+} from "@/api/flowable/todo";
+import {
+  getProjectComment,
+  addProjectComment,
+  updateProjectComment,
+} from "@/api/oa/project/projectComment";
+import { getUsersDeptLeaderByDept } from "@/api/system/post";
+import {
+  getProjectProgress,
+  addProjectProgress,
+  delProjectProgress,
+} from "@/api/oa/project/projectProgress";
 import { listBudgetCar, getBudgetCar } from "@/api/oa/budget/budgetCar";
 import { listBudgetDevice, getBudgetDevice } from "@/api/oa/budget/budgetDevice";
 import { listBudgetSettle, getBudgetSettle } from "@/api/oa/budget/budgetSettle";
 import { listBudgetStaff, getBudgetStaff } from "@/api/oa/budget/budgetStaff";
 import { listBudget } from "@/api/oa/budget/budget";
+import { getProject, updateProject } from "@/api/oa/project/project";
+import { getCar } from "@/api/oa/car/car";
 export default {
   computed: {
-    ...mapGetters(['name', 'userId']),
+    ...mapGetters(["name", "userId"]),
   },
   props: {
     disabled: {
@@ -123,38 +181,84 @@ export default {
   },
   data() {
     return {
+      loading: true,
       form: {
-        manageApprover: '',
-        manageApproverName: '',
-        manageApprovalTime: ''
+        licensePlate: "",
+        driver: "",
+        staff: "",
+        entryTime: "",
+        exitTime: "",
       },
       rules: {
-        manageComment: [{ required: true, message: "请输入审核意见", trigger: "blur" }]
+        manageComment: [{ required: true, message: "请输入审核意见", trigger: "blur" }],
       },
-      progressList: [{
-        date: "",
-        percentage: "",
-        situation: "",
-      }]
-    }
+      progressList: [
+        {
+          date: "",
+          percentage: "",
+          situation: "",
+        },
+      ],
+      noBudget: true,
+      budgetId: "",
+    };
   },
   watch: {
     taskName(newval, oldval) {
-      if (newval == '项目生产') {
-        this.doesItExistBudget(this.taskForm.formId)
+      if (newval == "项目生产") {
+        this.doesItExistBudget(this.taskForm.formId);
       }
-    }
+    },
   },
   created() {
-    if (this.taskName == '项目生产') {
-      this.doesItExistBudget(this.taskForm.formId)
+    if (this.taskName == "项目生产") {
+      this.doesItExistBudget(this.taskForm.formId);
+      this.initProgress();
     }
   },
   methods: {
+    initProgress() {
+      getProject(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.form.entryTime = res.data.entryTime;
+          this.form.exitTime = res.data.exitTime;
+        }
+      });
+      getProjectProgress(this.taskForm.formId).then(res => {
+        if (res.data.length != 0) {
+          this.progressList = res.data;
+        }
+      });
+    },
+    // 查询是否有预算表
     doesItExistBudget(projectId) {
       listBudget({ projectId }).then(res => {
-        console.log(res);
-      })
+        this.loading = false;
+        if (res.total == 0) {
+        } else {
+          this.noBudget = false;
+          this.budgetId = res.rows[0].budgetId;
+          getBudgetCar(this.budgetId).then(res => {
+            let carArr = [];
+            let carDriverList = [];
+            for (let i of res.data) {
+              carArr.push(i.car.licensePlate);
+              getCar(i.carId).then(res => {
+                carDriverList.push(res.data.driverUser.nickName);
+                this.form.driver = carDriverList.join("、");
+              });
+            }
+            this.form.licensePlate = carArr.join("、");
+          });
+          getBudgetStaff(this.budgetId).then(res => {
+            let userArr = [];
+            for (let u of res.data) {
+              userArr.push(u.user.nickName);
+            }
+            this.form.staff = userArr.join("、");
+          });
+        }
+      });
     },
     addProgressList() {
       this.progressList.push({
@@ -173,26 +277,32 @@ export default {
       }
     },
     handleAddProgress(form) {
-      addProjectProgress(form)
-    },
-    confirmAddForm() {
-      for (let progress of this.progressList) {
-        progress.projectId = this.taskForm.formId
-        progress.progressId = new Snowflake(1n, 1n, 0n).nextId().toString();
-        console.log(progress.progressId);
-        // addProjectProgress(progress);
-      }
+      addProjectProgress(form);
     },
+    // 暂存数据
     preserve() {
-
-    }
+      delProjectProgress([this.taskForm.formId]).then(res => {
+        for (let progress of this.progressList) {
+          progress.projectId = this.taskForm.formId;
+          addProjectProgress(progress);
+        }
+      });
+      updateProject({
+        projectId: this.taskForm.formId,
+        entryTime: this.form.entryTime,
+        exitTime: this.form.exitTime,
+      }).then(res => {
+        this.$message.success("保存成功");
+      });
+    },
+    submitNextFlow() {},
   },
-}
+};
 </script>
 
 <style lang="scss" scoped>
 .auditor {
-  font-family: '华文行楷';
+  font-family: "华文行楷";
   font-size: 20px;
 }
 
@@ -219,11 +329,11 @@ table {
     width: 5px;
     height: 14px;
     border-radius: 10px;
-    background-color: #2893E5;
+    background-color: #2893e5;
   }
 }
 
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #121212 !important;
 }
-</style>
+</style>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-16 14:04:51
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-17 15:51:53
 -->
 <template>
   <div class="app-container">
@@ -83,7 +83,6 @@ export default {
     initForm() {
       getProjectComment(this.taskForm.formId).then(res => {
         if (res.data) {
-          debugger
           this.form = res.data
           this.form.scApprover = '';
           if (res.data.scApproverName) {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-16 17:25:30
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-17 15:00:41
 -->
 <template>
   <div>
@@ -21,30 +21,17 @@
       <div class="add-main">
         <el-steps :active="activeStep" align-center finish-status="success">
           <el-step title="项目信息" description="需要预算的项目"></el-step>
-          <el-step
-            title="间接成本明细"
-            description="选择参与的人员、车辆和设备，得到间接成本"
-          ></el-step>
+          <el-step title="间接成本明细" description="选择参与的人员、车辆和设备，得到间接成本"></el-step>
           <!-- <el-step title="选择车辆和设备" description="选择，得到对应预算"></el-step> -->
           <el-step title="直接成本明细" description="包含绩效预算和其他预算"></el-step>
           <el-step title="生成预算表" description="生成最终的项目预算表"></el-step>
         </el-steps>
         <!-- 选择项目 -->
         <div class="project" v-if="activeStep == 0">
-          <el-form
-            ref="form1"
-            :model="projectForm"
-            :rules="projectRule"
-            label-width="120px"
-          >
+          <el-form ref="form1" :model="projectForm" :rules="projectRule" label-width="120px">
             <el-form-item label="项目编号：" prop="projectNumber">
               <div style="display: flex">
-                <el-input
-                  v-model="projectForm.projectNumber"
-                  placeholder="请选择项目编号"
-                  disabled
-                  style="width: 300px"
-                />
+                <el-input v-model="projectForm.projectNumber" placeholder="请选择项目编号" disabled style="width: 300px" />
               </div>
             </el-form-item>
             <el-form-item label="项目名称：" prop="projectName">
@@ -52,10 +39,10 @@
             </el-form-item>
             <el-form-item label="项目负责人：" prop="projectLeader">
               {{
-                projectForm.projectLeaderUser
-                  ? projectForm.projectLeaderUser.nickName
-                  : ""
-              }}
+          projectForm.projectLeaderUser
+            ? projectForm.projectLeaderUser.nickName
+            : ""
+        }}
             </el-form-item>
             <el-form-item label="项目类型：" prop="projectType">
               {{ projectForm.projectType }}
@@ -125,24 +112,12 @@
             <!-- 选择人员 -->
             <el-form-item label="选择人员：">
               <span v-if="chooseUser.length != 0">
-                <el-tag
-                  effect="plain"
-                  type=""
-                  v-for="item in chooseUser"
-                  style="margin: 5px; font-size: 14px"
-                  :key="item.userId"
-                >
+                <el-tag effect="plain" type="" v-for="item in chooseUser" style="margin: 5px; font-size: 14px"
+                  :key="item.userId">
                   {{ item.nickName }}
                 </el-tag>
               </span>
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                @click="openPeople = true"
-                size="mini"
-                >选择</el-button
-              >
+              <el-button type="primary" plain icon="el-icon-plus" @click="openPeople = true" size="mini">选择</el-button>
             </el-form-item>
             <el-form-item label="人员预算：" v-if="chooseUser.length != 0">
               <table border="1">
@@ -170,43 +145,27 @@
                     ></el-input>
                   </td> -->
                   <td>
-                    <el-input
-                      v-model="user.days"
-                      placeholder="请输入天数"
-                      @change="calculateUserTotal(user)"
-                    ></el-input>
+                    <el-input v-model="user.days" placeholder="请输入天数" @change="calculateUserTotal(user)"></el-input>
                   </td>
                   <td class="staffCost">{{ user.staffCost }}</td>
                 </tr>
                 <tr>
-                  <td colspan="5">合计</td>
+                  <td colspan="6">合计</td>
                   <td>{{ budgetForm.staffCost }}</td>
                 </tr>
               </table>
             </el-form-item>
-            
-        <div style="color:red">tips:人员成本=(基础工资+岗位工资)/21.75，固定工资中的年功工资暂忽略不计，绩效工资计入直接成本，津贴补贴、五险一金扣除暂未考虑</div>
+
+            <div style="color:red">tips:人员成本=(基础工资+岗位工资)/21.75，固定工资中的年功工资暂忽略不计，绩效工资计入直接成本，津贴补贴、五险一金扣除暂未考虑</div>
             <!-- 选择车辆 -->
             <el-form-item label="选择车辆：">
               <span v-if="chooseCar.length != 0">
-                <el-tag
-                  effect="plain"
-                  type=""
-                  v-for="item in chooseCar"
-                  style="margin: 5px; font-size: 14px"
-                  :key="item.licensePlate"
-                >
+                <el-tag effect="plain" type="" v-for="item in chooseCar" style="margin: 5px; font-size: 14px"
+                  :key="item.licensePlate">
                   {{ item.licensePlate + item.brand }}
                 </el-tag>
               </span>
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                @click="openCar = true"
-                size="mini"
-                >选择</el-button
-              >
+              <el-button type="primary" plain icon="el-icon-plus" @click="openCar = true" size="mini">选择</el-button>
             </el-form-item>
             <el-form-item label="车辆预算：" v-if="chooseCar.length != 0">
               <table border="1">
@@ -221,28 +180,16 @@
                 <tr v-for="car in chooseCar" :key="car.carId">
                   <td>{{ car.licensePlate }}</td>
                   <td>
-                    <el-input
-                      v-model="car.mileage"
-                      placeholder="请输入油耗"
-                      @change="calculateCarTotal(car)"
-                    ></el-input>
+                    <el-input v-model="car.mileage" placeholder="请输入油耗" @change="calculateCarTotal(car)"></el-input>
                   </td>
                   <td>
-                    <el-input
-                      v-model="car.distance"
-                      placeholder="请输入总里程"
-                      @change="calculateCarTotal(car)"
-                    ></el-input>
+                    <el-input v-model="car.distance" placeholder="请输入总里程" @change="calculateCarTotal(car)"></el-input>
                   </td>
                   <td>
                     {{ car.dayCost }}
                   </td>
                   <td>
-                    <el-input
-                      v-model="car.days"
-                      placeholder="请输入天数"
-                      @change="calculateCarTotal(car)"
-                    ></el-input>
+                    <el-input v-model="car.days" placeholder="请输入天数" @change="calculateCarTotal(car)"></el-input>
                   </td>
                   <td class="carCost">{{ car.expense }}</td>
                 </tr>
@@ -255,24 +202,12 @@
             <!-- 选择设备 -->
             <el-form-item label="选择设备：">
               <span v-if="chooseDevice.length != 0">
-                <el-tag
-                  effect="plain"
-                  type=""
-                  v-for="item in chooseDevice"
-                  style="margin: 5px; font-size: 14px"
-                  :key="item.code"
-                >
+                <el-tag effect="plain" type="" v-for="item in chooseDevice" style="margin: 5px; font-size: 14px"
+                  :key="item.code">
                   {{ item.name + "-" + item.series + "-" + item.brand }}
                 </el-tag>
               </span>
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                @click="openDevice = true"
-                size="mini"
-                >选择</el-button
-              >
+              <el-button type="primary" plain icon="el-icon-plus" @click="openDevice = true" size="mini">选择</el-button>
             </el-form-item>
             <el-form-item label="设备预算：" v-if="chooseDevice.length != 0">
               <table border="1">
@@ -292,11 +227,8 @@
                     {{ device.dayCost }}
                   </td>
                   <td>
-                    <el-input
-                      v-model="device.days"
-                      placeholder="请输入天数"
-                      @change="calculateDeviceTotal(device)"
-                    ></el-input>
+                    <el-input v-model="device.days" placeholder="请输入天数"
+                      @change="calculateDeviceTotal(device)"></el-input>
                   </td>
                   <td class="deviceCost">{{ device.depreciation }}</td>
                 </tr>
@@ -307,9 +239,7 @@
               </table>
             </el-form-item>
             <el-form-item label="间接成本小计：">
-              <el-tag type="danger" style="margin-right: 20px; font-size: 14px"
-                >¥ {{ budgetForm.fixCost }}</el-tag
-              >
+              <el-tag type="danger" style="margin-right: 20px; font-size: 14px">¥ {{ budgetForm.fixCost }}</el-tag>
             </el-form-item>
           </el-form>
         </div>
@@ -326,34 +256,22 @@
             <el-breadcrumb-item>¥ {{ budgetForm.fixCost }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-form>
-            <choose-money :workList="workList" @getSettle="getSettle"></choose-money>
+            <choose-money :workList="workList" :chooseUser="chooseUser" :budgetForm="budgetForm" @getSettle="getSettle"></choose-money>
             <el-form-item label="外协费用：">
-              <el-input
-                v-model="budgetForm.outExpense"
-                style="width: 400px"
-                @change="getDirectExpense(budgetForm)"
-              ></el-input>
+              <el-input v-model="budgetForm.outExpense" style="width: 400px"
+                @change="getDirectExpense(budgetForm)"></el-input>
             </el-form-item>
             <el-form-item label="商务费用：">
-              <el-input
-                v-model="budgetForm.businessExpense"
-                style="width: 400px"
-                @change="getDirectExpense(budgetForm)"
-              ></el-input>
+              <el-input v-model="budgetForm.businessExpense" style="width: 400px"
+                @change="getDirectExpense(budgetForm)"></el-input>
             </el-form-item>
             <el-form-item label="车船租赁：">
-              <el-input
-                v-model="budgetForm.rentExpense"
-                style="width: 400px"
-                @change="getDirectExpense(budgetForm)"
-              ></el-input>
+              <el-input v-model="budgetForm.rentExpense" style="width: 400px"
+                @change="getDirectExpense(budgetForm)"></el-input>
             </el-form-item>
             <el-form-item label="其他费用：">
-              <el-input
-                v-model="budgetForm.otherExpense"
-                style="width: 400px"
-                @change="getDirectExpense(budgetForm)"
-              ></el-input>
+              <el-input v-model="budgetForm.otherExpense" style="width: 400px"
+                @change="getDirectExpense(budgetForm)"></el-input>
             </el-form-item>
             <el-form-item label="直接成本小计：">
               <el-tag type="danger" style="margin-right: 20px; font-size: 14px">
@@ -379,11 +297,7 @@
             <el-breadcrumb-item>直接成本小计</el-breadcrumb-item>
             <el-breadcrumb-item>¥ {{ budgetForm.directExpense }}</el-breadcrumb-item>
           </el-breadcrumb>
-          <budget-table
-            :budgetForm="budgetForm"
-            :projectForm="projectForm"
-            @getTotal="getTotalBudget"
-          ></budget-table>
+          <budget-table :budgetForm="budgetForm" :projectForm="projectForm" @getTotal="getTotalBudget"></budget-table>
         </div>
         <div class="finish" v-if="activeStep == 4">
           <el-result icon="success" title="成功提示" subTitle="预算表生成完成">
@@ -392,33 +306,18 @@
         </div>
         <el-divider></el-divider>
         <div class="btn">
-          <el-button @click="activeStep -= 1" :disabled="activeStep == 0"
-            >上一步</el-button
-          >
-          <el-button @click="confirmStep" type="primary" v-if="activeStep < 4"
-            >下一步</el-button
-          >
-          <el-button @click="submitComplete" type="primary" v-if="activeStep == 4"
-            >完成</el-button
-          >
+          <el-button @click="activeStep -= 1" :disabled="activeStep == 0">上一步</el-button>
+          <el-button @click="confirmStep" type="primary" v-if="activeStep < 4">下一步</el-button>
+          <el-button @click="submitComplete" type="primary" v-if="activeStep == 4">完成</el-button>
         </div>
       </div>
 
       <!-- 项目选择对话框 -->
-      <el-dialog
-        title="选择项目"
-        :visible.sync="openProject"
-        width="700px"
-        append-to-body
-      >
+      <el-dialog title="选择项目" :visible.sync="openProject" width="700px" append-to-body>
         <el-form :inline="true">
           <el-form-item label="项目编号" prop="projectNumber">
-            <el-input
-              v-model="queryParams.projectNumber"
-              placeholder="请输入项目编号"
-              clearable
-              @keyup.enter.native="getProjectList"
-            />
+            <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable
+              @keyup.enter.native="getProjectList" />
           </el-form-item>
           <el-form-item style="margin-bottom: 0; display: none">
             <el-input></el-input>
@@ -432,49 +331,23 @@
           <el-table-column type="index" width="50"> </el-table-column>
           <el-table-column prop="isFinshed" label="状态" width="90px">
             <template slot-scope="scope">
-              <el-tag
-                :type="scope.row.isFinished === '0' ? 'success' : 'warning'"
-                disable-transitions
-              >
+              <el-tag :type="scope.row.isFinished === '0' ? 'success' : 'warning'" disable-transitions>
                 {{ scope.row.isFinished == "0" ? "进行中" : "已结束" }}
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column
-            label="项目编号"
-            align="center"
-            key="projectNumber"
-            prop="projectNumber"
-          />
-          <el-table-column
-            label="项目名称"
-            align="center"
-            key="projectName"
-            prop="projectName"
-            width="200px"
-          />
-          <el-table-column
-            label="项目负责人"
-            align="center"
-            key="projectLeader"
-            prop="projectLeaderUser.nickName"
-          />
+          <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
+          <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" width="200px" />
+          <el-table-column label="项目负责人" align="center" key="projectLeader" prop="projectLeaderUser.nickName" />
           <el-table-column align="center">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" @click="chooseProject(scope.row)"
-                >选择</el-button
-              >
+              <el-button size="mini" type="text" @click="chooseProject(scope.row)">选择</el-button>
             </template>
           </el-table-column>
         </el-table>
         <div style="text-align: right">
-          <el-pagination
-            @current-change="getProjectList"
-            :current-page.sync="queryParams.pageNum"
-            :page-size="queryParams.pageSize"
-            layout="total, prev, pager, next"
-            :total="projectTotal"
-          >
+          <el-pagination @current-change="getProjectList" :current-page.sync="queryParams.pageNum"
+            :page-size="queryParams.pageSize" layout="total, prev, pager, next" :total="projectTotal">
           </el-pagination>
         </div>
       </el-dialog>
@@ -574,8 +447,8 @@ export default {
       },
       projectTotal: 0,
       projectForm: {
-        projectRegistrantUser:{
-          nickName:''
+        projectRegistrantUser: {
+          nickName: ''
         }
       },
       workList: [],
@@ -605,9 +478,6 @@ export default {
     // 查询项目列表
     getProjectList() {
       getProject(this.$route.query.formId).then(response => {
-        // console.log(response.rows);
-        // this.projectList = response.rows;
-        // this.projectTotal = response.total;
         this.projectForm = response.data;
       });
     },
@@ -638,6 +508,7 @@ export default {
         this.activeStep += 1;
         this.calculateThatCost();
       } else if (this.activeStep == 3) {
+        console.log(this.budgetForm);
         this.addBudgetForm(this.budgetForm);
         this.activeStep += 1;
       } else {
@@ -664,11 +535,17 @@ export default {
     getSettle(val) {
       this.budgetForm.settleExpense = val.settle;
       this.budgetForm.workList = val.workList;
+      this.budgetForm.inOutPriceSum = val.inOutPriceSum
+      if (this.chooseUser.length != 0) {
+        for (let s of this.chooseUser) {
+          s.inOutPrice = val.inOutPrice
+        }
+      }
       this.getDirectExpense(this.budgetForm);
     },
     // 计算单个人员的成本
     calculateUserTotal(user) {
-      let total =parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) * Number(user.days);
+      let total = parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) * Number(user.days);
       this.$set(user, "staffCost", total.toFixed(2));
       this.getCost("staffCost", "staffCost", this.chooseUser);
       this.getFixCost();

oa-ui/src/views/oa/budget/components/budgetTable.vue

@@ -82,6 +82,10 @@
         <td>{{ work.coefficient }}</td>
         <td>{{ work.settle }}</td>
       </tr>
+      <tr>
+        <td colspan="5" class="head">进出场津贴</td>
+        <td>{{ budgetForm.inOutPriceSum }}</td>
+      </tr>
       <tr>
         <td colspan="5" class="head">外协费用</td>
         <td>{{ budgetForm.outExpense }}</td>
@@ -106,12 +110,6 @@
         <td colspan="6" class="head">总成本=（间接成本+直接成本）*120%</td>
         <td>{{ totalBudget }}</td>
       </tr>
-      <!-- <tr>
-        <td class="head">编制人</td>
-        <td colspan="2">{{  }}</td>
-        <td class="head">审核人</td>
-        <td colspan="3"></td>
-      </tr> -->
     </table>
   </div>
 </template>
@@ -142,8 +140,13 @@ export default {
     this.userLen = this.budgetForm.chooseUser.length + 1;
     this.carLen = this.budgetForm.chooseCar.length + 1;
     this.deviceLen = this.budgetForm.chooseDevice.length + 1;
-    this.workLen = this.budgetForm.workList.length + 5;
+    this.workLen = this.budgetForm.workList.length + 6;
     this.totalBudget = ((Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost)) * 1.2).toFixed(2);
+    let sum = 0
+    for(let s of this.budgetForm.chooseUser){
+      sum = sum + (Number(s.inOutPrice) * Number(s.days))
+    }
+    this.budgetForm.inOutPriceSum = sum.toFixed(2)
     this.$emit('getTotal',this.totalBudget)
   },
   methods: {

oa-ui/src/views/oa/budget/components/chooseMoney.vue

@@ -91,9 +91,8 @@
               {{ work.workload }}
             </td>
             <td>
-              <el-input-number v-model="work.coefficient"  
-              :controls="false" :precision="2" :step="0.01" :max="10" @blur="getTotal(work)"
-              style="width:60px;">
+              <el-input-number v-model="work.coefficient" :controls="false" :precision="2" :step="0.01" :max="10"
+                @blur="getTotal(work)" style="width:60px;">
               </el-input-number>
               <!-- <el-input v-model="work.coefficient" placeholder="请输入系数" @blur="getTotal(work)"></el-input> -->
             </td>
@@ -103,18 +102,18 @@
           </tr>
           <tr>
             <td colspan="8">合计</td>
-            <td>{{ Number(settle) - Number(inOutPriceSum) }}</td>
+            <td>{{ (Number(settle) - Number(inOutPriceSum)).toFixed(2) }}</td>
           </tr>
         </table>
         <div style="color:red">tips:预结算表中的系数为：困难系统和调整系数相乘的值（1分制）。例如：困难系数1，调整系数0.8，最终系数为0.8</div>
       </el-form-item>
       <el-form-item label="进出场费用：">
         <el-input v-numeric v-model="inOutPrice" style="width:200px;" @change="getInoutpriceSum">
-          <template slot="append">单价</template>
+          <template slot="prepend">单价</template>
         </el-input>
         ×
         <el-input v-numeric v-model="peopleNumber" style="width:200px;" @change="getInoutpriceSum">
-          <template slot="append">人天</template>
+          <template slot="prepend">人天</template>
         </el-input>
         = {{ inOutPriceSum }}
       </el-form-item>
@@ -134,6 +133,14 @@ export default {
     workList: {
       type: Array,
       require: true
+    },
+    chooseUser: {
+      type: Array,
+      require: true
+    },
+    budgetForm: {
+      type: Object,
+      require: true
     }
   },
   data() {
@@ -156,9 +163,9 @@ export default {
         scaleGradeLoading: true,
       },
       settle: 0,
-      inOutPrice:0,
-      peopleNumber:0,
-      inOutPriceSum:0
+      inOutPrice: 0,
+      peopleNumber: 0,
+      inOutPriceSum: 0
     }
   },
   created() {
@@ -169,6 +176,8 @@ export default {
   },
   mounted() {
     this.getSettleSum();
+    console.log(this.budgetForm)
+
   },
   methods: {
     /* 获取工作类别 */
@@ -271,14 +280,25 @@ export default {
       }
       sum = sum + this.inOutPriceSum;
       this.settle = sum.toFixed(2);
+      let days = 0
+      for (let user of this.chooseUser) {
+        days = days + Number(user.days)
+      }
+      this.peopleNumber = days
+      if (this.budgetForm.inOutPriceSum && this.budgetForm.inOutPriceSum !=0 ) {
+        this.settle = Number(this.settle) + Number(this.budgetForm.inOutPriceSum)
+        this.inOutPrice = Number(this.budgetForm.inOutPriceSum) / this.peopleNumber
+        this.inOutPriceSum = this.budgetForm.inOutPriceSum
+      }
       let obj = {}
       obj.workList = this.workList;
       obj.settle = this.settle;
       obj.inOutPrice = this.inOutPrice;
       obj.peopleNumber = this.peopleNumber;
+      obj.inOutPriceSum = this.inOutPriceSum;
       this.$emit('getSettle', obj);
     },
-    getInoutpriceSum(){
+    getInoutpriceSum() {
       this.inOutPriceSum = Number(this.inOutPrice) * Number(this.peopleNumber);
       this.getSettleSum()
     },