检验撤销修改

applications/dee-mes/src/views/taskExecution/index.vue

@@ -351,9 +351,9 @@
         <a
           href="javascript:void(0)"
           class="gooey-menu-item"
-          :disabled="!editor.revoke || isOK"
+          :disabled="!editor.revoke || (isOk&&isRevoke)"
           content="检验撤销"
-          @click="editor.revoke && !isOK && setRejected()"
+          @click="editor.revoke && !(isOk&&isRevoke) && setRejected()"
         >
           <el-badge :value="editor.countQuality" class="item" hidden>
             <i
@@ -599,7 +599,8 @@ export default {
       enclosureData: [],
       showHeader: true,
       sideShow: true,
-      isOK: !this.$route.query.isOK || this.$route.query.isOK === 'false'
+      isOK: !this.$route.query.isOK || this.$route.query.isOK === 'false',
+      isRevoke: this.$route.query.isRevoke && this.$route.query.isRevoke === 'true'
     }
   },
   computed: {},

applications/dee-mes/src/views/taskReception/components/taskReceiveTable/table.vue

@@ -302,7 +302,8 @@ export default {
           showMenu: false,
           showTag: 'false',
           isOK: item.isOK,
-          backFlag: true
+          backFlag: true,
+          isRevoke: true
         }
       })
       this.$store.dispatch('app/closeSideBar', false)