Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue

@@ -549,7 +549,7 @@ export default {
     // 转办
     openTurnDo(val) {
       this.operation = val
-      this.currentLink = false
+      this.currentLink = true
       this.countersignLink = true
       this.dialogList.comment = ''
       getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
@@ -580,6 +580,7 @@ export default {
     openAgree(val) {
       this.operation = val
       this.currentLink = true
+      this.countersignLink = false
       this.dialogList.comment = '同意'
       getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
         if (resp.success) {
@@ -594,6 +595,7 @@ export default {
     openReject(val) {
       this.operation = val
       this.currentLink = true
+      this.countersignLink = false
       this.dialogList.comment = ''
       getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
         if (resp.success) {
@@ -608,6 +610,7 @@ export default {
     openStop(val) {
       this.operation = val
       this.currentLink = false
+      this.countersignLink = false
       this.dialogList.comment = ''
       this.nodeDialogVisible = true
     },
@@ -638,6 +641,11 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请选择转办人员' })
         return
       }
+      if (this.dialogList.comment === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        return
+      }
+      this.countersign.views = this.dialogList.comment
       assignTask(this.countersign).then((response) => {
         if (response.success) {
           this.$notify({

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue

@@ -591,7 +591,7 @@ export default {
     // 转办
     openTurnDo(val) {
       this.operation = val
-      this.currentLink = false
+      this.currentLink = true
       this.countersignLink = true
       this.dialogList.comment = ''
       getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
@@ -627,6 +627,7 @@ export default {
         this.purchaseVisible = true
       } else {
         this.currentLink = true
+        this.countersignLink = false
         this.dialogList.comment = '同意'
         getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
           if (resp.success) {
@@ -647,6 +648,7 @@ export default {
       this.formobj.purchaseSystemSid = this.purchaseSid
       this.cancel()
       this.currentLink = true
+      this.countersignLink = false
       this.dialogList.comment = '同意'
       getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
         if (resp.success) {
@@ -666,6 +668,7 @@ export default {
     openReject(val) {
       this.operation = val
       this.currentLink = true
+      this.countersignLink = false
       this.dialogList.comment = ''
       getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
         if (resp.success) {
@@ -680,6 +683,7 @@ export default {
     openStop(val) {
       this.operation = val
       this.currentLink = false
+      this.countersignLink = false
       this.dialogList.comment = ''
       this.nodeDialogVisible = true
     },
@@ -710,6 +714,11 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请选择转办人员' })
         return
       }
+      if (this.dialogList.comment === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        return
+      }
+      this.countersign.views = this.dialogList.comment
       assignTask(this.countersign).then((response) => {
         if (response.success) {
           this.$notify({

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue

@@ -549,7 +549,7 @@ export default {
     // 转办
     openTurnDo(val) {
       this.operation = val
-      this.currentLink = false
+      this.currentLink = true
       this.countersignLink = true
       this.dialogList.comment = ''
       getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
@@ -580,6 +580,7 @@ export default {
     openAgree(val) {
       this.operation = val
       this.currentLink = true
+      this.countersignLink = false
       this.dialogList.comment = '同意'
       console.log(this.current, 9898)
       getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
@@ -595,6 +596,7 @@ export default {
     openReject(val) {
       this.operation = val
       this.currentLink = true
+      this.countersignLink = false
       this.dialogList.comment = ''
       getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
         if (resp.success) {
@@ -609,6 +611,7 @@ export default {
     openStop(val) {
       this.operation = val
       this.currentLink = false
+      this.countersignLink = false
       this.dialogList.comment = ''
       this.nodeDialogVisible = true
     },
@@ -639,6 +642,11 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请选择转办人员' })
         return
       }
+      if (this.dialogList.comment === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        return
+      }
+      this.countersign.views = this.dialogList.comment
       assignTask(this.countersign).then((response) => {
         if (response.success) {
           this.$notify({