Merge remote-tracking branch 'origin/master'

zss

2024-01-22 3469ab9c960629989bb4d54c109380cd55064b89

Merge remote-tracking branch 'origin/master'

 src/views/quality/Packaging_ledger/index.vue

@@ -139,13 +139,13 @@
      </basic-container>
      <el-dialog title="标签列表" top="5vh" :visible.sync="diaPrintTab" width="500px">
        <div style="width:100%;height: 400px;overflow-y: auto;">
          <div id="qrCard" class="dia_body">
            <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 10px;">
              <div style="padding: 5px;">
          <div class="dia_body" id="qrCard">
            <el-card v-for="(item, i) in qrData" :key="i" >
              <div>
                  <table border="2px" class="x1111116">
                      <tr class="x1111113">
                            <td class="x1111114" colspan=6>
                              <div style="height: 75px;display: flex;margin-top: 2px;">
                              <div style="height: 60px;display: flex;margin-top: 2px;">
                                  <div style="margin-top: 5px;">
                                  <img width="150" height="48"  src="../../../../public/img/image001.jpg" alt="IMG_256">
                                  </div>
@@ -157,9 +157,9 @@
                      </tr>
                      <tr class="x1111117">
                            <td class="x1111114">
                              <span style="font-family: 宋体;text-align: center;">序&nbsp;&nbsp;号:</span>
                              <span style="font-family: 宋体;text-align: center;">包&nbsp;装&nbsp;人:</span>
                            </td>
                            <td class="x1111114"  colspan=4 >{{ i + 1 }} </td>
                            <td class="x1111114"  colspan=4 >{{ item.createUser }} </td>
                            <td class="x1111114"  rowspan=3  >
                              <div style="padding: 1px;">
                              <vueQr :text=str+item.packageBoxId :size="110" :margin="1"></vueQr>
@@ -177,7 +177,6 @@
                              <span style="font-family: 宋体;text-align: center;">合&nbsp;同&nbsp;号：</span>
                            </td>
                            <td class="x1111114" colspan=4>{{ item.contractNo }}</td>
                            
                      </tr>
                      <tr class="x1111113">
                        <td class="x1111114" colspan=6>
@@ -408,16 +407,16 @@
                style: `@page {
                  margin:0;
                  padding: 0;
                  size: 360px 170px;
                  size: 323px 210px;
                }
                html{
                  zoom:100%;
                }
                @media print{
                  width: 360px;
                  height: 170px;
                  margin:0;
                  padding: 0;
                  width: 323px;
                  height: 210px;
                  margin:7cm 0mm 0mm 0mm;
                  padding: 0mm 10mm;
                }`,
                onPrintDialogClose: this.erexcel=false,
                targetStyles: ["*"], // 使用dom的所有样式，很重要
@@ -425,6 +424,7 @@
          });
      },
      handleSelectionChange(val){
        console.log(val,"=====");
        this.multipleSelection = val
        let lastRow = val[val.length - 1]
        this.handleCurrentChange(lastRow)
@@ -436,11 +436,13 @@
        }
        this.diaPrintTab = true
        this.multipleSelection.forEach(item=>{
          let obj = {
          const obj = {
            packageNo: item.packageNo,
            contractNo: item.contractNo,
            packageBoxId:item.id
            packageBoxId:item.id,
            createUser:item.createUser
          }
          console.log(obj);
          this.qrData.push(obj)
        })
      },
@@ -550,8 +552,8 @@
}
.x1111116{
    border: 1px solid black;
    height: 220px;
    width: 450px;
    height: 200px;
    width: 445px;
}
.x1111114{
    border: 1px solid black;
@@ -565,4 +567,7 @@
    font-size: 12pt;
    font-family: 宋体;
}
.avue-main .el-card__body {
    padding: 4px 0px 5px;
}
</style>