浏览代码

修改绩效审批流程

lamphua 8 个月前
父节点
当前提交
6b12ffc3f2

+ 8
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml 查看文件

220
             <if test="participates != null">participates,</if>
220
             <if test="participates != null">participates,</if>
221
             <if test="taskDocument != null">task_document,</if>
221
             <if test="taskDocument != null">task_document,</if>
222
             <if test="projectRequest != null">project_request,</if>
222
             <if test="projectRequest != null">project_request,</if>
223
+            <if test="leadDept != null">lead_dept,</if>
224
+            <if test="joinDept != null">join_dept,</if>
225
+            <if test="inLeader != null">in_leader,</if>
226
+            <if test="outLeader != null">out_leader,</if>
223
         </trim>
227
         </trim>
224
         <trim prefix="values (" suffix=")" suffixOverrides=",">
228
         <trim prefix="values (" suffix=")" suffixOverrides=",">
225
             <if test="projectId != null">#{projectId},</if>
229
             <if test="projectId != null">#{projectId},</if>
254
             <if test="participates != null">#{participates},</if>
258
             <if test="participates != null">#{participates},</if>
255
             <if test="taskDocument != null">#{taskDocument},</if>
259
             <if test="taskDocument != null">#{taskDocument},</if>
256
             <if test="projectRequest != null">#{projectRequest},</if>
260
             <if test="projectRequest != null">#{projectRequest},</if>
261
+            <if test="leadDept != null">#{leadDept},</if>
262
+            <if test="joinDept != null">#{joinDept},</if>
263
+            <if test="inLeader != null">#{inLeader},</if>
264
+            <if test="outLeader != null">#{outLeader},</if>
257
         </trim>
265
         </trim>
258
     </insert>
266
     </insert>
259
 
267
 

+ 3
- 62
oa-back/sql/sq.sql
文件差异内容过多而无法显示
查看文件


+ 4
- 2
oa-ui/src/views/flowable/form/technicalForm.vue 查看文件

1
 <!--
1
 <!--
2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-07-04 17:37:29
3
  * @Date: 2024-07-04 17:37:29
4
- * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-09-27 17:08:06
4
+ * @LastEditors: wrh
5
+ * @LastEditTime: 2024-09-29 13:59:58
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container">
8
   <div class="app-container">
225
           this.formTotal = 1;
225
           this.formTotal = 1;
226
           this.form = res.data;
226
           this.form = res.data;
227
           if (this.taskName == '接受交底') {
227
           if (this.taskName == '接受交底') {
228
+            this.form.accepter = this.$store.getters.userId;
228
             this.acceptUser = this.$store.getters.name;
229
             this.acceptUser = this.$store.getters.name;
229
             this.form.acceptTime = new Date();
230
             this.form.acceptTime = new Date();
230
           }
231
           }
231
           if (this.taskName == '确认交底') {
232
           if (this.taskName == '确认交底') {
233
+            this.form.confirmer = this.$store.getters.userId;
232
             this.confirmUser = this.$store.getters.name;
234
             this.confirmUser = this.$store.getters.name;
233
             this.form.confirmTime = new Date();
235
             this.form.confirmTime = new Date();
234
           }
236
           }

正在加载...
取消
保存