补片流程打印自动缩放问题修改，调整图纸打印的间距

chenlu

昨天 c9834a08fe9cb6ed9daabfce3fd73936d997aee1

补片流程打印自动缩放问题修改，调整图纸打印的间距

 north-glass-erp/northglass-erp/src/components/ImageSizeEditor.vue

@@ -81,6 +81,7 @@

  fit: { type: String, default: 'contain' },
  marginX: { type: String, default: '30px' },
  marginY: { type: String, default: '50px' },
  dialogTitle: { type: String, default: '设置图片尺寸' },
  showHint: { type: Boolean, default: true }
})
@@ -127,7 +128,9 @@
    width: `${w}px`,
    height: `${h}px`,
    marginLeft: props.marginX,
    marginRight: props.marginX
    marginRight: props.marginX,
    marginTop: props.marginY,
    marginBottom: props.marginY
  }
}


 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue

@@ -608,7 +608,7 @@

  @page {
    size: auto;  /* auto is the initial value */
    margin: 4mm 5mm 10mm 5mm;  /* this affects the margin in the printer settings */
    margin: 4mm 5mm 0mm 5mm;  /* this affects the margin in the printer settings */
    @top-right {
      content: none !important;
    }

 north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue

@@ -248,10 +248,11 @@
<template>
<!--  <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>-->
  <div id="printFlowCard">
    <table v-for="(item,id) in produceList" id="contentTable" :key="id">
    <div id="contentDiv" v-for="(item,id) in produceList" :key="id">
      <table  id="contentTable"  style="border-bottom: none;margin-bottom: 20px">
      <thead>
      <tr v-for="(itemFlow,index) in item.detail" :key="index">
        <td    colspan="34">
          <td colspan="31">
          <div style="float: left;"><img id="img-pic" style="width: 42px;height: 32px" src="@/assets/northGlass.ico" alt=""></div>
          <div id="bj" style="float: right;font-size: 28px">补 {{ id + 1 }}</div>
          <div style="left: 150px">{{ company.companyName }}</div>
@@ -273,26 +274,27 @@
      </tr>
      <tr v-for="(items,index) in item.detail" :key="index">
        <td class="tdNowrap">客户名称：</td>
        <td colspan="3">{{ items.customer_name }}</td>
          <td colspan="4">{{ items.customer_name }}</td>
        <td class="tdNowrap">项目名称：</td>
        <td v-if="name=='洛阳北方玻璃技术股份有限公司'" colspan="4" style="min-width: 250px;">{{ items.projectBatch }}</td>
        <td v-else colspan="4" style="min-width: 250px;">{{ items.project }}</td>
          <td v-if="name=='洛阳北方玻璃技术股份有限公司'" colspan="3" style="min-width: 250px;">{{ items.projectBatch }}</td>
          <td v-else colspan="3" style="min-width: 250px;">{{ items.project }}</td>
        <td class="tdNowrap">工艺流程：</td>
        <td :colspan="4+item.processList.length*2"  style="width: 500px">{{ items.process }}</td>
          <td :colspan="5+item.processList.length*2"  style="width: 500px">{{ items.process }}</td>
      </tr>
      <tr v-for="(itemTr,index) in item.detail" :key="index">
        <td class="tdNowrap">磨边类型：</td>
        <td colspan="3">{{ itemTr.edging_type }}</td>
          <td colspan="4">{{ itemTr.edging_type }}</td>
        <td class="tdNowrap">单片名称：</td>
        <td v-if="!company.processFontSize" colspan="3">{{ itemTr.glass_child }}</td>
        <td v-else-if="itemTr.qrcodeList.length*1>1" colspan="8">多层合并，详情见产品名称</td>
        <td v-else colspan="8" style="font-size: 18px;">{{ itemTr.glass_child }}</td>
          <td v-else-if="itemTr.qrcodeList.length*1>1" colspan="3" >多层合并，详情见产品名称</td>
          <td v-else colspan="3" style="font-size: 18px;">{{ itemTr.glass_child }}</td>
        <td class="tdNowrap">产品名称：</td>
        <td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
        <td v-else :colspan="2+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
          <td v-else :colspan="5+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
      </tr>
      <tr>
        <td rowspan='2'>序号</td>
          <td rowspan='2'>图号</td>
        <td rowspan='2'>编号</td>
        <td rowspan="2">层号</td>
        <td rowspan='2' class="tdNowrap">宽(弧长)*高</td>
@@ -319,6 +321,7 @@

      <tr v-for="(itemDatile,index) in item.detailList" :key="index">
        <td>{{ itemDatile.order_number }}</td>
          <td>{{ itemDatile.mapNumber }}</td>
        <td class="tdNowrap" v-if="name=='金华福喜天成玻璃有限公司' || name=='浙江巨星嘉泰新材料有限公司' ">{{ itemDatile.building_number }}</td>
        <td class="tdNowrap" v-else>{{ itemDatile.s01Value }}</td>
        <td>{{ itemDatile.technology_number }}</td>
@@ -340,10 +343,8 @@
          <td></td>
        </template>
      </tr>
      </tbody>
      <tfoot>
      <tr style="height: 14px">
        <td v-for="(itemsum,index) in item.detail" :key="index" colspan="34">
          <td v-for="(itemsum,index) in item.detail" :key="index" colspan="31">
          数量：
          <label>{{ itemsum.quantity }}</label>
          面积：
@@ -360,7 +361,7 @@
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="1"></td>
          <td colspan="2"></td>
        <template v-for=" n in item.processList.length">
          <td colspan="2"></td>
        </template>
@@ -373,30 +374,17 @@
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="1"></td>
        <template v-for=" n in item.processList.length">
          <td colspan="2"></td>
        </template>
      </tr>
      <tr>
        <td>质检签名</td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="1"></td>
        <template v-for=" n in item.processList.length">
          <td colspan="2"></td>
        </template>
      </tr>
      <tr>
        <td>原片箱号</td>
        <td colspan="29"></td>
          <td colspan="31"></td>
      </tr>
      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td colspan="30">
          <td colspan="31">
          <span style="display: flex;">
            <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
            <div class='qrCode' style="width: 80px;height: 80px;">
@@ -409,16 +397,29 @@
          </span>
        </td>
      </tr>
        </tbody>
        <tfoot>

      <tr v-for="(itemtextareas,index) in item.detail" :key="index">
        <td  colspan="34" rowspan="6" style="width: 99%;height: 150px ">
          <td  colspan="31"  style="width: 480px;height: 150px ">
          <div style="width: 100%;height: 100%;text-align: left">
            <textarea v-if="!company.processFontSize" style="height: 99%;width: 99%;border: none;;font-size: 14px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
            <textarea v-else style="height: 99%;width: 99%;border: none;;font-size: 36px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
          </div>
        </td>
      </tr>
        <tr style="border-bottom: none">
          <td colspan="31" style="text-align: left;border-bottom: none;">
            <div>
              <span>质检签名：</span>
              <span style="margin-left: 300px">生产签名：</span>
            </div>
          </td>
        </tr>
      </tfoot>
    </table>
    </div>

  </div>

</template>
@@ -504,7 +505,7 @@

  @page {
    size: auto;  /* auto is the initial value */
    margin:  2mm 4mm 0mm 4mm;  /* this affects the margin in the printer settings */
    margin: 4mm 5mm 0mm 5mm;  /* this affects the margin in the printer settings */
    @top-right {
      content: none !important;
    }

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -1824,7 +1824,8 @@
               pl.patch_processes,
               pl.responsible_team,
               pl.responsible_personnel,
               od.building_number
               od.building_number,
               IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -1912,7 +1913,8 @@
               round(ogd.child_width)                                         as width,
               round(ogd.child_height)                                        as height,
               pd.separation,
               fc.technology_number
               fc.technology_number,
               IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and