Bläddra i källkod

借款审批流程修改

lamphua 11 månader sedan
förälder
incheckning
b5e97f6857

+ 5
- 3
oa-back/sql/sql.sql
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 1
- 1
oa-ui/src/views/flowable/form/changeForm.vue Visa fil

226
           this.leaderList.push(res.data.userId);
226
           this.leaderList.push(res.data.userId);
227
         })
227
         })
228
         getUsersManageLeaderByDept({ deptId: Number(v) }).then(res => {
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 Visa fil

602
                   });
602
                   });
603
                 } else {
603
                 } else {
604
                   getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
604
                   getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
605
-                    let userId = res.data.userId;
605
+                    let userId = res.data[0].userId;
606
                     this.$set(this.taskForm.variables, "approval", userId);
606
                     this.$set(this.taskForm.variables, "approval", userId);
607
                     this.$set(this.taskForm.variables, "isProject", this.isProject);
607
                     this.$set(this.taskForm.variables, "isProject", this.isProject);
608
                     complete(this.taskForm).then(response => {
608
                     complete(this.taskForm).then(response => {
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
               else if (this.taskName == '分管审核') {
626
               else if (this.taskName == '分管审核') {
627
                 getUserByPost({ postName: '总经理' }).then(res => {
627
                 getUserByPost({ postName: '总经理' }).then(res => {
628
                   this.$set(this.taskForm.variables, "approval", res.data[0].userId);
628
                   this.$set(this.taskForm.variables, "approval", res.data[0].userId);

+ 2
- 2
oa-ui/src/views/flowable/form/settleForm.vue Visa fil

820
           if (deptId && isList) {
820
           if (deptId && isList) {
821
             getUsersManageLeaderByDept({ deptId }).then((res) => {
821
             getUsersManageLeaderByDept({ deptId }).then((res) => {
822
               let id = [];
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
               this.$set(this.taskForm.variables, "approvalList", id);
825
               this.$set(this.taskForm.variables, "approvalList", id);
826
               complete(this.taskForm).then((response) => {
826
               complete(this.taskForm).then((response) => {
827
                 this.$modal.msgSuccess(response.msg);
827
                 this.$modal.msgSuccess(response.msg);

+ 2
- 2
oa-ui/src/views/flowable/form/technicalPlan.vue Visa fil

480
                 this.completeTitle = "流程审批";
480
                 this.completeTitle = "流程审批";
481
               }
481
               }
482
               else if (this.taskName == '技术审核') {
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
                   this.$set(this.taskForm.variables, "approval", userId);
485
                   this.$set(this.taskForm.variables, "approval", userId);
486
                   complete(this.taskForm).then(response => {
486
                   complete(this.taskForm).then(response => {
487
                     this.$modal.msgSuccess(response.msg);
487
                     this.$modal.msgSuccess(response.msg);

Loading…
Avbryt
Spara