Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

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

@@ -66,7 +66,7 @@
         <td>{{ device.depreciation }}</td>
       </tr>
       <tr>
-        <td colspan="6" class="head">固定成本小计</td>
+        <td colspan="6" class="head">间接成本小计</td>
         <td>{{ budgetForm.fixCost }}</td>
       </tr>
       <tr>
@@ -107,7 +107,7 @@
         <td>{{ budgetForm.directExpense }}</td>
       </tr>
       <tr>
-        <td colspan="6" class="head">总成本=（固定成本+直接成本）*120%</td>
+        <td colspan="6" class="head">总成本=（间接成本+直接成本）*120%</td>
         <td>{{ budgetForm.totalBudget }}</td>
       </tr>
       <!-- <tr>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-21 17:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-07 09:34:27
+ * @LastEditTime: 2024-07-16 16:09:58
 -->
 <template>
   <div class="app-container">
@@ -105,7 +105,7 @@
       <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="fixCost" />
+      <el-table-column label="间接成本" align="center" prop="fixCost" />
       <el-table-column label="预结算额" align="center" prop="settleExpense" />
       <el-table-column label="外协费用" align="center" prop="outExpense" />
       <el-table-column label="商务费用" align="center" prop="businessExpense" />
@@ -167,8 +167,8 @@
         <el-form-item label="设备成本" prop="deviceCost">
           <el-input v-model="form.deviceCost" placeholder="请输入设备成本" />
         </el-form-item>
-        <el-form-item label="固定成本" prop="fixCost">
-          <el-input v-model="form.fixCost" placeholder="请输入固定成本" />
+        <el-form-item label="间接成本" prop="fixCost">
+          <el-input v-model="form.fixCost" placeholder="请输入间接成本" />
         </el-form-item>
         <el-form-item label="预结算额" prop="settleExpense">
           <el-input v-model="form.settleExpense" placeholder="请输入预结算额" />

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

@@ -18,8 +18,8 @@
       <el-form-item label="设备成本" prop="deviceCost">
         <el-input v-model="form.deviceCost" placeholder="请输入设备成本" />
       </el-form-item>
-      <el-form-item label="固定成本" prop="fixCost">
-        <el-input v-model="form.fixCost" placeholder="请输入固定成本" />
+      <el-form-item label="间接成本" prop="fixCost">
+        <el-input v-model="form.fixCost" placeholder="请输入间接成本" />
       </el-form-item>
       <el-form-item label="预结算额" prop="settleExpense">
         <el-input v-model="form.settleExpense" placeholder="请输入预结算额" />

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

@@ -45,7 +45,7 @@
       <el-table-column label="序号" align="center" type="index" />
       <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="fixCost" />
+      <el-table-column label="间接成本" align="center" prop="fixCost" />
       <el-table-column label="直接成本" align="center" prop="settleExpense" />
       <el-table-column label="其他成本" align="center" prop="directExpense">
         <template slot-scope="scope">

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

@@ -130,7 +130,7 @@
               <span>{{ parseTime(scope.row.contractExpire, '{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="固定成本(天)" align="center" key="salary" prop="salary.salary" :show-overflow-tooltip="true">
+          <!-- <el-table-column label="间接成本(天)" align="center" key="salary" prop="salary.salary" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.salary ? scope.row.salary.salary : "" }}
           </template>