借款流程修改前端

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBorrowController.java

@@ -96,10 +96,14 @@ public class CmcBorrowController extends BaseController
             cmcBorrow.setManagerUserId(getLoginUser().getUserId());
             cmcBorrow.setManagerTime(new Date());
         }
-        if (cmcBorrow.getZjlComment() != null && cmcBorrow.getCwComment() == null) {
+        if (cmcBorrow.getZjlComment() != null && cmcBorrow.getDszComment() == null) {
             cmcBorrow.setZjlUserId(getLoginUser().getUserId());
             cmcBorrow.setZjlTime(new Date());
         }
+        if (cmcBorrow.getDszComment() != null && cmcBorrow.getCwComment() == null) {
+            cmcBorrow.setDszUserId(getLoginUser().getUserId());
+            cmcBorrow.setDszTime(new Date());
+        }
         if (cmcBorrow.getUnionComment() != null && cmcBorrow.getCwComment() == null) {
             cmcBorrow.setUnionUserId(getLoginUser().getUserId());
             cmcBorrow.setUnionTime(new Date());

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -78,7 +79,14 @@ public class CmcBudgetController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBudget cmcBudget)
     {
-        cmcBudget.setAuditor(getLoginUser().getUserId());
+        if (cmcBudget.getAuditComment() != null && cmcBudget.getApproveComment() == null) {
+            cmcBudget.setAuditor(getLoginUser().getUserId());
+            cmcBudget.setAuditTime(new Date());
+        }
+        if (cmcBudget.getApproveComment() != null) {
+            cmcBudget.setApprover(getLoginUser().getUserId());
+            cmcBudget.setApproveTime(new Date());
+        }
         return toAjax(cmcBudgetService.updateCmcBudget(cmcBudget));
     }
 

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

@@ -1,7 +1,9 @@
 package com.ruoyi.oa.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -119,6 +121,22 @@ public class CmcBudget extends BaseEntity
     /** 审核人 */
     private Long auditor;
 
+    /** 审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date auditTime;
+
+    /** 批准时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "批准时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date approveTime;
+
+    @Excel(name = "审批意见")
+    private String auditComment;
+
+    @Excel(name = "批准意见")
+    private String approveComment;
+
     public void setBudgetId(String budgetId)
     {
         this.budgetId = budgetId;
@@ -358,6 +376,42 @@ public class CmcBudget extends BaseEntity
     {
         return approverUser;
     }
+    public void setAuditTime(Date auditTime)
+    {
+        this.auditTime = auditTime;
+    }
+
+    public Date getAuditTime()
+    {
+        return auditTime;
+    }
+    public void setApproveTime(Date approveTime)
+    {
+        this.approveTime = approveTime;
+    }
+
+    public Date getApproveTime()
+    {
+        return approveTime;
+    }
+    public void setAuditComment(String auditComment)
+    {
+        this.auditComment = auditComment;
+    }
+
+    public String getAuditComment()
+    {
+        return auditComment;
+    }
+    public void setApproveComment(String approveComment)
+    {
+        this.approveComment = approveComment;
+    }
+
+    public String getApproveComment()
+    {
+        return approveComment;
+    }
 
     @Override
     public String toString() {

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

@@ -217,6 +217,22 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-form-item label="董事长批准意见" prop="dszComment">
+              <el-input type="textarea" v-model="form.dszComment" placeholder="请输入董事长批准意见" :disabled="taskName != '董事长批准'"
+                :autosize="{ minRows: 4 }" />
+            </el-form-item>
+            <el-row>
+              <el-col :span="6" :xs="24" :offset="12">
+                <el-form-item label="签名：" label-width="120px" v-if="showFormItem('董事长批准')">
+                  <span class="auditor"> {{ form.dszUser ? form.dszUser.nickName : dszUser }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="日期：" label-width="120px" v-if="showFormItem('董事长批准')">
+                  <span> {{ form.dszTime ? form.dszTime : dszTime }} </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </div>
           <!-- 党工团审核 -->
           <div v-if="form.borrowUsage != 0 && form.borrowUsage != 1">
@@ -338,14 +354,16 @@ export default {
       xmUser: '',
       managerUser: '',
       zjlUser: '',
+      dszUser: '',
       unionUser: '',
       cwUser: '',
-      deptTime: '',
-      xmTime: '',
-      managerTime: '',
-      zjlTime: '',
-      unionTime: '',
-      lendTime: '',
+      deptTime: undefined,
+      xmTime: undefined,
+      managerTime: undefined,
+      zjlTime: undefined,
+      dszTime: undefined,
+      unionTime: undefined,
+      lendTime: undefined,
       // 遮罩层
       loading: true,
       detail: {},
@@ -381,6 +399,7 @@ export default {
       formTotal: 0,
       flowData: {},
       isProject: true,
+      exceed: false,
       deptId: undefined,
       dgtLabel: '工会审核意见',
       totalBudget: 0,
@@ -396,14 +415,18 @@ export default {
       this.managerUser = this.$store.getters.name;
       this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
-    if (this.taskName == '项目部审核') {
-      this.xmUser = this.$store.getters.name;
-      this.xmTime = parseTime(new Date(), '{y}-{m}-{d}')
-    }
+    // if (this.taskName == '项目部审核') {
+    //   this.xmUser = this.$store.getters.name;
+    //   this.xmTime = parseTime(new Date(), '{y}-{m}-{d}')
+    // }
     if (this.taskName == '总经理审核') {
       this.zjlUser = this.$store.getters.name;
       this.zjlTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
+    if (this.taskName == '董事长批准') {
+      this.dszUser = this.$store.getters.name;
+      this.dszTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     if (this.taskName == '党工团审核') {
       this.unionUser = this.$store.getters.name;
       this.unionTime = parseTime(new Date(), '{y}-{m}-{d}')
@@ -444,12 +467,12 @@ export default {
             { required: true, message: '请输入部门负责人意见', trigger: 'blur' },
           ],
         }
-      } else if (this.taskName == '项目部审核') {
-        this.rules = {
-          xmComment: [
-            { required: true, message: '请输入项目部校核意见', trigger: 'blur' }
-          ]
-        }
+        // } else if (this.taskName == '项目部审核') {
+        //   this.rules = {
+        //     xmComment: [
+        //       { required: true, message: '请输入项目部校核意见', trigger: 'blur' }
+        //     ]
+        //   }
       } else if (this.taskName == '分管审核') {
         this.rules = {
           managerComment: [
@@ -462,6 +485,12 @@ export default {
             { required: true, message: '请输入总经理审批意见', trigger: 'blur' }
           ]
         }
+      } else if (this.taskName == '董事长审核') {
+        this.rules = {
+          dszComment: [
+            { required: true, message: '请输入董事长审批意见', trigger: 'blur' }
+          ]
+        }
       } else if (this.taskName == '党工团审核') {
         this.rules = {
           unionComment: [
@@ -590,29 +619,29 @@ export default {
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               if (this.taskName == '部门审核') {
-                if (this.isProject) {
-                  getUsersDeptLeaderByDept({ deptId: 107 }).then(res => {
-                    let userId = res.data.userId;
-                    this.$set(this.taskForm.variables, "approval", userId);
-                    this.$set(this.taskForm.variables, "isProject", this.isProject);
-                    complete(this.taskForm).then(response => {
-                      this.$modal.msgSuccess(response.msg);
-                      this.$emit('goBack')
-                    });
+                // if (this.isProject) {
+                //   getUsersDeptLeaderByDept({ deptId: 107 }).then(res => {
+                //     let userId = res.data.userId;
+                //     this.$set(this.taskForm.variables, "approval", userId);
+                //     this.$set(this.taskForm.variables, "isProject", this.isProject);
+                //     complete(this.taskForm).then(response => {
+                //       this.$modal.msgSuccess(response.msg);
+                //       this.$emit('goBack')
+                //     });
+                //   });
+                // } else {
+                getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
+                  let userId = res.data[0].userId;
+                  this.$set(this.taskForm.variables, "approval", userId);
+                  // this.$set(this.taskForm.variables, "isProject", this.isProject);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
                   });
-                } else {
-                  getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
-                    let userId = res.data[0].userId;
-                    this.$set(this.taskForm.variables, "approval", userId);
-                    this.$set(this.taskForm.variables, "isProject", this.isProject);
-                    complete(this.taskForm).then(response => {
-                      this.$modal.msgSuccess(response.msg);
-                      this.$emit('goBack')
-                    });
-                  })
-                }
-
+                })
               }
+
+              // }
               // else if (this.taskName == '项目部审核') {
               //   getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
               //     let userId = res.data[0].userId;
@@ -633,6 +662,31 @@ export default {
                 })
               }
               else if (this.taskName == '总经理审核') {
+                if (!this.exceed) {
+                  let approvalList = [];
+                  getUsersDeptLeaderByDept({ deptId: 106 }).then(res => {
+                    approvalList.push(res.data.userId);
+                    getUsersViceDeptLeaderByDept({ deptId: 106 }).then(res1 => {
+                      approvalList.push(res1.data.userId);
+                      this.$set(this.taskForm.variables, "approvalList", approvalList);
+                      complete(this.taskForm).then(response => {
+                        this.$modal.msgSuccess(response.msg);
+                        this.$emit('goBack')
+                      })
+                    })
+                  });
+                }
+                else {
+                  getUserByPost({ postName: '董事长' }).then(res => {
+                    this.$set(this.taskForm.variables, "approval", res.data[0].userId);
+                    complete(this.taskForm).then(response => {
+                      this.$modal.msgSuccess(response.msg);
+                      this.$emit('goBack')
+                    });
+                  })
+                }
+              }
+              else if (this.taskName == '董事长批准') {
                 let approvalList = [];
                 getUsersDeptLeaderByDept({ deptId: 106 }).then(res => {
                   approvalList.push(res.data.userId);
@@ -723,12 +777,14 @@ export default {
         isShow = true;
       else if (name == '部门审核')
         isShow = (this.taskName != '借款申请');
-      else if (name == '项目部审核')
-        isShow = (this.taskName != '借款申请' && this.taskName != '部门审核');
+      // else if (name == '项目部审核')
+      //   isShow = (this.taskName != '借款申请' && this.taskName != '部门审核');
       else if (name == '分管审核')
         isShow = (this.taskName != '借款申请' && this.taskName != '部门审核' && this.taskName != '项目部审核');
       else if (name == '总经理审核')
-        isShow = (this.taskName == '总经理审核' || this.taskName == '财务处理' || this.taskName == '');
+        isShow = (this.taskName == '总经理审核' || this.taskName == '董事长批准' || this.taskName == '财务处理' || this.taskName == '');
+      else if (name == '董事长批准')
+        isShow = (this.taskName == '董事长批准' || this.taskName == '财务处理' || this.taskName == '');
       else if (name == '党工团审核')
         isShow = (this.taskName == '党工团审核' || this.taskName == '财务处理' || this.taskName == '');
       else if (name == '财务处理')