修改预算表的显示表格

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-21 18:04:09
+ * @LastEditTime: 2024-05-22 18:48:24
 -->
 <template>
   <div>
@@ -106,7 +106,9 @@
             <el-breadcrumb-item>选择项目</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectName }}</el-breadcrumb-item>
-            <el-breadcrumb-item>{{ projectForm.projectLeaderUser.nickName }}</el-breadcrumb-item>
+            <el-breadcrumb-item>{{ projectForm.projectLeaderUser
+          ? projectForm.projectLeaderUser.nickName
+          : "" }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-form ref="form2" :model="peopleForm" style="padding: 20px 100px 0">
             <!-- 选择人员 -->
@@ -180,7 +182,7 @@
                 <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>
+                    {{ car.mileage }}
                   </td>
                   <td>
                     <el-input v-model="car.distance" placeholder="请输入总里程" @change="calculateCarTotal(car)"></el-input>
@@ -249,18 +251,36 @@
             <el-breadcrumb-item>选择项目</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectName }}</el-breadcrumb-item>
-            <el-breadcrumb-item>{{ projectForm.projectLeaderUser.nickName }}</el-breadcrumb-item>
+            <el-breadcrumb-item>{{ projectForm.projectLeaderUser
+          ? projectForm.projectLeaderUser.nickName
+          : "" }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-breadcrumb separator-class="el-icon-arrow-right" style="margin: 15px 0">
             <el-breadcrumb-item>间接成本小计</el-breadcrumb-item>
             <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>
-            <el-form-item label="其他预算：">
+            <choose-money :workList="workList" :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">
+                  <td>合同项目</td>
+                  <td>合同编码</td>
+                  <td>合同编号</td>
+                  <td>合同金额</td>
+                </tr>
                 <tr>
+                  <td>{{ contract.tender ? contract.tender.projectName : '' }}</td>
+                  <td>{{ contract.contractCode }}</td>
+                  <td>{{ contract.contractNumber }}</td>
+                  <td>{{ contract.amount }}</td>
+                </tr>
+              </table>
+            </el-form-item>
+            <el-form-item label="其他预算：" label-width="90px">
+              <table border="1">
+                <tr class="head">
                   <td>内容</td>
                   <td>费用金额</td>
                   <td>备注</td>
@@ -268,51 +288,51 @@
                 <tr>
                   <td>外协费用</td>
                   <td>
-                    <el-input-number :controls="false" :precision="2" v-model="budgetForm.outExpense" style="width: 400px"
-                      @change="getDirectExpense(budgetForm)"></el-input-number>
+                    <el-input-number :controls="false" :precision="2" v-model="budgetForm.outExpense"
+                      style="width: 100%" @change="getDirectExpense(budgetForm)"></el-input-number>
                   </td>
                   <td>
-                    <el-input type="textarea" v-model="budgetForm.outRemark" style="width: 400px"></el-input>
+                    <el-input type="textarea" v-model="budgetForm.outRemark" style="width: 100%"></el-input>
                   </td>
                 </tr>
                 <tr>
                   <td>税费成本</td>
                   <td>
-                    <el-input-number :controls="false" :precision="2" v-model="budgetForm.taxExpense" style="width: 400px"
-                      @change="getDirectExpense(budgetForm)"></el-input-number>
+                    <el-input-number :controls="false" :precision="2" v-model="budgetForm.taxExpense"
+                      style="width: 100%" @change="getDirectExpense(budgetForm)"></el-input-number>
                   </td>
                   <td>
-                    <el-input type="textarea" v-model="budgetForm.taxRemark" style="width: 400px"></el-input>
+                    <el-input type="textarea" v-model="budgetForm.taxRemark" style="width: 100%"></el-input>
                   </td>
                 </tr>
                 <tr>
                   <td>经营管理费用</td>
                   <td>
-                    <el-input-number :controls="false" :precision="2" v-model="budgetForm.businessExpense" style="width: 400px"
-                      @change="getDirectExpense(budgetForm)"></el-input-number>
+                    <el-input-number :controls="false" :precision="2" v-model="budgetForm.businessExpense"
+                      style="width: 100%" @change="getDirectExpense(budgetForm)"></el-input-number>
                   </td>
                   <td>
-                    <el-input type="textarea" v-model="budgetForm.businessRemark" style="width: 400px"></el-input>
+                    <el-input type="textarea" v-model="budgetForm.businessRemark" style="width: 100%"></el-input>
                   </td>
                 </tr>
                 <tr>
                   <td>车船租赁</td>
                   <td>
-                    <el-input-number :controls="false" :precision="2" v-model="budgetForm.rentExpense" style="width: 400px"
-                      @change="getDirectExpense(budgetForm)"></el-input-number>
+                    <el-input-number :controls="false" :precision="2" v-model="budgetForm.rentExpense"
+                      style="width: 100%" @change="getDirectExpense(budgetForm)"></el-input-number>
                   </td>
                   <td>
-                    <el-input type="textarea" v-model="budgetForm.rentRemark" style="width: 400px"></el-input>
+                    <el-input type="textarea" v-model="budgetForm.rentRemark" style="width: 100%"></el-input>
                   </td>
                 </tr>
                 <tr>
                   <td>其他费用</td>
                   <td>
-                    <el-input-number :controls="false" :precision="2" v-model="budgetForm.otherExpense" style="width: 400px"
-                      @change="getDirectExpense(budgetForm)"></el-input-number>
+                    <el-input-number :controls="false" :precision="2" v-model="budgetForm.otherExpense"
+                      style="width: 100%" @change="getDirectExpense(budgetForm)"></el-input-number>
                   </td>
                   <td>
-                    <el-input type="textarea" v-model="budgetForm.otherRemark" style="width: 400px"></el-input>
+                    <el-input type="textarea" v-model="budgetForm.otherRemark" style="width: 100%"></el-input>
                   </td>
                 </tr>
               </table>
@@ -331,7 +351,9 @@
             <el-breadcrumb-item>选择项目</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectName }}</el-breadcrumb-item>
-            <el-breadcrumb-item>{{ projectForm.projectLeaderUser.nickName }}</el-breadcrumb-item>
+            <el-breadcrumb-item>{{ projectForm.projectLeaderUser
+          ? projectForm.projectLeaderUser.nickName
+          : "" }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-breadcrumb separator-class="el-icon-arrow-right" style="margin: 15px 0">
             <el-breadcrumb-item>间接成本小计</el-breadcrumb-item>
@@ -341,7 +363,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-show="activeStep == 4">
           <el-result icon="success" title="成功提示" subTitle="预算表生成完成">
@@ -415,6 +437,8 @@
 </template>
 
 <script>
+import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
+import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import { getProject } from "@/api/oa/project/project";
 import { listProjectWork } from "@/api/oa/project/projectWork";
 import { getSalary } from "@/api/oa/staff/salary";
@@ -508,10 +532,12 @@ export default {
       openDevice: false,
       chooseCar: [],
       chooseDevice: [],
+      contract:{}
     };
   },
   created() {
     this.getProjectList();
+    this.getProjectContract();
     this.getProjectWorkList();
   },
   methods: {
@@ -526,6 +552,22 @@ export default {
         this.projectForm = response.data;
       });
     },
+    // 查询项目是否有合同关联
+    getProjectContract() {
+      listProjectContract({ projectId: this.taskForm.formId }).then(res => {
+        if (res.rows) {
+          console.log(res.rows);
+          if(res.rows.length == 1){
+            getContract(res.rows[0].contractId).then(result=>{
+              if (result.data) {
+                this.contract = result.data;
+                this.budgetForm.contract = result.data;
+              }
+            })
+          }
+        }
+      })
+    },
     getProjectWorkList() {
       listProjectWork({ projectId: this.$route.query.formId }).then(res => {
         this.workList = res.rows;
@@ -565,6 +607,9 @@ export default {
     },
     getChooseCar(val) {
       this.chooseCar = val;
+      for(let car of this.chooseCar){
+        car.mileage = 1.5
+      }
       this.openCar = false;
     },
     getChooseDevice(val) {
@@ -580,7 +625,6 @@ export default {
       this.budgetForm.settleExpense = val.settle;
       this.budgetForm.workList = val.workList;
       this.budgetForm.inOutPriceSum = val.inOutPriceSum
-      console.log(this.budgetForm);
       if (this.chooseUser.length != 0) {
         for (let s of this.chooseUser) {
           s.inOutPrice = val.inOutPrice
@@ -588,7 +632,7 @@ export default {
       }
       this.getDirectExpense(this.budgetForm);
     },
-    setPreSettlement(val){
+    setPreSettlement(val) {
       this.budgetForm.contentList = val
     },
     // 计算单个人员的成本
@@ -655,7 +699,7 @@ export default {
         device.budgetId = form.budgetId;
         addBudgetDevice(device);
       }
-      for (let work of form.workList) {
+      for (let work of form.contentList) {
         work.budgetId = form.budgetId;
         addBudgetSettle(work)
       }
@@ -751,6 +795,7 @@ export default {
 }
 
 table {
+  width: 100%;
   /*居中*/
   // margin: 0 auto;
   /*边框*/
@@ -764,6 +809,9 @@ table {
     padding: 3px;
   }
 }
+.head{
+  font-weight: bold;
+}
 
 ::v-deep .el-input.is-disabled .el-input__inner {
   background-color: #fff;

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

@@ -1,125 +1,142 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 14:28:28
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-22 19:10:22
 -->
 <template>
   <div class="main">
     <h2 style="text-align: center">项目直接生产成本预算表</h2>
     <table border="1" class="table">
       <tr>
-        <td class="head">项目名称</td>
-        <td colspan="3">{{ budgetForm.project ? budgetForm.project.projectName : '' }}</td>
-        <td class="head">项目编号</td>
-        <td colspan="2">{{ budgetForm.project ? budgetForm.project.projectNumber : '' }}</td>
+        <td style="width: 100px;">项目名称</td>
+        <td colspan="6">{{ budgetForm.project ? budgetForm.project.projectName : '' }}</td>
+        <td>项目编号</td>
+        <td colspan="1">{{ budgetForm.project ? budgetForm.project.projectNumber : '' }}</td>
       </tr>
       <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>
-      </tr>
-      <tr v-for="user, index in chooseUser" :key="'user' + index">
+        <td :rowspan="workLen + 2">直接成本</td>
+        <td>工作简述</td>
+        <td>工作内容</td>
+        <td>数量</td>
+        <td>单价</td>
+        <td>单位</td>
+        <td>系数</td>
+        <td>金额</td>
+        <td style="width: 250px;">备注</td>
+      </tr>
+      <tr v-for="work in workList">
+        <td>{{ work.content }}</td>
+        <td>{{ work.cmcPrice ? work.cmcPrice.workItem:''}}</td>
+        <td>{{ work.workload }}</td>
+        <td>{{ work.price }}</td>
+        <td>{{ work.unit }}</td>
+        <td>{{ work.coefficient }}</td>
+        <td>{{ work.settle }}</td>
+        <td>{{ work.remark ? work.remark : '' }}</td>
+      </tr>
+      <tr>
+        <td :colspan="6" class="head">直接成本合计</td>
+        <td :colspan="1" class="head">{{ budgetForm.settleExpense }}</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td :rowspan="userLen + carLen + deviceLen + 2">间接成本</td>
+      </tr>
+      <tr v-if="userLen != 1">
+        <td :rowspan="userLen">人员</td>
+        <td>姓名</td>
+        <td>基本工资</td>
+        <td>岗位工资</td>
+        <td>人员成本（天）</td>
+        <td>预算天数</td>
+        <td>金额</td>
+        <td></td>
+      </tr>
+      <tr v-for="user in chooseUser" :key="'user' + user.userId">
         <td>{{ user.user ? user.user.nickName : '' }}</td>
-        <td>{{ user.dept? user.dept.deptName : '' }}</td>
+        <td>1780</td>
         <td>{{ user.salary.salary }}</td>
-        <td>{{ parseFloat(user.salary.salary / 31).toFixed(2) }}</td>
+        <td>{{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}</td>
         <td>{{ user.days }}</td>
         <td>{{ user.staffCost }}</td>
+        <td></td>
       </tr>
-      <tr>
-        <td :rowspan="carLen" class="head vertical-text">车辆</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, index in chooseCar" :key="'car' + index">
+      <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>{{ car.distance }}</td>
         <td>{{ car.car ? car.car.dayCost : '' }}</td>
         <td>{{ car.days }}</td>
         <td>{{ car.expense }}</td>
+        <td></td>
       </tr>
-      <tr>
-        <td :rowspan="deviceLen" class="head vertical-text">设备</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, index in chooseDevice" :key="'device' + index">
+      <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>{{ device.days }}</td>
         <td>{{ device.depreciation }}</td>
+        <td></td>
       </tr>
       <tr>
-        <td colspan="6" class="head">固定成本小计</td>
-        <td>{{ budgetForm.fixCost }}</td>
+        <td :colspan="6" class="head">间接成本合计</td>
+        <td :colspan="1" class="head">{{ budgetForm.fixCost }}</td>
+        <td></td>
       </tr>
-      <tr>
-        <td :rowspan="workLen" class="head vertical-text">预计结算金额</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 workList" :key="'work' + index">
-        <td>{{ workContentList.length != 0 ? workContentList[index].content : "" }}</td>
-        <td>{{ work.scaleGrade }}</td>
-        <td>{{ work.workload }}</td>
-        <td>{{ work.price }}</td>
-        <td>{{ work.coefficient }}</td>
-        <td>{{ work.settle }}</td>
+      <tr class="head">
+        <td :colspan="3">外协费用</td>
+        <td :colspan="5">{{ budgetForm.outExpense }}</td>
+        <td>{{ budgetForm.outRemark }}</td>
       </tr>
-      <tr>
-        <td colspan="5" class="head">进出场津贴</td>
-        <td>{{ budgetForm.inOutPriceSum }}</td>
+      <tr class="head">
+        <td colspan="3">车船租赁</td>
+        <td :colspan="5">{{ budgetForm.rentExpense }}</td>
+        <td>{{ budgetForm.rentRemark }}</td>
       </tr>
-      <tr>
-        <td colspan="5" class="head">外协费用</td>
-        <td>{{ budgetForm.outExpense }}</td>
+      <tr class="head">
+        <td colspan="3">其他费用</td>
+        <td :colspan="5">{{ budgetForm.otherExpense }}</td>
+        <td>{{ budgetForm.otherRemark }}</td>
       </tr>
-      <tr>
-        <td colspan="5" class="head">商务费用</td>
-        <td>{{ budgetForm.businessExpense }}</td>
+      <tr class="head">
+        <td colspan="3">税费成本</td>
+        <td :colspan="5">{{ budgetForm.taxExpense }}</td>
+        <td>{{ budgetForm.taxRemark }}</td>
       </tr>
-      <tr>
-        <td colspan="5" class="head">车船租赁</td>
-        <td>{{ budgetForm.rentExpense }}</td>
+      <tr class="head">
+        <td colspan="3">经营管理费用</td>
+        <td :colspan="5">{{ budgetForm.businessExpense }}</td>
+        <td>{{ budgetForm.businessRemark }}</td>
       </tr>
       <tr>
-        <td colspan="5" class="head">其他费用</td>
-        <td>{{ budgetForm.otherExpense }}</td>
+        <td colspan="3" class="head">成本合计</td>
+        <td colspan="5" class="head">{{ budgetForm.totalBudget }}</td>
       </tr>
-      <tr>
-        <td colspan="6" class="head">直接成本小计</td>
-        <td>{{ budgetForm.directExpense }}</td>
-      </tr>
-      <tr>
-        <td colspan="6" class="head">总成本=（固定成本+直接成本）*120%</td>
-        <td>{{ budgetForm.totalBudget }}</td>
-      </tr>
-      <tr>
-        <td class="head">编制人</td>
-        <td colspan="5">{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName :'' }}</td>
-        <!-- <td class="head">审核人</td> -->
-        <!-- <td colspan="3">{{ name }}</td> -->
+      <tr v-if="budgetForm.contract">
+        <td colspan="3" class="head">利润</td>
+        <td colspan="2" class="head">{{ profit }}</td>
+        <td colspan="3" class="head">合同总价约</td>
+        <td colspan="1" class="head">{{ budgetForm.contract ? budgetForm.contract.amount : '' }}</td>
       </tr>
     </table>
   </div>
@@ -172,32 +189,38 @@ export default {
     initBudgetForm() {
       listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(res => {
         this.budgetForm = res.rows[0];
-        listBudgetDevice({budgetId: this.budgetForm.budgetId}).then(res => {
+        console.log(this.budgetForm);
+        listBudgetDevice({ budgetId: this.budgetForm.budgetId }).then(res => {
           this.chooseDevice = res.rows;
           this.deviceLen = res.rows.length + 1;
         })
-        listBudgetStaff({budgetId: this.budgetForm.budgetId}).then(res => {
+        listBudgetStaff({ budgetId: this.budgetForm.budgetId }).then(res => {
           this.chooseUser = res.rows;
           this.userLen = res.rows.length + 1;
           let days = 0;
-          for(let d of this.chooseUser){
+          for (let d of this.chooseUser) {
             days = days + d.days
           }
           this.budgetForm.inOutPriceSum = Number(days) * Number(this.chooseUser[0].inOutPrice)
         })
-        listBudgetCar({budgetId: this.budgetForm.budgetId}).then(res => {
+        listBudgetCar({ budgetId: this.budgetForm.budgetId }).then(res => {
+          console.log(res.rows);
           this.chooseCar = res.rows;
           this.carLen = res.rows.length + 1;
         })
-        listBudgetSettle({budgetId: this.budgetForm.budgetId}).then(res => {
+        listBudgetSettle({ budgetId: this.budgetForm.budgetId }).then(res => {
           this.workList = res.rows;
-          this.workLen = res.rows.length + 6;
-          for(let work of this.workList){
-            if(work.groundType == '0'){
+          this.workLen = res.rows.length;
+
+          for (let work of this.workList) {
+            if (work.groundType == '0') {
               work.price = work.cmcPrice.commonPrice
               work.scaleGrade = work.cmcPrice.scaleGrade
-            }else{
+              work.unit = work.cmcPrice.unit
+            } else {
               work.price = work.cmcPrice.complexPrice
+              work.scaleGrade = work.cmcPrice.scaleGrade
+              work.unit = work.cmcPrice.unit
             }
           }
           this.getProjectWorkList();
@@ -205,7 +228,7 @@ export default {
       });
     },
     getProjectWorkList() {
-      listProjectWork({projectId: this.$route.query.formId}).then(res => {
+      listProjectWork({ projectId: this.$route.query.formId }).then(res => {
         this.workContentList = res.rows;
       })
     },

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:50:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-21 19:18:34
+ * @LastEditTime: 2024-05-22 19:07:27
 -->
 <template>
   <div>
@@ -15,9 +15,9 @@
         <td colspan="1">{{ projectForm.projectNumber }}</td>
       </tr>
       <tr>
-        <td :rowspan="workLen">直接成本</td>
+        <td :rowspan="workLen+2">直接成本</td>
         <td>工作简述</td>
-        <td>工作类别</td>
+        <td>工作内容</td>
         <td>数量</td>
         <td>单价</td>
         <td>单位</td>
@@ -27,7 +27,7 @@
       </tr>
       <tr v-for="work in budgetForm.contentList">
         <td>{{ work.content }}</td>
-        <td>{{ work.workType }}</td>
+        <td>{{ work.workItem }}</td>
         <td>{{ work.workload }}</td>
         <td>{{ work.price }}</td>
         <td>{{ work.unit }}</td>
@@ -36,13 +36,8 @@
         <td>{{ work.remark ? work.remark : '' }}</td>
       </tr>
       <tr>
-        <td :colspan="2">进出场费用</td>
-        <td :colspan="5">{{ budgetForm.inOutPriceSum }}</td>
-        <td></td>
-      </tr>
-      <tr>
-        <td :colspan="2" class="head">直接成本合计</td>
-        <td :colspan="5" class="head">{{ budgetForm.settleExpense }}</td>
+        <td :colspan="6" class="head">直接成本合计</td>
+        <td :colspan="1" class="head">{{ budgetForm.settleExpense }}</td>
         <td></td>
       </tr>
       <tr>
@@ -108,8 +103,8 @@
         <td></td>
       </tr>
       <tr>
-        <td :colspan="2" class="head">间接成本合计</td>
-        <td :colspan="5" class="head">{{ budgetForm.fixCost }}</td>
+        <td :colspan="6" class="head">间接成本合计</td>
+        <td :colspan="1" class="head">{{ budgetForm.fixCost }}</td>
         <td></td>
       </tr>
       <tr class="head">
@@ -117,16 +112,6 @@
         <td :colspan="5">{{ budgetForm.outExpense }}</td>
         <td>{{ budgetForm.outRemark }}</td>
       </tr>
-      <tr class="head">
-        <td colspan="3">税费成本</td>
-        <td :colspan="5">{{ budgetForm.taxExpense }}</td>
-        <td>{{ budgetForm.taxRemark }}</td>
-      </tr>
-      <tr class="head">
-        <td colspan="3">经营管理费用</td>
-        <td :colspan="5">{{ budgetForm.businessExpense }}</td>
-        <td>{{ budgetForm.businessRemark }}</td>
-      </tr>
       <tr class="head">
         <td colspan="3">车船租赁</td>
         <td :colspan="5">{{ budgetForm.rentExpense }}</td>
@@ -137,10 +122,26 @@
         <td :colspan="5">{{ budgetForm.otherExpense }}</td>
         <td>{{ budgetForm.otherRemark }}</td>
       </tr>
+      <tr class="head">
+        <td colspan="3">税费成本</td>
+        <td :colspan="5">{{ budgetForm.taxExpense }}</td>
+        <td>{{ budgetForm.taxRemark }}</td>
+      </tr>
+      <tr class="head">
+        <td colspan="3">经营管理费用</td>
+        <td :colspan="5">{{ budgetForm.businessExpense }}</td>
+        <td>{{ budgetForm.businessRemark }}</td>
+      </tr>
       <tr>
         <td colspan="3" class="head">成本合计</td>
         <td colspan="5" class="head">{{ costSum }}</td>
       </tr>
+      <tr v-if="budgetForm.contract">
+        <td colspan="3" class="head">利润</td>
+        <td colspan="2" class="head">{{ profit }}</td>
+        <td colspan="3" class="head">合同总价约</td>
+        <td colspan="1" class="head">{{ budgetForm.contract ? budgetForm.contract.amount : '' }}</td>
+      </tr>
     </table>
   </div>
 </template>
@@ -165,6 +166,7 @@ export default {
       workLen: 1,
       costSum: 0,
       inOutPrice: '',
+      profit:''
     }
   },
   created() {
@@ -172,9 +174,12 @@ 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.contentList.length + 3;
-    this.costSum = (Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost)).toFixed(2);
-    this.$emit('getTotal', this.totalBudget);
+    this.workLen = this.budgetForm.contentList.length;
+    this.costSum = (Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost) ).toFixed(2);
+    if(this.budgetForm.contract){
+      this.profit = (Number(this.budgetForm.contract.amount) - Number(this.costSum) ).toFixed(2)
+    }
+    this.$emit('getTotal', this.costSum);
   },
 }
 </script>

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

@@ -3,7 +3,7 @@
     <el-form>
       <el-form-item label="项目概况：" label-width="90px">
         <table border="1">
-          <tr>
+          <tr class="head">
             <td style="width: 320px">工作内容</td>
             <td style="width:120px;">等级或比例尺</td>
             <td style="width:90px;">单位</td>
@@ -35,7 +35,7 @@
       </el-form-item>
       <el-form-item label="预结算：" label-width="90px">
         <table border="1">
-          <tr>
+          <tr class="head">
             <td style="width: 250px">工作简述</td>
             <td>工作类别</td>
             <td>工作项目</td>
@@ -115,23 +115,10 @@
           </tr>
           <tr>
             <td colspan="9">合计</td>
-            <td>{{ (Number(settle) - Number(inOutPriceSum)).toFixed(2) }}</td>
+            <td>{{ Number(settle).toFixed(2) }}</td>
           </tr>
         </table>
-        <el-button icon="el-icon-plus" type="primary" size="mini" @click="addWorkList"></el-button>
-      </el-form-item>
-      <el-form-item label="进出场费用：">
-        <el-input v-numeric v-model="inOutPrice" style="width:200px;" @change="getInoutpriceSum">
-          <template slot="prepend">单价</template>
-        </el-input>
-        ×
-        <el-input v-numeric v-model="peopleNumber" style="width:200px;" @change="getInoutpriceSum">
-          <template slot="prepend">人天</template>
-        </el-input>
-        = {{ inOutPriceSum }}
-      </el-form-item>
-      <el-form-item label="预结算合计：">
-        <el-tag type="danger" style="margin-right:20px;font-size:14px;">¥{{ settle }}</el-tag>
+        <el-button icon="el-icon-plus" plain type="primary" size="mini" @click="addWorkList"></el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -207,9 +194,7 @@ export default {
         }
       ],
       settle: 0,
-      inOutPrice: 0,
-      peopleNumber: 0,
-      inOutPriceSum: 0
+      checkUserList: []
     }
   },
   created() {
@@ -337,33 +322,12 @@ export default {
       for (let work of this.contentList) {
         sum = sum + Number(work.settle)
       }
-      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) {
-      //   if (this.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.workList = this.contentList;
       obj.settle = this.settle;
-      obj.inOutPrice = this.inOutPrice;
-      obj.peopleNumber = this.peopleNumber;
-      obj.inOutPriceSum = this.inOutPriceSum;
-      console.log(this.inOutPriceSum);
       this.$emit('getSettle', obj);
-      this.$emit('getWorkList',this.contentList)
-    },
-    getInoutpriceSum() {
-      this.inOutPriceSum = Number(this.inOutPrice) * Number(this.peopleNumber);
-      this.getSettleSum()
+      this.$emit('getWorkList', this.contentList)
     },
     /* 计算总额 */
     calculateTotal(price, coefficient, workload, percent) {
@@ -409,6 +373,7 @@ table {
   // margin: 0 auto;
   /*边框*/
   /* border: 1px solid black; */
+  width: 100%;
   text-align: center;
   border-collapse: collapse;
 
@@ -418,7 +383,9 @@ table {
     padding: 3px;
   }
 }
-
+.head{
+  font-weight: bold;
+}
 .delete-btn {
   position: absolute;
   left: -30px;
@@ -426,7 +393,8 @@ table {
   transform: translate(0, -50%);
   color: #F56C6C;
   cursor: pointer;
-  i{
+
+  i {
     font-size: 25px;
   }
 }

oa-ui/src/views/flowable/form/components/chooseContract.vue

@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <el-row>
+      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="88px">
+        <el-form-item label="合同编码" prop="contractCode">
+          <el-input v-model="queryParams.contractCode" placeholder="请输入合同编码" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="合同编号" prop="contractNumber">
+          <el-input v-model="queryParams.contractNumber" placeholder="请输入合同编号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery()">搜索</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <el-table ref="choosePContract" v-loading="loading" :data="contractList" highlight-current-row
+      @current-change="handleCurrentChange" :row-key="getRowKeys" @row-dblclick="confirmChoose">
+      <el-table-column label="项目名称" align="center" key="tender.projectName" prop="tender.projectName"
+        min-width="150px" />
+      <el-table-column label="合同编码" align="center" key="contractCode" prop="contractCode" />
+      <el-table-column label="合同编号" align="center" prop="contractNumber" min-width="100px" />
+      <el-table-column label="合同金额" align="center" prop="amount" min-width="100px" />
+      <el-table-column label="拟稿人" align="center" prop="draftUser.nickName" min-width="100px" />
+      <el-table-column label="合同备注" align="center" prop="remark" min-width="100px" />
+    </el-table>
+    <div style="text-align: right;" class="mt20 mr20">
+      <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum"
+        :page-size="queryParams.pageSize" layout="total, prev, pager, next" :total="total">
+      </el-pagination>
+    </div>
+    <div>
+      已选项目：<el-tag>{{ choosePContract.tender.projectName }}</el-tag>
+    </div>
+    <div style="text-align: center;margin-top: 20px;">
+      <el-button type="primary" @click="confirmChoose">确认选择</el-button>
+      <el-button @click="$emit('close')">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
+import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+export default {
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      contractList: [],
+      userList: [],
+      total: 0,
+      loading: true,
+      choosePContract: {
+        tender: {
+          projectName: ''
+        }
+      },
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      listContract(this.queryParams).then(response => {
+        console.log(response);
+        this.contractList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.choosePContract = val
+    },
+    getRowKeys(row) {
+      return row.contractId;
+    },
+    confirmChoose() {
+      console.log(this.choosePContract);
+      this.$emit('choose', this.choosePContract)
+    },
+  },
+
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/flowable/form/components/chooseTender.vue

@@ -23,7 +23,7 @@
     <el-table ref="choosePTender" v-loading="loading" :data="tenderList" highlight-current-row
       @current-change="handleCurrentChange" :row-key="getRowKeys" @row-dblclick="confirmChoose">
       <el-table-column label="投标项目名称" align="center" key="projectName" prop="projectName"
-        :show-overflow-tooltip="true" />
+        :show-overflow-tooltip="true"  width="170px" />
       <el-table-column label="招标业主" align="center" prop="partyA" min-width="100px" />
       <el-table-column label="招标代理" align="center" prop="agent" min-width="100px" />
       <el-table-column label="招标地点" align="center" prop="place" min-width="100px" />

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

@@ -1,8 +1,14 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-03-18 11:00:04
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-22 13:51:57
+-->
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-20 16:15:23
+ * @LastEditTime: 2024-05-22 11:00:26
 -->
 
 <template>
@@ -16,7 +22,7 @@
             <el-input v-model="addForm.projectNumber"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="addForm.projectSource == 0">
           <el-form-item label="合同编码：">
             <el-input v-model="contractCode" disabled></el-input>
           </el-form-item>
@@ -27,7 +33,7 @@
             <el-input v-model="addForm.projectName"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="addForm.projectSource == 0">
           <el-form-item label="合同编号：">
             <el-input v-model="contractNumber" disabled></el-input>
           </el-form-item>
@@ -45,6 +51,15 @@
         <el-radio v-model="addForm.projectSource" label="0">院内</el-radio>
         <el-radio v-model="addForm.projectSource" label="1">院外</el-radio>
       </el-form-item>
+      <el-form-item label="合同编码：" v-if="addForm.projectSource == '1'">
+        <el-input v-model="chooseContractInfo.contractCode">
+          <el-button slot="append" @click="openContract = true">选择</el-button>
+        </el-input>
+      </el-form-item>
+
+      <el-form-item label="合同编号：" v-if="addForm.projectSource == '1'">
+        <el-input v-model="chooseContractInfo.contractNumber" disabled></el-input>
+      </el-form-item>
       <el-form-item label="甲方单位：" prop="partyA">
         <el-autocomplete class="inline-input" v-model="addForm.partyA" :fetch-suggestions="querySearch"
           placeholder="请输入内容" style="width: 100%"></el-autocomplete>
@@ -125,6 +140,9 @@
       <el-button type="primary" @click="confirmAddForm" :disabled="disabled">提 交</el-button>
       <!-- <el-button @click="cancel" :disabled="disabled">取 消</el-button> -->
     </div>
+    <el-dialog title="选择合同" :visible.sync="openContract" width="1000px" append-to-body>
+      <choose-contract @choose="setContract" @close="openContract = false"></choose-contract>
+    </el-dialog>
   </div>
 </template>
 
@@ -138,7 +156,9 @@ import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate
 import { listProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+import chooseContract from '../components/chooseContract.vue';
 export default {
+  components: { chooseContract },
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   props: {
     disabled: {
@@ -155,6 +175,7 @@ export default {
   },
   data() {
     return {
+      openContract:false,
       registerTime: undefined,
       // 查询参数
       queryParams: {
@@ -172,7 +193,9 @@ export default {
       addForm: {
         registerTime: undefined,
         projectRegistrant: "",
+        projectSource: "0"
       },
+      chooseContractInfo:{},
       contractCode: "",
       contractNumber: "",
       rules: {
@@ -226,6 +249,7 @@ export default {
         this.loading = false;
       });
     },
+    
     getProjectInfo() {
       getProject(this.taskForm.formId).then(res => {
         this.addForm = res.data;
@@ -258,6 +282,10 @@ export default {
         }
       })
     },
+    setContract(val){
+      this.chooseContractInfo = val;
+      this.openContract = false;
+    },
     confirmAddForm() {
       this.addForm.projectId = this.taskForm.formId;
       for (let work of this.workList) {
@@ -268,6 +296,10 @@ export default {
         this.$modal.msgSuccess("新增成功");
         this.getList();
       });
+      let pcobj = {projectId:this.taskForm.formId,contractId:this.chooseContractInfo.contractId}
+      addProjectContract(pcobj).then(response =>{
+        this.$modal.msgSuccess("合同关联成功");
+      })
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
       getNextFlowNode(params).then(res => {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-10 14:57:12
+ * @LastEditTime: 2024-05-22 18:18:31
 -->
 <template>
   <div class="app-container">
@@ -74,7 +74,7 @@
 
     <!-- 发起流程 -->
     <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
-      <progress-tree :definitionList="definitionList" @confirm="handleStartProcess"></progress-tree>
+      <progress-tree :definitionList="definitionList" @confirm="handleStartProcess"  @close="open =false"></progress-tree>
       <!-- <el-form :model="queryProcessParams" ref="queryProcessForm" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="queryProcessParams.name" placeholder="请输入名称" clearable size="small"

oa-ui/src/views/flowable/task/myProcess/progressTree.vue

@@ -19,7 +19,7 @@
     <el-divider></el-divider>
     <div class="text-center">
       <el-button type="primary" @click="confirm">确定</el-button>
-      <el-button>取消</el-button>
+      <el-button @click="$emit('close')">取消</el-button>
     </div>
   </div>
 </template>

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

@@ -256,7 +256,7 @@
             <div v-if="form.tenderId != null">
 
               <FileUpload ref="zb" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" :isShowTip="false"
-              :filePathName="'投标文件'" :isModify="true" @input="getUploadPathBidDocument"></FileUpload>
+                :filePathName="'投标文件'" :isModify="true" @input="getUploadPathBidDocument"></FileUpload>
               <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
                 tag="ul">
                 <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
@@ -361,8 +361,8 @@
             <FileUpload v-if="form.tenderId == null" ref="bsFile" :limit="1" :filePathName="'投标文件'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getUploadPathTenderDocument"></FileUpload>
             <div v-if="form.tenderId != null">
-              <FileUpload ref="bs" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" :isShowTip="false"  :filePathName="'投标文件'"
-                :isModify="true" @input="getUploadPathTenderDocument"></FileUpload>
+              <FileUpload ref="bs" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" :isShowTip="false"
+                :filePathName="'投标文件'" :isModify="true" @input="getUploadPathTenderDocument"></FileUpload>
               <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
                 tag="ul">
                 <li key="li02" class="el-upload-list__item ele-upload-list__item-content">
@@ -672,8 +672,10 @@ export default {
       }
     },
     getFileName(name) {
-      let arr = name.split('/')
-      return arr[arr.length - 1];
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
     },
     handleFileDelete(name) {
       if (name == 'zb')