修改预算编制到流程中

oa-ui/src/views/flowable/task/todo/detail/index.vue

             @goBack="goBack"></device-form>
           <project-process :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目流转'"
             @goBack="goBack"></project-process>
+          <add-budget :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'" @goBack="goBack"></add-budget>
           <el-row type="flex" justify="center" v-show="isShowApprove()">
             <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
               @click="handleComplete">审核通过
 import carForm from "@/views/flowable/form/carForm.vue";
 import deviceForm from "@/views/flowable/form/deviceForm";
 import projectProcess from "@/views/flowable/form/projectProcess/index.vue"
+import AddBudget from '@/views/oa/budget/addBudget.vue';
 
 export default {
   name: "Record",
     JyTable,
     carForm,
     deviceForm,
-    projectProcess
+    projectProcess,
+    AddBudget
   },
   props: {},
   data() {
     },
     // 是否显示审批通过
     isShowApprove() {
-      if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批' || this.taskForm.procDefName == '用车审批（工会）' || this.taskForm.procDefName == '设备审批'|| this.taskForm.procDefName == '项目流转') {
+      if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批'
+       || this.taskForm.procDefName == '用车审批（工会）' || this.taskForm.procDefName == '设备审批'|| this.taskForm.procDefName == '项目流转'
+       || this.taskForm.procDefName == '项目预算') {
         return false
       } else {
         return true

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

+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+  export default {
+    
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

             {{ work.unit }}
           </td>
           <td>
-            {{ work.workLoad }}
+            {{ work.workload }}
           </td>
           <td>
             {{ work.deadline }}
             {{ work.price }} / {{ work.unit }}
           </td>
           <td>
-            {{ work.workLoad }}
+            {{ work.workload }}
           </td>
           <td>
             <el-input v-model="work.coefficient" placeholder="请输入系数" @blur="getTotal(work)"></el-input>
           </td>
           <td class="workTotal">
-            {{ work.total }}
+            {{ work.settle }}
           </td>
         </tr>
         <tr>
           work.priceId = res.data.id;
           this.setValue(work, 'price', res.data.price)
           this.setValue(work, 'coefficient', 1)
-          if (work.workLoad != undefined || work.workLoad != '') {
+          if (work.workload != undefined || work.workload != '') {
             this.getTotal(work);
           }
         }
     },
     /* 获取总额 */
     getTotal(work) {
-      let total = this.calculateTotal(work.price, work.coefficient, work.workLoad, 1);
-      this.setValue(work, 'total', total)
+      let total = this.calculateTotal(work.price, work.coefficient, work.workload, 1);
+      this.setValue(work, 'settle', total)
       this.getSettleSum();
     },
     /* 计算总额 */
-    calculateTotal(price, coefficient, workLoad, percent) {
-      return ((parseFloat(price) * parseFloat(coefficient) * parseFloat(workLoad)) * percent).toFixed(2);
+    calculateTotal(price, coefficient, workload, percent) {
+      return ((parseFloat(price) * parseFloat(coefficient) * parseFloat(workload)) * percent).toFixed(2);
     },
     getSettleSum() {
       let sum = 0;
       for(let work of this.workList){
-        sum = sum + Number(work.total)
+        sum = sum + Number(work.settle)
       }
       this.settle = sum.toFixed(2);
       let obj = {}
       obj.workList = this.workList;
       obj.settle = this.settle;
-      console.log(this.workList);
       this.$emit('getSettle', obj)
     },
     //数组去重

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

+<!--
+ * @Author: ysh
+ * @Date: 2024-03-21 17:49:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-03 14:51:37
+-->
 <!--
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
- * @LastEditors: wrh
- * @LastEditTime: 2024-03-27 10:00:27
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-03 14:41:00
 -->
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目id" prop="projectId">
-        <el-input
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="项目编号" prop="projectId">
+        <el-select
           v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="人员成本" prop="staffCost">
-        <el-input
-          v-model="queryParams.staffCost"
-          placeholder="请输入人员成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车辆成本" prop="carCost">
-        <el-input
-          v-model="queryParams.carCost"
-          placeholder="请输入车辆成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备成本" prop="deviceCost">
-        <el-input
-          v-model="queryParams.deviceCost"
-          placeholder="请输入设备成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="固定成本" prop="fixCost">
-        <el-input
-          v-model="queryParams.fixCost"
-          placeholder="请输入固定成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预结算额" prop="settleExpense">
-        <el-input
-          v-model="queryParams.settleExpense"
-          placeholder="请输入预结算额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="外协费用" prop="outExpense">
-        <el-input
-          v-model="queryParams.outExpense"
-          placeholder="请输入外协费用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="商务费用" prop="businessExpense">
-        <el-input
-          v-model="queryParams.businessExpense"
-          placeholder="请输入商务费用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车船租赁" prop="rentExpense">
-        <el-input
-          v-model="queryParams.rentExpense"
-          placeholder="请输入车船租赁"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="其他费用" prop="otherExpense">
-        <el-input
-          v-model="queryParams.otherExpense"
-          placeholder="请输入其他费用"
+          filterable
+          placeholder="请选择"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="直接成本" prop="directExpense">
-        <el-input
-          v-model="queryParams.directExpense"
-          placeholder="请输入直接成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="预算总额" prop="totalBudget">
-        <el-input
-          v-model="queryParams.totalBudget"
-          placeholder="请输入预算总额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="编制人" prop="compiler">
-        <el-input
-          v-model="queryParams.compiler"
-          placeholder="请输入编制人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核人" prop="auditor">
-        <el-input
-          v-model="queryParams.auditor"
-          placeholder="请输入审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="item in projectList"
+            :key="item.projectId"
+            :label="item.projectNumber"
+            :value="item.projectId"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
           size="mini"
           @click="handleAdd"
           v-hasPermi="['oa:budget:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['oa:budget:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['oa:budget:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
           size="mini"
           @click="handleExport"
           v-hasPermi="['oa:budget:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="budgetList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="budgetList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="预算id" align="center" prop="budgetId" /> -->
       <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
-      <el-table-column label="项目名称" align="center" prop="project.projectName" />
+      <el-table-column
+        label="项目名称"
+        align="center"
+        prop="project.projectName"
+        width="200px"
+      />
       <el-table-column label="人员成本" align="center" prop="staffCost" />
       <el-table-column label="车辆成本" align="center" prop="carCost" />
       <el-table-column label="设备成本" align="center" prop="deviceCost" />
       <el-table-column label="审核人" align="center" prop="auditorUser.nickName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:budget:edit']"
-          >修改</el-button>
+            >修改</el-button
+          > -->
           <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleDetails(scope.row)"
+            >详情</el-button
+          >
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['oa:budget:remove']"
-          >删除</el-button>
+            >删除</el-button
+          > -->
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 预算详情 -->
+    <el-dialog :title="title" :visible.sync="detailsOpen" width="1000px" append-to-body>
+      
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listBudget, getBudget, delBudget, addBudget, submitBudget, updateBudget } from "@/api/oa/budget/budget";
-
+import {
+  listBudget,
+  getBudget,
+  delBudget,
+  addBudget,
+  submitBudget,
+  updateBudget,
+} from "@/api/oa/budget/budget";
+import { listProject } from "@/api/oa/project/project";
+import budgetTable from './components/budgetTable.vue';
 export default {
   name: "Budget",
+  components:{ budgetTable }, 
   data() {
     return {
       // 遮罩层
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
+      projectList: [],
+      detailsOpen: false,
     };
   },
   created() {
     this.getList();
+    this.getProjectList();
   },
   methods: {
     /** 查询cmc预算管理列表 */
       this.loading = true;
       listBudget(this.queryParams).then(response => {
         this.budgetList = response.rows;
+        console.log(this.budgetList);
         this.total = response.total;
         this.loading = false;
       });
     },
+    getProjectList() {
+      listProject({
+        pageNum: 1,
+        pageSize: 99999999,
+      }).then(response => {
+        this.projectList = response.rows;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
         totalBudget: null,
         compiler: null,
         auditor: null,
-        createTime: null
+        createTime: null,
       };
       this.resetForm("form");
     },
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.budgetId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map(item => item.budgetId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       // this.reset();
       // this.open = true;
       // this.title = "添加cmc预算管理";
-      this.$router.push({ path: '/budget/add' })
+      this.$router.push({ path: "/budget/add" });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const budgetId = row.budgetId || this.ids
+      const budgetId = row.budgetId || this.ids;
       getBudget(budgetId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改cmc预算管理";
       });
     },
+    // 详情按钮
+    handleDetails(row) {
+      this.detailsOpen = true;
+      console.log(row);
+      this.title = row.project.projectNumber + "预算详情";
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
     /** 删除按钮操作 */
     handleDelete(row) {
       const budgetIds = row.budgetId || this.ids;
-      this.$modal.confirm('是否确认删除cmc预算管理编号为"' + budgetIds + '"的数据项？').then(function() {
-        return delBudget(budgetIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除cmc预算管理编号为"' + budgetIds + '"的数据项？')
+        .then(function () {
+          return delBudget(budgetIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('oa/budget/export', {
-        ...this.queryParams
-      }, `budget_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "oa/budget/export",
+        {
+          ...this.queryParams,
+        },
+        `budget_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>