网页端：新建参培审核流程何参培记录表

移动端：修改借款审批

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

@@ -47,6 +47,9 @@ public class CmcTrainApproval extends BaseEntity
     @Excel(name = "主要内容")
     private String content;
 
+    /** 佐证附件 */
+    private String document;
+
     /** 时长 */
     @Excel(name = "时长")
     private Double hours;
@@ -84,6 +87,15 @@ public class CmcTrainApproval extends BaseEntity
     {
         return userId;
     }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
     public void setReportTime(Date reportTime) 
     {
         this.reportTime = reportTime;
@@ -97,47 +109,50 @@ public class CmcTrainApproval extends BaseEntity
     {
         this.trainName = trainName;
     }
-
     public String getTrainName() 
     {
         return trainName;
     }
+
     public void setContent(String content) 
     {
         this.content = content;
     }
-
     public String getContent() 
     {
         return content;
     }
+
     public void setHours(Double hours) 
     {
         this.hours = hours;
     }
-
-    public Double getHours() 
+    public Double getHours()
     {
         return hours;
     }
+
+    public void setDocument(String document){this.document = document;}
+    public String getDocument(){return document;}
+
     public void setDeptUserId(Long deptUserId) 
     {
         this.deptUserId = deptUserId;
     }
-
     public Long getDeptUserId() 
     {
         return deptUserId;
     }
+
     public void setDeptTime(Date deptTime) 
     {
         this.deptTime = deptTime;
     }
-
     public Date getDeptTime() 
     {
         return deptTime;
     }
+
     public void setDeptComment(String deptComment) 
     {
         this.deptComment = deptComment;

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

@@ -11,12 +11,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reportTime"    column="report_time"    />
         <result property="trainName"    column="train_name"    />
         <result property="content"    column="content"    />
+        <result property="document"    column="document"    />
         <result property="hours"    column="hours"    />
         <result property="deptUserId"    column="dept_user_id"    />
         <result property="deptTime"    column="dept_time"    />
         <result property="deptComment"    column="dept_comment"    />
-        <association property="user"    javaType="SysUser"         resultMap="ReportUserResult" />
-        <association property="user"    javaType="SysUser"         resultMap="DeptUserResult" />
+        <association property="reportUser"    javaType="SysUser"         resultMap="ReportUserResult" />
+        <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
     </resultMap>
 
@@ -36,9 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcTrainApprovalVo">
-        select ta.participate_id, ta.user_id, u.nick_name as report_nick_name, ta.dept_id, d.dept_name, ta.report_time, ta.train_name, ta.content, ta.hours, ta.dept_user_id, u1.nick_name as dept_nick_name, ta.dept_time, ta.dept_comment from cmc_train_approval as ta
+        select ta.participate_id, ta.user_id, u.nick_name as report_nick_name, ta.dept_id, d.dept_name, ta.report_time, ta.train_name, ta.content,ta.document, ta.hours, ta.dept_user_id, u1.nick_name as dept_nick_name, ta.dept_time, ta.dept_comment from cmc_train_approval as ta
         left join sys_user as u on u.user_id = ta.user_id
-        left join sys_user as u1 on u1.user_id = ta.user_id
+        left join sys_user as u1 on u1.user_id = ta.dept_user_id
         left join sys_dept as d on d.dept_id = ta.dept_id
     </sql>
 
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportTime != null "> and ta.report_time = #{reportTime}</if>
             <if test="trainName != null  and trainName != ''"> and ta.train_name like concat('%', #{trainName}, '%')</if>
             <if test="content != null  and content != ''"> and ta.content = #{content}</if>
+            <if test="document != null  and document != ''"> and ta.document = #{document}</if>
             <if test="hours != null "> and ta.hours = #{hours}</if>
             <if test="deptUserId != null "> and ta.dept_user_id = #{deptUserId}</if>
             <if test="deptTime != null "> and ta.dept_time = #{deptTime}</if>
@@ -71,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportTime != null">report_time,</if>
             <if test="trainName != null">train_name,</if>
             <if test="content != null">content,</if>
+            <if test="document != null">document,</if>
             <if test="hours != null">hours,</if>
             <if test="deptUserId != null">dept_user_id,</if>
             <if test="deptTime != null">dept_time,</if>
@@ -83,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportTime != null">#{reportTime},</if>
             <if test="trainName != null">#{trainName},</if>
             <if test="content != null">#{content},</if>
+            <if test="document != null">#{document},</if>
             <if test="hours != null">#{hours},</if>
             <if test="deptUserId != null">#{deptUserId},</if>
             <if test="deptTime != null">#{deptTime},</if>
@@ -98,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportTime != null">report_time = #{reportTime},</if>
             <if test="trainName != null">train_name = #{trainName},</if>
             <if test="content != null">content = #{content},</if>
+            <if test="document != null">document = #{document},</if>
             <if test="hours != null">hours = #{hours},</if>
             <if test="deptUserId != null">dept_user_id = #{deptUserId},</if>
             <if test="deptTime != null">dept_time = #{deptTime},</if>

oa-ui-app/config.js

@@ -21,11 +21,11 @@ module.exports = {
     // 政策协议
     agreements: [{
         title: "隐私政策",
-        url: "https://ruoyi.vip/protocol.html"
+        // url: "https://ruoyi.vip/protocol.html"
       },
       {
         title: "用户服务协议",
-        url: "https://ruoyi.vip/protocol.html"
+        // url: "https://ruoyi.vip/protocol.html"
       }
     ]
   }

oa-ui-app/main.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-01-16 11:17:07
+ * @LastEditors: 
+ * @LastEditTime: 2025-03-03 14:24:08
+ */
 import Vue from 'vue'
 import App from './App'
 import store from './store' // store
@@ -10,11 +16,19 @@ Vue.use(uView)
 
 Vue.config.productionTip = false
 Vue.prototype.$store = store
+// 创建全局的 publicData 对象
+Vue.prototype.publicData = {
+  partySecretary: 4, // 党委书记
+  leagueSecretary: 142, // 团委书记
+  gm: 7, //总经理
+  chairman: 2,//董事长
+  zg: 9,
+}
+
 
 App.mpType = 'app'
 
 const app = new Vue({
   ...App
 })
-
 app.$mount()

oa-ui-app/pages/form/borrow/borrow.vue

@@ -2,7 +2,13 @@
  * @Author: ysh
  * @Date: 2025-02-20 10:20:22
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-03 11:02:06
+ * @LastEditTime: 2025-03-03 17:23:02
+-->
+<!--
+ * @Author: ysh
+ * @Date: 2025-02-20 10:20:22
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-03 17:19:59
 -->
 <template>
   <view class="form-container">
@@ -30,7 +36,8 @@
 
       <!-- 借款类型 -->
       <uni-forms-item label="借款类型" required class="form-item" name="borrowUsage">
-        <uni-data-checkbox v-model="form.borrowUsage" :localdata="borrowUsageOptions"></uni-data-checkbox>
+        <uni-data-checkbox v-model="form.borrowUsage" :localdata="borrowUsageOptions"
+          :disabled="taskName != '借款申请'"></uni-data-checkbox>
       </uni-forms-item>
 
       <!-- 借款事由 -->
@@ -50,23 +57,37 @@
         <BorrowDetail :borrowId="form.borrowId" :taskName="taskName" @getApplyAmount="setApplyAmount"></BorrowDetail>
       </uni-forms-item>
 
-      <uni-forms-item label="申请金额" class="form-item">
-        <view>{{ (this.form.applyAmount).toFixed(2) }}</view>
-        <view style="color:#E74C3C" v-if="exceed && form.borrowUsage == '0'">
-          超过预算金额：{{ getMoreAmount('0') }}</view>
+      <uni-forms-item label="申请金额" required class="form-item">
+        <view class="amount-text">¥ {{ (this.form.applyAmount).toFixed(2) }}</view>
+        <view class="warning-text" v-if="exceed && form.borrowUsage == '0'">
+          超过预算金额：¥ {{ getMoreAmount('0') }}
+        </view>
       </uni-forms-item>
 
       <uni-forms-item label="最大借款金额" class="form-item">
-        {{ totalBudget.toFixed(2) }}
+        <view class="amount-text">¥ {{ totalBudget.toFixed(2) }}</view>
       </uni-forms-item>
+
       <uni-forms-item label="已申请借款" class="form-item">
-        {{ hasBorrow.toFixed(2) }}
+        <view class="amount-text">¥ {{ hasBorrow.toFixed(2) }}</view>
       </uni-forms-item>
+
       <uni-forms-item label="可用借款" class="form-item">
-        {{ (totalBudget - hasBorrow).toFixed(2) }}
+        <view class="amount-text">¥ {{ (totalBudget - hasBorrow).toFixed(2) }}</view>
       </uni-forms-item>
-      <view>
-        <u-button type="primary" size="normal" @click="submit">提交申请</u-button>
+      <uni-forms-item label="申请人说明" required class="form-item">
+        <uv-textarea v-model="form.remark" placeholder="请输入申请人说明" :disabled="taskName != '借款申请'"></uv-textarea>
+      </uni-forms-item>
+
+
+      <uni-forms-item label="部门负责人意见" required class="form-item" v-if="taskName != '借款申请'">
+        <uv-textarea v-model="form.deptComment" placeholder="请输入部门负责人意见"></uv-textarea>
+      </uni-forms-item>
+
+      <view class="form-button">
+        <u-button type="warning" size="normal" @click="saves" style="margin-right: 10px"
+          v-if="taskName == '借款申请'">保存</u-button>
+        <u-button type="primary" size="normal" @click="submit">{{ taskName == '借款申请' ? '提交申请' : '提交审核' }}</u-button>
       </view>
     </uni-forms>
 
@@ -80,6 +101,9 @@ import { parseTime } from "@/utils/common.js"
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listBudget } from "@/api/oa/budget/budget";
+import { getUserByPost, getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import config from '@/config'
 import BorrowDetail from './borrowDetail.vue';
 export default {
   components: {
@@ -93,6 +117,8 @@ export default {
     startUserName: String, // 流程发起人
   },
   created() {
+    this.form.borrowId = this.taskForm.formId;
+    this.deptId = this.$store.getters.deptId;
     this.initForm();
     uni.setNavigationBarTitle({
       title: '借款审批'
@@ -104,6 +130,7 @@ export default {
         submitTime: '',
         borrowUsage: '0',
         applyAmount: 0,
+        remark: '',
       },
       rules: {},
       borrowUsageOptions: [{
@@ -131,17 +158,18 @@ export default {
       openProject: false,
       selectedProject: null, //选中的项目
       projectObj: {}, //项目信息的项目
-      fromTotal: 0,
+      formTotal: 0,
       totalBudget: 0, //预结算额
       exceed: false, //是否超预算
       hasBorrow: 0, //已申请借款
+      deptId: undefined,
     }
   },
   methods: {
     async initForm() {
       getBorrow(this.taskForm.formId).then(async res => {
         if (res.data) {
-          this.fromTotal = 1;
+          this.formTotal = 1;
           this.form = res.data;
           console.log(this.form);
           if (this.form.projectId) {
@@ -184,7 +212,7 @@ export default {
             }
           }
         } else {
-          this.fromTotal = 0;
+          this.formTotal = 0;
           this.form.applier = this.$store.getters.userId;
           this.form.applyDate = parseTime(new Date(), "{y}-{m}-{d}");
         }
@@ -202,24 +230,215 @@ export default {
       return result.toFixed(2)
     },
     setApplyAmount(val) {
-      console.log(val);
-      console.log(this.from);
       this.form.applyAmount = val
     },
     handleConfirm(project) {
       console.log('选中的项目:', project);
       this.selectedProject = project;
       this.projectObj = project;
+      this.form.projectId = project.projectId;
+    },
+    // 保存
+    async saves() {
+      if (this.formTotal == 0) {
+        this.form.borrowId = this.taskForm.formId;
+        await addBorrow(this.form)
+        this.initForm();
+      } else {
+        // 更新借款审批表
+        await updateBorrow(this.form);
+      }
+      this.$modal.msgSuccess('保存成功');
     },
     submit() {
-      this.$refs.form.validate().then(res => {
-        console.log('表单数据信息：', res);
+      // 显示确认提交对话框
+      uni.showModal({
+        title: '提示',
+        content: '确认提交吗？',
+        success: (res) => {
+          if (!res.confirm) {
+            return;
+          }
+          // 继续执行后续代码
+          this.handleSubmit();
+        }
+      });
+    },
+    // 处理提交逻辑
+    handleSubmit() {
+      this.$refs.form.validate().then(async res => {
+        if (this.form.borrowUsage == '0' && !this.form.projectId) {
+          this.$modal.msgError('请选择项目！')
+          return
+        }
+        if (this.formTotal != 0) {
+          // 定义审核节点配置
+          const auditConfig = {
+            '部门审核': {
+              userIdField: 'deptUserId',
+              timeField: 'deptTime'
+            },
+            '分管审核': {
+              userIdField: 'managerUserId',
+              timeField: 'managerTime'
+            },
+            '总经理审核': {
+              userIdField: 'zjlUserId',
+              timeField: 'zjlTime'
+            },
+            '董事长批准': {
+              userIdField: 'dszUserId',
+              timeField: 'dszTime'
+            },
+            '党工团审核': {
+              userIdField: 'unionUserId',
+              timeField: 'unionTime'
+            },
+            '财务处理': {
+              userIdField: 'cwUserId',
+              timeField: 'lendTime'
+            }
+          }
+          // 根据当前节点更新审核信息
+          const currentConfig = auditConfig[this.taskName]
+          if (currentConfig) {
+            const currentUserId = this.$store.getters.userId
+            const currentTime = parseTime(new Date(), '{y}-{m}-{d}')
+
+            // 设置审核人和审核时间
+            this.form[currentConfig.userIdField] = currentUserId
+            this.form[currentConfig.timeField] = currentTime
+          }
+
+          // 更新借款申请
+          await updateBorrow(this.form);
+          const params = { taskId: this.taskForm.taskId };
+          console.log('params', params);
+          getNextFlowNode(params).then(async res => {
+            // 处理不同的流程节点
+            if (this.taskName == '借款申请') {
+              // 处理借款申请节点
+              await this.borrowApprovalFun();
+            } else if (this.taskName == '部门审核') {
+              // 得到分管领导根据部门
+              const res = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
+              let userIds = [];
+              if (res.data) {
+                res.data.forEach(item => {
+                  userIds.push(item.userId)
+                })
+              }
+              this.taskForm.variables.approvalList = userIds;
+              this.handleComplete(this.taskForm);
+            } else if (this.taskName == '分管审核') {
+              // 得到总经理
+              const res = await getUserByPost({ postName: '总经理' });
+              this.taskForm.variables.approval = res.data[0].userId;
+              this.handleComplete(this.taskForm);
+            } else if (this.taskName == '总经理审核') {
+              this.exceed = false;
+              this.taskForm.variables.exceed = this.exceed;
+              if (!this.exceed) {
+                this.submitFD(); // 提交给财务部门
+              } else {
+                const res = await getUserByPost({ postName: '董事长' });
+                this.taskForm.variables.approval = res.data[0].userId;
+                this.handleComplete(this.taskForm);
+              }
+            } else if (this.taskName == '董事长批准' || this.taskName == '党工团审核') {
+              this.submitFD(); // 提交给财务部门
+            } else if (this.taskName == '财务处理') {
+              uni.showModal({
+                title: '提示',
+                content: '最后一个节点，提交将结束流程，是否提交？',
+                success: (res) => {
+                  if (res.confirm) {
+                    this.handleComplete(this.taskForm);
+                  }
+                }
+              });
+            }
+          })
+
+        }
       }).catch(err => {
         console.log('表单错误信息：', err);
       })
-    }
+    },
+    // 处理任务完成
+    handleComplete(taskForm) {
+      complete(taskForm).then(response => {
+        this.$modal.msgSuccess(response.msg);
+        this.$emit('goBack');
+      })
+    },
+    // 借款申请提交方法
+    async borrowApprovalFun() {
+      let userId;
+      // 如果是党工团申请 deptId == 0 为党工团申请
+      if (this.deptId === 0) {
+        // 2为工会、3为党委
+        if (this.form.borrowUsage == 2 || this.form.borrowUsage == 3) {
+          userId = this.publicData.partySecretary;
+        } else {
+          userId = this.publicData.leagueSecretary;
+        }
+        this.taskForm.variables.dept = this.deptId;
+        this.taskForm.variables.approval = userId;
+        this.handleComplete(this.taskForm);
+      } else if (this.deptId == 102) { //如果是经营管理层申请，走总经理审批
+        this.form.managerAmount = this.form.applyAmount;
+        await updateBorrow(this.form);
+        const res = await getUserByPost({ postName: '总经理' });
+        this.taskForm.variables.dept = this.deptId;
+        this.taskForm.variables.approval = res.data[0].userId;
+        this.handleComplete(this.taskForm);
+      } else if (this.deptId == 101) { //如果是董事会申请，走董事长批准
+        const res = await getUserByPost({ postName: '董事长' });
+        this.taskForm.variables.dept = this.deptId;
+        this.taskForm.variables.approval = res.data[0].userId;
+        this.handleComplete(this.taskForm);
+      } else { //普通员工申请项目借款
+        const res = await getUsersDeptLeader({ userId: this.$store.getters.userId });
+        let userId = res.data.userId;
+        this.taskForm.variables.approval = userId;
+        this.taskForm.variables.dept = this.deptId;
+        this.handleComplete(this.taskForm);
+      }
+    },
+    // 提交给财务部审核
+    async submitFD() {
+      let approvalList = [];
+      const res = await getUsersDeptLeaderByDept({ deptId: 106 });
+      approvalList.push(res.data.userId);
+      const res1 = await getUsersViceDeptLeaderByDept({ deptId: 106 });
+      approvalList.push(res1.data.userId);
+      this.taskForm.variables.approvalList = approvalList;
+      this.handleComplete(this.taskForm);
+    },
   },
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.amount-text {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+}
+
+.warning-text {
+  font-size: 14px;
+  color: #ff0000;
+  margin-top: 5px;
+}
+
+.form-button {
+  display: flex;
+}
+
+.example-body {
+  padding: 10px;
+  background-color: #fff;
+}
+</style>

oa-ui-app/pages/form/borrow/borrowDetail.vue

@@ -2,11 +2,10 @@
  * @Author: ysh
  * @Date: 2025-02-27 10:43:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-03 10:41:01
+ * @LastEditTime: 2025-03-03 16:58:18
 -->
 <template>
   <view class="container">
-    <u-button type="primary" @click="showAddPopup = true">+ 新增借款项</u-button>
     <!-- 列表标题 -->
     <view class="list-header">
       <text class="header-item">开支项目</text>
@@ -30,10 +29,11 @@
         </view>
       </view>
       <view class="box-button" v-if="taskName == '借款申请'">
-        <u-button size="normal" icon="edit-pen">修改</u-button>
+        <u-button size="normal" icon="edit-pen" @click="editItem(item)">修改</u-button>
         <u-button size="normal" icon="trash" @click="deleteItem(item)">删除</u-button>
       </view>
     </view>
+    <u-button type="primary" @click="showAddPopup = true" v-if="taskName == '借款申请'">+ 新增借款项</u-button>
     <!-- 借款弹窗 -->
     <view v-if="showAddPopup" class="add-popup">
       <view class="popup-content">
@@ -55,11 +55,12 @@
           <uni-forms-item label="合计">
             <text>{{ getTotal() }}</text>
           </uni-forms-item>
+          <view class="popup-buttons">
+            <u-button style="margin-right: 10px;" @click="cancelAdd">取消</u-button>
+            <u-button type="primary" class="confirm" @click="confirmAdd" v-if="!isModify">确认添加</u-button>
+            <u-button type="primary" class="confirm" @click="confirmAdd" v-else>确认修改</u-button>
+          </view>
         </uni-forms>
-        <view class="popup-buttons">
-          <u-button @click="cancelAdd">取消</u-button>
-          <u-button type="primary" class="confirm" @click="confirmAdd">确认添加</u-button>
-        </view>
       </view>
     </view>
   </view>
@@ -112,9 +113,11 @@ export default {
         },
       },
       errorMessage: '',
+      isModify: false,
     }
   },
   created() {
+    this.initList();
   },
   watch: {
     borrowId() {
@@ -127,29 +130,32 @@ export default {
   },
   methods: {
     initList() {
+      console.log('borrowId',  this.borrowId);
       listBorrowDetail({ pageSize: 999, borrowId: this.borrowId }).then(res => {
         if (res.rows.length != 0) {
           this.detailList = res.rows
-          console.log(res.rows);
         }
       });
     },
     // 确认添加
     confirmAdd() {
-      this.$refs.form.validate().then(res => {
-        console.log('表单数据信息：', res);
-        res.borrowId = this.borrowId;
-        res.applyAmount = this.getTotal();
-        addBorrowDetail(res);
+      const borrowId =  this.borrowId
+      this.$refs.form.validate().then(async res => {
+        this.newItem.applyAmount = this.getTotal();
+        if (this.isModify) {
+          await updateBorrowDetail(this.newItem);
+        } else {
+          this.newItem.borrowId = borrowId;
+          await addBorrowDetail(this.newItem);
+        }
         this.clearForm()
         this.showAddPopup = false
         this.initList();
+        this.$modal.msgSuccess('操作成功');
       }).catch(err => {
         console.log('表单错误信息：', err);
       })
-
     },
-
     // 清空表单
     clearForm() {
       this.newItem = {
@@ -177,7 +183,12 @@ export default {
         })
       })
 
-    }
+    },
+    editItem(item) {
+      this.newItem = item;
+      this.isModify = true;
+      this.showAddPopup = true;
+    },
   },
 }
 </script>

oa-ui-app/static/scss/global.scss

@@ -1,160 +1,172 @@
 .text-center {
-	text-align: center;
+  text-align: center;
 }
 
 .font-13 {
-	font-size: 13px;
+  font-size: 13px;
 }
 
 .font-12 {
-	font-size: 12px;
+  font-size: 12px;
 }
 
 .font-11 {
-	font-size: 11px;
+  font-size: 11px;
 }
 
 .text-grey1 {
-	color: #888;
+  color: #888;
 }
+
 .text-grey2 {
-	color: #aaa;
+  color: #aaa;
 }
-.text-justify{
-	text-align:justify;
+
+.text-justify {
+  text-align: justify;
 }
+
 .list-cell-arrow::before {
-    content: ' ';
-    height: 10px;
-    width: 10px;
-    border-width: 2px 2px 0 0;
-    border-color: #c0c0c0;
-    border-style: solid;
-    -webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
-    transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
-    position: absolute;
-    top: 50%;
-    margin-top: -6px;
-    right: 30rpx;
-  }
-  
-  .list-cell {
-    position: relative;
+  content: ' ';
+  height: 10px;
+  width: 10px;
+  border-width: 2px 2px 0 0;
+  border-color: #c0c0c0;
+  border-style: solid;
+  -webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+  transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+  position: absolute;
+  top: 50%;
+  margin-top: -6px;
+  right: 30rpx;
+}
+
+.list-cell {
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+  background-color: #fff;
+  color: #333;
+  padding: 26rpx 30rpx;
+}
+
+.list-cell:first-child {
+  border-radius: 8rpx 8rpx 0 0;
+}
+
+.list-cell:last-child {
+  border-radius: 0 0 8rpx 8rpx;
+}
+
+.list-cell::after {
+  content: '';
+  position: absolute;
+  border-bottom: 1px solid #eaeef1;
+  -webkit-transform: scaleY(0.5) translateZ(0);
+  transform: scaleY(0.5) translateZ(0);
+  transform-origin: 0 100%;
+  bottom: 0;
+  right: 0;
+  left: 0;
+  pointer-events: none;
+}
+
+
+.menu-list {
+  margin: 15px 15px;
+
+  .menu-item-box {
     width: 100%;
-    box-sizing: border-box;
-    background-color: #fff;
-    color: #333;
-    padding: 26rpx 30rpx;
-  }
-  
-  .list-cell:first-child {
-    border-radius: 8rpx 8rpx 0 0;
-  }
-  
-  .list-cell:last-child {
-    border-radius: 0 0 8rpx 8rpx;
-  }
-  
-  .list-cell::after {
-    content: '';
-    position: absolute;
-    border-bottom: 1px solid #eaeef1;
-    -webkit-transform: scaleY(0.5) translateZ(0);
-    transform: scaleY(0.5) translateZ(0);
-    transform-origin: 0 100%;
-    bottom: 0;
-    right: 0;
-    left: 0;
-    pointer-events: none;
-  }
-  
-  
-  .menu-list {
-    margin: 15px 15px;
-  
-    .menu-item-box {
-      width: 100%;
-      display: flex;
-      align-items: center;
-  
-      .menu-icon {
-        color: #007AFF;
-        font-size: 16px;
-        margin-right: 5px;
-      }
-      
-      .text-right {
-        margin-left: auto;
-        margin-right: 34rpx;
-        color: #999;
-      }
+    display: flex;
+    align-items: center;
+
+    .menu-icon {
+      color: #007AFF;
+      font-size: 16px;
+      margin-right: 5px;
+    }
+
+    .text-right {
+      margin-left: auto;
+      margin-right: 34rpx;
+      color: #999;
     }
   }
+}
+
+
+
+// 提交按钮
+.submit-btn {
+  border-radius: 8px;
+  background-color: #007AFF;
+  font-size: 16px;
+}
+
+// 保存按钮
+.save-btn {
+  border-radius: 8px;
+  background-color: #f9ae3d;
+  color: #fff;
+  font-size: 16px;
+}
+
 
 
-	::v-deep .uni-input-input:disabled{
-		-webkit-text-fill-color: #333333;
-	}
-	
-	::v-deep .uni-textarea-textarea:disabled{
-		-webkit-text-fill-color: #333333;
-	}
-	
-	
-	// 提交按钮
-	.submit-btn {
-		border-radius: 8px;
-		background-color: #007AFF;
-		font-size: 16px;
-	}
-	// 保存按钮
-	.save-btn {
-		border-radius: 8px;
-		background-color: #f9ae3d;
-		color:#fff;
-		font-size: 16px;
-	}
-
-
-  
 .form-container {
-	padding: 20px;
-	background-color: #f8f8f8;
+  padding: 20px;
+  background-color: #f8f8f8;
 }
 
 .form-title {
-	margin-bottom: 15px;
-	text-align: center;
+  margin-bottom: 15px;
+  text-align: center;
 
-	.title-text {
-		font-size: 20px;
-		font-weight: bold;
-		color: #333;
-	}
+  .title-text {
+    font-size: 20px;
+    font-weight: bold;
+    color: #333;
+  }
 
-	.title-line {
-		width: 50px;
-		height: 2px;
-		background-color: #007AFF;
-		margin: 8px auto;
-	}
+  .title-line {
+    width: 50px;
+    height: 2px;
+    background-color: #007AFF;
+    margin: 8px auto;
+  }
 }
 
 
 .custom-form {
-	background-color: #fff;
-	padding: 15px;
-	border-radius: 12px;
-	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+  background-color: #fff;
+  padding: 15px;
+  border-radius: 12px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
 }
 
 
 .form-item {
-	margin-bottom: 20px;
+  margin-bottom: 20px;
+
+  /deep/ .uni-forms-item__label {
+    font-weight: 500;
+    color: #666;
+    padding-bottom: 8px;
+  }
+}
+
+::v-deep .uni-input-input:disabled {
+  -webkit-text-fill-color: #333333;
+}
+
+::v-deep .uni-textarea-textarea:disabled {
+  -webkit-text-fill-color: #333333;
+}
+
+::v-deep .uni-data-checklist .checklist-group .checklist-box.is--default.is-checked.is-disable .radio__inner {
+  opacity: 1 !important;
+}
 
-	/deep/ .uni-forms-item__label {
-		font-weight: 500;
-		color: #666;
-		padding-bottom: 8px;
-	}
+::v-deep .uni-data-checklist .checklist-group .checklist-box.is--default.is-checked.is-disable .checklist-text {
+  opacity: 1 !important;
 }

oa-ui-app/store/getters.js

@@ -5,5 +5,6 @@ const getters = {
 	roles: state => state.user.roles,
 	permissions: state => state.user.permissions,
 	userId: state => state.user.userId,
+	deptId: state => state.user.deptId,
 }
 export default getters

oa-ui-app/store/modules/user.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-01-16 11:17:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-19 15:06:07
+ * @LastEditTime: 2025-03-03 14:31:51
  */
 import config from '@/config'
 import storage from '@/utils/storage'
@@ -20,6 +20,7 @@ const user = {
     roles: storage.get(constant.roles),
     permissions: storage.get(constant.permissions),
     userId: storage.get(constant.userId),
+    deptId: storage.get(constant.deptId),
   },
 
   mutations: {
@@ -46,6 +47,10 @@ const user = {
       state.userId = userId
       storage.set(constant.userId, userId)
     },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
+      storage.set(constant.deptId, deptId)
+    }
   },
 
   actions: {
@@ -80,7 +85,8 @@ const user = {
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
-					commit('SET_USERID', userId)
+          commit('SET_USERID', userId)
+          commit('SET_DEPTID', user.deptId)
           commit('SET_NAME', username)
           commit('SET_AVATAR', avatar)
           resolve(res)

oa-ui/src/components/flow/User/index.vue

@@ -4,83 +4,67 @@
       <!--部门数据-->
       <el-col :span="6" :xs="24">
         <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
+            style="margin-bottom: 20px" />
         </div>
         <div class="head-container">
-          <el-tree
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            node-key="id"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          />
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+            @node-click="handleNodeClick" />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="18" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 150px"
-              @keyup.enter.native="handleQuery"
-            />
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="68px">
+          <el-form-item label="用户姓名" prop="userId">
+            <el-select v-model="queryParams.userId" 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 label="手机号码" prop="phonenumber">
-            <el-input
-              v-model="queryParams.phonenumber"
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 150px"
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 150px"
+              @keyup.enter.native="handleQuery" />
           </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-table v-show="checkType === 'multiple'" ref="dataTable" v-loading="loading" :row-key="getRowKey" :data="userList" @selection-change="handleMultipleUserSelect">
+        <el-table v-show="checkType === 'multiple'" ref="dataTable" v-loading="loading" :row-key="getRowKey"
+          :data="userList" @selection-change="handleMultipleUserSelect">
           <el-table-column type="selection" :reserve-selection="true" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="用户姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
+            width="120" />
         </el-table>
-        <el-table v-show="checkType === 'single'" v-loading="loading" :data="userList" @current-change="handleSingleUserSelect">
-          <el-table-column  width="55" align="center" >
+        <el-table v-show="checkType === 'single'" v-loading="loading" :data="userList"
+          @current-change="handleSingleUserSelect">
+          <el-table-column width="55" align="center">
             <template slot-scope="scope">
-              <el-radio v-model="radioSelected" :label="scope.row.userId">{{''}}</el-radio>
+              <el-radio v-model="radioSelected" :label="scope.row.userId">{{ '' }}</el-radio>
             </template>
           </el-table-column>
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <!-- <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+            :show-overflow-tooltip="true" /> -->
+          <el-table-column label="用户姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+            :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"
+            width="120" />
         </el-table>
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page-sizes="[5,10]"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" :page-sizes="[5, 10]" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
       </el-col>
     </el-row>
   </div>
@@ -90,7 +74,7 @@
 import { listUser, deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {StrUtil} from "@/utils/StrUtil";
+import { StrUtil } from "@/utils/StrUtil";
 
 export default {
   name: "FlowUser",
@@ -183,7 +167,7 @@ export default {
     },
     userList: {
       handler(newVal) {
-        if (StrUtil.isNotBlank(newVal)  && this.selectUserList.length > 0) {
+        if (StrUtil.isNotBlank(newVal) && this.selectUserList.length > 0) {
           this.$nextTick(() => {
             this.$refs.dataTable.clearSelection();
             this.selectUserList?.split(',').forEach(key => {
@@ -207,10 +191,10 @@ export default {
     getList() {
       this.loading = true;
       listUser(this.queryParams).then(response => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
+        this.userList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }
       );
     },
     /** 查询部门下拉树结构 */
@@ -220,7 +204,7 @@ export default {
       });
     },
     // 保存选中的数据id,row-key就是要指定一个key标识这一行的数据
-    getRowKey (row) {
+    getRowKey(row) {
       return row.id
     },
     // 筛选节点

oa-ui/src/utils/deleteResource.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-22 16:45:18
+ * @LastEditTime: 2025-03-04 17:13:20
  */
 import request from '@/utils/request'
 
@@ -148,6 +148,12 @@ const apiEndpoints = [
       '/oa/safe/:id',
     ]
   },
+  {
+    procDefName: '参培审核',
+    apiUrl: [
+      '/oa/trainApproval/:id',
+    ]
+  },
 ]
 
 // 编写一个方法来处理删除请求，并同时发送所有API请求  

oa-ui/src/views/flowable/form/components/conditionDisplay.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-23 16:41:08
+ * @LastEditTime: 2025-03-04 14:12:25
 -->
 <template>
   <div>
@@ -58,6 +58,8 @@
       v-else-if="taskForm.procDefName == '项目委外'"></outsource-form>
     <performance-form :key="'performance' + taskForm.taskId" :taskForm="taskForm" :taskName="''" :isFlow="true"
       v-else-if="taskForm.procDefName == '绩效审批'"></performance-form>
+    <study-form :key="'study' + taskForm.taskId" :taskForm="taskForm" :taskName="''" :isFlow="true"
+      v-else-if="taskForm.procDefName == '参培审核'"></study-form>
   </div>
 </template>
 
@@ -90,6 +92,7 @@ import declare from "@/views/flowable/form/work/declareForm.vue";
 import procureForm from "@/views/flowable/form/procure/procureForm.vue";
 import outsourceForm from '@/views/flowable/form/outsource/outsourceForm.vue';
 import performanceForm from '@/views/flowable/form/performance/performanceForm.vue';
+import StudyForm from "@/views/flowable/form//oa/studyForm.vue";
 export default {
   props: {
     passingParam: {
@@ -129,6 +132,7 @@ export default {
     procureForm,
     outsourceForm,
     performanceForm,
+    StudyForm
   },
   data() {
     return {

oa-ui/src/views/flowable/form/components/detailDisplay.vue

@@ -52,6 +52,8 @@
       @goBack="goBack"></outsource-form>
     <performance-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '绩效审批'"
       @goBack="goBack"></performance-form>
+    <study-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '参培审核'"
+      @goBack="goBack"></study-form>
   </div>
 </template>
 
@@ -84,6 +86,7 @@ import declareForm from '@/views/flowable/form/work/declareForm.vue';
 import procureForm from '@/views/flowable/form/procure/procureForm.vue';
 import outsourceForm from '@/views/flowable/form/outsource/outsourceForm.vue';
 import PerformanceForm from '@/views/flowable/form/performance/performanceForm.vue';
+import StudyForm from "@/views/flowable/form//oa/studyForm.vue";
 export default {
   components: {
     ScTable,
@@ -114,6 +117,7 @@ export default {
     procureForm,
     outsourceForm,
     PerformanceForm,
+    StudyForm
   },
   props: {
     taskForm: {

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

@@ -0,0 +1,327 @@
+<template>
+  <div class="study-form">
+    <el-row :gutter="20">
+      <el-col :span="flowDisabled ? 18 : 24" :xs="24">
+        <div class="form-title">参培审核表</div>
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="上报人" prop="user.nickName">
+                {{ getUserName(form.userId) }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="上报人部门" prop="dept.deptName">
+                {{ getDeptName(form.deptId) }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="上报日期" prop="reportTime">
+                {{ form.reportTime }}
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="培训名称" prop="trainName">
+                <el-input v-model="form.trainName" placeholder="请输入培训名称" :disabled="taskName != '参培上报'" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-form-item label="主要内容" prop="content">
+            <el-input v-model="form.content" type="textarea" :rows="4" placeholder="请输入主要内容"
+              :disabled="taskName != '参培上报'" />
+          </el-form-item>
+
+          <el-form-item label="佐证附件" prop="document">
+            <FileUpload v-if="form.document == null || form.document == ''" :disabled="taskName != '参培上报'"
+              :isShowTip="false" :limit="1" :filePathName="'参培/佐证附件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getDocumentPath"></FileUpload>
+            <div v-if="form.document">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.document}`)">
+                {{ getFileName(form.document) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.document}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+              <el-link class="ml20" type="danger" @click="handleDeleteDocument" v-if="taskName == '参培上报'"
+                :underline="false">
+                <span class="el-icon-delete">删除文件</span>
+              </el-link>
+              <FileUpload v-if="taskName == '参培申请'" :limit="1" :filePathName="'参培/佐证附件'"
+                :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getDocumentPath"></FileUpload>
+            </div>
+          </el-form-item>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="学时" prop="hours">
+                <el-input-number v-model="form.hours" :min="0" :precision="1" :disabled="taskName != '参培上报'" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <template v-if="taskName != '参培上报'">
+            <el-form-item label="部门审核意见" prop="dept_comment">
+              <el-input v-model="form.deptComment" type="textarea" :rows="3" placeholder="请输入部门审核意见" :disabled="taskName != '部门审核'" />
+            </el-form-item>
+
+            <el-row>
+              <el-col :span="6" :offset="12" :xs="24">
+                <el-form-item label="签名：" label-width="120px">
+                  <span class="auditor"> {{ getUserName(form.deptUserId) }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="日期：" label-width="120px">
+                  <span> {{ form.deptTime ? form.deptTime : deptTime }} </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </template>
+        </el-form>
+        <div style="text-align: center;" v-if="taskName != ''">
+          <el-button type="warning" @click="saves">保 存</el-button>
+          <el-button type="primary" @click="submit">提 交</el-button>
+        </div>
+      </el-col>
+      <el-col :span="6" :xs="24" v-if="flowDisabled">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import flow from '@/views/flowable/task/todo/detail/flow'
+import { flowXmlAndNode } from "@/api/flowable/definition";
+import { parseTime } from "@/utils/ruoyi";
+import { getTrainApproval, updateTrainApproval, addTrainApproval } from "@/api/oa/study/trainApproval";
+import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+
+export default {
+  name: 'StudyForm',
+  components: {
+    flow,
+  },
+  props: {
+    taskForm: {
+      type: Object,
+      required: true
+    },
+    flowDisabled: {
+      type: Boolean,
+      default: true
+    },
+    taskName: {
+      type: String,
+      required: true
+    }
+  },
+  watch: {
+    'taskForm.formId'() {
+      this.initForm();
+    }
+  },
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      form: {
+        participateId: '',
+        userId: '',
+        deptId: '',
+        reportTime: '',
+        trainName: '',
+        content: '',
+        document: '',
+        hours: 0,
+        dept_user_id: '',
+        dept_time: '',
+        dept_comment: '',
+        user: {
+          nickName: '',
+        },
+        dept: {
+          deptName: '',
+        },
+        applierUser: null
+      },
+      rules: {
+        reportTime: [
+          { required: true, message: '请选择上报日期', trigger: 'change' }
+        ],
+        trainName: [
+          { required: true, message: '请输入培训名称', trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: '请输入主要内容', trigger: 'blur' }
+        ],
+        hours: [
+          { required: true, message: '请输入学时', trigger: 'blur' }
+        ]
+      },
+      flowData: {},
+      deptUser: '',
+      deptTime: undefined,
+      formTotal: 0,
+    }
+  },
+  created() {
+    if (this.flowDisabled) {
+      flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+        this.flowData = res.data;
+      })
+    }
+    this.form.user.nickName = this.$store.getters.name;
+    this.form.dept.deptName = this.$store.getters.deptName;
+    this.form.userId = this.$store.getters.userId;
+    this.form.deptId = this.$store.getters.deptId;
+    this.form.reportTime = parseTime(new Date(), '{y}-{m}-{d}');
+    if (this.taskForm && this.taskForm.formId) {
+      this.form.participateId = this.taskForm.formId;
+    }
+    this.initForm();
+  },
+  methods: {
+    initForm() {
+      getTrainApproval(this.taskForm.formId).then(res => {
+        console.log(res.data)
+        if (res.data) {
+          this.formTotal = 1;
+          this.form = res.data;
+          if (this.taskName == '部门审核') {
+            this.form.deptUserId = this.$store.getters.userId;
+            this.form.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
+          }
+        } else {
+          this.formTotal = 0;
+        }
+      })
+    },
+    getDocumentPath(val) {
+      let arr = val.split('/upload')
+      this.form.document = arr[1]
+      if (val == "") {
+        this.form.document = ""
+      }
+    },
+    getFileName(val) {
+      if (val) {
+        return val.substring(val.lastIndexOf('/') + 1)
+      }
+      return ''
+    },
+    handleDeleteDocument() {
+      this.$modal.confirm('是否确认删除该附件？').then(() => {
+        this.form.document = '';
+      }).catch(() => { });
+    },
+    saves() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          // 更新参培审批表
+          if (this.formTotal) {
+            updateTrainApproval(this.form).then(() => {
+              this.$modal.msgSuccess("保存成功");
+            });
+          } else {
+            addTrainApproval(this.form).then(() => {
+              this.$modal.msgSuccess("保存成功");
+              this.formTotal = 1;
+            });
+          }
+        }
+      });
+    },
+    submit() {
+      this.$modal.confirm('是否提交流程？').then(() => {
+        this.submitForm();
+      }).catch(() => { });
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.taskName == '部门审核') {
+            this.form.dept_user_id = this.$store.getters.userId;
+            this.form.dept_time = parseTime(new Date(), '{y}-{m}-{d}')
+          }
+          // 更新参培审批表
+          if (this.formTotal) {
+            updateTrainApproval(this.form).then(() => {
+              // 获取下一步流程
+              this.getNextFlowFn();
+            });
+          } else {
+            addTrainApproval(this.form).then(() => {
+              // 获取下一步流程
+              this.getNextFlowFn();
+            });
+          }
+        }
+      });
+    },
+    getNextFlowFn() {
+      getNextFlowNode({ taskId: this.taskForm.taskId }).then(() => {
+        if (this.taskName == '参培上报') {
+          getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+            let userId = res.data.userId;
+            this.$set(this.taskForm.variables, "approval", userId);
+            this.handleComplete(this.taskForm);
+          })
+        } else {
+          this.handleComplete(this.taskForm);
+        }
+      });
+    },
+    handleComplete(taskForm) {
+      complete(taskForm).then(response => {
+        this.$modal.msgSuccess(response.msg);
+        this.$emit('goBack');
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
+.study-form {
+  padding: 20px;
+  background-color: #fff;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+
+  .form-title {
+    font-size: 20px;
+    font-weight: bold;
+    text-align: center;
+    margin-bottom: 30px;
+    color: #303133;
+  }
+
+  .el-form {
+    max-width: 1200px;
+    margin: 0 auto;
+  }
+
+  .el-divider {
+    margin: 24px 0;
+  }
+
+  .upload-demo {
+    .el-upload {
+      width: 100%;
+    }
+  }
+}
+</style>

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-26 17:16:24
+ * @LastEditTime: 2025-03-04 14:27:27
 -->
 <template>
   <div class="app-container">
@@ -342,6 +342,7 @@ export default {
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
         let data = res.data;
+        debugger
         if (data.dataType === 'dynamic' && row.name != '项目预算') {
           if (data.type === 'assignee') { // 指定人员
             this.checkSendUser = true;

oa-ui/src/views/oa/study/approval.vue

@@ -2,69 +2,24 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="上报人" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入上报人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.userId" 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 label="部门" prop="deptId">
-        <el-input
-            v-model="queryParams.deptId"
-            placeholder="请输入部门"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
+        <el-select v-model="queryParams.deptId" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="上报日期" prop="reportTime">
-        <el-date-picker clearable
-          v-model="queryParams.reportTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.reportTime" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择上报日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="培训名称" prop="trainName">
-        <el-input
-          v-model="queryParams.trainName"
-          placeholder="请输入培训名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="时长" prop="hours">
-        <el-input
-          v-model="queryParams.hours"
-          placeholder="请输入时长"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门审核人" prop="deptUserId">
-        <el-input
-          v-model="queryParams.deptUserId"
-          placeholder="请输入部门审核人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门审核时间" prop="deptTime">
-        <el-date-picker clearable
-          v-model="queryParams.deptTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择部门审核时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="部门审核意见" prop="deptComment">
-        <el-input
-          v-model="queryParams.deptComment"
-          placeholder="请输入部门审核意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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>
@@ -73,55 +28,17 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:trainApproval:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:trainApproval:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:trainApproval:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:trainApproval:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:trainApproval:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="trainApprovalList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="参培id" align="center" prop="participateId" />
-      <el-table-column label="上报人" align="center" prop="userId" />
-      <el-table-column label="部门" align="center" prop="deptId" />
+      <!-- <el-table-column label="参培id" align="center" prop="participateId" /> -->
+      <el-table-column label="上报人" align="center" prop="reportUser.nickName" />
+      <el-table-column label="部门" align="center" prop="dept.deptName" />
       <el-table-column label="上报日期" align="center" prop="reportTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
@@ -130,7 +47,7 @@
       <el-table-column label="培训名称" align="center" prop="trainName" />
       <el-table-column label="主要内容" align="center" prop="content" />
       <el-table-column label="时长" align="center" prop="hours" />
-      <el-table-column label="部门审核人" align="center" prop="deptUserId" />
+      <el-table-column label="部门审核人" align="center" prop="deptUser.nickName" />
       <el-table-column label="部门审核时间" align="center" prop="deptTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
@@ -139,31 +56,16 @@
       <el-table-column label="部门审核意见" align="center" prop="deptComment" />
       <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-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:trainApproval:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:trainApproval:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:trainApproval:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:trainApproval:remove']">删除</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"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改参培审核对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -172,10 +74,7 @@
           <el-input v-model="form.userId" placeholder="请输入上报人" />
         </el-form-item>
         <el-form-item label="上报日期" prop="reportTime">
-          <el-date-picker clearable
-            v-model="form.reportTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+          <el-date-picker clearable v-model="form.reportTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择上报日期">
           </el-date-picker>
         </el-form-item>
@@ -183,7 +82,7 @@
           <el-input v-model="form.trainName" placeholder="请输入培训名称" />
         </el-form-item>
         <el-form-item label="主要内容">
-          <editor v-model="form.content" :min-height="192"/>
+          <editor v-model="form.content" :min-height="192" />
         </el-form-item>
         <el-form-item label="时长" prop="hours">
           <el-input v-model="form.hours" placeholder="请输入时长" />
@@ -192,10 +91,7 @@
           <el-input v-model="form.deptUserId" 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"
+          <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择部门审核时间">
           </el-date-picker>
         </el-form-item>
@@ -302,7 +198,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.participateId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -344,12 +240,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const participateIds = row.participateId || this.ids;
-      this.$modal.confirm('是否确认删除参培审核编号为"' + participateIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除参培审核编号为"' + participateIds + '"的数据项？').then(function () {
         return delTrainApproval(participateIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {