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

gaoluyang

4 天以前 6f158a536ab6af133da4a2f07de179161fd63c16

 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>