保证金管理

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

@@ -75,6 +75,12 @@ public class CmcDepositController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcDeposit cmcDeposit)
     {
+        if (cmcDeposit.getContractId() != null && cmcDeposit.getTenderId() == null) {
+            cmcDeposit.setTenderId("0");
+        }
+        if (cmcDeposit.getTenderId() != null && cmcDeposit.getContractId() == null) {
+            cmcDeposit.setContractId("0");
+        }
         return toAjax(cmcDepositService.insertCmcDeposit(cmcDeposit));
     }
 

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

@@ -24,9 +24,11 @@ public class CmcBorrow extends BaseEntity
     private String borrowId;
 
     /** 项目id */
-    @Excel(name = "项目id")
     private String projectId;
-
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
     private CmcProject project;
 
     /** 借款事由 */
@@ -44,21 +46,34 @@ public class CmcBorrow extends BaseEntity
     private SysDept dept;
 
     /** 借款人 */
-    @Excel(name = "借款人")
     private Long applier;
 
+    @Excel(name = "借款人")
+    private String applierUserName;
     private SysUser applierUser;
 
+    @Excel(name = "部门审批人")
+    private String deptUserName;
     private SysUser deptUser;
 
+    @Excel(name = "项目部审批人")
+    private String xmUserName;
     private SysUser xmUser;
 
+    @Excel(name = "分管审批人")
+    private String managerUserName;
     private SysUser managerUser;
 
+    @Excel(name = "总经理")
+    private String zjlUserName;
     private SysUser zjlUser;
 
+    @Excel(name = "党工团审批人")
+    private String unionUserName;
     private SysUser unionUser;
 
+    @Excel(name = "财务部经办人")
+    private String cwUserName;
     private SysUser cwUser;
 
     /** 借款日期 */
@@ -79,11 +94,9 @@ public class CmcBorrow extends BaseEntity
     private String deptComment;
 
     /** 部门审批人 */
-    @Excel(name = "部门审批人")
     private Long deptUserId;
 
     /** 项目部审批人 */
-    @Excel(name = "项目部审批人")
     private Long xmUserId;
 
     /** 项目部审批意见 */
@@ -95,11 +108,9 @@ public class CmcBorrow extends BaseEntity
     private String managerComment;
 
     /** 分管审批人 */
-    @Excel(name = "分管审批人")
     private Long managerUserId;
 
     /** 总经理审批人 */
-    @Excel(name = "总经理审批人")
     private Long zjlUserId;
 
     /** 总经理审批意见 */
@@ -107,7 +118,6 @@ public class CmcBorrow extends BaseEntity
     private String zjlComment;
 
     /** 工会审批人 */
-    @Excel(name = "工会审批人")
     private Long unionUserId;
 
     /** 工会审批意见 */
@@ -115,7 +125,6 @@ public class CmcBorrow extends BaseEntity
     private String unionComment;
 
     /** 财务部经办人 */
-    @Excel(name = "财务部经办人")
     private Long cwUserId;
 
     /** 财务部支付备注 */
@@ -181,6 +190,8 @@ public class CmcBorrow extends BaseEntity
     public void setProject(CmcProject project)
     {
         this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
     }
 
     public CmcProject getProject()
@@ -235,6 +246,7 @@ public class CmcBorrow extends BaseEntity
     public void setApplierUser(SysUser applierUser)
     {
         this.applierUser = applierUser;
+        this.applierUserName = applierUser == null ? "" : applierUser.getNickName();
     }
 
     public SysUser getApplierUser()
@@ -244,6 +256,7 @@ public class CmcBorrow extends BaseEntity
     public void setDeptUser(SysUser deptUser)
     {
         this.deptUser = deptUser;
+        this.deptUserName = deptUser == null ? "" : deptUser.getNickName();
     }
 
     public SysUser getDeptUser()
@@ -253,6 +266,7 @@ public class CmcBorrow extends BaseEntity
     public void setXmUser(SysUser xmUser)
     {
         this.xmUser = xmUser;
+        this.xmUserName = xmUser == null ? "" : xmUser.getNickName();
     }
 
     public SysUser getXmUser()
@@ -262,6 +276,7 @@ public class CmcBorrow extends BaseEntity
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
     }
 
     public SysUser getManagerUser()
@@ -271,6 +286,7 @@ public class CmcBorrow extends BaseEntity
     public void setZjlUser(SysUser zjlUser)
     {
         this.zjlUser = zjlUser;
+        this.zjlUserName = zjlUser == null ? "" : zjlUser.getNickName();
     }
 
     public SysUser getZjlUser()
@@ -280,6 +296,7 @@ public class CmcBorrow extends BaseEntity
     public void setUnionUser(SysUser unionUser)
     {
         this.unionUser = unionUser;
+        this.unionUserName = unionUser == null ? "" : unionUser.getNickName();
     }
 
     public SysUser getUnionUser()
@@ -289,6 +306,7 @@ public class CmcBorrow extends BaseEntity
     public void setCwUser(SysUser cwUser)
     {
         this.cwUser = cwUser;
+        this.cwUserName = cwUser == null ? "" : cwUser.getNickName();
     }
 
     public SysUser getCwUser()

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

@@ -99,15 +99,17 @@ public class CmcBudget extends BaseEntity
     private BigDecimal totalBudget;
 
     /** 编制人 */
-    @Excel(name = "编制人")
     private Long compiler;
 
+    @Excel(name = "编制人")
+    private String compilerUserName;
     private SysUser compilerUser;
 
+    @Excel(name = "审核人")
+    private String auditorUserName;
     private SysUser auditorUser;
 
     /** 审核人 */
-    @Excel(name = "审核人")
     private Long auditor;
 
     public void setBudgetId(String budgetId)
@@ -304,6 +306,7 @@ public class CmcBudget extends BaseEntity
     public void setCompilerUser(SysUser compilerUser)
     {
         this.compilerUser = compilerUser;
+        this.compilerUserName = compilerUser == null ? "" : compilerUser.getNickName();
     }
 
     public SysUser getCompilerUser()
@@ -313,6 +316,7 @@ public class CmcBudget extends BaseEntity
     public void setAuditorUser(SysUser auditorUser)
     {
         this.auditorUser = auditorUser;
+        this.auditorUserName = auditorUser == null ? "" : auditorUser.getNickName();
     }
 
     public SysUser getAuditorUser()

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

@@ -26,12 +26,16 @@ public class CmcDeposit extends BaseEntity
     private String depositType;
 
     /** 投标项目id */
-    @Excel(name = "投标项目id")
     private String tenderId;
+    @Excel(name = "投标项目名称")
+    private String projectName;
+    private CmcTender tender;
 
     /** 合同id */
-    @Excel(name = "合同id")
     private String contractId;
+    @Excel(name = "合同名称")
+    private String contractName;
+    private CmcContract contract;
 
     /** 预计退还日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -55,14 +59,18 @@ public class CmcDeposit extends BaseEntity
     private String depositWay;
 
     /** 申请人 */
-    @Excel(name = "申请人")
     private Long applier;
 
-
+    @Excel(name = "申请人")
+    private String applierUserName;
     private SysUser applierUser;
 
+    @Excel(name = "分管审批人")
+    private String managerUserName;
     private SysUser managerUser;
 
+    @Excel(name = "财务部经办人")
+    private String cwUserName;
     private SysUser cwUser;
 
     /** 申请日期 */
@@ -88,7 +96,6 @@ public class CmcDeposit extends BaseEntity
     private Date managerTime;
 
     /** 分管审批人 */
-    @Excel(name = "分管审批人")
     private Long managerUserId;
 
     /** 汇款日期 */
@@ -111,7 +118,6 @@ public class CmcDeposit extends BaseEntity
     private String cwComment;
 
     /** 财务处理人 */
-    @Excel(name = "财务处理人")
     private Long cwUserId;
 
     /** 汇款凭证 */
@@ -145,6 +151,16 @@ public class CmcDeposit extends BaseEntity
     {
         return tenderId;
     }
+    public void setTender(CmcTender tender)
+    {
+        this.tender = tender;
+        this.projectName = tender == null ? "" : tender.getProjectName();
+    }
+
+    public CmcTender getTender()
+    {
+        return tender;
+    }
     public void setContractId(String contractId) 
     {
         this.contractId = contractId;
@@ -154,6 +170,16 @@ public class CmcDeposit extends BaseEntity
     {
         return contractId;
     }
+    public void setContract(CmcContract contract)
+    {
+        this.contract = contract;
+        this.contractName = contract == null ? "" : contract.getContractName();
+    }
+
+    public CmcContract getContract()
+    {
+        return contract;
+    }
     public void setReturnTime(Date returnTime) 
     {
         this.returnTime = returnTime;
@@ -211,6 +237,7 @@ public class CmcDeposit extends BaseEntity
     public void setApplierUser(SysUser applierUser)
     {
         this.applierUser = applierUser;
+        this.applierUserName = applierUser == null ? "" : applierUser.getNickName();
     }
 
     public SysUser getApplierUser()
@@ -274,6 +301,7 @@ public class CmcDeposit extends BaseEntity
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
     }
 
     public SysUser getManagerUser()
@@ -328,6 +356,7 @@ public class CmcDeposit extends BaseEntity
     public void setCwUser(SysUser cwUser)
     {
         this.cwUser = cwUser;
+        this.cwUserName = cwUser == null ? "" : cwUser.getNickName();
     }
 
     public SysUser getCwUser()

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

@@ -170,7 +170,7 @@ public class CmcTechnical extends BaseEntity
     public void setDirectUser(SysUser directUser)
     {
         this.directUser = directUser;
-        this.designUserName = directUser == null ? "" : directUser.getNickName();
+        this.directUserName = directUser == null ? "" : directUser.getNickName();
 
     }
 

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

@@ -30,6 +30,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="cwUser"    javaType="SysUser"         resultMap="CwUserResult" />
+        <association property="tender"    javaType="CmcTender"         resultMap="CmcTenderResult" />
+        <association property="contract"    javaType="CmcContract"         resultMap="CmcContractResult" />
+    </resultMap>
+
+    <resultMap type="CmcContract" id="CmcContractResult">
+        <result property="contractId"    column="contract_id"    />
+        <result property="contractName"    column="contract_name"    />
+    </resultMap>
+
+    <resultMap type="CmcTender" id="CmcTenderResult">
+        <result property="tenderId"    column="tender_id"    />
+        <result property="projectName"    column="project_name"    />
     </resultMap>
 
     <resultMap type="SysUser" id="ApplierUserResult">
@@ -48,12 +60,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcDepositVo">
-        select d.deposit_id, d.deposit_type, d.tender_id, d.contract_id, d.return_time, d.account_name, d.account_bank, d.card_number, d.deposit_way, d.applier, u.nick_name as applier_nick_name,
+        select d.deposit_id, d.deposit_type, d.tender_id, t.project_name, d.contract_id, c.contract_name, d.return_time, d.account_name, d.account_bank, d.card_number, d.deposit_way, d.applier, u.nick_name as applier_nick_name,
                d.apply_time, d.apply_reason, d.apply_document, d.manager_time, d.manager_comment, d.manager_user_id, u1.nick_name as manager_nick_name, d.remit_time, d.cw_time, d.back_time, d.cw_comment,
                d.cw_user_id, u2.nick_name as cw_nick_name, d.remit_document from cmc_deposit as d
          left join sys_user as u on u.user_id = d.applier
          left join sys_user as u1 on u1.user_id = d.manager_user_id
          left join sys_user as u2 on u2.user_id = d.cw_user_id
+         left join cmc_tender as t on t.tender_id = d.tender_id
+         left join cmc_contract as c on c.contract_id = d.contract_id
     </sql>
 
     <select id="selectCmcDepositList" parameterType="CmcDeposit" resultMap="CmcDepositResult">

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-18 15:19:08
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-20 18:31:18
 -->
 <template>
   <div class="main">
@@ -58,7 +58,8 @@
       </el-descriptions>
     </div>
     <h2 style="text-align: center">项目直接生产成本预算表</h2>
-    <p style="text-align: center;">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
+    <p style="text-align: center;">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }} | 审核人：{{
+      budgetForm.auditorUser ? budgetForm.auditorUser.nickName : '' }}</p>
     <table border="1" class="table" v-if="taskName == '预算审核'">
       <tr>
         <td style="width: 100px;">项目名称</td>
@@ -129,7 +130,7 @@
         <td>车牌号</td>
         <td>油耗</td>
         <td>总里程</td>
-        <td>折旧成天（天）</td>
+        <td>折旧成本（天）</td>
         <td>预算天数</td>
         <td>金额</td>
       </tr>
@@ -295,7 +296,7 @@
         <td>车牌号</td>
         <td>油耗</td>
         <td>总里程</td>
-        <td>折旧成天（天）</td>
+        <td>折旧成本（天）</td>
         <td>预算天数</td>
         <td>金额</td>
       </tr>
@@ -386,7 +387,7 @@ import { listProjectContract, addProjectContract } from "@/api/oa/contract/proje
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
 import { getUser } from '@/api/system/user'
-import { getUsersManageLeader } from "@/api/system/post";
+import { getUsersManageLeaderByDept } from '@/api/system/post'
 import { getPriceRemarkByWorkType } from '@/api/oa/price/price'
 export default {
   computed: {
@@ -404,6 +405,7 @@ export default {
   data() {
     return {
       projectId: '',
+      managerList: [],
       budgetForm: {
       },
       projectForm: {
@@ -482,6 +484,14 @@ export default {
     getProjectList() {
       getProject(this.taskForm.formId).then(response => {
         this.projectForm = response.data;
+        let deptId = response.data.undertakingDept.split(',');
+        for (let d of deptId) {
+          getUsersManageLeaderByDept({ deptId: Number(d) }).then(res => {
+            if (res.data) {
+              this.managerList.push(res.data.userId)
+            }
+          })
+        }
       });
     },
     getProjectWorkList() {
@@ -489,20 +499,17 @@ export default {
         this.workContentList = res.rows;
       })
     },
-   confirmSucess(taskName) {
+    confirmSucess(taskName) {
       const params = { taskId: this.taskForm.taskId };
       if (taskName == '预算审核') {
         this.updateBudgetForm();
         getNextFlowNode(params).then(res => {
-          getUsersManageLeader({ userId: this.budgetForm.compiler }).then(res => {
-            let userId = res.data.userId;
-            this.$set(this.taskForm.variables, "approval", userId);
-            complete(this.taskForm).then(response => {
-              this.$modal.msgSuccess(response.msg);
-              this.$emit("goBack");
-            });
+          this.$set(this.taskForm.variables, "approvalList", this.managerList);
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit("goBack");
           });
-        });
+        })
       } else if (taskName == '预算批准') {
         getNextFlowNode(params).then(res => {
           complete(this.taskForm).then(response => {

oa-ui/src/views/flowable/form/budget/components/budgetForm.vue

@@ -36,7 +36,7 @@
         <td class="head">车牌号</td>
         <td class="head">油耗</td>
         <td class="head">总里程</td>
-        <td class="head">折旧成天（天）</td>
+        <td class="head">折旧成本（天）</td>
         <td class="head">预算天数</td>
         <td class="head">金额</td>
       </tr>

oa-ui/src/views/flowable/form/budget/components/budgetTable.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:50:41
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-22 19:07:27
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-20 14:54:00
 -->
 <template>
   <div>
@@ -69,7 +69,7 @@
         <td>车牌号</td>
         <td>油耗</td>
         <td>总里程</td>
-        <td>折旧成天（天）</td>
+        <td>折旧成本（天）</td>
         <td>预算天数</td>
         <td>金额</td>
         <!-- <td></td> -->

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

@@ -255,8 +255,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="支付日期：" style="margin-left:20px" prop="lendTime" v-if="showFormItem('财务处理')">
-                <el-date-picker style="width:160px;" v-model="form.lendTime" value-format="yyyy-MM-dd" type="date"
+              <el-form-item label="支付日期：" prop="lendTime" v-if="showFormItem('财务处理')">
+                <el-date-picker style="width:140px;" v-model="form.lendTime" value-format="yyyy-MM-dd" type="date"
                   placeholder="选择日期" :disabled="taskName != '财务处理'">
                 </el-date-picker>
               </el-form-item>
@@ -677,11 +677,11 @@ export default {
       else if (name == '分管审核')
         isShow = (this.taskName != '借款申请' && this.taskName != '部门审核' && this.taskName != '项目部审核');
       else if (name == '总经理审核')
-        isShow = (this.taskName == '总经理审核' || this.taskName == '财务处理');
+        isShow = (this.taskName == '总经理审核' || this.taskName == '财务处理' || this.taskName == '');
       else if (name == '党工团审核')
-        isShow = (this.taskName == '党工团审核' || this.taskName == '财务处理');
+        isShow = (this.taskName == '党工团审核' || this.taskName == '财务处理' || this.taskName == '');
       else if (name == '财务处理')
-        isShow = (this.taskName == '财务处理');
+        isShow = (this.taskName == '财务处理' || this.taskName == '');
       return isShow;
     },
     confirmProject(val) {

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="18" :xs="24">
+      <el-col :span="flowDisabled ? 18 : 24" :xs="24">
         <h2 class="text-center">保证金审批表</h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -177,12 +177,12 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="6" :offset="12" :xs="24">
-              <el-form-item label="处理人" label-width="120px" v-if="taskName == '财务处理'">
+              <el-form-item label="处理人" label-width="120px" v-if="taskName == '财务处理' || taskName == ''">
                 <span class="auditor"> {{ form.cwUser ? form.cwUser.nickName : cwUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6" :xs="24">
-              <el-form-item label="处理日期" label-width="120px" v-if="taskName == '财务处理'">
+              <el-form-item label="处理日期" label-width="120px" v-if="taskName == '财务处理' || taskName == ''">
                 <span> {{ form.cwTime ? form.cwTime : cwTime }} </span>
               </el-form-item>
             </el-col>
@@ -193,7 +193,7 @@
           <el-button @click="submitForm" type="danger" v-if="taskName == '财务处理'">结束</el-button>
         </div>
       </el-col>
-      <el-col :span="6" :xs="24">
+      <el-col :span="6" :xs="24" v-if="flowDisabled">
         <el-card>
           <h2 style="text-align: center;">流程进度</h2>
           <div>
@@ -239,6 +239,10 @@ export default {
     taskForm: {
       type: Object,
       required: true
+    },    
+    flowDisabled: {
+      type: Boolean,
+      default: true
     }
   },
   name: "Deposit",
@@ -334,9 +338,10 @@ export default {
     this.getTenderList();
     this.getContractList();
     this.getList();
-    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
-      this.flowData = res.data;
-    })
+    if (this.flowDisabled)
+      flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+        this.flowData = res.data;
+      })
   },
   methods: {
     initRules() {

oa-ui/src/views/flowable/form/inProgress/achiData.vue

@@ -11,7 +11,7 @@
 
     <el-table :data="achiList" style="width: 100%" class="custom-table">
       <el-table-column type="index" label="序号" width="50" />
-      <el-table-column label="成果汇交时间" prop="submitTime" width="100" />
+      <el-table-column label="成果提交时间" prop="submitTime" width="100" />
       <el-table-column label="生产部门检查员" prop="produceInspector" width="120">
         <template slot-scope="scope">
           {{ findUserName(scope.row.produceInspector) }}

oa-ui/src/views/flowable/form/inProgress/borrowData.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 14:45:08
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-03 11:46:33
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-20 14:36:57
 -->
 <template>
   <div class="mt20">
@@ -51,7 +51,7 @@
           {{ scope.row.zjlComment == null ? '待审' : scope.row.zjlComment }}
         </template>
       </el-table-column>
-      <el-table-column prop="CwUserId" label="财务经办人" show-overflow-tooltip width="100">
+      <el-table-column prop="cwUser.nickName" label="财务经办人" show-overflow-tooltip width="100">
       </el-table-column>
       <el-table-column prop="lendTime" label="支付时间">
       </el-table-column>

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

@@ -50,16 +50,16 @@
               placeholder="选择日期" :disabled="taskName != '安全交底'">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="接受交底意见" prop="disclosureComment" v-if="taskName == '接受交底'">
+          <el-form-item label="接受交底意见" prop="disclosureComment" v-if="taskName == '接受交底' || taskName == ''">
             <el-input :disabled="true" placeholder="按要求进行作业" />
           </el-form-item>
-          <el-form-item label="接受交底时间" prop="acceptTime" v-if="taskName == '接受交底'">
+          <el-form-item label="接受交底时间" prop="acceptTime" v-if="taskName == '接受交底' || taskName == ''">
             <el-date-picker clearable v-model="form.acceptTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
               :disabled="taskName != '接受交底'">
             </el-date-picker>
           </el-form-item>
         </el-form>
-        <div style="text-align: center;">
+        <div style="text-align: center;" v-if="taskName">
           <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>

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

@@ -490,7 +490,7 @@ export default {
       else if (name == '技术审核')
         isShow = (this.taskName != '技术安排' && this.taskName != '方案上传');
       else if (name == '总工审核')
-        isShow = (this.taskName == '总工审核');
+        isShow = (this.taskName == '总工审核' || this.taskName == '');
       return isShow;
     },
   }

oa-ui/src/views/oa/deposit/contract.vue

@@ -0,0 +1,364 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
+      <el-form-item label="合同id" prop="contractId">
+        <el-input v-model="queryParams.contractId" placeholder="请输入合同id" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="预计退还日期" prop="returnTime">
+        <el-date-picker clearable v-model="queryParams.returnTime" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择预计退还日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="申请人" prop="applier">
+        <el-select v-model="queryParams.applier" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:deposit:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="depositList" @selection-change="handleSelectionChange">
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column label="保证金类型" align="center" prop="depositType" >
+        <template slot-scope="scope">
+          <span>{{ scope.row.depositType == '0' ? '投标保证金' : '合同保证金' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="合同名称" align="center" prop="contract.contractName" />
+      <!-- <el-table-column label="开户名称" align="center" prop="accountName" />
+      <el-table-column label="开户银行" align="center" prop="accountBank" />
+      <el-table-column label="银行卡号" align="center" prop="cardNumber" /> -->
+      <el-table-column label="保证金形式" align="center" prop="depositWay" >
+        <template slot-scope="scope">
+          <span>{{ scope.row.depositWay == '0' ? '电汇' : (scope.row.depositWay == '1' ? '现金' : '汇票') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请人" align="center" prop="applierUser.nickName" />
+      <el-table-column label="申请日期" align="center" prop="applyTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="申请说明" align="center" prop="applyReason" />
+      <el-table-column label="相关附件" align="center" prop="applyDocument" /> -->
+      <!-- <el-table-column label="分管审批意见" align="center" prop="managerComment" />
+      <el-table-column label="分管审批时间" align="center" prop="managerTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="分管审批人" align="center" prop="managerUserId" />
+      
+      <el-table-column label="财务处理时间" align="center" prop="cwTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.cwTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="汇款日期" align="center" prop="remitTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.remitTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="预计退还日期" align="center" prop="returnTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.returnTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="退还时间" align="center" prop="backTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.backTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="财务打款备注" align="center" prop="cwComment" />
+      <el-table-column label="财务处理人" align="center" prop="cwUserId" />
+      <!-- <el-table-column label="汇款凭证" align="center" prop="remitDocument" /> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:deposit:query']">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改cmc保证金审批对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="合同id" prop="contractId">
+          <el-input v-model="form.contractId" placeholder="请输入合同id" />
+        </el-form-item>
+        <el-form-item label="预计退还日期" prop="returnTime">
+          <el-date-picker clearable v-model="form.returnTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择预计退还日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="开户名称" prop="accountName">
+          <el-input v-model="form.accountName" placeholder="请输入开户名称" />
+        </el-form-item>
+        <el-form-item label="开户银行" prop="accountBank">
+          <el-input v-model="form.accountBank" placeholder="请输入开户银行" />
+        </el-form-item>
+        <el-form-item label="银行卡号" prop="cardNumber">
+          <el-input v-model="form.cardNumber" placeholder="请输入银行卡号" />
+        </el-form-item>
+        <el-form-item label="保证金形式" prop="depositWay">
+          <el-input v-model="form.depositWay" placeholder="请输入保证金形式" />
+        </el-form-item>
+        <el-form-item label="申请人" prop="applier">
+          <el-input v-model="form.applier" placeholder="请输入申请人" />
+        </el-form-item>
+        <el-form-item label="申请日期" prop="applyTime">
+          <el-date-picker clearable v-model="form.applyTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择申请日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="申请说明" prop="applyReason">
+          <el-input v-model="form.applyReason" placeholder="请输入申请说明" />
+        </el-form-item>
+        <el-form-item label="相关附件" prop="applyDocument">
+          <el-input v-model="form.applyDocument" 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="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="managerUserId">
+          <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
+        </el-form-item>
+        <el-form-item label="汇款日期" prop="remitTime">
+          <el-date-picker clearable v-model="form.remitTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择汇款日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="财务处理时间" prop="cwTime">
+          <el-date-picker clearable v-model="form.cwTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择财务处理时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="退还时间" prop="backTime">
+          <el-date-picker clearable v-model="form.backTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择退还时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="财务打款备注" prop="cwComment">
+          <el-input v-model="form.cwComment" 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="remitDocument">
+          <el-input v-model="form.remitDocument" placeholder="请输入汇款凭证" />
+        </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>
+    </el-dialog>
+    <el-dialog :title="title" :visible.sync="infoOpen" width="50%" append-to-body>
+      <deposit-form :taskForm="taskForm" :taskName="''" :flowDisabled="false"></deposit-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDeposit, getDeposit, delDeposit, addDeposit, updateDeposit } from "@/api/oa/deposit/deposit";
+import depositForm from '../../flowable/form/finance/depositForm.vue';
+
+export default {
+  name: "Deposit",
+  components: { depositForm, },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc保证金审批表格数据
+      depositList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      infoOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        depositType: null,
+        contractId: null,
+        returnTime: null,
+        accountName: null,
+        accountBank: null,
+        cardNumber: null,
+        depositWay: null,
+        applier: null,
+        applyTime: null,
+        applyReason: null,
+        applyDocument: null,
+        managerComment: null,
+        managerTime: null,
+        managerUserId: null,
+        remitTime: null,
+        cwTime: null,
+        backTime: null,
+        cwComment: null,
+        cwUserId: null,
+        remitDocument: null
+      },
+      // 表单参数
+      form: {},
+      taskForm: {
+        formId:''
+      },
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc保证金审批列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.tenderId = '0';
+      listDeposit(this.queryParams).then(response => {
+        this.depositList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        depositId: null,
+        depositType: null,
+        contractId: null,
+        returnTime: null,
+        accountName: null,
+        accountBank: null,
+        cardNumber: null,
+        depositWay: null,
+        applier: null,
+        applyTime: null,
+        applyReason: null,
+        applyDocument: null,
+        managerComment: null,
+        managerTime: null,
+        managerUserId: null,
+        remitTime: null,
+        cwTime: null,
+        backTime: null,
+        cwComment: null,
+        cwUserId: null,
+        remitDocument: 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.depositId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc保证金审批";
+    },
+    handleView(row){
+      this.taskForm.formId = row.depositId;
+      this.infoOpen = true;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const depositId = row.depositId || this.ids
+      getDeposit(depositId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc保证金审批";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.depositId != null) {
+            updateDeposit(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDeposit(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const depositIds = row.depositId || this.ids;
+      this.$modal.confirm('是否确认删除cmc保证金审批编号为"' + depositIds + '"的数据项？').then(function () {
+        return delDeposit(depositIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/deposit/export', {
+        ...this.queryParams
+      }, `deposit_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/deposit/index.vue → oa-ui/src/views/oa/deposit/tender.vue

@@ -4,9 +4,6 @@
       <el-form-item label="投标项目id" prop="tenderId">
         <el-input v-model="queryParams.tenderId" placeholder="请输入投标项目id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="合同id" prop="contractId">
-        <el-input v-model="queryParams.contractId" placeholder="请输入合同id" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="预计退还日期" prop="returnTime">
         <el-date-picker clearable v-model="queryParams.returnTime" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择预计退还日期">
@@ -47,19 +44,21 @@
 
     <el-table v-loading="loading" :data="depositList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="保证金类型" align="center" prop="depositType" />
-      <el-table-column label="投标项目id" align="center" prop="tenderId" />
-      <el-table-column label="合同id" align="center" prop="contractId" />
-      <el-table-column label="预计退还日期" align="center" prop="returnTime" width="180">
+      <el-table-column label="保证金类型" align="center" prop="depositType" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.returnTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ scope.row.depositType == '0' ? '投标保证金' : '合同保证金' }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="投标项目名称" align="center" prop="tender.projectName" />
       <!-- <el-table-column label="开户名称" align="center" prop="accountName" />
       <el-table-column label="开户银行" align="center" prop="accountBank" />
       <el-table-column label="银行卡号" align="center" prop="cardNumber" /> -->
-      <el-table-column label="保证金形式" align="center" prop="depositWay" />
-      <el-table-column label="申请人" align="center" prop="applier" />
+      <el-table-column label="保证金形式" align="center" prop="depositWay"  >
+        <template slot-scope="scope">
+          <span>{{ scope.row.depositWay == '0' ? '电汇' : (scope.row.depositWay == '1' ? '现金' : '汇票') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请人" align="center" prop="applierUser.nickName" />
       <el-table-column label="申请日期" align="center" prop="applyTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>
@@ -74,16 +73,22 @@
         </template>
       </el-table-column>
       <el-table-column label="分管审批人" align="center" prop="managerUserId" />
+      
+      <el-table-column label="财务处理时间" align="center" prop="cwTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.cwTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
       <el-table-column label="汇款日期" align="center" prop="remitTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.remitTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="财务处理时间" align="center" prop="cwTime" width="180">
+      <el-table-column label="预计退还日期" align="center" prop="returnTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.cwTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.returnTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column label="退还时间" align="center" prop="backTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.backTime, '{y}-{m}-{d}') }}</span>
@@ -91,7 +96,7 @@
       </el-table-column>
       <el-table-column label="财务打款备注" align="center" prop="cwComment" />
       <el-table-column label="财务处理人" align="center" prop="cwUserId" />
-      <el-table-column label="汇款凭证" align="center" prop="remitDocument" />
+      <!-- <el-table-column label="汇款凭证" align="center" prop="remitDocument" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
@@ -113,9 +118,6 @@
         <el-form-item label="投标项目id" prop="tenderId">
           <el-input v-model="form.tenderId" placeholder="请输入投标项目id" />
         </el-form-item>
-        <el-form-item label="合同id" prop="contractId">
-          <el-input v-model="form.contractId" placeholder="请输入合同id" />
-        </el-form-item>
         <el-form-item label="预计退还日期" prop="returnTime">
           <el-date-picker clearable v-model="form.returnTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择预计退还日期">
@@ -186,14 +188,19 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog :title="title" :visible.sync="infoOpen" width="50%" append-to-body>
+      <deposit-form :taskForm="taskForm" :taskName="''" :flowDisabled="false"></deposit-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listDeposit, getDeposit, delDeposit, addDeposit, updateDeposit } from "@/api/oa/deposit/deposit";
+import depositForm from '../../flowable/form/finance/depositForm.vue';
 
 export default {
   name: "Deposit",
+  components: { depositForm, },
   data() {
     return {
       // 遮罩层
@@ -214,13 +221,13 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      infoOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         depositType: null,
         tenderId: null,
-        contractId: null,
         returnTime: null,
         accountName: null,
         accountBank: null,
@@ -242,6 +249,9 @@ export default {
       },
       // 表单参数
       form: {},
+      taskForm: {
+        formId:''
+      },
       // 表单校验
       rules: {
       }
@@ -254,6 +264,7 @@ export default {
     /** 查询cmc保证金审批列表 */
     getList() {
       this.loading = true;
+      this.queryParams.contractId = '0';
       listDeposit(this.queryParams).then(response => {
         this.depositList = response.rows;
         this.total = response.total;
@@ -271,7 +282,6 @@ export default {
         depositId: null,
         depositType: null,
         tenderId: null,
-        contractId: null,
         returnTime: null,
         accountName: null,
         accountBank: null,
@@ -316,7 +326,8 @@ export default {
       this.title = "添加cmc保证金审批";
     },
     handleView(row){
-
+      this.taskForm.formId = row.depositId;
+      this.infoOpen = true;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {