Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

spring

昨天 3739a47340c8d8b6edf5fdcbb0534f5fc8d96530

 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>