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

gaoluyang

3 天以前 86ebbcd63e211f4a99e1b5585ddaf7ad805c461a

 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>