Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-03 215d66d640d3e1528834803fdf65659dc872c632

 src/components/view/b1-inspection-order.vue

@@ -120,10 +120,13 @@
    height: 8px !important;
  }
  .el-dialog__body >>>.el-radio__label{
    padding-left: 2px !important;
     padding-left: 2px !important;
  }
  .el-dialog__body >>>.el-card__body{
    padding: 0 !important;
  }
  .el-dialog__body >>>.el-card {
    border: none;
  }
  .el-dialog__body >>>.el-radio__input.is-disabled .el-radio__inner{
    border-color: #000 !important;
@@ -369,16 +372,16 @@
        </el-row>
      </span>
    </el-dialog>
    <div class="el-dialog__body" style="width:320px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;position: fixed;top: 0;display: none;">
    <div class="el-dialog__body" style="overflow-y: auto;position: absolute;margin-top: 0;position: fixed;top: 999px;z-index: 99999;">
        <div id="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-before:always;page-break-after: always;color: #000;">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-after: always;color: #000;box-shadow: none;" >
            <div style="display: flex;">
              <div>
                <el-col :span="8" :offset="4">
                <el-col :span="10" :offset="2">
                  <vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
                </el-col>
              </div>
              <div style="margin-left: 57px;line-height: 9px;">
              <div style="margin-left: 12px;line-height: 9px;">
                <el-row>
                  <el-col  style="font-size: 8px;"><span>样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                </el-row>
@@ -412,7 +415,7 @@
            </div>
          </el-card>
        </div>
      </div>
    </div>
   </div>
</template>

@@ -651,9 +654,9 @@
        insOrderRow:{},
        checkIndexList:[],
        checkDataList:[
          // {
          //   sampleCode:'11111'
          // }
          {
            sampleCode:'11111'
          }
        ],
        qrData:[],
        multipleSelection:[]
@@ -730,11 +733,11 @@
        PrintJS({
            printable: 'printMOrder',//页面
            type: "html",//文档类型
              maxWidth:450,
              maxWidth:360,
              targetStyles:['*'],
              style: `@page {
                margin:0;
                size: 360px 175px portrait;
                size: 360px 175px collapse;
              }
              html{
                zoom:100%;