附件相关

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -719,7 +719,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             String currentTaskId = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId();
             List<HistoricTaskInstance> htiTargetList = historyService.createHistoricTaskInstanceQuery()
                     .processInstanceId(task.getProcessInstanceId())
-                    .taskDefinitionKey(flowTaskVo.getTargetKey())
+                    .taskDefinitionKey(lastHistoricTaskDefinitionKey)
                     .list();
             String taskAssignee = "";
             for (HistoricTaskInstance hti: htiTargetList) {

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

@@ -122,6 +122,14 @@ public class CmcBorrow extends BaseEntity
     @Excel(name = "财务部支付备注")
     private String cwComment;
 
+    /** 支付凭证 */
+    @Excel(name = "支付凭证")
+    private String lendDocument;
+
+    /** 借款附件 */
+    @Excel(name = "借款附件")
+    private String borrowDocument;
+
     /** 部门审批时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -476,6 +484,24 @@ public class CmcBorrow extends BaseEntity
     {
         return lendTime;
     }
+    public void setLendDocument(String lendDocument)
+    {
+        this.lendDocument = lendDocument;
+    }
+
+    public String getLendDocument()
+    {
+        return lendDocument;
+    }
+    public void setBorrowDocument(String borrowDocument)
+    {
+        this.borrowDocument = borrowDocument;
+    }
+
+    public String getBorrowDocument()
+    {
+        return borrowDocument;
+    }
 
     @Override
     public String toString() {

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

@@ -114,6 +114,10 @@ public class CmcDeposit extends BaseEntity
     @Excel(name = "财务处理人")
     private Long cwUserId;
 
+    /** 汇款凭证 */
+    @Excel(name = "汇款凭证")
+    private String remitDocument;
+
     public void setDepositId(String depositId) 
     {
         this.depositId = depositId;
@@ -330,6 +334,15 @@ public class CmcDeposit extends BaseEntity
     {
         return cwUser;
     }
+    public void setRemitDocument(String remitDocument)
+    {
+        this.remitDocument = remitDocument;
+    }
+
+    public String getRemitDocument()
+    {
+        return remitDocument;
+    }
 
     @Override
     public String toString() {

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

@@ -32,6 +32,8 @@ 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"    />
+        <result property="lendDocument"    column="lend_document"    />
+        <result property="borrowDocument"    column="borrow_document"    />
         <result property="unionTime"    column="union_time"    />
         <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
         <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
@@ -94,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select b.borrow_id, b.project_id, p.project_number, p.project_name, b.apply_reason, b.applier, u.nick_name as applier_nick_name, d.dept_name, b.apply_dept, b.remark, b.borrow_usage,
                b.apply_date, b.apply_amount, b.manager_amount, b.dept_comment, b.dept_user_id, u1.nick_name as dept_nick_name, b.xm_user_id, u2.nick_name as xm_nick_name, b.xm_comment,
                b.manager_comment, b.manager_user_id, u3.nick_name as manager_nick_name, b.zjl_user_id, u4.nick_name as zjl_nick_name, b.zjl_comment,  b.union_user_id, u5.nick_name as zjl_nick_name,
-               b.union_comment, b.cw_user_id, u6.nick_name as cw_nick_name, b.cw_comment, b.dept_time, b.xm_time, b.manager_time, b.zjl_time, b.lend_time, b.union_time from cmc_borrow as b
+               b.union_comment, b.cw_user_id, u6.nick_name as cw_nick_name, b.cw_comment, b.dept_time, b.xm_time, b.manager_time, b.zjl_time, b.lend_time, b.lend_document, b.borrow_document, b.union_time from cmc_borrow as b
         left join sys_user as u on u.user_id = b.applier
         left join sys_user as u1 on u1.user_id = b.dept_user_id
         left join sys_user as u2 on u2.user_id = b.xm_user_id
@@ -175,6 +177,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zjlTime != null">zjl_time,</if>
             <if test="lendTime != null">lend_time,</if>
             <if test="unionTime != null">union_time,</if>
+            <if test="lendDocument != null">lend_document,</if>
+            <if test="borrowDocument != null">borrow_document,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="borrowId != null">#{borrowId},</if>
@@ -205,6 +209,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zjlTime != null">#{zjlTime},</if>
             <if test="unionTime != null">#{unionTime},</if>
             <if test="lendTime != null">#{lendTime},</if>
+            <if test="lendDocument != null">#{lendDocument},</if>
+            <if test="borrowDocument != null">#{borrowDocument},</if>
          </trim>
     </insert>
 
@@ -238,6 +244,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zjlTime != null">zjl_time = #{zjlTime},</if>
             <if test="unionTime != null">union_time = #{unionTime},</if>
             <if test="lendTime != null">lend_time = #{lendTime},</if>
+            <if test="lendDocument != null">lend_document = #{lendDocument},</if>
+            <if test="borrowDocument != null">borrow_document = #{borrowDocument},</if>
         </trim>
         where borrow_id = #{borrowId}
     </update>

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="cwTime"    column="cw_time"    />
         <result property="backTime"    column="back_time"    />
         <result property="cwComment"    column="cw_comment"    />
+        <result property="remitDocument"    column="remit_document"    />
         <result property="cwUserId"    column="cw_user_id"    />
         <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
@@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <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,
                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 from cmc_deposit as d
+               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
@@ -109,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="backTime != null">back_time,</if>
             <if test="cwComment != null">cw_comment,</if>
             <if test="cwUserId != null">cw_user_id,</if>
+            <if test="remitDocument != null">remit_document,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="depositId != null">#{depositId},</if>
@@ -132,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="backTime != null">#{backTime},</if>
             <if test="cwComment != null">#{cwComment},</if>
             <if test="cwUserId != null">#{cwUserId},</if>
+            <if test="remitDocument != null">#{remitDocument},</if>
          </trim>
     </insert>
 
@@ -158,6 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="backTime != null">back_time = #{backTime},</if>
             <if test="cwComment != null">cw_comment = #{cwComment},</if>
             <if test="cwUserId != null">cw_user_id = #{cwUserId},</if>
+            <if test="remitDocument != null">remit_document = #{remitDocument},</if>
         </trim>
         where deposit_id = #{depositId}
     </update>

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

@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join sys_user_post as up on r.user_id = up.user_id
 		left join sys_post as p on p.post_id = up.post_id
 		where p.post_name = '副主任'
-		order by u.user_id desc limit 1
+		order by r.user_id desc limit 1
 	</select>
 
 	<select id="selectDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
@@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join sys_user_post as up on r.user_id = up.user_id
 		left join sys_post as p on p.post_id = up.post_id
 		where p.post_name = '副主任'
-		order by u.user_id desc limit 1
+		order by r.user_id desc limit 1
 	</select>
 
 	<delete id="deleteUserPostByUserId" parameterType="Long">

oa-back/sql/sql.sql

@@ -6909,6 +6909,7 @@ create table `cmc_borrow`  (
   `applier` 		bigint 			default null comment '借款人',
   `apply_dept`		bigint			default null comment '申请部门',
   `remark` 			varchar(255)  	default null comment '申请人说明',
+  `borrow_document` varchar(255)  	default null comment '借款附件',
   `apply_date` 		date 			default null comment '借款日期',
   `apply_amount` 	decimal(10, 2) 	default null comment '申请金额',
   `manager_amount` 	decimal(10, 2) 	default null comment '核准金额',
@@ -6924,6 +6925,7 @@ create table `cmc_borrow`  (
   `union_comment` 	varchar(255)  	default null comment '工会审批意见',
   `cw_user_id` 		bigint 			default null comment '财务部经办人',
   `cw_comment` 		varchar(255)  	default null comment '财务部支付备注',
+  `lend_document` 	varchar(255)  	default null comment '支付凭证',
   `dept_time` 		date 			default null comment '部门审批时间',
   `xm_time` 		date 			default null comment '项目部审批时间',
   `manager_time` 	date 			default null comment '分管审批时间',
@@ -7270,6 +7272,7 @@ create table `cmc_deposit`  (
   `back_time` 				date			default null comment '退还时间',
   `cw_comment` 				varchar(255)	default null comment '财务打款备注',
   `cw_user_id` 				bigint			default null comment '财务处理人',
+  `remit_document` 			varchar(255)  	default null comment '汇款凭证',
   primary key (`deposit_id`)
 ) engine = innodb comment = 'cmc保证金审批表';
 

oa-ui/src/views/flowable/form/business/brandForm.vue

@@ -25,8 +25,22 @@
             <el-input v-model="form.applyReason" placeholder="请输入申请支付说明" :disabled="taskName != '支付申请'" />
           </el-form-item>
           <el-form-item label="审核文件" prop="approvalDocument">
-            <el-input v-model="form.approvalDocument" placeholder="请输入审核文件" :disabled="taskName != '支付申请'" />
-          </el-form-item>
+            <FileUpload v-if="taskName == '支付申请'" :limit="1" :filePathName="'品牌项目支付/审核文件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getBrandPath"></FileUpload>
+            <div>
+              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+                tag="ul">
+                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                  <el-link :href="`${baseUrl}${'/profile/upload' + form.approvalDocument}`" :underline="false"
+                    target="_blank">
+                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                      {{ getFileName(form.approvalDocument) }}
+                    </span>
+                  </el-link>
+                </li>
+              </transition-group>
+            </div>
+          </el-form-item>            
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="签名：" label-width="120px">
@@ -127,6 +141,7 @@ export default {
   name: "Brand",
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       applierUser: '',
       applyTime: undefined,
       cwUser: '',
@@ -408,7 +423,20 @@ export default {
       this.download('oa/brand/export', {
         ...this.queryParams
       }, `brand_${new Date().getTime()}.xlsx`)
-    }
+    },    
+    getBrandPath(val) {
+      let arr = val.split('/upload')
+      this.form.approvalDocument = arr[1]
+      if (val == "") {
+        this.form.approvalDocument = ""
+      }
+    },
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
   }
 };
 </script>

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

@@ -123,6 +123,23 @@
           <el-form-item label="申请人说明" prop="remark">
             <el-input type="textarea" v-model="form.remark" placeholder="请输入申请人说明" :disabled="taskName != '借款申请'" />
           </el-form-item>
+          <el-form-item label="附件上传" prop="borrowDocument">
+            <FileUpload v-if="taskName == '借款申请'" :limit="1" :filePathName="'借款/申请附件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getBorrowPath"></FileUpload>
+            <div>
+              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+                tag="ul">
+                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                  <el-link :href="`${baseUrl}${'/profile/upload' + form.borrowDocument}`" :underline="false"
+                    target="_blank">
+                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                      {{ getFileName(form.borrowDocument) }}
+                    </span>
+                  </el-link>
+                </li>
+              </transition-group>
+            </div>
+          </el-form-item>
           <el-divider></el-divider>
           <!-- 非党工团审核 -->
           <div v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
@@ -210,8 +227,24 @@
               </el-col>
             </el-row>
           </div>
-
-
+          <el-divider></el-divider>
+          <el-form-item label="支付凭证" prop="lendDocument">
+            <FileUpload v-if="showFormItem('财务处理')" :limit="1" :filePathName="'借款/支付凭证'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getLendPath"></FileUpload>
+            <div v-if="showFormItem('财务处理')">
+              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+                tag="ul">
+                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                  <el-link :href="`${baseUrl}${'/profile/upload' + form.lendDocument}`" :underline="false"
+                    target="_blank">
+                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                      {{ getFileName(form.lendDocument) }}
+                    </span>
+                  </el-link>
+                </li>
+              </transition-group>
+            </div>
+          </el-form-item>
           <el-form-item label="财务部支付备注" prop="cwComment">
             <el-input type="textarea" v-model="form.cwComment" placeholder="请输入财务部支付备注" :disabled="taskName != '财务处理'" />
           </el-form-item>
@@ -275,6 +308,7 @@ export default {
   },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       deptUser: '',
       xmUser: '',
       managerUser: '',
@@ -612,6 +646,26 @@ export default {
       }
       this.form[name2] = sum.toFixed(2);
     },
+    getBorrowPath(val) {
+      let arr = val.split('/upload')
+      this.form.borrowDocument = arr[1]
+      if (val == "") {
+        this.form.borrowDocument = ""
+      }
+    },
+    getLendPath(val) {
+      let arr = val.split('/upload')
+      this.form.lendDocument = arr[1]
+      if (val == "") {
+        this.form.lendDocument = ""
+      }
+    },
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
     // 修改借款类型
     hanldeChangeType() {
       if (this.form.borrowUsage == '0') {

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

@@ -84,11 +84,28 @@
             </el-col>
           </el-row>
           <el-form-item label="申请说明" prop="applyReason">
-            <el-input v-model="form.applyReason" placeholder="请输入申请说明" :disabled="taskName != '保证金申请'" />
+            <el-input type="textarea" v-model="form.applyReason" placeholder="请输入申请说明" :disabled="taskName != '保证金申请'" />
           </el-form-item>
           <el-form-item label="相关附件" prop="applyDocument">
             <el-input v-model="form.applyDocument" placeholder="请输入相关附件" :disabled="taskName != '保证金申请'" />
           </el-form-item>
+          <el-form-item label="相关附件" prop="applyDocument">
+            <FileUpload v-if="taskName == '保证金申请'" :limit="1" :filePathName="'保证金/申请附件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getApplyPath"></FileUpload>
+            <div>
+              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+                tag="ul">
+                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                  <el-link :href="`${baseUrl}${'/profile/upload' + form.applyDocument}`" :underline="false"
+                    target="_blank">
+                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                      {{ getFileName(form.applyDocument) }}
+                    </span>
+                  </el-link>
+                </li>
+              </transition-group>
+            </div>
+          </el-form-item>
           <el-row :gutter="20">
             <el-col :span="6" :offset="12" :xs="24">
               <el-form-item label="申请人" label-width="120px">
@@ -118,6 +135,23 @@
             </el-col>
           </el-row>
           <el-divider></el-divider>
+          <el-form-item label="汇款凭证" prop="remitDocument">
+            <FileUpload v-if="taskName == '财务处理'" :limit="1" :filePathName="'保证金/汇款凭证'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getRemitPath"></FileUpload>
+            <div v-if="taskName == '财务处理'">
+              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+                tag="ul">
+                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                  <el-link :href="`${baseUrl}${'/profile/upload' + form.remitDocument}`" :underline="false"
+                    target="_blank">
+                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                      {{ getFileName(form.remitDocument) }}
+                    </span>
+                  </el-link>
+                </li>
+              </transition-group>
+            </div>
+          </el-form-item>
           <el-form-item label="财务打款备注" prop="cwComment">
             <el-input v-model="form.cwComment" placeholder="请输入财务打款备注" :disabled="taskName != '财务处理'" />
           </el-form-item>
@@ -196,6 +230,7 @@ export default {
   name: "Deposit",
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       applierUser: '',
       applyTime: undefined,
       managerUser: '',
@@ -541,7 +576,27 @@ export default {
       this.download('oa/deposit/export', {
         ...this.queryParams
       }, `deposit_${new Date().getTime()}.xlsx`)
-    }
+    },    
+    getApplyPath(val) {
+      let arr = val.split('/upload')
+      this.form.applyDocument = arr[1]
+      if (val == "") {
+        this.form.applyDocument = ""
+      }
+    },
+    getRemitPath(val) {
+      let arr = val.split('/upload')
+      this.form.remitDocument = arr[1]
+      if (val == "") {
+        this.form.remitDocument = ""
+      }
+    },
+    getFileName(name) {
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+    },
   }
 };
 </script>