Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

昨天 2088822f2bca6d93ad3e550a166a9b18332747fd

 src/views/collaborativeApproval/approvalProcess/index.vue

@@ -45,7 +45,7 @@
          type="danger"
          plain
          @click="handleDelete"
          v-if="currentApproveType !== 7"
          v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7"
        >删除</el-button>
      </div>
    </div>