Merge remote-tracking branch 'origin/master'

2022-05-10 18:16:01 +08:00
parent 3d5d2c27a0 56d4f62da7
commit 1eea038aec
1 changed files with 6 additions and 0 deletions
@@ -225,6 +225,7 @@
      terminationProcess() {
        this.textLoading = this.$t('terminationProcessing')
        this.loading = true
+        this.queryBy.reviewResult = 'termination of task'
        this.completeTask({ flag: 2 })
      },
      adopt() {
@@ -238,6 +239,11 @@
      sendBack() {
        this.textLoading = this.$t('Returning')
        this.loading = true
+        if (this.queryBy.reviewResult == 'inconformity' || this.queryBy.reviewResult == 'to track'){
+
+        }else{
+          this.queryBy.reviewResult = 'to be confirmed'
+        }
        this.completeTask({ flag: 1 })
      },
      submit() {