Quellcode durchsuchen

修改绩效审批流程

lamphua vor 6 Monaten
Ursprung
Commit
6b12ffc3f2

+ 8
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml Datei anzeigen

@@ -220,6 +220,10 @@
220 220
             <if test="participates != null">participates,</if>
221 221
             <if test="taskDocument != null">task_document,</if>
222 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 227
         </trim>
224 228
         <trim prefix="values (" suffix=")" suffixOverrides=",">
225 229
             <if test="projectId != null">#{projectId},</if>
@@ -254,6 +258,10 @@
254 258
             <if test="participates != null">#{participates},</if>
255 259
             <if test="taskDocument != null">#{taskDocument},</if>
256 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 265
         </trim>
258 266
     </insert>
259 267
 

+ 3
- 62
oa-back/sql/sq.sql
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 4
- 2
oa-ui/src/views/flowable/form/technicalForm.vue Datei anzeigen

@@ -1,8 +1,8 @@
1 1
 <!--
2 2
  * @Author: ysh
3 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 7
 <template>
8 8
   <div class="app-container">
@@ -225,10 +225,12 @@ export default {
225 225
           this.formTotal = 1;
226 226
           this.form = res.data;
227 227
           if (this.taskName == '接受交底') {
228
+            this.form.accepter = this.$store.getters.userId;
228 229
             this.acceptUser = this.$store.getters.name;
229 230
             this.form.acceptTime = new Date();
230 231
           }
231 232
           if (this.taskName == '确认交底') {
233
+            this.form.confirmer = this.$store.getters.userId;
232 234
             this.confirmUser = this.$store.getters.name;
233 235
             this.form.confirmTime = new Date();
234 236
           }

Laden…
Abbrechen
Speichern