Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

8 小时以前 33dbc6a161554f3a897f9e9273feb4f2c1b47381

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

@@ -527,7 +527,6 @@
              id += selectRecords[i].id + "|"
            }
          }
          console.log(lableTypes)
          //成品标签1
          if (lableTypes == 1) {

@@ -606,7 +605,7 @@
            return
          }
          if (printMerge.value === null || printMerge.value === '') {
            ElMessage.warning('请填入需要合并的层')
            ElMessage.warning(t('rework.msg1'))
            return
          }