Merge remote-tracking branch 'origin/master'

cuilei

昨天 83f051915bbe4562abfb5f1589642dd393ea8490

 src/views/mes/modules/MesProductionWorkOrderReportModal.vue

@@ -171,8 +171,8 @@
      });
    },
    // 打印标签
    printLabel() {
      this.generateQRCode('成品托标签'); // 先生成二维码
    printLabel(palletNumber) {
      this.generateQRCode(palletNumber); // 先生成二维码
      setTimeout(() => {
        printJS({
          printable: 'printLabel',
@@ -279,7 +279,7 @@
                }
                //成品托标签打印
                this.$nextTick(() => {
                  this.printLabel()
                  this.printLabel(data.palletNumber)
                })
              }
              this.submitCallback()