借款申请表单

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

@@ -193,14 +193,30 @@ public class CmcProjectController extends BaseController
         cmcProject.setIsFinished("0");
         cmcProject.setRemark(formDataJson.getString("remark"));
         String workList = formDataJson.getString("workList");
-        workList = workList.substring(1, workList.length() - 1);
-        if (workList.split("}").length > 1) {
-            cmcProjectWorkService.deleteCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
-            for (int i = 0; i < workList.split("}").length; i++) {
-                String workArri = workList.split("}")[i] + "}";
-                if (i > 0)
-                    workArri = workArri.substring(1);
-                JSONObject workArrObject = JSONObject.parse(workArri);
+        if (workList != null) {
+            workList = workList.substring(1, workList.length() - 1);
+            if (workList.split("}").length > 1) {
+                cmcProjectWorkService.deleteCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
+                for (int i = 0; i < workList.split("}").length; i++) {
+                    String workArri = workList.split("}")[i] + "}";
+                    if (i > 0)
+                        workArri = workArri.substring(1);
+                    JSONObject workArrObject = JSONObject.parse(workArri);
+                    CmcProjectWork cmcProjectWork = new CmcProjectWork();
+                    cmcProjectWork.setWorkId(new SnowFlake().generateId());
+                    cmcProjectWork.setProjectId(formDataJson.getString("projectId"));
+                    cmcProjectWork.setContent(workArrObject.getString("content"));
+                    cmcProjectWork.setScale(workArrObject.getString("scale"));
+                    cmcProjectWork.setUnit(workArrObject.getString("unit"));
+                    cmcProjectWork.setWorkload(workArrObject.getString("workload"));
+                    cmcProjectWork.setDeadline(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")));
+                    cmcProjectWork.setRemark(workArrObject.getString("remark"));
+                    cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
+                }
+            }
+            else {
+                JSONObject workArrObject = JSONObject.parse(workList);
+                cmcProjectWorkService.deleteCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
                 CmcProjectWork cmcProjectWork = new CmcProjectWork();
                 cmcProjectWork.setWorkId(new SnowFlake().generateId());
                 cmcProjectWork.setProjectId(formDataJson.getString("projectId"));
@@ -213,20 +229,6 @@ public class CmcProjectController extends BaseController
                 cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
             }
         }
-        else {
-            JSONObject workArrObject = JSONObject.parse(workList);
-            cmcProjectWorkService.deleteCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
-            CmcProjectWork cmcProjectWork = new CmcProjectWork();
-            cmcProjectWork.setWorkId(new SnowFlake().generateId());
-            cmcProjectWork.setProjectId(formDataJson.getString("projectId"));
-            cmcProjectWork.setContent(workArrObject.getString("content"));
-            cmcProjectWork.setScale(workArrObject.getString("scale"));
-            cmcProjectWork.setUnit(workArrObject.getString("unit"));
-            cmcProjectWork.setWorkload(workArrObject.getString("workload"));
-            cmcProjectWork.setDeadline(DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")));
-            cmcProjectWork.setRemark(workArrObject.getString("remark"));
-            cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
-        }
         return toAjax(cmcProjectService.updateCmcProject(cmcProject));
     }
 

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

@@ -3,6 +3,7 @@ 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;
 import com.ruoyi.common.annotation.Excel;
@@ -25,6 +26,8 @@ public class CmcBorrow extends BaseEntity
     @Excel(name = "项目id")
     private String projectId;
 
+    private CmcProject project;
+
     /** 借款类型 */
     @Excel(name = "借款类型")
     private String borrowType;
@@ -33,10 +36,16 @@ public class CmcBorrow extends BaseEntity
     @Excel(name = "借款事由")
     private String applyReason;
 
+    /** 借款部门 */
+    @Excel(name = "借款部门")
+    private String applyDept;
+
     /** 借款人 */
     @Excel(name = "借款人")
     private Long applier;
 
+    private SysUser applierUser;
+
     /** 借款日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "借款日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -133,6 +142,15 @@ public class CmcBorrow extends BaseEntity
     {
         return projectId;
     }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
     public void setBorrowType(String borrowType) 
     {
         this.borrowType = borrowType;
@@ -151,6 +169,15 @@ public class CmcBorrow extends BaseEntity
     {
         return applyReason;
     }
+    public void setApplyDept(String applyDept)
+    {
+        this.applyDept = applyDept;
+    }
+
+    public String getApplyDept()
+    {
+        return applyDept;
+    }
     public void setApplier(Long applier) 
     {
         this.applier = applier;
@@ -160,6 +187,15 @@ public class CmcBorrow extends BaseEntity
     {
         return applier;
     }
+    public void setApplierUser(SysUser applierUser)
+    {
+        this.applierUser = applierUser;
+    }
+
+    public SysUser getApplierUser()
+    {
+        return applierUser;
+    }
     public void setApplyDate(Date applyDate) 
     {
         this.applyDate = applyDate;
@@ -331,6 +367,7 @@ public class CmcBorrow extends BaseEntity
             .append("borrowType", getBorrowType())
             .append("applyReason", getApplyReason())
             .append("applier", getApplier())
+            .append("applyDept", getApplyDept())
             .append("applyDate", getApplyDate())
             .append("applyAmount", getApplyAmount())
             .append("managerAmount", getManagerAmount())

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBorrowMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="borrowType"    column="borrow_type"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="applier"    column="applier"    />
+        <result property="applyDept"    column="apply_dept"    />
         <result property="applyDate"    column="apply_date"    />
         <result property="applyAmount"    column="apply_amount"    />
         <result property="managerAmount"    column="manager_amount"    />
@@ -28,43 +29,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="managerTime"    column="manager_time"    />
         <result property="zjlTime"    column="zjl_time"    />
         <result property="lendTime"    column="lend_time"    />
+        <association property="applierUser"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
     </resultMap>
 
     <sql id="selectCmcBorrowVo">
-        select borrow_jd, project_id, borrow_type, apply_reason, applier, apply_date, apply_amount, manager_amount, dept_comment, dept_user_id, xm_user_id, xm_comment, manager_comment, manager_user_id, zjl_user_id, zjl_comment, cw_user_id, cw_comment, dept_time, xm_time, manager_time, zjl_time, lend_time from cmc_borrow
+        select b.borrow_jd, b.project_id, p.project_number, p.project_name, b.borrow_type, b.apply_reason, b.applier, u.nick_name, d.dept_name, b.apply_date, b.apply_amount, b.manager_amount, b.dept_comment, b.dept_user_id, b.xm_user_id, b.xm_comment, b.manager_comment, b.manager_user_id, b.zjl_user_id, b.zjl_comment, b.cw_user_id, b.cw_comment, b.dept_time, b.xm_time, b.manager_time, b.zjl_time, b.lend_time from cmc_borrow as b
+        left join sys_user as u on u.user_id = b.applier
+        left join sys_dept as d on d.dept_id = b.apply_dept
+        left join cmc_project as p on b.project_id = p.project_id
     </sql>
 
     <select id="selectCmcBorrowList" parameterType="CmcBorrow" resultMap="CmcBorrowResult">
         <include refid="selectCmcBorrowVo"/>
         <where>  
-            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
-            <if test="borrowType != null  and borrowType != ''"> and borrow_type = #{borrowType}</if>
-            <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
-            <if test="applier != null "> and applier = #{applier}</if>
-            <if test="applyDate != null "> and apply_date = #{applyDate}</if>
-            <if test="applyAmount != null "> and apply_amount = #{applyAmount}</if>
-            <if test="managerAmount != null "> and manager_amount = #{managerAmount}</if>
-            <if test="deptComment != null  and deptComment != ''"> and dept_comment = #{deptComment}</if>
-            <if test="deptUserId != null "> and dept_user_id = #{deptUserId}</if>
-            <if test="xmUserId != null "> and xm_user_id = #{xmUserId}</if>
-            <if test="xmComment != null  and xmComment != ''"> and xm_comment = #{xmComment}</if>
-            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
-            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
-            <if test="zjlUserId != null "> and zjl_user_id = #{zjlUserId}</if>
-            <if test="zjlComment != null  and zjlComment != ''"> and zjl_comment = #{zjlComment}</if>
-            <if test="cwUserId != null "> and cw_user_id = #{cwUserId}</if>
-            <if test="cwComment != null  and cwComment != ''"> and cw_comment = #{cwComment}</if>
-            <if test="deptTime != null "> and dept_time = #{deptTime}</if>
-            <if test="xmTime != null "> and xm_time = #{xmTime}</if>
-            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
-            <if test="zjlTime != null "> and zjl_time = #{zjlTime}</if>
-            <if test="lendTime != null "> and lend_time = #{lendTime}</if>
+            <if test="projectId != null  and projectId != ''"> and b.project_id = #{projectId}</if>
+            <if test="borrowType != null  and borrowType != ''"> and b.borrow_type = #{borrowType}</if>
+            <if test="applyReason != null  and applyReason != ''"> and b.apply_reason = #{applyReason}</if>
+            <if test="applyDept != null  and applyDept != ''"> and b.apply_dept = #{applyDept}</if>
+            <if test="applier != null "> and b.applier = #{applier}</if>
+            <if test="applyDate != null "> and b.apply_date = #{applyDate}</if>
+            <if test="applyAmount != null "> and b.apply_amount = #{applyAmount}</if>
+            <if test="managerAmount != null "> and b.manager_amount = #{managerAmount}</if>
+            <if test="deptComment != null  and deptComment != ''"> and b.dept_comment = #{deptComment}</if>
+            <if test="deptUserId != null "> and b.dept_user_id = #{deptUserId}</if>
+            <if test="xmUserId != null "> and b.xm_user_id = #{xmUserId}</if>
+            <if test="xmComment != null  and xmComment != ''"> and b.xm_comment = #{xmComment}</if>
+            <if test="managerComment != null  and managerComment != ''"> and b.manager_comment = #{managerComment}</if>
+            <if test="managerUserId != null "> and b.manager_user_id = #{managerUserId}</if>
+            <if test="zjlUserId != null "> and b.zjl_user_id = #{zjlUserId}</if>
+            <if test="zjlComment != null  and zjlComment != ''"> and b.zjl_comment = #{zjlComment}</if>
+            <if test="cwUserId != null "> and b.cw_user_id = #{cwUserId}</if>
+            <if test="cwComment != null  and cwComment != ''"> and b.cw_comment = #{cwComment}</if>
+            <if test="deptTime != null "> and b.dept_time = #{deptTime}</if>
+            <if test="xmTime != null "> and b.xm_time = #{xmTime}</if>
+            <if test="managerTime != null "> and b.manager_time = #{managerTime}</if>
+            <if test="zjlTime != null "> and b.zjl_time = #{zjlTime}</if>
+            <if test="lendTime != null "> and b.lend_time = #{lendTime}</if>
         </where>
     </select>
     
     <select id="selectCmcBorrowByBorrowJd" parameterType="String" resultMap="CmcBorrowResult">
         <include refid="selectCmcBorrowVo"/>
-        where borrow_jd = #{borrowJd}
+        where b.borrow_jd = #{borrowJd}
     </select>
         
     <insert id="insertCmcBorrow" parameterType="CmcBorrow">
@@ -75,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="borrowType != null">borrow_type,</if>
             <if test="applyReason != null">apply_reason,</if>
             <if test="applier != null">applier,</if>
+            <if test="applyDept != null">apply_dept,</if>
             <if test="applyDate != null">apply_date,</if>
             <if test="applyAmount != null">apply_amount,</if>
             <if test="managerAmount != null">manager_amount,</if>
@@ -100,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="borrowType != null">#{borrowType},</if>
             <if test="applyReason != null">#{applyReason},</if>
             <if test="applier != null">#{applier},</if>
+            <if test="applyDept != null">#{applyDept},</if>
             <if test="applyDate != null">#{applyDate},</if>
             <if test="applyAmount != null">#{applyAmount},</if>
             <if test="managerAmount != null">#{managerAmount},</if>
@@ -128,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="borrowType != null">borrow_type = #{borrowType},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
             <if test="applier != null">applier = #{applier},</if>
+            <if test="applyDept != null">apply_dept = #{applyDept},</if>
             <if test="applyDate != null">apply_date = #{applyDate},</if>
             <if test="applyAmount != null">apply_amount = #{applyAmount},</if>
             <if test="managerAmount != null">manager_amount = #{managerAmount},</if>

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

@@ -0,0 +1,327 @@
+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '借款审批'">
+                <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
+                  :disabled="taskName != '借款申请'" clearable>
+                  <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
+                    :value="item.projectId">
+                  </el-option>
+                </el-select>
+                <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
+                  <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
+                  }}</el-descriptions-item>
+                  <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+                  }}</el-descriptions-item>
+                  <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : ''
+                  }}</el-descriptions-item>
+                  <el-descriptions-item label="承担部门" label-class-name="my-label">
+                    <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>
+                  </el-descriptions-item>
+                  <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
+                  }}</el-descriptions-item>
+                </el-descriptions>
+              </el-form-item>
+      <el-form-item label="借款事由" prop="applyReason">
+        <el-input v-model="form.applyReason" placeholder="请输入借款事由" />
+      </el-form-item>
+      <el-form-item label="申请人" prop="user.nickName">
+        {{ form.applierUser ? form.applierUser.nickName : form.user.nickName }}
+      </el-form-item>
+      <el-form-item label="申请部门" prop="dept.deptName">
+        {{ form.dept.deptName }}
+      </el-form-item>
+      <el-form-item label="申请时间：" prop="date">
+                    <el-date-picker style="width:140px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
+                      placeholder="选择日期" :disabled="taskName != '借款申请'">
+                    </el-date-picker>
+                  </el-form-item>
+      <el-form-item label="申请金额" prop="applyAmount">
+        <el-input v-model="form.applyAmount" placeholder="请输入申请金额" />
+      </el-form-item>
+      <el-form-item label="核准金额" prop="managerAmount">
+        <el-input v-model="form.managerAmount" placeholder="请输入核准金额" />
+      </el-form-item>
+      <el-form-item label="部门意见" prop="deptComment">
+        <el-input v-model="form.deptComment" placeholder="请输入部门意见" />
+      </el-form-item>
+      <el-form-item label="部门审批人" prop="deptUserId">
+        <el-input v-model="form.deptUserId" placeholder="请输入部门审批人" />
+      </el-form-item>
+      <el-form-item label="项目部审批人" prop="xmUserId">
+        <el-input v-model="form.xmUserId" placeholder="请输入项目部审批人" />
+      </el-form-item>
+      <el-form-item label="项目部审批意见" prop="xmComment">
+        <el-input v-model="form.xmComment" placeholder="请输入项目部审批意见" />
+      </el-form-item>
+      <el-form-item label="分管审批意见" prop="managerComment">
+        <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" />
+      </el-form-item>
+      <el-form-item label="分管审批人" prop="managerUserId">
+        <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
+      </el-form-item>
+      <el-form-item label="总经理审批人" prop="zjlUserId">
+        <el-input v-model="form.zjlUserId" placeholder="请输入总经理审批人" />
+      </el-form-item>
+      <el-form-item label="总经理审批意见" prop="zjlComment">
+        <el-input v-model="form.zjlComment" placeholder="请输入总经理审批意见" />
+      </el-form-item>
+      <el-form-item label="财务部经办人" prop="cwUserId">
+        <el-input v-model="form.cwUserId" placeholder="请输入财务部经办人" />
+      </el-form-item>
+      <el-form-item label="财务部支付备注" prop="cwComment">
+        <el-input v-model="form.cwComment" placeholder="请输入财务部支付备注" />
+      </el-form-item>
+      <el-form-item label="部门审批时间" prop="deptTime">
+        <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择部门审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="项目部审批时间" prop="xmTime">
+        <el-date-picker clearable v-model="form.xmTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择项目部审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="分管审批时间" prop="managerTime">
+        <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择分管审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="总经理审批时间" prop="zjlTime">
+        <el-date-picker clearable v-model="form.zjlTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择总经理审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="借款支付时间" prop="lendTime">
+        <el-date-picker clearable v-model="form.lendTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择借款支付时间">
+        </el-date-picker>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
+import { listProject, getProject } from "@/api/oa/project/project";
+
+export default {
+  name: "Borrow",
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc借款申请表格数据
+      borrowList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        borrowType: null,
+        applyReason: null,
+        applier: null,
+        applyDate: null,
+        applyAmount: null,
+        managerAmount: null,
+        deptComment: null,
+        deptUserId: null,
+        xmUserId: null,
+        xmComment: null,
+        managerComment: null,
+        managerUserId: null,
+        zjlUserId: null,
+        zjlComment: null,
+        cwUserId: null,
+        cwComment: null,
+        deptTime: null,
+        xmTime: null,
+        managerTime: null,
+        zjlTime: null,
+        lendTime: null
+      },
+      projectList: [],
+      chooseProject: {},
+      isSelect: false,
+      // 表单参数
+      form: {
+        user: {
+          nickName: '',
+        },
+        dept: {
+          deptName: '',
+        },
+        applyDate: undefined,
+      },
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.form.applyDate = new Date();
+    this.form.user.nickName = this.$store.getters.name;
+    this.form.dept.deptName = this.$store.getters.deptName;
+    this.getProjectList();
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc借款申请列表 */
+    getList() {
+      this.loading = true;
+      listBorrow(this.queryParams).then(response => {
+        this.borrowList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 查询项目列表
+    getProjectList() {
+      this.loading = true
+      listProject({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.projectList = response.rows;
+      })
+    },
+    // 选择项目
+    handleSelectProject(val) {
+      if (val != "" && val != undefined && val != null) {
+        getProject(val).then(res => {
+          this.chooseProject = res.data;
+          this.isSelect = true
+        })
+      } else {
+        this.isSelect = false
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        borrowJd: null,
+        projectId: null,
+        borrowType: null,
+        applyReason: null,
+        applier: null,
+        applyDate: null,
+        applyAmount: null,
+        managerAmount: null,
+        deptComment: null,
+        deptUserId: null,
+        xmUserId: null,
+        xmComment: null,
+        managerComment: null,
+        managerUserId: null,
+        zjlUserId: null,
+        zjlComment: null,
+        cwUserId: null,
+        cwComment: null,
+        deptTime: null,
+        xmTime: null,
+        managerTime: null,
+        zjlTime: null,
+        lendTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.borrowJd)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc借款申请";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const borrowJd = row.borrowJd || this.ids
+      getBorrow(borrowJd).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc借款申请";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.borrowJd != null) {
+            updateBorrow(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBorrow(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const borrowJds = row.borrowJd || this.ids;
+      this.$modal.confirm('是否确认删除cmc借款申请编号为"' + borrowJds + '"的数据项？').then(function () {
+        return delBorrow(borrowJds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/borrow/export', {
+        ...this.queryParams
+      }, `borrow_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -31,6 +31,7 @@
           <project-process :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目流转'"
             @goBack="goBack"></project-process>
           <add-budget :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'" @goBack="goBack"></add-budget>
+          <borrow-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '借款审批'" @goBack="goBack"></borrow-form>          
           <el-row type="flex" justify="center" v-show="isShowApprove()">
             <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
               @click="handleComplete">审核通过
@@ -179,6 +180,7 @@ import carForm from "@/views/flowable/form/carForm.vue";
 import deviceForm from "@/views/flowable/form/deviceForm";
 import projectProcess from "@/views/flowable/form/projectProcess/index.vue"
 import AddBudget from '@/views/oa/budget/addBudget.vue';
+import borrowForm from '@/views/flowable/form/borrowForm.vue';
 
 export default {
   name: "Record",
@@ -196,7 +198,8 @@ export default {
     carForm,
     deviceForm,
     projectProcess,
-    AddBudget
+    AddBudget,
+    borrowForm
   },
   props: {},
   data() {