Merge remote-tracking branch 'origin/develop' into develop

2022-03-29 16:49:03 +08:00
parent 88eb05eca7 15265c6fc1
commit 3e3eda649e
6 changed files with 45 additions and 5 deletions
@@ -1904,7 +1904,6 @@
                  }).then(res => {
                      this.verifySarStandard = this.$route.query.verifySarStandard
                      let mes = JSON.parse(res.mes)
-                      console.log(mes)
                      mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                      this.form = mes.form
                      this.form['id'] = mes.form.id
@@ -1920,7 +1919,7 @@
                      this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                      this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                      this.roleForm = mes.roleForm
-                      this.formTongGuo.commentText = mes.commentText
+                      this.commentText = mes.commentText
                  })
              }else {
                  this.form.XCSJBUSS = this.dateFormatter()
@@ -1633,6 +1633,27 @@
                    this.roleForm.hqUserName=nameList;
                }
            },
+            checkedRoleTransfer (data) {
+                this.isSubmit = true
+                this.saveLoading = true
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    this.isSubmit = false
+                    this.saveLoading = false
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
            checkedRole (data) {
                if (this.type === 0) {
                    this.roleForm.deptUserId = data[0].id
@@ -1259,6 +1259,27 @@
                }

            },
+            checkedRoleTransfer (data) {
+                this.isSubmit = true
+                this.saveLoading = true
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    this.isSubmit = false
+                    this.saveLoading = false
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
            drawerCheckZRBM(data) {
                let idList = ''
                let nameList = ''
@@ -1868,7 +1868,7 @@
                      this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                      this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                      this.roleForm = mes.roleForm
-                      this.formTongGuo.commentText = mes.commentText
+                      this.commentText = mes.commentText
                  })
              }else {
                  this.form.XCSJBUSS = this.dateFormatter()
@@ -2221,7 +2221,7 @@
                }
            },
            handleSubmit() {
-                // this.getRule()
+                this.getRule()
                // const val= this.form.country;
                // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                //     if (val instanceof Array) {
@@ -1484,7 +1484,6 @@
                return data.name.indexOf(value) !== -1;
            },
            getTaskId (mesg) {
-                this.verifySarStandard = this.$route.query.verifySarStandard
                this.form = mesg.form
                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])