Browse Source

借款审批流程修改

lamphua 11 months ago
parent
commit
b5e97f6857

+ 5
- 3
oa-back/sql/sql.sql
File diff suppressed because it is too large
View File


+ 1
- 1
oa-ui/src/views/flowable/form/changeForm.vue View File

@@ -226,7 +226,7 @@ export default {
226 226
           this.leaderList.push(res.data.userId);
227 227
         })
228 228
         getUsersManageLeaderByDept({ deptId: Number(v) }).then(res => {
229
-          this.leaderList.push(res.data.userId);
229
+          this.leaderList.push(res.data[0].userId);
230 230
         })
231 231
       }
232 232
     },

+ 11
- 11
oa-ui/src/views/flowable/form/finance/borrowForm.vue View File

@@ -602,7 +602,7 @@ export default {
602 602
                   });
603 603
                 } else {
604 604
                   getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
605
-                    let userId = res.data.userId;
605
+                    let userId = res.data[0].userId;
606 606
                     this.$set(this.taskForm.variables, "approval", userId);
607 607
                     this.$set(this.taskForm.variables, "isProject", this.isProject);
608 608
                     complete(this.taskForm).then(response => {
@@ -613,16 +613,16 @@ export default {
613 613
                 }
614 614
 
615 615
               }
616
-              else if (this.taskName == '项目部审核') {
617
-                getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
618
-                  let userId = res.data.userId;
619
-                  this.$set(this.taskForm.variables, "approval", userId);
620
-                  complete(this.taskForm).then(response => {
621
-                    this.$modal.msgSuccess(response.msg);
622
-                    this.$emit('goBack')
623
-                  });
624
-                });
625
-              }
616
+              // else if (this.taskName == '项目部审核') {
617
+              //   getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
618
+              //     let userId = res.data[0].userId;
619
+              //     this.$set(this.taskForm.variables, "approval", userId);
620
+              //     complete(this.taskForm).then(response => {
621
+              //       this.$modal.msgSuccess(response.msg);
622
+              //       this.$emit('goBack')
623
+              //     });
624
+              //   });
625
+              // }
626 626
               else if (this.taskName == '分管审核') {
627 627
                 getUserByPost({ postName: '总经理' }).then(res => {
628 628
                   this.$set(this.taskForm.variables, "approval", res.data[0].userId);

+ 2
- 2
oa-ui/src/views/flowable/form/settleForm.vue View File

@@ -820,8 +820,8 @@ export default {
820 820
           if (deptId && isList) {
821 821
             getUsersManageLeaderByDept({ deptId }).then((res) => {
822 822
               let id = [];
823
-              id.push(res.data.userId);
824
-              id.push(10);
823
+              id.push(res.data[0].userId);
824
+              // id.push(10);
825 825
               this.$set(this.taskForm.variables, "approvalList", id);
826 826
               complete(this.taskForm).then((response) => {
827 827
                 this.$modal.msgSuccess(response.msg);

+ 2
- 2
oa-ui/src/views/flowable/form/technicalPlan.vue View File

@@ -480,8 +480,8 @@ export default {
480 480
                 this.completeTitle = "流程审批";
481 481
               }
482 482
               else if (this.taskName == '技术审核') {
483
-                getUsersManageLeaderByDept({ deptId: 110 }).then(res => {
484
-                  let userId = res.data.userId;
483
+                getUsersManageLeaderByDept({ deptId: 109 }).then(res => {
484
+                  let userId = res.data[0].userId;
485 485
                   this.$set(this.taskForm.variables, "approval", userId);
486 486
                   complete(this.taskForm).then(response => {
487 487
                     this.$modal.msgSuccess(response.msg);

Loading…
Cancel
Save