新增技术交底退回按钮

oa-ui/src/assets/styles/ruoyi.scss

@@ -47,8 +47,9 @@
 .mb10 {
   margin-bottom: 10px;
 }
+
 .ml10 {
-	margin-left: 10px;
+  margin-left: 10px;
 }
 
 .mt20 {
@@ -62,18 +63,30 @@
 .mb20 {
   margin-bottom: 20px;
 }
-.ml20 {
-	margin-left: 20px;
-}
 
-.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
+.ml20 {
+  margin-left: 20px;
+}
+
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   font-family: inherit;
   font-weight: 500;
   line-height: 1.1;
   color: inherit;
 }
 
-.el-message-box__status + .el-message-box__message{
+.el-message-box__status+.el-message-box__message {
   word-break: break-word;
 }
 
@@ -89,7 +102,9 @@
 }
 
 .el-table {
-  .el-table__header-wrapper, .el-table__fixed-header-wrapper {
+
+  .el-table__header-wrapper,
+  .el-table__fixed-header-wrapper {
     th {
       word-break: break-word;
       background-color: #f8f8f9;
@@ -100,7 +115,7 @@
   }
 
   .el-table__body-wrapper {
-    .el-button [class*="el-icon-"] + span {
+    .el-button [class*="el-icon-"]+span {
       margin-left: 1px;
     }
   }
@@ -138,10 +153,11 @@
 }
 
 @media (max-width: 768px) {
-  .pagination-container .el-pagination > .el-pagination__jump {
+  .pagination-container .el-pagination>.el-pagination__jump {
     display: none !important;
   }
-  .pagination-container .el-pagination > .el-pagination__sizes {
+
+  .pagination-container .el-pagination>.el-pagination__sizes {
     display: none !important;
   }
 }
@@ -153,20 +169,22 @@
 }
 
 /** 表格更多操作下拉样式 */
-.el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine {
-	cursor: pointer;
-	margin-left: 5px;
+.el-table .el-dropdown-link,
+.el-table .el-dropdown-selfdefine {
+  cursor: pointer;
+  margin-left: 5px;
 }
 
-.el-table .el-dropdown, .el-icon-arrow-down {
+.el-table .el-dropdown,
+.el-icon-arrow-down {
   font-size: 12px;
 }
 
-.el-tree-node__content > .el-checkbox {
+.el-tree-node__content>.el-checkbox {
   margin-right: 8px;
 }
 
-.list-group-striped > .list-group-item {
+.list-group-striped>.list-group-item {
   border-left: 0;
   border-right: 0;
   border-radius: 0;
@@ -289,7 +307,8 @@
   position: relative;
   float: right;
 }
-el-input.is-disabled >.el-input__inner {
+
+el-input.is-disabled>.el-input__inner {
   color: #686a6e;
 }
 
@@ -311,4 +330,22 @@ el-input.is-disabled >.el-input__inner {
 ::v-deep .el-radio__input.is-disabled .el-radio__inner,
 .el-radio__input.is-disabled.is-checked .el-radio__inner {
   border-color: var(--current-color);
+}
+
+.del-file {
+  cursor: pointer;
+  color: #ed5565;
+  display: inline-block;
+  line-height: 1;
+  padding-left: 10px;
+  font-family: element-icons !important;
+  speak: none;
+  font-style: normal;
+  font-weight: 400;
+  font-variant: normal;
+  text-transform: none;
+  vertical-align: baseline;
+}
+.del-file:hover{
+  color: #f3a5ad;
 }

oa-ui/src/utils/deleteResource.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-23 15:43:29
+ * @LastEditTime: 2024-09-27 11:41:27
  */
 import request from '@/utils/request'
 
@@ -110,6 +110,13 @@ const apiEndpoints = [
       '/oa/outsourceWork/:id'
     ]
   },
+  {
+    procDefName: '绩效审批',
+    apiUrl: [
+      '/oa/performance/:id',
+      '/oa/wage/batch/:id'
+    ]
+  },
 ]
 
 // 编写一个方法来处理删除请求，并同时发送所有API请求  

oa-ui/src/views/flowable/form/components/flowBtn/returnBtn.vue

@@ -0,0 +1,69 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-09-27 15:19:36
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-27 15:59:43
+-->
+<template>
+  <div>
+    <el-form ref="taskForm" :model="taskForm" label-width="80px">
+      <el-form-item label="退回节点" prop="targetKey">
+        <el-radio-group v-model="taskForm.targetKey">
+          <el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id">{{ item.name }}
+          </el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
+        <el-input  type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
+      </el-form-item>
+    </el-form>
+    <div class="text-center">
+      <el-button @click="$emit('cancel')">取 消</el-button>
+      <el-button type="primary" @click="taskReturn">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
+export default {
+  props: {
+    taskForm: {
+      type: Object,
+      require: true
+    }
+  },
+  data() {
+    return {
+      form: {},
+      returnTaskList: []
+    }
+  },
+  created() {
+    this.handleReturn();
+  },
+  methods: {
+    /** 可退回任务列表 */
+    handleReturn() {
+      returnList(this.taskForm).then(res => {
+        this.returnTaskList = res.data.reverse();
+        this.taskForm.variables = null;
+      })
+    },
+    /** 提交退回任务 */
+    taskReturn() {
+      this.$refs["taskForm"].validate(valid => {
+        if (valid) {
+          returnTask(this.taskForm).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            this.$emit('saves')
+            this.$emit('goBack')
+          });
+        }
+      });
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/flowable/form/components/flowBtn/returnComment.vue

@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <div>退回意见：{{ reBackDescription }}</div>
+    <div>办理人：{{ assigneeName }}</div>
+  </div>
+</template>
+
+<script>
+import { flowRecordFull } from "@/api/flowable/finished";
+export default {
+  props: {
+    taskForm: {
+      type: Object,
+      require: true
+    }
+  },
+  data() {
+    return {
+      reBackDescription: '',
+      assigneeName:''
+    }
+  },
+  created() {
+    this.getComment()
+  },
+  methods: {
+    getComment() {
+      const params = { procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }
+      flowRecordFull(params).then(res => {
+        if (res.data.flowList) {
+          if (res.data.flowList.length > 1 && res.data.flowList[1].comment && res.data.flowList[1].comment.type == '退回意见') {
+            this.reBackDescription = res.data.flowList[1].comment.comment
+            this.assigneeName = res.data.flowList[1].assigneeName
+            this.$emit('isReturn', true)
+          } else {
+            this.$emit('isReturn', false)
+          }
+        }
+      })
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -1,7 +1,18 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-07-04 17:37:29
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-27 16:49:03
+-->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
+        <div class="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="150px">
           <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '技术交底'">
             <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目编号" disabled style="width: 300px" />
@@ -32,9 +43,9 @@
               :autosize="{ minRows: 8 }" />
           </el-form-item>
           <el-form-item label="附件" prop="document">
-            <FileUpload v-if="taskName == '技术交底'" ref="bsFile" :limit="1" :filePathName="'技术交底'"
+            <FileUpload v-if="!form.document" ref="bsFile" :limit="1" :filePathName="'技术交底'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getTechnicalDoc"></FileUpload>
-            <div v-if="form.document && taskName != '技术交底'">
+            <div v-if="form.document">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.document}`)">
                 {{ getFileName(form.document) }}
               </el-link>
@@ -42,6 +53,7 @@
                 :underline="false" target="_blank">
                 <span class="el-icon-download">下载文件</span>
               </el-link>
+              <span class="el-icon-delete del-file" @click="deleteDoc" v-if="taskName == '技术交底'">删除文件</span>
             </div>
           </el-form-item>
           <el-form-item label="技术交底意见" prop="disclosureComment">
@@ -96,6 +108,7 @@
           </el-row>
         </el-form>
         <div style="text-align: center;" v-if="taskName">
+          <el-button type="danger" @click="returnOpen = true">退 回</el-button>
           <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>
@@ -108,6 +121,9 @@
         </el-card>
       </el-col>
     </el-row>
+    <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>
 
@@ -119,10 +135,14 @@ import flow from '@/views/flowable/task/todo/detail/flow';
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { getUsersManageLeaderByDept, getUsersDeptLeaderByDept, getUserByPost } from '@/api/system/post'
+import ReturnBtn from './components/flowBtn/returnBtn.vue';
+import ReturnComment from './components/flowBtn/returnComment.vue';
 
 export default {
   components: {
-    flow
+    flow,
+    ReturnBtn,
+    ReturnComment,
   },
   name: "Technical",
   props: {
@@ -141,38 +161,6 @@ export default {
       disclosureUser: '',
       acceptUser: '',
       confirmUser: '',
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // cmc技术交底表格数据
-      technicalList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        projectId: null,
-        accepter: null,
-        disclosurer: null,
-        confirmer: null,
-        content: null,
-        document: null,
-        disclosureComment: null,
-        disclosureTime: null,
-        acceptTime: null
-      },
       userList: [],
       chooseProject: {},
       isSelect: false,
@@ -185,13 +173,14 @@ export default {
       // 表单校验
       rules: {},
       formTotal: 0,
-      flowData: {}
+      flowData: {},
+      returnOpen: false,
+      showAlter: true,
     };
   },
   created() {
     this.getProjectById();
     this.getUserList();
-    this.getList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
     })
@@ -260,15 +249,6 @@ export default {
         this.userList = res.rows
       })
     },
-    /** 查询cmc技术交底列表 */
-    getList() {
-      this.loading = true;
-      listTechnical(this.queryParams).then(response => {
-        this.technicalList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
     isEmptyObject(obj) {
       for (var key in obj) {
         if (obj.hasOwnProperty(key)) {
@@ -277,21 +257,6 @@ export default {
       }
       return true;
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        technicalId: null,
-        projectId: null,
-        accepter: null,
-        disclosurer: null,
-        content: null,
-        document: null,
-        disclosureComment: null,
-        disclosureTime: null,
-        acceptTime: null
-      };
-      this.resetForm("form");
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -299,43 +264,45 @@ export default {
           if (this.formTotal != 0) {
             updateTechnical(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(async res => {
-              if (this.taskName == '技术交底')
+              if (this.taskName == '技术交底') {
                 this.$set(this.taskForm.variables, "approval", this.form.accepter);
+                this.handleComplete();
+              }
               else if (this.taskName == '接受交底') {
                 let res = await getUsersDeptLeaderByDept({ deptId: 109 })
                 this.$set(this.taskForm.variables, "approval", res.data.userId);
+                this.handleComplete();
+              } else if (this.taskName == '确认交底') {
+                this.$modal.confirm('最后一个节点，提交将结束流程，是否提交？').then(res => {
+                  this.handleComplete();
+                })
               }
-              complete(this.taskForm).then(response => {
-                this.$modal.msgSuccess(response.msg);
-                this.$emit('goBack')
-              });
             })
           } else {
             this.form.technicalId = this.taskForm.formId;
             this.form.projectId = this.taskForm.formId;
             addTechnical(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
               this.$set(this.taskForm.variables, "approval", this.form.accepter);
-              complete(this.taskForm).then(response => {
-                this.$modal.msgSuccess(response.msg);
-                this.$emit('goBack')
-              });
+              this.handleComplete();
             })
           }
         }
       });
     },
+    handleComplete() {
+      complete(this.taskForm).then(response => {
+        this.$modal.msgSuccess(response.msg);
+        this.$emit('goBack')
+      });
+    },
     getFileName(name) {
       if (name) {
         let arr = name.split('/')
@@ -351,21 +318,11 @@ export default {
         }
       }
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const technicalIds = row.technicalId || this.ids;
-      this.$modal.confirm('是否确认删除cmc技术交底编号为"' + technicalIds + '"的数据项？').then(function () {
-        return delTechnical(technicalIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
+    deleteDoc() {
+      this.$set(this.form, 'document', undefined)
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/technical/export', {
-        ...this.queryParams
-      }, `technical_${new Date().getTime()}.xlsx`)
+    isReturn(val) {
+      this.showAlter = val
     }
   }
 };