tjiao

src/components/WorkFlow/index.vue

@@ -193,6 +193,9 @@ export default {
         handlerVisible = false
         attachVisible = true
       }
+      if (this.flowData.curActivityCode === 'submit') {
+        remarkVisible = false
+      }
       this.remarkVisible = remarkVisible
       this.handlerVisible = handlerVisible
       this.attachVisible = attachVisible

src/views/goaf/danger/activity/Accept.vue

@@ -196,13 +196,6 @@ export default {
       this.formData.acceptRemark = flow.data.actionRemark
       this.formData.attachList = flow.data.attachList
 
-      this.formData.acceptAccountId = flow.user.accountIdTo
-      this.formData.acceptAccountName = flow.user.accountNameTo
-      this.formData.acceptGroupId = flow.user.groupIdTo
-      this.formData.acceptGroupName = flow.user.groupNameTo
-      this.formData.acceptPositionId = flow.user.positionIdTo
-      this.formData.acceptPositionName = flow.user.positionNameTo
-
       updateDanger(this.formData).then((resp) => {
         const { code, msg } = resp
         if (code === 0) {

src/views/goaf/danger/activity/Rectify.vue

@@ -223,12 +223,12 @@ export default {
       this.formData.rectifyRemark = flow.data.actionRemark
       this.formData.attachList = flow.data.attachList
 
-      this.formData.rectifyAccountId = flow.user.accountIdTo
-      this.formData.rectifyAccountName = flow.user.accountNameTo
-      this.formData.rectifyGroupId = flow.user.groupIdTo
-      this.formData.rectifyGroupName = flow.user.groupNameTo
-      this.formData.rectifyPositionId = flow.user.positionIdTo
-      this.formData.rectifyPositionName = flow.user.positionNameTo
+      this.formData.acceptAccountId = flow.user.accountIdTo
+      this.formData.acceptAccountName = flow.user.accountNameTo
+      this.formData.acceptGroupId = flow.user.groupIdTo
+      this.formData.acceptGroupName = flow.user.groupNameTo
+      this.formData.acceptPositionId = flow.user.positionIdTo
+      this.formData.acceptPositionName = flow.user.positionNameTo
 
       updateDanger(this.formData).then((resp) => {
         const { code, msg } = resp

src/views/goaf/danger/activity/Submit.vue

@@ -254,12 +254,18 @@ export default {
         this.formData.scenePhoto = attach.fileUrl
         this.formData.sceneIcon = attach.fileIcon
       }
-      this.formData.submitGroupId = this.userData.groupId
-      this.formData.submitGroupName = this.userData.groupName
-      this.formData.submitPositionId = this.userData.positionId
-      this.formData.submitPositionName = this.userData.positionName
-      this.formData.submitAccountId = this.userData.userId
-      this.formData.submitAccountName = this.userData.userName
+      // this.formData.submitGroupId = this.userData.groupId
+      // this.formData.submitGroupName = this.userData.groupName
+      // this.formData.submitPositionId = this.userData.positionId
+      // this.formData.submitPositionName = this.userData.positionName
+      // this.formData.submitAccountId = this.userData.userId
+      // this.formData.submitAccountName = this.userData.userName
+      this.formData.reviewAccountId = flow.user.accountIdTo
+      this.formData.reviewAccountName = flow.user.accountNameTo
+      this.formData.reviewGroupId = flow.user.groupIdTo
+      this.formData.reviewGroupName = flow.user.groupNameTo
+      this.formData.reviewPositionId = flow.user.positionIdTo
+      this.formData.reviewPositionName = flow.user.positionNameTo
 
       if (flow.curActivityCode === 'review') {
         this.formData.status = 1