修改预算撤回、更新等操作

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

 
     <resultMap type="CmcCar" id="CmcCarResult">
         <result property="carId"    column="car_id"    />
+        <result property="brand"    column="brand"    />
         <result property="licensePlate"    column="license_plate"    />
         <result property="driver"    column="driver"    />
         <result property="dayCost"    column="day_cost"    />
     </resultMap>
 
     <sql id="selectCmcBudgetCarVo">
-        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.driver, u.nick_name, c.day_cost, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.expense, bc.remark from cmc_budget_car as bc
+        select bc.budget_car_id, bc.budget_id, bc.car_id, c.license_plate, c.driver, c.brand, u.nick_name, c.day_cost, bc.days, bc.depreciation, bc.distance, bc.mileage, bc.expense, bc.remark from cmc_budget_car as bc
         left join cmc_car as c on c.car_id = bc.car_id
         left join sys_user as u on c.driver = u.user_id
     </sql>

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

 
     <resultMap type="SysUser" id="SysUserResult">
         <result property="userId"    column="user_id"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="nickName"    column="nick_name"    />
         <result property="postLevel"    column="post_level"    />
         <result property="salaryLevel"    column="salary_level"    />
     </resultMap>
 
     <sql id="selectCmcBudgetStaffVo">
-        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.nick_name, bs.days, ps.salary, bs.staff_cost, bs.remark from cmc_budget_staff as bs
+        select bs.budget_staff_id, bs.budget_id, bs.user_id, u.dept_id, u.nick_name, bs.days, ps.salary, bs.staff_cost, bs.remark from cmc_budget_staff as bs
         left join sys_user as u on u.user_id = bs.user_id
         left join cmc_post_salary as ps on u.salary_level = ps.salary_level and u.post_level = ps.post_level
     </sql>

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

  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-11 18:20:03
+ * @LastEditTime: 2024-06-12 16:03:19
 -->
 <template>
   <div>
     <div>
+        <el-alert v-if="reBackDescription != ''" title="预算被退回" type="warning" show-icon
+          :description="reBackDescription">
+        </el-alert>
       <div class="header">
-        <!-- <div class="back">
-        <el-button type="primary" plain @click="goBack">返回</el-button>
-      </div> -->
         <div class="title">
           <div class="title-text">新增预算</div>
           <div class="title-tips">
                 </tr>
                 <tr v-for="user in chooseUser" :key="user.userId">
                   <td>{{ user.nickName }}</td>
-                  <td>{{ user.dept.deptName }}</td>
+                  <td>{{ user.dept ? user.dept.deptName : user.deptName }}</td>
                   <td>{{ 1780 }}</td>
                   <td>{{ user.salary.salary }}</td>
                   <td>{{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}</td>
             <el-breadcrumb-item>¥ {{ budgetForm.fixCost }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-form>
-            <choose-money :workList="workList" :chooseUser="chooseUser" :budgetForm="budgetForm" @getSettle="getSettle"
-              @getWorkList="setPreSettlement"></choose-money>
+            <choose-money :workList="workList" :settleList="contentList" :chooseUser="chooseUser"
+              :budgetForm="budgetForm" @getSettle="getSettle" @getWorkList="setPreSettlement"></choose-money>
             <el-form-item label="关联合同：" label-width="90px" v-if="contract.contractId">
               <table border="1">
                 <tr class="head">
             <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-show="activeStep == 4">
           <el-result icon="success" title="成功提示" subTitle="预算表生成完成">
 import chooseDevice from "./components/chooseDevice.vue";
 import chooseMoney from "./components/chooseMoney.vue";
 import budgetTable from "./components/budgetTable.vue";
-import { addBudget } from "@/api/oa/budget/budget.js";
-import { addBudgetStaff } from "@/api/oa/budget/budgetStaff.js";
-import { addBudgetCar } from "@/api/oa/budget/budgetCar.js";
-import { addBudgetDevice } from "@/api/oa/budget/budgetDevice.js";
-import { addBudgetSettle } from "@/api/oa/budget/budgetSettle.js";
+import { listBudget, addBudget, updateBudget, delBudget } from "@/api/oa/budget/budget.js";
+import { listBudgetStaff, addBudgetStaff, delBudgetStaff } from "@/api/oa/budget/budgetStaff.js";
+import { listBudgetCar, addBudgetCar, delBudgetCar } from "@/api/oa/budget/budgetCar.js";
+import { listBudgetDevice, addBudgetDevice, delBudgetDevice } from "@/api/oa/budget/budgetDevice.js";
+import { listBudgetSettle, addBudgetSettle, delBudgetSettle } from "@/api/oa/budget/budgetSettle.js";
 import { Snowflake } from "@/utils/snowFlake.js";
 import budgetForm from "./components/budgetForm.vue";
+import { flowRecordFull } from "@/api/flowable/finished";
 import {
   complete,
   rejectTask,
       openDevice: false,
       chooseCar: [],
       chooseDevice: [],
-      contract:{}
+      contentList: [],
+      contract: {},
+      reBackDescription: "",
+      flag: false,
     };
   },
   created() {
     this.getProjectContract();
     this.getProjectWorkList();
   },
+  mounted() {
+    this.initBudgetForm();
+    this.getAlter();
+  },
   methods: {
+    getAlter() {
+      const params = { procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }
+      flowRecordFull(params).then(res => {
+        if(res.data.flowList)
+          this.reBackDescription = res.data.flowList[1].comment.type + '：' + res.data.flowList[1].comment.comment
+      })
+    },
+    // 初始化预算表，先从后台查询是否有数据
+    initBudgetForm() {
+      listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
+        if (res.rows[0] && res.rows[0].budgetId) {
+          this.flag = true
+          this.budgetForm = res.rows[0];
+          const budgetId = res.rows[0].budgetId
+          return Promise.all([
+            listBudgetCar({ budgetId }),
+            listBudgetDevice({ budgetId }),
+            listBudgetSettle({ budgetId }),
+            listBudgetStaff({ budgetId }),
+          ]);
+        }
+      }).then(([response1, response2, response3, response4]) => {
+        if (response1.rows) {
+          this.chooseCar = response1.rows
+          for (let car of this.chooseCar) {
+            car.licensePlate = car.car.licensePlate
+            car.dayCost = car.car.dayCost
+            car.brand = car.car.brand
+          }
+        }
+        if (response2.rows) {
+          this.chooseDevice = response2.rows;
+          for (let device of this.chooseDevice) {
+            device.brand = device.device.brand
+            device.dayCost = device.device.dayCost
+            device.name = device.device.name
+            device.series = device.device.series
+          }
+        }
+        if (response3.rows) {
+          this.contentList = response3.rows;
+        }
+        if (response4.rows) {
+          this.chooseUser = response4.rows;
+          for (let user of this.chooseUser) {
+            user.nickName = this.getUserName(user.userId)
+            user.deptName = this.getDeptName(user.user.deptId)
+          }
+        }
+      })
+
+    },
     goBack() {
       let obj = { path: "/budget/add" };
       this.$tab.closeOpenPage(obj);
     getProjectContract() {
       listProjectContract({ projectId: this.taskForm.formId }).then(res => {
         if (res.rows) {
-          if(res.rows.length == 1){
-            getContract(res.rows[0].contractId).then(result=>{
+          if (res.rows.length == 1) {
+            getContract(res.rows[0].contractId).then(result => {
               if (result.data) {
                 this.contract = result.data;
                 this.budgetForm.contract = result.data;
         this.activeStep += 1;
         this.calculateThatCost();
       } else if (this.activeStep == 3) {
-        this.addBudgetForm(this.budgetForm);
+        if (this.flag) {
+          this.updateBudgetForm(this.budgetForm)
+        } else {
+          this.addBudgetForm(this.budgetForm);
+        }
         this.activeStep += 1;
       } else {
         this.activeStep += 1;
     },
     getChooseCar(val) {
       this.chooseCar = val;
-      for(let car of this.chooseCar){
+      for (let car of this.chooseCar) {
         car.mileage = 1.5
       }
       this.openCar = false;
       }
       for (let work of form.contentList) {
         work.budgetId = form.budgetId;
-        addBudgetSettle(work).then(res=>{
+        addBudgetSettle(work).then(res => {
           this.$message.success('预算添加成功')
         })
       }
     },
+    updateBudgetForm(form) {
+      updateBudget(form);
+      delBudgetStaff(form.budgetId).then(res => {
+        for (let user of form.chooseUser) {
+
+          addBudgetStaff(user);
+        }
+      });
+      delBudgetCar(form.budgetId).then(res => {
+        for (let car of form.chooseCar) {
+          addBudgetCar(car);
+        }
+      })
+      delBudgetDevice(form.budgetId).then(res => {
+        for (let device of form.chooseDevice) {
+          addBudgetDevice(device);
+        }
+      })
+      delBudgetSettle(form.budgetId).then(res => {
+        for (let work of form.contentList) {
+          addBudgetSettle(work)
+        }
+        this.$message.success('预算添加成功')
+      })
+    },
     calculateThatCost() {
       let staffCost = 0;
       let carCost = 0;
     padding: 3px;
   }
 }
-.head{
+
+.head {
   font-weight: bold;
 }
 

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

  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-05 10:27:53
+ * @LastEditTime: 2024-06-12 18:26:04
 -->
 <template>
   <div class="main">
+    <div v-if="taskName == '预算审核'">
+      <h2 class="text-center">项目信息</h2>
+      <el-descriptions :column="3" border class="descriptions">
+        <el-descriptions-item label="项目编号">
+          {{ projectForm.projectNumber }}
+        </el-descriptions-item>
+        <el-descriptions-item label="项目名称">
+          {{ projectForm.projectName }}
+        </el-descriptions-item>
+        <el-descriptions-item label="项目负责人">
+          {{ getUserName(projectForm.projectLeader) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="项目备注" :span="3">
+          {{ projectForm.remark }}
+        </el-descriptions-item>
+        <el-descriptions-item label="项目概况">
+          <div>
+            <table border="1" style="width: 100%;">
+              <tr>
+                <td style="width: 250px">工作内容</td>
+                <td style="width: 100px">等级或比例尺</td>
+                <td style="width: 100px">单位</td>
+                <td style="width: 100px">工作量</td>
+                <td style="width: 100px">要求完成时间</td>
+                <td style="width: 200px">备注</td>
+              </tr>
+              <tr v-for="(work, index) in workContentList" :key="index">
+                <td>
+                  {{ work.content }}
+                </td>
+                <td>
+                  {{ work.scale }}
+                </td>
+                <td>
+                  {{ work.unit }}
+                </td>
+                <td>
+                  {{ work.workload }}
+                </td>
+                <td>
+                  {{ work.deadline }}
+                </td>
+                <td>
+                  {{ work.remark }}
+                </td>
+              </tr>
+            </table>
+          </div>
+        </el-descriptions-item>
+      </el-descriptions>
+    </div>
     <h2 style="text-align: center">项目直接生产成本预算表</h2>
     <p style="text-align: center;">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
-    <table border="1" class="table">
+    <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>金额</td>
         <td></td>
       </tr>
-      <tr v-for="user in chooseUser" :key="'user' + user.userId">
+      <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>预算天数</td>
         <td>金额</td>
       </tr>
-      <tr v-for="car in chooseCar" :key="'car' + car.carId">
+      <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>预算天数</td>
         <td>金额</td>
       </tr>
-      <tr v-for="device in chooseDevice" :key="'device' + device.deviceId">
+      <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>
 </template>
 
 <script>
-import { listBudget } from "@/api/oa/budget/budget";
-import { listBudgetCar } from "@/api/oa/budget/budgetCar";
-import { listBudgetDevice } from "@/api/oa/budget/budgetDevice";
-import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
-import { listBudgetStaff } from "@/api/oa/budget/budgetStaff";
+import { listBudget,updateBudget } from "@/api/oa/budget/budget";
+import { listBudgetCar,updateBudgetCar } from "@/api/oa/budget/budgetCar";
+import { listBudgetDevice,updateBudgetDevice } from "@/api/oa/budget/budgetDevice";
+import { listBudgetSettle,updateBudgetSettle } from "@/api/oa/budget/budgetSettle";
+import { listBudgetStaff,updateBudgetStaff } from "@/api/oa/budget/budgetStaff";
 import { listProjectWork } from "@/api/oa/project/projectWork";
 import { mapGetters } from 'vuex';
+import { getProject } from "@/api/oa/project/project";
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
 import { getUser } from '@/api/system/user'
 import { getUsersManageLeader } from "@/api/system/post";
+import { getPriceRemarkByWorkType } from '@/api/oa/price/price'
 export default {
   computed: {
     ...mapGetters(["name", "userId"]),
       projectId: '',
       budgetForm: {
       },
-      projectForm: {},
+      projectForm: {
+        projectRegistrantUser: {
+          nickName: ''
+        }
+      },
       userLen: 1,
       carLen: 1,
       deviceLen: 1,
             }
             this.getProjectWorkList();
           })
+          this.getProjectList();
           listProjectContract({ projectId: this.taskForm.formId }).then(res => {
             if (res.total == 1) {
               getContract(res.rows[0].contractId).then(response => {
             }
           })
         }
-
+      });
+    },
+    // 查询项目列表
+    getProjectList() {
+      getProject(this.taskForm.formId).then(response => {
+        this.projectForm = response.data;
       });
     },
     getProjectWorkList() {
     confirmSucess(taskName) {
       const params = { taskId: this.taskForm.taskId };
       if (taskName == '预算审核') {
-        getNextFlowNode(params).then(res => {
-          getUsersManageLeader({ userId: this.budgetForm.compiler }).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.updateBudgetForm();
+        // getNextFlowNode(params).then(res => {
+        //   getUsersManageLeader({ userId: this.budgetForm.compiler }).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");
+        //     });
+        //   });
+        // });
       } else if (taskName == '预算批准') {
         getNextFlowNode(params).then(res => {
           complete(this.taskForm).then(response => {
           });
         })
       }
-
-    }
+    },
+    updateBudgetForm() {
+      console.log(this.budgetForm);
+      console.log(this.chooseUser);
+      console.log(this.chooseDevice);
+      console.log(this.chooseCar);
+      updateBudget(this.budgetForm);
+      for(let car of this.chooseCar){
+        updateBudgetCar(car)
+      }
+      for(let device of this.chooseDevice){
+        updateBudgetDevice(device)
+      }
+      for(let user of this.chooseUser){
+        updateBudgetStaff(user)
+      }
+      for(let work of this.workList){
+        updateBudgetSettle(work)
+      }
+    },
+    // 计算作业结算金额
+    computeWorkSettle(work) {
+      let workload = Number(work.workload);
+      let price = Number(work.price);
+      let coefficient = Number(work.coefficient);
+      if (!isNaN(workload) && !isNaN(price) && !isNaN(coefficient)) {
+        let result = workload * price * coefficient;
+        this.$set(work, 'settle', result.toFixed(2));
+        this.computedSettleExpense();
+        this.computedDirectExpense();
+      } else {
+        this.$message.error('请确保参与计算的值都为数字')
+      }
+    },
+    computedFixCostSettle(item, type) {
+      if (type == 'user') {
+        let salaryPerDay = (Number(item.salary.salary) + 1780 || 0) / 21.75; // 转换为每天的薪资，或默认为0  
+        let totalDays = Number(item.days) || 0; // 转换为天数，或默认为0  
+        // 计算总薪资  
+        let total = (salaryPerDay * totalDays).toFixed(2);
+        this.$set(item, 'staffCost', total);
+        this.getCost("staffCost", "staffCost", this.chooseUser);
+      } else if (type == 'car') {
+        let total1 = (Number(item.mileage) || 0) * (Number(item.distance) || 0);
+        let total2 = (Number(item.car.dayCost) || 0) * (Number(item.days) || 0);
+        this.$set(item, "depreciation", total2);
+        let sum = (total1 + total2).toFixed(2); // sum 是一个字符串  
+        this.$set(item, "expense", sum); // expense 将是一个字符串，包含两位小数的总和   
+        this.getCost("expense", "carCost", this.chooseCar);
+      } else {
+        let total = (Number(item.device.dayCost) || 0) * (Number(item.days) || 0);
+        this.$set(item, "depreciation", total.toFixed(2));
+        this.getCost("depreciation", "deviceCost", this.chooseDevice);
+      }
+      this.getFixCost();
+      this.computedTotalBudget();
+    },
+    getCost(name1, name2, list) {
+      let sum = 0;
+      for (let user of list) {
+        sum = sum + Number(user[name1]);
+      }
+      this.budgetForm[name2] = sum.toFixed(2);
+    },
+    getFixCost() {
+      let total =
+        Number(this.budgetForm.staffCost) +
+        Number(this.budgetForm.carCost) +
+        Number(this.budgetForm.deviceCost);
+      this.budgetForm.fixCost = total.toFixed(2);
+    },
+    computedSettleExpense() {
+      let sum = this.workList.reduce((accumulator, work) => {
+        const settleValue = Number(work.settle);
+        // 如果settleValue不是NaN（即它可以被转换为数字）  
+        if (!isNaN(settleValue)) {
+          return accumulator + settleValue;
+        }
+        return accumulator;
+      }, 0); // 初始累加器值为0  
+      this.$set(this.budgetForm, 'settleExpense', sum.toFixed(2))
+    },
+    computedDirectExpense() {
+      const { settleExpense, outExpense, businessExpense, taxExpense, rentExpense, otherExpense } = this.budgetForm;
+      const expenses = [settleExpense, outExpense, businessExpense, taxExpense, rentExpense, otherExpense];
+      // 使用 reduce 函数计算总和  
+      let sum = expenses.reduce((acc, curr) => {
+        // 确保每个当前值都是数字（如果不是，则默认为0）  
+        const num = Number(curr) || 0;
+        return acc + num;
+      }, 0);
+      this.$set(this.budgetForm, 'directExpense', `${sum.toFixed(2)}`);
+      this.computedTotalBudget();
+    },
+    computedTotalBudget() {
+      const { fixCost, directExpense } = this.budgetForm;
+      // 确保 fixCost 和 directExpense 是数字，如果不是则默认为 0  
+      const totalBudget = (Number(fixCost) || 0) + (Number(directExpense) || 0);
+      this.$set(this.budgetForm, 'totalBudget', totalBudget.toFixed(2));
+      this.profit = (Number(this.contract.amount) || 0) - (Number(totalBudget) || 0);
+    },
+    getCoefficientRemark(work) {
+      let workType = work.cmcPrice.workType
+      getPriceRemarkByWorkType({ workType }).then(res => {
+        if (res.code == 200) {
+          if (workType != undefined)
+            this.$notify({
+              title: workType,
+              dangerouslyUseHTMLString: true,
+              message: res.msg,
+              duration: 0
+            });
+        }
+      })
+    },
   },
 };
 </script>
   }
 }
 
+.descriptions {
+  width: 1200px;
+  margin: 0 auto;
+}
+
 .head {
   line-height: 35px;
   font-weight: bold;
 }
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #5a5757;
+  background: rgba($color: #a9adb3, $alpha: 0.1);
+  width: 150px;
+  min-width: 150px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #cdd0d3;
+}
 </style>

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

     budgetForm: {
       type: Object,
       require: true
+    },
+    settleList: {
+      type: Array
     }
   },
   data() {
   created() {
     this.getWorkTypeList();
   },
+  watch: {
+    settleList(val) {
+      this.initContenList();
+    }
+  },
   mounted() {
     this.getSettleSum();
   },
   methods: {
+    initContenList() {
+      if (this.settleList.length != 0) {
+        this.contentList = this.settleList;
+        for (let c of this.contentList) {
+          this.$set(c, 'workSelect', {
+            // 项目列表
+            projectList: [],
+            // 工作类别列表
+            workTypeList: [],
+            // 工作项目
+            workItemList: [],
+            // 项目细项
+            subItemList: [],
+            // 比例尺
+            scaleGradeList: [],
+            workTypeLoading: true,
+            workItemLoading: true,
+            subItemLoading: true,
+            scaleGradeLoading: true,
+          })
+          this.$set(c, 'workType', c.cmcPrice.workType)
+          this.$set(c, 'scaleGrade', c.cmcPrice.scaleGrade)
+          this.$set(c, 'workItem', c.cmcPrice.workItem)
+          this.$set(c, 'unit', c.cmcPrice.unit)
+          if (c.groundType == '0') {
+            this.$set(c, 'price', c.cmcPrice.commonPrice)
+          }else{
+            this.$set(c, 'price', c.cmcPrice.complexPrice)
+          }
+          this.getTotal(c)
+        }
+      }
+    },
     addWorkList() {
       this.contentList.push({
         content: '',
     padding: 3px;
   }
 }
-.head{
+
+.head {
   font-weight: bold;
 }
+
 .delete-btn {
   position: absolute;
   left: -30px;

oa-ui/src/views/login.vue

  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-05 17:52:02
+ * @LastEditTime: 2024-06-12 17:34:58
 -->
 <template>
   <el-row class="login-wrapper">
   .login-bg {
     flex: 1.8;
     min-width: 0%;
-    background: url('../assets/images/xizang02.jpg') no-repeat;
+    background: url('../assets/images/login.jpg') no-repeat;
+    background-size: 100% 100%;
     position: relative;
   }