Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-16 352ea6a79d6d1e470d53b4a4f3800d183d0f40d4

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue

@@ -448,6 +448,10 @@
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }
          if(printMerge.value===null ||printMerge.value===''){
            ElMessage.warning('请填入需要合并的层')
            return
          }

          let id = ""
          for (let i = 0; i < selectRecords.length; i++) {