Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-07-08 368b5a8bed1af57fb51f5c836e2e15059765019b

 north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue

@@ -131,37 +131,16 @@
              <tbody>
              <template v-for="(itemDatile,index) in item.detailList" :key="index">
                <tr style="width: 100%;">
                  <td colspan="5" style="font-weight: bold">加工品种:</td>
                </tr>
                <tr style="width: 100%;">
                  <td colspan="5"><el-input class="textarea" type="textarea" :autosize="{ minRows: 2, maxRows: 20 }"  v-model="itemDatile.product_name"/></td>
                  <td colspan="1" style="font-weight: bold">加工品种:</td>
                  <td colspan="4"><el-input class="textarea" type="textarea"  :autosize="{ minRows: 2, maxRows: 20 }"  v-model="itemDatile.product_name"/></td>
                </tr>
                <template v-for="(item,index) in itemDatile.detailList" :key="index">
                  <tr style="width: 100%;margin-top: 20px" >
                    <td style="font-size: 9px;height:50px ">{{ item.building_number }}</td>
                  <tr style="width: 100%;margin-top: 20px">
                    <td style="font-size: 10px">{{ item.building_number }}</td>
                    <td style="font-weight: bold">{{ item.width }}</td>
                    <td style="font-weight: bold">{{ item.height }}</td>
                    <td style="font-weight: bold">{{ item.quantity }}</td>
                    <td>{{ item.area }}</td>
                  </tr>
                  <tr  v-if=" (index+1)%10 === 0 || (index+1)===itemDatile.detailList.length"
                       style="border: 0;font-size: 10px"
                       :class="(index+1)%10 === 0 ? 'print-container' : ''">
                    <td colspan="5" style="border: 0;">
                      <div style="display:flex;">
                        <div>地址:洛阳国家高新技术开发区张庄</div>&nbsp;&nbsp;&nbsp;&nbsp;
                        <div>电话:0379-64312861.64331830</div>
                      </div>
                      <div style="display:flex;">
                        <div>http://www.northglass.com</div>&nbsp;&nbsp;&nbsp;&nbsp;
                        <div>传真:0379-64332066</div>
                      </div>
                      <div style="display:flex;">
                        <div>E-mail:luoyang@northglass.com</div>&nbsp;&nbsp;&nbsp;&nbsp;
                        <div>邮编：471003</div>
                      </div>

                    </td>
                  </tr>
                </template>
              </template>
@@ -176,7 +155,23 @@
              </tbody>
              <tfoot >

              <tr style="border: 0;font-size: 10px">
                <td colspan="5" style="border: 0;">
                  <div style="display:flex;">
                    <div>地址:洛阳国家高新技术开发区张庄</div>&nbsp;&nbsp;&nbsp;&nbsp;
                    <div>电话:0379-64312861.64331830</div>
                  </div>
                  <div style="display:flex;">
                    <div>http://www.northglass.com</div>&nbsp;&nbsp;&nbsp;&nbsp;
                    <div>传真:0379-64332066</div>
                  </div>
                  <div style="display:flex;">
                    <div>E-mail:luoyang@northglass.com</div>&nbsp;&nbsp;&nbsp;&nbsp;
                    <div>邮编：471003</div>
                  </div>

                </td>
              </tr>
              </tfoot>
            </table>
          </div>
@@ -225,6 +220,7 @@
    margin: 4mm 5mm 0mm 5mm  /* this affects the margin in the printer settings */

  }

  thead{
    display: table-header-group;
  }
@@ -234,14 +230,14 @@
  tr {
    page-break-inside: avoid;
  }
  .print-container{
    page-break-after: always;
  }

  .foot_tr {

  tfoot {
    display: table-footer-group;
     position: fixed;
    /* position: fixed;
     width: 50%;
     bottom: 0;
     height: 100px;*/
  }

}