修改禅道已知bug

jero-web/src/views/processCenter/components/examineInformation.vue

@@ -16,7 +16,7 @@
             <a-form-model-item style="margin-left: 36px" class="itemModel" prop="flag">
               <a-radio-group style="margin-top: 2px" @change="flagChange" class="box-input" v-model="formInline.flag">
                 <a-radio value="0">
-                  {{$t('agree')}}
+                  {{$t('accept')}}
                 </a-radio>
                 <a-radio value="1">
                   {{$t('disagree')}}

jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue

@@ -126,7 +126,7 @@
       if (this.$route.query.taskDefinitionKey == 'dreqr') {
         this.titleName = this.$t('engineerReply')
       } else {
-        this.titleName = this.$t('confirmationEngineeringInterfacePerson')
+        this.titleName = this.$t('taskConfirmationResponsiblePerson')
       }
       this.queryTaskDetailByTask(function() {
         _this.queryProjectLawsInventoryInfo()
@@ -195,17 +195,17 @@
             this.$message.success(this.$t('OperationSuccessful'))
             if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') {
               if (value.flag == 0) {
-                if (this.queryProject.verifyDeliverableType) {
+                if (this.queryProject.verifyRemark) {
                   this.startProcessDesign(this.queryBy, 4)
                 }
-                if (this.queryProject.prehomoDeliverableType) {
+                if (this.queryProject.prehomoRemark) {
                   this.startProcessDesign(this.queryBy, 3)
                 }
-                if (this.queryProject.designDeliverableType) {
+                if (this.queryProject.designRemark) {
                   this.startProcessDesign(this.queryBy, 2)
                 }
-                if (!this.queryProject.verifyDeliverableType && !this.queryProject.prehomoDeliverableType &&
-                  !this.queryProject.designDeliverableType) {
+                if (!this.queryProject.verifyRemark && !this.queryProject.prehomoRemark &&
+                  !this.queryProject.designRemark) {
                   setTimeout(() => {
                     this.loading = false
                     window.close()

jero-web/src/views/processCenter/processForm/taskListProcess/index.vue

@@ -320,15 +320,18 @@
         putAction(this.url.dreSubmit, query).then((res) => {
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
-            // this.$router.push({
-            //   path: '/ProjectDetails',
-            //   query: this.$route.query
-            // })
-            setTimeout(() => {
-              this.loading = false
-              window.close()
-            }, 1000)
 
+            this.$router.push({
+              path: '/ProjectDetails',
+              query: {
+                type:'103',
+                ...this.$route.query
+              }
+            })
+            // setTimeout(() => {
+            //   this.loading = false
+            //   window.close()
+            // }, 1000)
           } else {
             this.loading = false
             this.$message.warning(this.$t('operationFailed'))
@@ -347,10 +350,6 @@
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
             this.edit()
-            // this.$router.push({
-            //   path: '/ProjectDetails',
-            //   query: this.$route.query
-            // })
           } else {
             this.loading = false
             this.$message.warning(this.$t('operationFailed'))
@@ -366,7 +365,13 @@
           if (res.success) {
             setTimeout(() => {
               this.loading = false
-              window.close()
+              this.$router.push({
+                path: '/ProjectDetails',
+                query: {
+                  type:'103',
+                  ...this.$route.query
+                }
+              })
             }, 1000)
           }
         })