Merge remote-tracking branch 'origin/master'

zss

2024-05-08 dbe4d740a7b0b5696c89f4df14b6804a71364432

 src/views/quality/Packaging_ledger/index.vue

@@ -147,7 +147,7 @@
        </packfromadd>
      </basic-container>
      <el-dialog title="标签列表" top="5vh" :visible.sync="diaPrintTab" width="500px">
        <div style="width:100%;height: 400px;overflow-y: auto;">
        <div style="width:100%;height: 400px;overflow-y: auto;page-break-before:always;page-break-after: always;">
          <div class="dia_body" id="qrCard">
            <el-card v-for="(item, i) in qrData" :key="i" >
              <div>
@@ -491,7 +491,7 @@
                style: `@page {
                  margin:0;
                  padding: 0;
                  size: 323px 210px;
                  size: 323px 210px landscape;
                }
                html{
                  zoom:100%;