修改预算表编制

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-10 14:07:41
+ * @LastEditTime: 2024-05-21 18:04:09
 -->
 <template>
   <div>
@@ -27,7 +27,7 @@
           <el-step title="生成预算表" description="生成最终的项目预算表"></el-step>
         </el-steps>
         <!-- 选择项目 -->
-        <div class="project" v-if="activeStep == 0">
+        <div class="project" v-show="activeStep == 0">
           <el-form ref="form1" :model="projectForm" :rules="projectRule" label-width="120px">
             <el-form-item label="项目编号：" prop="projectNumber">
               <div style="display: flex">
@@ -101,7 +101,7 @@
         </div>
 
         <!-- 选择参与人员、车辆和设备 -->
-        <div class="staff" v-if="activeStep == 1">
+        <div class="staff" v-show="activeStep == 1">
           <el-breadcrumb separator-class="el-icon-arrow-right">
             <el-breadcrumb-item>选择项目</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
@@ -244,7 +244,7 @@
           </el-form>
         </div>
         <!-- 绩效和其他预算 -->
-        <div class="other" v-if="activeStep == 2">
+        <div class="other" v-show="activeStep == 2">
           <el-breadcrumb separator-class="el-icon-arrow-right">
             <el-breadcrumb-item>选择项目</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
@@ -256,22 +256,66 @@
             <el-breadcrumb-item>¥ {{ budgetForm.fixCost }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-form>
-            <choose-money :workList="workList" :chooseUser="chooseUser" :budgetForm="budgetForm" @getSettle="getSettle"></choose-money>
-            <el-form-item label="外协费用：">
-              <el-input v-model="budgetForm.outExpense" style="width: 400px"
-                @change="getDirectExpense(budgetForm)"></el-input>
-            </el-form-item>
-            <el-form-item label="商务费用：">
-              <el-input v-model="budgetForm.businessExpense" style="width: 400px"
-                @change="getDirectExpense(budgetForm)"></el-input>
-            </el-form-item>
-            <el-form-item label="车船租赁：">
-              <el-input v-model="budgetForm.rentExpense" style="width: 400px"
-                @change="getDirectExpense(budgetForm)"></el-input>
-            </el-form-item>
-            <el-form-item label="其他费用：">
-              <el-input v-model="budgetForm.otherExpense" style="width: 400px"
-                @change="getDirectExpense(budgetForm)"></el-input>
+            <choose-money :workList="workList" :chooseUser="chooseUser" :budgetForm="budgetForm"
+              @getSettle="getSettle" @getWorkList="setPreSettlement"></choose-money>
+            <el-form-item label="其他预算：">
+              <table border="1">
+                <tr>
+                  <td>内容</td>
+                  <td>费用金额</td>
+                  <td>备注</td>
+                </tr>
+                <tr>
+                  <td>外协费用</td>
+                  <td>
+                    <el-input-number :controls="false" :precision="2" v-model="budgetForm.outExpense" style="width: 400px"
+                      @change="getDirectExpense(budgetForm)"></el-input-number>
+                  </td>
+                  <td>
+                    <el-input type="textarea" v-model="budgetForm.outRemark" style="width: 400px"></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>
+                  </td>
+                  <td>
+                    <el-input type="textarea" v-model="budgetForm.taxRemark" style="width: 400px"></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>
+                  </td>
+                  <td>
+                    <el-input type="textarea" v-model="budgetForm.businessRemark" style="width: 400px"></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>
+                  </td>
+                  <td>
+                    <el-input type="textarea" v-model="budgetForm.rentRemark" style="width: 400px"></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>
+                  </td>
+                  <td>
+                    <el-input type="textarea" v-model="budgetForm.otherRemark" style="width: 400px"></el-input>
+                  </td>
+                </tr>
+              </table>
             </el-form-item>
             <el-form-item label="直接成本小计：">
               <el-tag type="danger" style="margin-right: 20px; font-size: 14px">
@@ -299,7 +343,7 @@
           </el-breadcrumb>
           <budget-table :budgetForm="budgetForm" :projectForm="projectForm" @getTotal="getTotalBudget"></budget-table>
         </div>
-        <div class="finish" v-if="activeStep == 4">
+        <div class="finish" v-show="activeStep == 4">
           <el-result icon="success" title="成功提示" subTitle="预算表生成完成">
             <template slot="extra"> </template>
           </el-result>
@@ -428,6 +472,7 @@ export default {
         outExpense: 0,
         businessExpense: 0,
         rentExpense: 0,
+        taxExpense: 0,
         otherExpense: 0,
         directExpense: 0,
         totalBudget: 0,
@@ -482,7 +527,7 @@ export default {
       });
     },
     getProjectWorkList() {
-      listProjectWork({projectId: this.$route.query.formId}).then(res => {
+      listProjectWork({ projectId: this.$route.query.formId }).then(res => {
         this.workList = res.rows;
       })
     },
@@ -535,6 +580,7 @@ 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
@@ -542,6 +588,9 @@ export default {
       }
       this.getDirectExpense(this.budgetForm);
     },
+    setPreSettlement(val){
+      this.budgetForm.contentList = val
+    },
     // 计算单个人员的成本
     calculateUserTotal(user) {
       let total = parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) * Number(user.days);
@@ -584,6 +633,7 @@ export default {
         Number(form.settleExpense) +
         Number(form.outExpense) +
         Number(form.rentExpense) +
+        Number(form.taxExpense) +
         Number(form.businessExpense) +
         Number(form.otherExpense);
       this.budgetForm.directExpense = sum.toFixed(2);
@@ -684,12 +734,15 @@ export default {
   }
 
   .staff,
-  .other,
   .finish {
     width: 1200px;
     margin: 0 auto;
     padding-top: 50px;
   }
+
+  .other {
+    padding-top: 50px;
+  }
 }
 
 .btn {

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

@@ -1,40 +1,83 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-05-10 15:50:41
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-21 19:18:34
+-->
 <template>
   <div>
     <h2 style="text-align:center;">项目直接生产成本预算表</h2>
     <table border="1" class="table">
       <tr>
-        <td class="head">项目名称</td>
-        <td colspan="3">{{ projectForm.projectName }}</td>
-        <td class="head">项目编号</td>
-        <td colspan="2">{{ projectForm.projectNumber }}</td>
+        <td style="width: 100px;">项目名称</td>
+        <td colspan="6">{{ projectForm.projectName }}</td>
+        <td>项目编号</td>
+        <td colspan="1">{{ projectForm.projectNumber }}</td>
+      </tr>
+      <tr>
+        <td :rowspan="workLen">直接成本</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 budgetForm.contentList">
+        <td>{{ work.content }}</td>
+        <td>{{ work.workType }}</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="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></td>
+      </tr>
+      <tr>
+        <td :rowspan="userLen + carLen + deviceLen + 2">间接成本</td>
       </tr>
       <tr v-if="userLen != 1">
-        <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>
-        <td class="head">金额</td>
+        <td :rowspan="userLen">人员</td>
+        <td>姓名</td>
+        <td>基本工资</td>
+        <td>岗位工资</td>
+        <td>人员成本（天）</td>
+        <!-- <td>进出场单价</td> -->
+        <td>预算天数</td>
+        <td>金额</td>
+        <td></td>
       </tr>
       <tr v-for="user in budgetForm.chooseUser" :key="'user' + user.userId">
         <td>{{ user.nickName }}</td>
-        <td>{{ 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.inOutPrice }}</td> -->
         <td>{{ user.days }}</td>
         <td>{{ user.staffCost }}</td>
+        <td></td>
       </tr>
       <tr v-if="carLen != 1">
-        <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>
+        <td :rowspan="carLen">车辆</td>
+        <td>车牌号</td>
+        <td>油耗</td>
+        <td>总里程</td>
+        <td>折旧成天（天）</td>
+        <td>预算天数</td>
+        <td>金额</td>
+        <!-- <td></td> -->
       </tr>
       <tr v-for="car in budgetForm.chooseCar" :key="'car' + car.carId">
         <td>{{ car.licensePlate }}</td>
@@ -43,15 +86,17 @@
         <td>{{ car.dayCost }}</td>
         <td>{{ car.days }}</td>
         <td>{{ car.expense }}</td>
+        <td></td>
       </tr>
       <tr v-if="deviceLen != 1">
-        <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>
+        <td :rowspan="deviceLen">设备</td>
+        <td>设备名称</td>
+        <td>规格型号</td>
+        <td>品牌</td>
+        <td>折旧成本（天）</td>
+        <td>预算天数</td>
+        <td>金额</td>
+        <!-- <td>备注</td> -->
       </tr>
       <tr v-for="device in budgetForm.chooseDevice" :key="'device' + device.deviceId">
         <td>{{ device.name }}</td>
@@ -60,55 +105,41 @@
         <td>{{ 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>
-      </tr>
-      <tr>
-        <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.scale }}</td>
-        <td>{{ work.workload }}</td>
-        <td>{{ work.price }}</td>
-        <td>{{ work.coefficient }}</td>
-        <td>{{ work.settle }}</td>
-      </tr>
-      <tr>
-        <td colspan="5" class="head">进出场津贴</td>
-        <td>{{ budgetForm.inOutPriceSum }}</td>
-      </tr>
-      <tr>
-        <td colspan="5" class="head">外协费用</td>
-        <td>{{ budgetForm.outExpense }}</td>
-      </tr>
-      <tr>
-        <td colspan="5" class="head">商务费用</td>
-        <td>{{ budgetForm.businessExpense }}</td>
-      </tr>
-      <tr>
-        <td colspan="5" class="head">车船租赁</td>
-        <td>{{ budgetForm.rentExpense }}</td>
-      </tr>
-      <tr>
-        <td colspan="5" class="head">其他费用</td>
-        <td>{{ budgetForm.otherExpense }}</td>
-      </tr>
-      <tr>
-        <td colspan="6" class="head">直接成本小计</td>
-        <td>{{ budgetForm.directExpense }}</td>
+        <td :colspan="2" class="head">间接成本合计</td>
+        <td :colspan="5" class="head">{{ budgetForm.fixCost }}</td>
+        <td></td>
+      </tr>
+      <tr class="head">
+        <td :colspan="3">外协费用</td>
+        <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>
+        <td>{{ budgetForm.rentRemark }}</td>
+      </tr>
+      <tr class="head">
+        <td colspan="3">其他费用</td>
+        <td :colspan="5">{{ budgetForm.otherExpense }}</td>
+        <td>{{ budgetForm.otherRemark }}</td>
       </tr>
       <tr>
-        <td colspan="6" class="head">总成本=（间接成本+直接成本）*120%</td>
-        <td>{{ totalBudget }}</td>
+        <td colspan="3" class="head">成本合计</td>
+        <td colspan="5" class="head">{{ costSum }}</td>
       </tr>
     </table>
   </div>
@@ -132,24 +163,18 @@ export default {
       carLen: 1,
       deviceLen: 1,
       workLen: 1,
-      totalBudget: 0
+      costSum: 0,
+      inOutPrice: '',
     }
   },
   created() {
+    console.log(this.budgetForm);
     this.userLen = this.budgetForm.chooseUser.length + 1;
     this.carLen = this.budgetForm.chooseCar.length + 1;
     this.deviceLen = this.budgetForm.chooseDevice.length + 1;
-    this.workLen = this.budgetForm.workList.length + 6;
-    this.totalBudget = ((Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost)) * 1.2).toFixed(2);
-    let sum = 0
-    for(let s of this.budgetForm.chooseUser){
-      sum = sum + (Number(s.inOutPrice) * Number(s.days))
-    }
-    this.budgetForm.inOutPriceSum = sum.toFixed(2)
-    this.$emit('getTotal',this.totalBudget)
-  },
-  methods: {
-
+    this.workLen = this.budgetForm.contentList.length + 3;
+    this.costSum = (Number(this.budgetForm.directExpense) + Number(this.budgetForm.fixCost)).toFixed(2);
+    this.$emit('getTotal', this.totalBudget);
   },
 }
 </script>
@@ -163,6 +188,7 @@ export default {
   text-align: center;
   border-collapse: collapse;
   margin: 0 auto;
+
   /*设置背景颜色*/
   /* background-color: #bfa; */
   td {

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

@@ -1,36 +1,7 @@
 <template>
   <div>
     <el-form>
-      <el-form-item label="项目概况：">
-        <!-- <div style="display:flex;flex-wrap:wrap;">
-          <el-card v-for="(work, index) in workList" :key="index" class="card">
-            <div class="work-item">
-              <div class="work-label" style="min-width:70px">工作内容：</div>
-              <div>{{ work.content }}</div>
-            </div>
-            <div class="work-item">
-              <div class="work-label">等级或比例尺：</div>
-              <div>{{ work.scale }}</div>
-            </div>
-            <div class="work-item">
-              <div class="work-label">单位：</div>
-              <div>{{ work.unit }}</div>
-            </div>
-            <div class="work-item">
-              <div class="work-label">工作量：</div>
-              <div>{{ work.workload }}</div>
-            </div>
-            <div class="work-item">
-              <div class="work-label">要求完成时间：</div>
-              <div>{{ work.deadline }}</div>
-            </div>
-            <div class="work-item">
-              <div class="work-label">备注：</div>
-              <div>{{ work.remark }}</div>
-            </div>
-          </el-card>
-        </div> -->
-
+      <el-form-item label="项目概况：" label-width="90px">
         <table border="1">
           <tr>
             <td style="width: 320px">工作内容</td>
@@ -62,29 +33,33 @@
           </tr>
         </table>
       </el-form-item>
-      <el-form-item label="预结算：">
+      <el-form-item label="预结算：" label-width="90px">
         <table border="1">
           <tr>
-            <td style="width: 250px">工作内容</td>
+            <td style="width: 250px">工作简述</td>
             <td>工作类别</td>
             <td>工作项目</td>
             <!-- <td>项目细项</td> -->
             <td>比例尺</td>
             <td>地类类型</td>
             <td style="width:90px;">单价</td>
-            <td style="width:90px;">总工作量</td>
+            <td>单位</td>
+            <td style="width:90px;">数量</td>
             <td style="width:70px;">系数</td>
             <td style="min-width:70px;">总额</td>
+            <td style="min-width:70px;">备注</td>
           </tr>
-          <tr v-for="(work, index) in workList" :key="index">
-            <td>
-              {{ work.content }}
+          <tr v-for="(work, index) in contentList" :key="index">
+            <td style="position:relative;">
+              <div class="delete-btn" @click="deletWorkItem(index)">
+                <i class="el-icon-circle-close"></i>
+              </div>
+              <el-input type="textarea" v-model="work.content"></el-input>
             </td>
             <td>
-              <el-select v-model="work.workType" :style="{ width: '100%' }" :loading="work.workSelect.workTypeLoading"
+              <el-select v-model="work.workType" :style="{ width: '100%' }"
                 @change="getWorkItemList(work, work.workType)">
-                <el-option v-for="item in work.workSelect.workTypeList" :key="item.value" :label="item.label"
-                  :value="item.value">
+                <el-option v-for="item in workTypeList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </td>
@@ -114,10 +89,16 @@
               </el-select>
             </td>
             <td>
-              {{ work.price }} / {{ work.unit }}
+              {{ work.price }}
             </td>
             <td>
-              {{ work.workload }}
+              <el-select v-model="work.unit" placeholder="请选择" clearable>
+                <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label"
+                  :value="dict.label" />
+              </el-select>
+            </td>
+            <td>
+              <el-input v-model="work.workload" @change="getTotal(work)"></el-input>
             </td>
             <td>
               <el-input-number v-model="work.coefficient" :controls="false" :precision="2" :step="0.01" :max="10"
@@ -125,16 +106,19 @@
               </el-input-number>
               <el-button type="text" @click="getCoefficientRemark(work.workType)">系数备注</el-button>
             </td>
-            <td class="workTotal">
-              {{ work.settle }}
+            <td>
+              <el-input v-model="work.settle"></el-input>
+            </td>
+            <td>
+              <el-input type="textarea" v-model="work.remark"></el-input>
             </td>
           </tr>
           <tr>
-            <td colspan="8">合计</td>
+            <td colspan="9">合计</td>
             <td>{{ (Number(settle) - Number(inOutPriceSum)).toFixed(2) }}</td>
           </tr>
         </table>
-        <div style="color:red">tips:预结算表中的系数为：困难系统和调整系数相乘的值（1分制）。例如：困难系数1，调整系数0.8，最终系数为0.8</div>
+        <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">
@@ -150,7 +134,6 @@
         <el-tag type="danger" style="margin-right:20px;font-size:14px;">¥{{ settle }}</el-tag>
       </el-form-item>
     </el-form>
-
   </div>
 </template>
 
@@ -159,7 +142,7 @@ import { getWorkTypeList, getWorkItemList, getSubItemList, getScaleGradeList, ge
 import { deepClone } from '@/utils'
 import { getPriceRemarkByWorkType } from '@/api/oa/price/price'
 export default {
-  components: {},
+  dicts: ['cmc_scale_grade', 'cmc_unit'],
   props: {
     workList: {
       type: Array,
@@ -176,7 +159,7 @@ export default {
   },
   data() {
     return {
-      // 工作选项
+      workTypeList: [],
       workSelect: {
         // 项目列表
         projectList: [],
@@ -193,6 +176,36 @@ export default {
         subItemLoading: true,
         scaleGradeLoading: true,
       },
+      contentList: [
+        {
+          content: '',
+          workType: '',
+          workItem: '',
+          scaleGrade: '',
+          groundType: '0',
+          price: '',
+          unit: '',
+          workload: '',
+          coefficient: 1,
+          settle: 0,
+          workSelect: {
+            // 项目列表
+            projectList: [],
+            // 工作类别列表
+            workTypeList: [],
+            // 工作项目
+            workItemList: [],
+            // 项目细项
+            subItemList: [],
+            // 比例尺
+            scaleGradeList: [],
+            workTypeLoading: true,
+            workItemLoading: true,
+            subItemLoading: true,
+            scaleGradeLoading: true,
+          }
+        }
+      ],
       settle: 0,
       inOutPrice: 0,
       peopleNumber: 0,
@@ -200,22 +213,56 @@ export default {
     }
   },
   created() {
-    for (let work of this.workList) {
-      this.setValue(work, 'workSelect', deepClone(this.workSelect));
-      this.getWorkTypeList(work);
-    }
+    this.getWorkTypeList();
   },
   mounted() {
     this.getSettleSum();
-
   },
   methods: {
+    addWorkList() {
+      this.contentList.push({
+        content: '',
+        workType: '',
+        workItem: '',
+        scaleGrade: '',
+        groundType: '0',
+        price: '',
+        unit: '',
+        workload: '',
+        coefficient: 1,
+        settle: 0,
+        workSelect: {
+          // 项目列表
+          projectList: [],
+          // 工作类别列表
+          workTypeList: [],
+          // 工作项目
+          workItemList: [],
+          // 项目细项
+          subItemList: [],
+          // 比例尺
+          scaleGradeList: [],
+          workTypeLoading: true,
+          workItemLoading: true,
+          subItemLoading: true,
+          scaleGradeLoading: true,
+        }
+      });
+    },
+    deletWorkItem(index) {
+      let arr = this.contentList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
     /* 获取工作类别 */
-    getWorkTypeList(work) {
+    getWorkTypeList() {
       getWorkTypeList().then(res => {
         if (res) {
-          this.setValue(work.workSelect, 'workTypeList', this.setArray(res));
-          this.setValue(work.workSelect, 'workTypeLoading', false);
+          this.workTypeList = this.setArray(res);
         }
       });
     },
@@ -233,30 +280,12 @@ export default {
         }
       })
     },
-    /* 获取项目细项 */
-    getSubItemList(work, workItem) {
-      getSubItemList({ workItem }).then(res => {
-        if (res) {
-          let subItemList = this.setArray(res);
-          work.workSelect.subItemLoading = false;
-          work.workSelect.subItemList = subItemList;
-          work.subItem = subItemList[0].label;
-          if (work.scaleGrade == undefined) {
-            this.setValue(work, 'scaleGrade', '无');
-          }
-          if (work.groundType == undefined) {
-            this.setValue(work, 'groundType', '0');
-          }
-          this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
-        }
-      })
-    },
     /* 获取比例尺 */
     getScaleGradeList(work, workItem) {
       if (work.scale) {
-        this.setValue(work, 'scaleGrade', work.scale);
+        this.$set(work, 'scaleGrade', work.scale);
         if (work.groundType == undefined) {
-          this.setValue(work, 'groundType', '0');
+          this.$set(work, 'groundType', '0');
         }
         this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
       } else {
@@ -265,27 +294,27 @@ export default {
             let scaleGradeList = this.setArray(res);
             work.workSelect.scaleGradeLoading = false;
             work.workSelect.scaleGradeList = scaleGradeList;
-            this.setValue(work, 'scaleGrade', scaleGradeList[0].label)
+            this.$set(work, 'scaleGrade', scaleGradeList[0].label)
             // work.scaleGrade = scaleGradeList[0].label;
             if (work.scaleGrade == undefined) {
-              this.setValue(work, 'scaleGrade', '无');
+              this.$set(work, 'scaleGrade', '无');
             }
             if (work.groundType == undefined) {
-              this.setValue(work, 'groundType', '0');
+              this.$set(work, 'groundType', '0');
             }
             this.getUnitPrice(work, work.workItem, work.subItem, work.scaleGrade, work.groundType);
           }
         })
       }
-
     },
     /* 获取单价 */
     getUnitPrice(work, workItem, subItem, scaleGrade, groundType) {
       getUnitPrice({ workItem, subItem, scaleGrade, groundType: groundType }).then(res => {
         if (res.length != 0) {
           work.priceId = res.data.id;
-          this.setValue(work, 'price', res.data.price)
-          this.setValue(work, 'coefficient', 1)
+          this.$set(work, 'price', res.data.price)
+          this.$set(work, 'unit', res.data.unit)
+          this.$set(work, 'coefficient', 1)
           if (work.workload != undefined || work.workload != '') {
 
             this.getTotal(work);
@@ -296,45 +325,65 @@ export default {
     /* 获取总额 */
     getTotal(work) {
       let total = this.calculateTotal(work.price, work.coefficient, work.workload, 1);
-      this.setValue(work, 'settle', total)
+      if (total < 600) {
+        total = 600
+        this.$message.warning('不足600，按600算')
+      }
+      this.$set(work, 'settle', total)
       this.getSettleSum();
     },
-    /* 计算总额 */
-    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) {
+      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
-        }
-      }
+      // 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.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()
     },
-    //数组去重
+    /* 计算总额 */
+    calculateTotal(price, coefficient, workload, percent) {
+      return ((parseFloat(price) * parseFloat(coefficient) * parseFloat(workload)) * percent).toFixed(2);
+    },
+    getCoefficientRemark(workType) {
+      getPriceRemarkByWorkType({ workType }).then(res => {
+        if (res.code == 200) {
+          if (workType != undefined)
+            this.$notify({
+              title: workType,
+              dangerouslyUseHTMLString: true,
+              message: res.msg,
+              duration: 0
+            });
+        }
+
+      })
+    },
+    // 数组去重，并格式化为label、value形式
     setArray(arr) {
       if (arr != [] && arr != undefined) {
         let datalist = [...new Set(arr)];
@@ -350,25 +399,7 @@ export default {
         return [];
       }
     },
-    setValue(key, name, val) {
-      this.$set(key, name, val)
-    },
-    getCoefficientRemark(workType) {
-      getPriceRemarkByWorkType({workType}).then(res => {
-        console.log(res);
-        if (res.code == 200) {
-          if(workType != undefined)
-            this.$notify({
-              title: workType ,
-              dangerouslyUseHTMLString: true,
-              message: res.msg,
-              duration: 0
-            });
-        }
-
-      })
-    }
-  }
+  },
 }
 </script>
 
@@ -388,18 +419,15 @@ table {
   }
 }
 
-.card {
-  flex: 1;
-  margin: 0 5px;
-}
-
-.work-item {
-  display: flex;
-  border-bottom: 1px solid rgb(228, 228, 228);
-
-  .work-label {
-    text-align: right;
-    font-weight: bold;
+.delete-btn {
+  position: absolute;
+  left: -30px;
+  top: 50%;
+  transform: translate(0, -50%);
+  color: #F56C6C;
+  cursor: pointer;
+  i{
+    font-size: 25px;
   }
 }
 </style>

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

@@ -19,7 +19,11 @@
       <!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
       <el-table-column label="姓名" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
       <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" :show-overflow-tooltip="true" />
-      <el-table-column label="年龄" align="center" key="age" prop="age" :show-overflow-tooltip="true" />
+      <el-table-column label="年龄" align="center" key="age" prop="age" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          {{ getAgeByIdCard(scope.row.idCard) }}
+        </template>
+      </el-table-column>
       <el-table-column label="性别" align="center" key="sex" prop="sex" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           {{ scope.row.sex == 0 ? '男' : '女' }}
@@ -106,7 +110,32 @@ export default {
     },
     clearChoose() {
       this.$refs.chooseUser.clearSelection();
-    }
+    },
+    getAgeByIdCard(idCard) {
+      const sexAndAge = {}
+      //获取用户身份证号码
+      const userCard = idCard
+      //如果用户身份证号码为undefined则返回空
+      if (!userCard) {
+        return sexAndAge
+      }
+      // 获取出生日期
+      const yearBirth = userCard.substring(6, 10)
+      const monthBirth = userCard.substring(10, 12)
+      const dayBirth = userCard.substring(12, 14)
+      // 获取当前年月日并计算年龄
+      const myDate = new Date()
+      const monthNow = myDate.getMonth() + 1
+      const dayNow = myDate.getDate()
+      let age = myDate.getFullYear() - yearBirth
+
+      if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
+        age--
+      }
+      // 得到年龄
+      sexAndAge.age = age
+      return sexAndAge.age
+    },
   },
 }
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-20 16:20:49
+ * @LastEditTime: 2024-05-21 09:41:42
 -->
 <template>
   <div class="app-container">
@@ -56,7 +56,7 @@
         </el-col>
         <el-col :span="12" :xs="24">
           <el-form-item label="组织交底文档：" prop="organizeDocument">
-            <FileUpload ref="orz" :limit="1" :filePathName="'组织交底文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+            <FileUpload v-if="$route.query.taskName == '项目安排'" ref="orz" :limit="1" :filePathName="'组织交底文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
               @input="setOrganizeDocument">
             </FileUpload>
             <div v-if="$route.query.taskName != '项目安排'" class="upload-list">
@@ -228,18 +228,18 @@ export default {
       updateProject(this.form)
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
-      // getNextFlowNode(params).then(res => {
-      //   this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-      //   this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
-      //   getUsersDeptLeaderByDept({ deptId: 105 }).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');
-      //     });
-      //   })
-      // })
+      getNextFlowNode(params).then(res => {
+        this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+        this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
+        getUsersDeptLeaderByDept({ deptId: 105 }).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');
+          });
+        })
+      })
     },
     cancel() {
       this.form = {}
@@ -268,8 +268,6 @@ export default {
 
 <style lang="scss" scoped>
 .upload-list {
-  display: flex;
-  text-align: left;
-  justify-content: space-around;
+  
 }
 </style>