合并分支 'temp0927_dev_third' 到 'master'

修改流程

查看合并请求 laws-nio/laws-weilai!179

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

@@ -24,6 +24,9 @@
                 <a-radio value="3" v-if="issue">
                   {{$t('inquiry')}}
                 </a-radio>
+                <a-radio value="4" v-if="isSendBack">
+                  {{$t('sendBack')}}
+                </a-radio>
               </a-radio-group>
             </a-form-model-item>
           </div>
@@ -106,6 +109,10 @@
       title: {
         type: String,
         default: ''
+      },
+      isSendBack:{
+        type: Boolean,
+        default: false
       }
     },
     components: {

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

@@ -31,6 +31,7 @@
           v-if="isDisplay"
           isApprovalOpinion
           :title="titleName"
+          :isSendBack="isSendBackOne"
           ref="examineInformationRef"
           :url="url"/>
         <!--        @terminationProcess="terminationProcess"-->
@@ -145,6 +146,11 @@
           return false
         }
         return true
+      },
+      isSendBackOne() {
+        if (this.$route.query.taskDefinitionKey == 'zrrqr') {
+          return true
+        }
       }
     },
     methods: {
@@ -190,7 +196,7 @@
           rejectTime: rejectTime,
           rejectCause: rejectCause,
           projectLawsInventoryId: ids,
-          rejectType:'1',
+          rejectType: '1'
         }
         postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
 

jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue

@@ -27,6 +27,9 @@
                   <a-radio value="3" v-if="taskDefinitionKey == 'zrrjsrw'">
                     {{$t('inquiry')}}
                   </a-radio>
+                  <a-radio value="4" v-if="taskDefinitionKey == 'zrrqr'">
+                    {{$t('sendBack')}}
+                  </a-radio>
                 </a-radio-group>
               </a-form-model-item>
             </div>