网页端：工作填报新增工作月份搜索与导出，工作填报流程新增退回按钮

oa-ui/src/views/flowable/form/work/declareForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-08-16 09:16:36
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-31 09:48:58
+ * @LastEditTime: 2025-09-05 13:59:35
 -->
 <template>
   <div>
@@ -10,6 +10,11 @@
       <el-col :span="isFlow ? 18 : 24" :xs="24">
         <h2 class="text-center">项目工作填报表</h2>
         <el-divider></el-divider>
+        <div class="mt20 mb20" v-if="showAlter">
+          <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
+            <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
+          </el-alert>
+        </div>
         <el-form ref="form" :model="form" :rules="rules" label-width="110px" :disabled="formDisabled">
           <el-form-item label="是否零星项目：">
             <el-radio-group v-model="radio" @change="chooseLX" :disabled="taskName != '工作填报'">
@@ -51,8 +56,8 @@
           </el-form-item>
           <el-form-item label="工作日期：" prop="dateRange">
             <el-date-picker v-model="form.dateRange" type="daterange" range-separator="至" start-placeholder="开始日期"
-              end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-              :disabled="taskName != '工作填报'" @change="handleDateRangeChange">
+              end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :disabled="taskName != '工作填报'"
+              @change="handleDateRangeChange">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="工天：" prop="workLoad">
@@ -80,6 +85,8 @@
         </el-form>
         <el-row class="text-center mt20" v-if="!formDisabled">
           <el-button type="warning" @click="save" v-if="taskName != '填报人确认'">保 存</el-button>
+          <el-button type="danger" @click="returnOpen = true" v-if="taskName != '工作填报' && taskName != '填报人确认'">退
+            回</el-button>
           <el-button type="primary" @click="submitForm" v-if="taskName == '工作填报'">提 交</el-button>
           <el-button type="success" @click="approveForm"
             v-if="taskName != '工作填报' && taskName != '填报人确认'">审核通过</el-button>
@@ -98,6 +105,10 @@
     <el-dialog title="选择项目" :visible.sync="prOpen" :width="deviceWidth" append-to-body>
       <choose-project @chooseProject="confirmProject"></choose-project>
     </el-dialog>
+
+    <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
+      <return-btn :taskForm="taskForm" @goBack="$emit('goBack')" @saves="" @cancel="returnOpen = false"></return-btn>
+    </el-dialog>
   </div>
 </template>
 
@@ -112,10 +123,14 @@ import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import chooseProject from '../components/chooseProject.vue';
 import { parseTime } from "@/utils/ruoyi";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from "@/api/system/post.js";
+import ReturnComment from "@/views/flowable/form/components/flowBtn/returnComment.vue";
+import ReturnBtn from "@/views/flowable/form/components/flowBtn/returnBtn.vue";
 export default {
   components: {
     flow,
-    chooseProject
+    chooseProject,
+    ReturnComment,
+    ReturnBtn
   },
   computed: {
     ...mapState({
@@ -192,7 +207,9 @@ export default {
       workItemList: [],
       projectList: [],
       hasForm: false,
-      money: 0
+      money: 0,
+      showAlter: true,
+      returnOpen: false
     }
   },
   methods: {
@@ -448,7 +465,10 @@ export default {
           this.countMoney();
         }
       }
-    }
+    },
+    isReturn(val) {
+      this.showAlter = val;
+    },
   },
 }
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-08-14 14:24:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-31 10:00:14
+ * @LastEditTime: 2025-09-05 13:53:52
 -->
 <template>
   <div class="app-container">
@@ -31,6 +31,12 @@
           placeholder="请选择填报月份">
         </el-date-picker>
       </el-form-item>
+
+      <el-form-item label="工作月份" prop="workDate">
+        <el-date-picker clearable v-model="queryParams.workDate" type="month" value-format="yyyy-MM"
+          placeholder="请选择工作月份">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <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>
@@ -54,8 +60,8 @@
       <el-table-column label="工作类别" align="center" prop="workType" />
       <el-table-column label="工作项目" align="center" prop="workItem" />
       <el-table-column label="工作内容" align="center" prop="workContent" width="250px" />
-      <el-table-column label="开始日期" align="center" prop="beginDate" width="92px"/>
-      <el-table-column label="结束日期" align="center" prop="endDate" width="92px"/>
+      <el-table-column label="开始日期" align="center" prop="beginDate" width="92px" />
+      <el-table-column label="结束日期" align="center" prop="endDate" width="92px" />
       <el-table-column label="工天" align="center" prop="workLoad" />
       <el-table-column label="工天单价" align="center" prop="price" />
       <el-table-column label="系数" align="center" prop="coefficient" />
@@ -67,17 +73,17 @@
       <el-table-column label="审核状态" align="center">
         <template slot-scope="scope">
           <div>
-            <el-tag :type="formatFn(scope.row, 'checkStatus') ? 'success':'warning'" size="mini">一审</el-tag>
+            <el-tag :type="formatFn(scope.row, 'checkStatus') ? 'success' : 'warning'" size="mini">一审</el-tag>
             <i v-if="formatFn(scope.row, 'checkStatus')" class="el-icon-circle-check" style="color:#67C23A"></i>
             <i v-else class="el-icon-warning-outline" style="color:#E6A23C"></i>
           </div>
           <div>
-            <el-tag :type="formatFn(scope.row, 'auditStatus') ? 'success':'warning'" size="mini">二审</el-tag>
+            <el-tag :type="formatFn(scope.row, 'auditStatus') ? 'success' : 'warning'" size="mini">二审</el-tag>
             <i v-if="formatFn(scope.row, 'auditStatus')" class="el-icon-circle-check" style="color:#67C23A"></i>
             <i v-else class="el-icon-warning-outline" style="color:#E6A23C"></i>
           </div>
           <div>
-            <el-tag :type="formatFn(scope.row, 'confirmStatus') ? 'success':'warning'" size="mini">确认</el-tag>
+            <el-tag :type="formatFn(scope.row, 'confirmStatus') ? 'success' : 'warning'" size="mini">确认</el-tag>
             <i v-if="formatFn(scope.row, 'confirmStatus')" class="el-icon-circle-check" style="color:#67C23A"></i>
             <i v-else class="el-icon-warning-outline" style="color:#E6A23C"></i>
           </div>
@@ -271,6 +277,13 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      if (this.queryParams.workDate) {
+        this.queryParams.beginDate = this.queryParams.workDate;
+        this.queryParams.endDate = this.queryParams.workDate;
+      } else {
+        this.queryParams.beginDate = null;
+        this.queryParams.endDate = null;
+      }
       this.getList();
     },
     /** 重置按钮操作 */