新增借款退回

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-09-27 15:19:36
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-06 15:25:39
+ * @LastEditTime: 2024-12-09 14:12:58
 -->
 <template>
   <div>
@@ -37,6 +37,11 @@ export default {
       default: ''
     }
   },
+  watch: {
+    comment(newval) {
+      this.taskForm.comment = newval
+    }
+  },
   data() {
     return {
       form: {},
@@ -51,8 +56,7 @@ export default {
     this.handleReturn();
   },
   mounted() {
-    debugger
-    if(this.comment != ''){
+    if (this.comment != '') {
       this.taskForm.comment = this.comment
     }
   },

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -5,6 +5,11 @@
       <el-col :span="24" :md="flowDisabled ? 18 : 24">
         <h2 class="text-center">借款申请</h2>
         <el-divider></el-divider>
+        <div class="mt20 mb20" v-if="showAlter && flowDisabled">
+          <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="100px">
           <el-row :gutter="20">
             <el-col :md="6" :span="24">
@@ -243,8 +248,8 @@
           </div>
           <el-divider></el-divider>
           <el-form-item label="支付凭证" prop="lendDocument">
-            <FileUpload v-if="taskName == '财务处理'" :disabled="taskName != '财务处理'" :limit="1" :filePathName="'借款/支付凭证'" :isShowTip="false"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getLendPath">
+            <FileUpload v-if="taskName == '财务处理'" :disabled="taskName != '财务处理'" :limit="1" :filePathName="'借款/支付凭证'"
+              :isShowTip="false" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getLendPath">
             </FileUpload>
             <div v-if="form.lendDocument && taskName != '财务处理'">
               <!-- <file-item :document="form.lendDocument"></file-item> -->
@@ -278,6 +283,7 @@
         </el-form>
         <div style="text-align: center;" v-if="taskName != ''">
           <el-button type="warning" @click="saves()">保 存</el-button>
+          <el-button type="danger" v-if="taskName != '借款申请'" @click="returnOpen = true">退 回</el-button>
           <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>
@@ -297,6 +303,10 @@
       <borrow-print :form="form" :exceed="exceed" :chooseProject="chooseProject" :detailList="detailList"
         @cancel="printOpen = false"></borrow-print>
     </el-dialog>
+    <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
+      <return-btn :taskForm="taskForm" :comment="commentByRole()" @goBack="$emit('goBack')" @saves=""
+        @cancel="returnOpen = false"></return-btn>
+    </el-dialog>
     <el-button type="success" @click="printOpen = true">打印</el-button>
   </div>
 </template>
@@ -316,13 +326,17 @@ import { listBudget } from "@/api/oa/budget/budget";
 import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
 import FileItem from '../business/fileItem.vue';
 import BorrowPrint from '../components/print/borrowPrint.vue';
+import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
+import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
 
 export default {
   components: {
     flow,
     projectChoose,
     FileItem,
-    BorrowPrint
+    BorrowPrint,
+    ReturnComment,
+    ReturnBtn
   },
   name: "Borrow",
   props: {
@@ -401,6 +415,8 @@ export default {
       totalBudget: 0,
       hasBorrow: 0,
       printOpen: false,
+      showAlter: true,
+      returnOpen:false,
     };
   },
   created() {
@@ -896,6 +912,24 @@ export default {
         result = this.form.managerAmount - (this.totalBudget - this.hasBorrow);
       }
       return result.toFixed(2)
+    },
+    isReturn(val) {
+      this.showAlter = val
+    },
+    commentByRole() {
+      if (this.taskName == '部门审核') {
+        return this.form.deptComment
+      } else if (this.taskName == '分管审核') {
+        return this.form.managerComment
+      } else if (this.taskName == '总经理审核') {
+        return this.form.zjlComment
+      } else if (this.taskName == '董事长批准') {
+        return this.form.dszComment
+      } else if (this.taskName == '党工团审核') {
+        return this.form.unionComment
+      } else if (this.taskName == '财务处理') {
+        return this.form.cwComment
+      }
     }
   }
 };