修改预算的新增接口

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

  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-29 16:51:06
+ * @LastEditTime: 2024-04-03 11:23:25
 -->
 <template>
   <div>
                 <td style="width:100px">进出场单价</td>
                 <td style="width:100px">预算天数</td>
                 <td style="width: 100px">总额</td>
-                <td></td>
               </tr>
               <tr v-for="user in chooseUser" :key="user.userId">
                 <td>{{ user.nickName }}</td>
                 <td>{{ user.salary.salary }}</td>
                 <td>{{ parseFloat(user.salary.salary / 31).toFixed(2) }}</td>
                 <td>
-                  <el-input v-model="user.inOutPrice" placeholder="请输入进出场单价" @change="calculateUserTotal(user)"></el-input>
+                  <el-input v-model="user.inOutPrice" placeholder="请输入进出场单价"
+                    @change="calculateUserTotal(user)"></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>
-                <td>
-                  <!-- <el-button type="text" @click="calculateUserTotal(user)">计算</el-button> -->
-                </td>
               </tr>
               <tr>
                 <td colspan="5">合计</td>
                 <td>{{ budgetForm.staffCost }}</td>
-                <td>
-                  <el-button type="text" @click="calculateTotal('staffCost')">计算</el-button>
-                </td>
               </tr>
             </table>
           </el-form-item>
                 <td style="width:110px">折旧成本（天）</td>
                 <td style="width:110px">预算天数</td>
                 <td style="width: 100px">总额</td>
-                <td></td>
               </tr>
               <tr v-for="car in chooseCar" :key="car.carId">
                 <td>{{ car.licensePlate }}</td>
                   <el-input v-model="car.days" placeholder="请输入天数" @change="calculateCarTotal(car)"></el-input>
                 </td>
                 <td class="carCost">{{ car.expense }}</td>
-                <td>
-                  <!-- <el-button type="text" @click="calculateCarTotal(car)">计算</el-button> -->
-                </td>
               </tr>
               <tr>
                 <td colspan="5">合计</td>
                 <td>{{ budgetForm.carCost }}</td>
-                <td>
-                  <el-button type="text" @click="calculateTotal('carCost')">计算</el-button>
-                </td>
               </tr>
             </table>
           </el-form-item>
                 <td>折旧成本（天）</td>
                 <td style="width:100px">预算天数</td>
                 <td style="width: 100px">总额</td>
-                <td></td>
               </tr>
               <tr v-for="device in chooseDevice" :key="device.deviceId">
                 <td>{{ device.name }}</td>
                   <el-input v-model="device.days" placeholder="请输入天数" @change="calculateDeviceTotal(device)"></el-input>
                 </td>
                 <td class="deviceCost">{{ device.depreciation }}</td>
-                <td>
-                  <!-- <el-button type="text" @click="calculateDeviceTotal(device)">计算</el-button> -->
-                </td>
               </tr>
               <tr>
                 <td colspan="5">合计</td>
                 <td>{{ budgetForm.deviceCost }}</td>
-                <td>
-                  <el-button type="text" @click="calculateTotal('deviceCost')">计算</el-button>
-                </td>
               </tr>
             </table>
           </el-form-item>
           <el-form-item label="固定成本小计：">
-            <el-tag type="danger" style="margin-right:20px;font-size:14px;">{{ budgetForm.fixCost }}</el-tag>
-            <el-button @click="getFixCost" type="success">计算</el-button>
+            <el-tag type="danger" style="margin-right:20px;font-size:14px;">¥ {{ budgetForm.fixCost }}</el-tag>
           </el-form-item>
         </el-form>
 
         <el-form>
           <choose-money :workList="workList" @getSettle="getSettle"></choose-money>
           <el-form-item label="外协费用：">
-            <el-input-number v-model="budgetForm.outExpense" style="width:400px;"></el-input-number>
+            <el-input v-model="budgetForm.outExpense" style="width:400px;"
+              @change="getDirectExpense(budgetForm)"></el-input>
           </el-form-item>
           <el-form-item label="商务费用：">
-            <el-input-number v-model="budgetForm.businessExpense" style="width:400px;"></el-input-number>
+            <el-input v-model="budgetForm.businessExpense" style="width:400px;"
+              @change="getDirectExpense(budgetForm)"></el-input>
           </el-form-item>
           <el-form-item label="车船租赁：">
-            <el-input-number v-model="budgetForm.rentExpense" style="width:400px;"></el-input-number>
+            <el-input v-model="budgetForm.rentExpense" style="width:400px;"
+              @change="getDirectExpense(budgetForm)"></el-input>
           </el-form-item>
           <el-form-item label="其他费用：">
-            <el-input-number v-model="budgetForm.otherExpense" style="width:400px;"></el-input-number>
+            <el-input v-model="budgetForm.otherExpense" style="width:400px;"
+              @change="getDirectExpense(budgetForm)"></el-input>
           </el-form-item>
           <el-form-item label="直接成本小计：">
-            {{ budgetForm.directExpense }}
-            <el-button type="success" style="margin-left:30px;" @click="getDirectExpense(budgetForm)">计算</el-button>
+            <el-tag type="danger" style="margin-right:20px;font-size:14px;"> ¥{{ budgetForm.directExpense }} </el-tag>
           </el-form-item>
 
         </el-form>
           <el-breadcrumb-item>直接成本小计</el-breadcrumb-item>
           <el-breadcrumb-item>¥ {{ budgetForm.directExpense }}</el-breadcrumb-item>
         </el-breadcrumb>
-        <budget-table :budgetForm="budgetForm" :projectForm="projectForm" ></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="预算表生成完成">
+          <template slot="extra">
+          </template>
+        </el-result>
       </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="activeStep += 1" type="primary" v-if="activeStep == 4">生成预算表</el-button>
+        <el-button @click="goBack" type="primary" v-if="activeStep == 4">完成</el-button>
       </div>
     </div>
 
         </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="projectLeaderName" prop="projectLeaderName" />
+        <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>
 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';
 export default {
   components: {
     choosePeople, chooseCar, chooseDevice, chooseMoney, budgetTable
   data() {
     return {
       activeStep: 0,
-      form: {},
+      form:{
+        projectId: null,
+        staffCost: 0,
+        carCost: 0,
+        deviceCost: 0,
+        fixCost: 0,
+        outExpense: 0,
+        businessExpense: 0,
+        rentExpense: 0,
+        otherExpense: 0,
+        directExpense: 0,
+        totalBudget: 0,
+        settleExpense:0,
+        compiler: '',
+        auditor: ''
+      },
       budgetForm: {
+        projectId: null,
+        staffCost: 0,
+        carCost: 0,
+        deviceCost: 0,
         fixCost: 0,
         outExpense: 0,
         businessExpense: 0,
         otherExpense: 0,
         directExpense: 0,
         totalBudget: 0,
+        settleExpense:0,
         compiler: '',
         auditor: ''
       }, // 预算表
       this.openProject = false;
     },
     confirmStep() {
-        debugger
       if (this.activeStep == 0) {
         if (this.projectForm.projectNumber == undefined) {
           this.activeStep = 0;
         } else {
           this.activeStep += 1;
         }
-      }else if(this.activeStep == 2){
+      } else if (this.activeStep == 2) {
         this.budgetForm.chooseUser = this.chooseUser;
         this.budgetForm.chooseCar = this.chooseCar;
         this.budgetForm.chooseDevice = this.chooseDevice;
+        this.budgetForm.projectId = this.projectForm.projectId;
         this.activeStep += 1;
+        this.calculateThatCost();
+      } else if (this.activeStep == 3) {
+        console.log(this.budgetForm);
+        this.form.projectId = this.budgetForm.projectId
+        this.form.staffCost = this.budgetForm.staffCost
+        this.form.carCost = this.budgetForm.carCost
+        this.form.deviceCost = this.budgetForm.deviceCost
+        this.form.fixCost = this.budgetForm.fixCost
+        this.form.outExpense = this.budgetForm.outExpense
+        this.form.businessExpense = this.budgetForm.businessExpense
+        this.form.rentExpense = this.budgetForm.rentExpense
+        this.form.otherExpense = this.budgetForm.otherExpense
+        this.form.directExpense = this.budgetForm.directExpense
+        this.form.totalBudget = this.budgetForm.totalBudget
+        this.form.settleExpense = this.budgetForm.settleExpense
+        this.addBudgetForm(this.form)
       }
       else {
         this.activeStep += 1;
       });
     },
     getSettle(val) {
-      console.log(val);
-      console.log(this.budgetForm);
       this.budgetForm.settleExpense = val.settle;
       this.budgetForm.workList = val.workList;
+      this.getDirectExpense(this.budgetForm)
     },
     // 计算单个人员的成本
     calculateUserTotal(user) {
-      if (user.inOutPrice == undefined) {
-        this.$message.error("请输入进出场单价");
-        return;
-      }
       let total =
         (parseFloat(user.salary.salary / 31).toFixed(2) + Number(user.inOutPrice)) *
         Number(user.days);
       this.$set(user, "staffCost", total.toFixed(2));
+      this.getCost("staffCost", "staffCost", this.chooseUser);
+      this.getFixCost()
     },
     calculateCarTotal(car) {
       let total1 = Number(car.mileage) * Number(car.distance)
       let sum = (total1 + total2).toFixed(2);
       this.$set(car, 'depreciation', total2);
       this.$set(car, 'expense', sum);
+      this.getCost("expense", "carCost", this.chooseCar);
+      this.getFixCost()
     },
     calculateDeviceTotal(device) {
       let total = Number(device.dayCost) * Number(device.days)
       this.$set(device, 'depreciation', total);
+      this.getCost("depreciation", "deviceCost", this.chooseDevice);
+      this.getFixCost()
     },
-    // 合计
-    calculateTotal(val) {
-      const elements = document.querySelectorAll("." + val);
+    getCost(name1, name2, list) {
       let sum = 0;
-      if (elements.length > 0) {
-        for (let e of elements) {
-          sum = sum + Number(e.innerHTML);
-        }
-        this.$set(this.budgetForm, val, sum.toFixed(2));
+      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)
     },
     // 获取直接成本
     getDirectExpense(form) {
-      console.log(this.budgetForm);
-      let sum = Number(form.settleExpense) + form.outExpense + form.rentExpense + form.businessExpense + form.otherExpense
+      let sum = Number(form.settleExpense) + Number(form.outExpense) + Number(form.rentExpense) + Number(form.businessExpense) + Number(form.otherExpense)
       this.budgetForm.directExpense = sum.toFixed(2)
+    },
+    getTotalBudget(val) {
+      this.budgetForm.totalBudget = val
+    },
+    addBudgetForm(form) {
+      addBudget(form)
+    },
+    calculateThatCost() {
+      let staffCost = 0;
+      let carCost = 0;
+      let deviceCost = 0;
+      for (let user of this.chooseUser) {
+        staffCost = staffCost + Number(user.staffCost)
+      }
+      for (let car of this.chooseCar) {
+        carCost = carCost + Number(car.expense)
+      }
+      for (let device of this.chooseDevice) {
+        deviceCost = deviceCost + Number(device.depreciation)
+      }
+      this.budgetForm.staffCost = staffCost;
+      this.budgetForm.carCost = carCost;
+      this.budgetForm.deviceCost = deviceCost;
     }
   },
 };

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

       <tr>
         <td class="head">项目名称</td>
         <td colspan="3">{{ projectForm.projectName }}</td>
-        <td>项目编号</td>
+        <td class="head">项目编号</td>
         <td colspan="2">{{ projectForm.projectNumber }}</td>
       </tr>
       <tr>
-        <td :rowspan="userLen">人员</td>
-        <td>姓名</td>
-        <td>岗位工资</td>
-        <td>人员成本（天）</td>
-        <td>进出场单价</td>
-        <td>预算天数</td>
-        <td>金额</td>
-      </tr>
-      <tr v-for="user in budgetForm.chooseUser" :key="user.userId">
+        <td :rowspan="userLen" 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 in budgetForm.chooseUser" :key="'user' + user.userId">
         <td>{{ user.nickName }}</td>
         <td>{{ user.salary.salary }}</td>
         <td>{{ parseFloat(user.salary.salary / 31).toFixed(2) }}</td>
         <td>{{ user.staffCost }}</td>
       </tr>
       <tr>
-        <td :rowspan="carLen">车辆</td>
-        <td>车牌号</td>
-        <td>油耗</td>
-        <td>总里程</td>
-        <td>折旧成天（天）</td>
-        <td>预算天数</td>
-        <td>金额</td>
-      </tr>
-      <tr v-for="car in budgetForm.chooseCar" :key="car.carId">
+        <td :rowspan="carLen" 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="car in budgetForm.chooseCar" :key="'car' + car.carId">
         <td>{{ car.licensePlate }}</td>
         <td>{{ car.mileage }}</td>
         <td>{{ car.distance }}</td>
         <td>{{ car.expense }}</td>
       </tr>
       <tr>
-        <td :rowspan="deviceLen">设备</td>
-        <td>设备名称</td>
-        <td>规格型号</td>
-        <td>品牌</td>
-        <td>折旧成本（天）</td>
-        <td>预算天数</td>
-        <td>金额</td>
-      </tr>
-      <tr v-for="device in budgetForm.chooseDevice" :key="device.deviceId">
+        <td :rowspan="deviceLen" 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="device in budgetForm.chooseDevice" :key="'device' + device.deviceId">
         <td>{{ device.name }}</td>
         <td>{{ device.series }}</td>
         <td>{{ device.brand }}</td>
         <td>{{ device.depreciation }}</td>
       </tr>
       <tr>
-        <td colspan="6">固定成本小计</td>
+        <td colspan="6" class="head">固定成本小计</td>
         <td>{{ budgetForm.fixCost }}</td>
       </tr>
       <tr>
-        <td :rowspan="workLen">预计结算金额</td>
-        <td>工作内容</td>
-        <td>比例尺</td>
-        <td>总工作量</td>
-        <td>单价</td>
-        <td>系数</td>
-        <td>金额</td>
+        <td :rowspan="workLen" 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="(work, index) in budgetForm.workList" :key="'work' + index">
         <td>{{ work.content }}</td>
         <td>{{ work.total }}</td>
       </tr>
       <tr>
-        <td colspan="5">外协费用</td>
+        <td colspan="5" class="head">外协费用</td>
         <td>{{ budgetForm.outExpense }}</td>
       </tr>
       <tr>
-        <td colspan="5">商务费用</td>
+        <td colspan="5" class="head">商务费用</td>
         <td>{{ budgetForm.businessExpense }}</td>
       </tr>
       <tr>
-        <td colspan="5">车船租赁</td>
+        <td colspan="5" class="head">车船租赁</td>
         <td>{{ budgetForm.rentExpense }}</td>
       </tr>
       <tr>
-        <td colspan="5">其他费用</td>
+        <td colspan="5" class="head">其他费用</td>
         <td>{{ budgetForm.otherExpense }}</td>
       </tr>
       <tr>
-        <td colspan="6">直接成本小计</td>
+        <td colspan="6" class="head">直接成本小计</td>
         <td>{{ budgetForm.directExpense }}</td>
       </tr>
       <tr>
-        <td colspan="6">总成本=（固定成本+直接成本）*120%</td>
-        <td>{{ totalCost }}</td>
+        <td colspan="6" class="head">总成本=（固定成本+直接成本）*120%</td>
+        <td>{{ totalBudget }}</td>
       </tr>
-      <tr>
-        <td>编制人</td>
-        <td colspan="2"></td>
-        <td>审核人</td>
+      <!-- <tr>
+        <td class="head">编制人</td>
+        <td colspan="2">{{  }}</td>
+        <td class="head">审核人</td>
         <td colspan="3"></td>
-      </tr>
+      </tr> -->
     </table>
   </div>
 </template>
       carLen: 1,
       deviceLen: 1,
       workLen: 1,
-      totalCost: 0
+      totalBudget: 0
     }
   },
   created() {
     this.carLen = this.budgetForm.chooseCar.length + 1;
     this.deviceLen = this.budgetForm.chooseDevice.length + 1;
     this.workLen = this.budgetForm.workList.length + 5;
+    this.totalBudget = ((Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost)) * 1.2).toFixed(2);
+    this.$emit('getTotal',this.totalBudget)
   },
   methods: {
 
 }
 
 .head {
-  background-color: var(--primary-color);
+  // background-color: var(--current-color);
+  // opacity: 0.5;
+  // color: #fff;
 }
 </style>

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

               </el-option>
             </el-select>
           </td>
-          <!-- <td>
-              <el-select v-model="work.subItem" :style="{ width: '100%' }"
-                @change="getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType)">
-                <el-option v-for="item in work.workSelect.subItemList" :key="item.value" :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </td> -->
           <td>
             <el-select v-model="work.scaleGrade" :style="{ width: '100%' }"
               @change="getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType)">
             {{ work.total }}
           </td>
         </tr>
+        <tr>
+          <td colspan="8">合计</td>
+          <td>{{ settle }}</td>
+        </tr>
       </table>
       <div style="color:red">tips:预结算表中的系数为：困难系统和调整系数相乘的值（1分制）。例如：困难系数1，调整系数0.8，最终系数为0.8</div>
     </el-form-item>
     <el-form-item label="预结算合计：">
-      {{ settle }}<el-button @click="getSettle()" type="success" style="margin-left:30px;">计算</el-button>
+      <el-tag type="danger" style="margin-right:20px;font-size:14px;">¥{{  settle }}</el-tag>
     </el-form-item>
   </div>
 </template>
       this.getWorkTypeList(work);
     }
   },
+  mounted(){
+    this.getSettleSum();
+  },
   methods: {
     /* 获取工作类别 */
     getWorkTypeList(work) {
     },
     /* 获取比例尺 */
     getScaleGradeList(work, workItem) {
-      getScaleGradeList({ workItem }).then(res => {
-        if (res) {
-          let scaleGradeList = this.setArray(res);
-          work.workSelect.scaleGradeLoading = false;
-          work.workSelect.scaleGradeList = scaleGradeList;
-          this.setValue(work, 'scaleGrade', scaleGradeList[0].label)
-          // work.scaleGrade = scaleGradeList[0].label;
-          if (work.scaleGrade == undefined) {
-            this.setValue(work, 'scaleGrade', '无');
-          }
-          if (work.groundType == undefined) {
-            this.setValue(work, 'groundType', '一般地类');
-          }
-          this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
+      if (work.scale) {
+        this.setValue(work, 'scaleGrade', work.scale);
+        if (work.groundType == undefined) {
+          this.setValue(work, 'groundType', '一般地类');
         }
-      })
+        this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
+      } else {
+        getScaleGradeList({ workItem }).then(res => {
+          if (res) {
+            let scaleGradeList = this.setArray(res);
+            work.workSelect.scaleGradeLoading = false;
+            work.workSelect.scaleGradeList = scaleGradeList;
+            this.setValue(work, 'scaleGrade', scaleGradeList[0].label)
+            // work.scaleGrade = scaleGradeList[0].label;
+            if (work.scaleGrade == undefined) {
+              this.setValue(work, 'scaleGrade', '无');
+            }
+            if (work.groundType == undefined) {
+              this.setValue(work, 'groundType', '一般地类');
+            }
+            this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
+          }
+        })
+      }
+
     },
     /* 获取单价 */
     getUnitPrice(work, workItem, subItem, scaleGrade, groundType) {
     getTotal(work) {
       let total = this.calculateTotal(work.price, work.coefficient, work.workLoad, 1);
       this.setValue(work, 'total', total)
+      this.getSettleSum();
     },
     /* 计算总额 */
     calculateTotal(price, coefficient, workLoad, percent) {
       return ((parseFloat(price) * parseFloat(coefficient) * parseFloat(workLoad)) * percent).toFixed(2);
     },
-    getSettle() {
-      const elements = document.querySelectorAll(".workTotal");
+    getSettleSum() {
       let sum = 0;
-      if (elements.length > 0) {
-        for (let e of elements) {
-          sum = sum + Number(e.innerHTML);
-        }
-        this.settle = sum.toFixed(2)
+      for(let work of this.workList){
+        sum = sum + Number(work.total)
       }
+      this.settle = sum.toFixed(2);
       let obj = {}
       obj.workList = this.workList;
       obj.settle = this.settle;