结算流程增加可退回节点

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcWage.java

@@ -42,7 +42,7 @@ public class CmcWage extends BaseEntity
     private BigDecimal performanceSalary;
 
     /** 注册测绘师（岩土工程师）补贴 */
-    @Excel(name = "注册测绘师（岩土工程师）补贴")
+    @Excel(name = "注册测绘师（岩土工程师/安全工程师）补贴")
     private BigDecimal certificatesSubsidy;
 
     /** 过节补贴 */

oa-ui/src/views/flowable/form/settleForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-23 17:08:37
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-12-27 11:37:41
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -478,7 +478,7 @@
         <div style="text-align: center" v-if="!disabled">
           <el-button type="warning" @click="preserve">保存</el-button>
           <el-button type="danger"
-            v-if="taskName == '经营发展部校核' || taskName == '分管审核' || taskName == '总经理审批' || taskName == '董事长批准'"
+            v-if="taskName != '结算发起'"
             @click="returnOpen = true">退 回</el-button>
           <el-button type="primary" @click="submitNextFlow" v-if="taskName != '董事长批准'">提交下一个流程</el-button>
           <el-button type="primary" @click="submitNextFlow" v-else>结算批准</el-button>

oa-ui/src/views/flowable/form/settleOther.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-10 15:46:32
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-12-19 16:52:40
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -520,8 +520,6 @@ export default {
     // 获取当前处理人
     getCurrentUser() {
       if (this.taskName == "分管审核") {
-        console.log(this.$store.state.user.name);
-        
         this.form.managerUserName = this.$store.state.user.name;
         this.form.managerUserId = this.$store.state.user.id;
         this.form.managerTime = parseTime(new Date(), "{y}-{m}-{d}");

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

@@ -60,8 +60,18 @@
           <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="结算总额" align="center" prop="reportTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.amount ? scope.row.amount : 0}}</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="工作量上报说明" align="center" prop="workloadReport" /> -->
       <el-table-column label="结算说明" align="center" prop="settleComment" />
+      <el-table-column label="总经理审批日期" align="center" prop="gmTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.gmTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"

oa-ui/src/views/oa/settle/other.vue

@@ -54,8 +54,18 @@
           <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="结算总额" align="center" prop="reportTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.amount ? scope.row.amount : 0}}</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="工作量上报说明" align="center" prop="workloadReport" /> -->
       <el-table-column label="结算说明" align="center" prop="settleComment" />
+      <el-table-column label="总经理审批日期" align="center" prop="gmTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.gmTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"