Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

8 天以前 4b2d55c8bde56676b4afdb41436a24763e0f8cca

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue

@@ -2,7 +2,7 @@

import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElDatePicker, ElMessage} from "element-plus"
import {ElCheckbox, ElDatePicker, ElMessage} from "element-plus"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
import {useRouter} from 'vue-router'
import {useI18n} from 'vue-i18n'
@@ -20,6 +20,8 @@
import companyInfo from "@/stores/sd/companyInfo"
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
import TagStyleDesigner from "@/components/pp/TagStyleDesigner.vue";
import {hiprint} from "vue-plugin-hiprint";
import {createTemplate} from "@/hook/createTemplateTag"

const company = companyInfo()

@@ -47,9 +49,10 @@
let editRow = ref({
  processId: null,
  technologyNumber: null,
  process:null
  process: null
})

//落架顺序
let landingSequence= ref(1)
//打印
let printRow = ref({
  list: null,
@@ -62,7 +65,9 @@
  list: null,//勾选的数据
  faceOrientation: null,//内外面
  type: null,//标签模板
  lableType: null//标签类型
  lableType: null,//标签类型
  dataType: null,
  landingSequence:null
})


@@ -139,6 +144,7 @@
  },
]
let hidePrintLabels = company.printLabel.hideButton;
let btnType = company.printBtn;

if (hidePrintLabels == 'true') {
  filteredOptions = lableTypeOptions.filter((option, index) => index !== 2);
@@ -175,6 +181,78 @@
const data = ref({
  printList: []
})
let hiprintTemplate = ref(null)
onMounted(async () => {
  await getTags();
  await hiprint.init();


})


const tags = ref([])

const tag = ref({
  id: null,
  name: null,
  type: 1,
  tagWidth: null,
  tagHeight: null,
  value: null,
  size: null
})

const changeTag = () => {
  hiprintTemplate.value = new hiprint.PrintTemplate({});
  hiprintTemplate.value.design("#hiprint-printTemplate1",{grid:true});
  const json = tag.value.value
  hiprintTemplate.value.update(json)
}

const getTags = () => {
  request.get('tagStyle/getTagList').then(res => {
    res.data.forEach(item => {
      item.value = JSON.parse(item.value)
    })
    tags.value = res.data
  })
}
const printOrder = (type) => {
  printNumber()
  const list = tag.value.value
  list.panels[0].printElements.forEach(element => {
    element.options.fontFamily = 'Arial'
    if( element.options.field !== undefined){
      if(type===3 ){
        element.options.hideTitle = true
      }
    }
    if(type!==3){
      element.options.hideTitle = false
      if( element.options.field === undefined){
        element.options.hideTitle = true
      }
    }
  })

  //hiprintTemplate.value.update(list)
  let object =  JSON.parse(JSON.stringify(lastList.value))
  //判断是否为表格
  let columnsNum = null
  if(list.panels[0].printElements[0].options.field==='table'){
    object = {table:lastList.value}
    columnsNum = (list.panels[0].printElements[0].options.gridColumns || 1)
  }
  //判断是否有 嵌套自定义纸张
  if(tag.value.tagHeight && tag.value.tagWidth){
    const print =createTemplate(list,object,tag.value.tagWidth,tag.value.tagHeight)
    hiprintTemplate.value.update(print.template)
    object = print.printData
  }
  hiprintTemplate.value.print(object)

}
const orderOtherMoney = ref(null)

const {currentRoute} = useRouter()
const route = currentRoute.value
@@ -193,7 +271,21 @@
        newDataCollection.push(item);
      })
    }
    orderOtherMoney.value = res.data.orderOtherMoney
    orderOtherMoney.value.forEach(item => {
      let column = {
        field: `${item.column}`,
        width: 100,
        title: item.alias,
        filters: [{data: ''}],
        slots: {filter: 'num1_filter'},
        filterMethod: filterChanged,
        sortable: true
      }

      gridOptions.columns.push(column)

    })
    titleSelectJson.value.dataType = res.data.type
    xGrid.value.reloadData(newDataCollection)
    gridOptions.loading = false
@@ -240,7 +332,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
    // remote: true
                    // remote: true
  },
  customConfig: {
    storage: true
@@ -255,6 +347,9 @@
    {title: t('basicData.operate'), width: 55, slots: {default: 'button_slot'}, fixed: "left"},
    {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {field: 'printQuantity', title: t('processCard.printQuantity'), width: 90,
      editRender: {name: 'input', attrs: {placeholder: ''}},
    },
    {
      field: 'order_id',
      title: t('order.orderId'),
@@ -290,25 +385,55 @@
      title: t('order.OrderNum'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,width: 100
      filterMethod: filterChanged, width: 120
      , sortable: true
    },
    {
      field: 'technology_number',
      title: t('processCard.technologyNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,width: 100
      filterMethod: filterChanged, width: 120
      , sortable: true
    },
    {
      field: 'building_number',
      title: t('processCard.buildingNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged, width: 120
      , sortable: true
    },
    {
      field: 'width',
      title: t('order.width'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged, width: 100
    },
    {
      field: 'height',
      title: t('order.height'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged, width: 100
    },
    {
      field: 'glassNumber',
      title: t('reportingWorks.glassNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,width: 100
      filterMethod: filterChanged, width: 100
    },
    {field: 'quantity', title: t('order.quantity'), width: 90},

    {field: 'total_area', title: t('order.area'), width: 90},
    {field: 'product_name', title: t('order.product'), width: 120},
    {
      field: 'product_name', title: t('order.product'), width: 120,
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'glass_child',
      title: t('reportingWorks.glassChild'),
@@ -332,15 +457,33 @@
      filterMethod: filterChanged, width: 120
    },
  ],//表头按钮

//表单验证
  editRules: {
    printQuantity: [
      {
        validator ({ row }) {
          const regex = /^[0-9]\d*$/
          const printQuantity =
              (row.printQuantity === undefined || row.printQuantity===null || row.printQuantity==='') ? 0 : row.printQuantity
           if(!regex.test(printQuantity)){
             return new Error(t('reportingWorks.enterIntegerGreaterThanEqualTo'))
          }
          else if(row.quantity<printQuantity){
            return new Error(t('processCard.printWarn1'))
          }
        }
      }
    ]
  },
  toolbarConfig: {
    buttons: [
      {code: 'print', name: t('processCard.print'), status: 'primary'},
      {code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
      {code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
      {code: 'printLabel2', name: t('processCard.labelPrinting2'), status: 'primary'},
      {code: 'printLabel3', name: '成品打印2', status: 'primary'},
      {code: 'printTest', name: "可编辑打印", status: 'primary'},
      {code: 'printLabel3', name: t('processCard.finishedProductPrinting2'), status: 'primary'},
      {code: 'printTest', name: t('processCard.editablePrinting'), status: 'primary'},
      {code: 'invertSelection', name: t('processCard.invertSelection'), status: 'primary'},
      // {code: 'printLike', name: "同配置打印", status: 'primary'},
    ],
    // import: false,
@@ -370,18 +513,19 @@
})

const gridEvents = {
  toolbarButtonClick({code}) {
  async toolbarButtonClick({code}) {
    const $grid = xGrid.value
    selectRecords = $grid.getCheckboxRecords()
    // selectRecords.forEach(obj => {
    //   delete obj.print_status;
    // });
    let type = printType.value
    let type = tag.value.name
    let faceOrientation = stateValue.value
    let lableTypes = lableType.value
    let lableTitle = lableType.text
    if ($grid) {
      switch (code) {
        //打印流程卡
        case 'print': {
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -403,7 +547,7 @@
          dialogTableVisible.value = true
          break
        }

        //标签打印 常州
        case 'printLabel': {
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -420,11 +564,12 @@
          }
          router.push({
            path: '/main/processCard/PrintLabel',
            query: {printList: JSON.stringify(selectRecords),printType:2}
            query: {printList: JSON.stringify(selectRecords), printType: 2}
          })

          break
        }
        //标签打印2 常州
        case 'printLabel2': {
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -441,7 +586,7 @@
          }
          router.push({
            path: '/main/processCard/PrintCustomLabelSemi2',
            query: {printList: JSON.stringify(selectRecords),printType:2}
            query: {printList: JSON.stringify(selectRecords), printType: 2}
          })

          break
@@ -474,6 +619,7 @@
          })
          break
        }
        //自定义成品标签打印
        case 'customLabel': {
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -492,8 +638,8 @@
              id += selectRecords[i].id + "|"
            }
          }
          //成品标签1
          if (lableTypes == 1) {
            console.log(company.label)
            labelRow.value.list = JSON.stringify(selectRecords)
            labelRow.value.faceOrientation = faceOrientation
            labelRow.value.type = type
@@ -501,7 +647,9 @@
            lastList.value = []
            if (company.label === 1) {
              dialogTableVisibleLabel.value = true
            } else if (company.label === 2) {
            }
            //常州项目
            else if (company.label === 2) {
              router.push({
                path: '/main/processCard/PrintCustomLabelCZ',
                query: {
@@ -509,12 +657,14 @@
                  faceOrientation: faceOrientation,
                  lableType: lableTypes,
                  printList: JSON.stringify(selectRecords),
                  printType:2
                  printType: 2
                }
              })
            }

          } else if (lableTypes == 2) {
          }
          //成品标签2
          else if (lableTypes == 2) {
            labelRow.value.list = JSON.stringify(selectRecords)
            labelRow.value.faceOrientation = faceOrientation
            labelRow.value.type = type
@@ -522,7 +672,9 @@
            lastList.value = []
            if (company.label === 1) {
              dialogTableVisibleCustomLabel.value = true
            } else if (company.label === 2) {
            }
            //常州项目
            else if (company.label === 2) {
              router.push({
                path: '/main/processCard/PrintCustomLabelSemiCZ',
                query: {
@@ -530,11 +682,13 @@
                  faceOrientation: faceOrientation,
                  lableType: lableTypes,
                  printList: JSON.stringify(selectRecords),
                  printType:2
                  printType: 2
                }
              })
            }
          } else if (lableTypes == 3) {
          }
          //成品标签3
          else if (lableTypes == 3) {
            router.push({
              path: '/main/processCard/PrintLabel1',
              query: {
@@ -542,7 +696,7 @@
                faceOrientation: faceOrientation,
                lableType: lableTypes,
                printList: JSON.stringify(selectRecords),
                printType:2
                printType: 2
              }
            })

@@ -577,6 +731,11 @@
          break
        }
        case 'printTest': {
          const errMap = await $grid.validate(true)
          if (errMap) {
            ElMessage.error(t('basicData.msg.checkoutLose'))
            return
          }
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
@@ -594,7 +753,7 @@
              id += selectRecords[i].id + "|"
            }
          }

          labelRow.value.landingSequence = landingSequence
          labelRow.value.list = JSON.stringify(selectRecords)
          labelRow.value.faceOrientation = faceOrientation
          labelRow.value.type = type
@@ -607,7 +766,7 @@
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }
          if (type === null || type === '' || type === undefined) {
          if (tag.value.name === null || tag.value.name === '' || tag.value.name === undefined) {
            ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
            return
          }
@@ -623,16 +782,34 @@

          labelRow.value.list = JSON.stringify(selectRecords)
          labelRow.value.faceOrientation = faceOrientation
          labelRow.value.type = type
          labelRow.value.type = tag.value.name
          labelRow.value.lableType = lableTypes
          let columnsLabel=company.printLabel.columnsLabel
          if (columnsLabel==1){
          labelRow.value.dataType = 1
          let columnsLabel = company.printLabel.columnsLabel
          if (columnsLabel == 1) {
            dialogTableVisibleLabelXJTwo.value = true
          }else {
          } else {
            dialogTableVisibleLabelXJ.value = true
          }

          break
        }
        case 'invertSelection': {
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }

          let tableData = $grid.getTableData().fullData;
          // 假设你的 Vxe Table 引用为 xTable
          const tableRef = $grid;

          // 获取当前选中的记录
          //const selectedRecords = tableRef.getCheckboxRecords();
          const allRecords = $grid.getTableData().fullData; // 替换为实际的数据源
          allRecords.forEach(record => {
            tableRef.toggleCheckboxRow(record);
          });
        }
      }
    }
@@ -647,24 +824,32 @@
}

const hideButton = () => {
  // 根据条件值 hidePrintLabels 过滤按钮数组
  gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
    // 这里根据 hidePrintLabels 的值决定是否隐藏 printLabel 和 printLabel2
    if (hidePrintLabels == 'true') {
      return button.code !== 'printLabel' && button.code !== 'printLabel2';
    } else {
      return true && button.code !== 'printLike' && button.code !== 'printLabel3'&& button.code !== 'printTest'; // 显示该按钮
    // 如果 type 不为空时，隐藏 print 按钮
    if (btnType == 1 && button.code === 'print') {
      return false;  // 隐藏 print 按钮
    }
  })
}

    // 根据 hidePrintLabels 的值判断是否隐藏 printLabel、printLabel2 和 customLabel
    if (hidePrintLabels == 'true') {
      return button.code !== 'printLabel' && button.code !== 'printLabel2' && button.code !== 'customLabel';
    } else {
      // 如果 hidePrintLabels 不是 'true'，则隐藏 printLike、printLabel3 和 printTest
      return button.code !== 'printLike' && button.code !== 'printLabel3' && button.code !== 'printTest';
    }

    // 默认返回 true，表示保留按钮
    return true;
  });
};


// 监听打印完成事件

// 监听打印次数事件
const printNumber = () => {

  selectRecordsData.value.printList = selectRecords
  let printState = 0
  request.post(`/processCard/updatePrintState/${printState}`, selectRecordsData.value).then((res) => {
  request.post(`/tagStyle/updatePrintNumber`, selectRecordsData.value).then((res) => {
    if (res.code == 200 && res.data === true) {
    } else {

@@ -674,88 +859,107 @@
  })
}

function onlandingSequenceChange(checked) {
  landingSequence.value = checked ? 0 : 1
}
</script>

<template>
  <div class="main-div-customer">
    <el-input v-show="isVisible" v-model="printMerge" :placeholder="$t('processCard.mergePrinting')" clearable
              style="width: 90px"></el-input>
    &nbsp;
    <label>{{ $t('processCard.labelStyle') }}：</label>
    <el-select v-model="printType" :placeholder="$t('processCard.pleaseSelect')" clearable default-value="default_city"
               style="width: 120px">
      <el-option
          v-for="item in titleSelectJson['dataType']"
          :key="item.id"
          :label="item.name"
          :value="item.name"
      />
    </el-select>
    &nbsp;
    <el-select v-model="lableType" :placeholder="lableTypeOptions[0].label" class="m-2" style="width: 140px">
      <el-option
          v-for="item in filteredOptions"
          :key="item.value"
          :label="item.label"
          :value="item.value"
      />
    </el-select>
    &nbsp;
    <el-select v-model="stateValue" :placeholder="$t('processCard.pleaseSelect')" allow-create class="m-2" clearable
               filterable style="width: 140px">
      <el-option
          v-for="item in stateOptions"
          :key="item.value"
          :label="item.label"
          :value="item.value"
      />
    </el-select>
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        height="100%"
        v-bind="gridOptions"
        v-on="gridEvents"
  <div  style="width: 100%;height: 100%">
    <div class="head">
      <el-input v-show="isVisible" v-model="printMerge" :placeholder="$t('processCard.mergePrinting')" clearable
                style="width: 90px"></el-input>
      &nbsp;
      <label>{{ $t('processCard.labelStyle') }}：</label>
      <el-select v-model="tag" :placeholder="$t('processCard.pleaseSelect')" style="width: 140px" @change="changeTag">
        <el-option
            v-for="(tag,index) in tags"
            :key="index"
            :label="tag.name"
            :value="tag"
        />
      </el-select>
      &nbsp;
      <el-select v-model="lableType" :placeholder="lableTypeOptions[0].label" class="m-2" style="width: 140px">
        <el-option
            v-for="item in filteredOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value"
        />
      </el-select>
      &nbsp;
      <el-select v-model="stateValue" v-show="false" :placeholder="$t('processCard.pleaseSelect')" allow-create class="m-2" clearable
                 filterable style="width: 140px">
        <el-option
            v-for="item in stateOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value"
        />
      </el-select>
      &nbsp;
      <el-checkbox
          :model-value="landingSequence === 0"
          @change="onlandingSequenceChange"
      >
        {{ t('processCard.landingSequence') }}
      </el-checkbox>
    </div>

    <div class="main-table">
      <vxe-grid
          ref="xGrid"
          :checkbox-config="{labelField: 'name', highlight: true, range: true}"
          :column-config="{resizable: true}"
          :data="tableData"
          :row-config="{isCurrent: true, isHover: true}"
          class="mytable-scrollbar"
          height="100%"
          v-bind="gridOptions"
          v-on="gridEvents">


    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
      <!--      下拉显示所有信息插槽-->
      <template #content="{ row }">
        <ul class="expand-wrapper">
          <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
            <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
            <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
            <span v-else>{{ row[item.field] }}</span>
        >
        <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
        <!--      下拉显示所有信息插槽-->
        <template #content="{ row }">
          <ul class="expand-wrapper">
            <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
              <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
              <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
              <span v-else>{{ row[item.field] }}</span>

          </li>
        </ul>
      </template>
            </li>
          </ul>
        </template>

      <!--左边固定显示的插槽-->
      <!--      v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
      <template #button_slot="{ row }">
        <el-button link
                   size="small"
                   type="primary"
                   @click="getTableRow(row,'edit')">
          {{ $t('basicData.edit') }}
        </el-button>
        <!--左边固定显示的插槽-->
        <!--      v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
        <template #button_slot="{ row }">
          <el-button link
                     size="small"
                     type="primary"
                     @click="getTableRow(row,'edit')">
            {{ $t('basicData.edit') }}
          </el-button>

      </template>
        </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input v-model="option.data"
                   type="text"
                   @input="changeFilterEvent($event, option, $panel)"/>
        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input v-model="option.data"
                     type="text"
                     @input="changeFilterEvent($event, option, $panel)"
                     @keyup.enter.native="$panel.confirmFilter()"/>
            </div>
          </div>
        </div>
      </template>
        </template>


    </vxe-grid>
      </vxe-grid>
    </div>
    <!--  流程卡打印  -->
    <el-dialog
        id="sizePrintCalrd"
@@ -764,7 +968,7 @@
        destroy-on-close
        style="width: 75%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
        <el-button v-print="printContent" :icon="Printer" circle />
      </template>
      <print-process
          id="child"
@@ -782,12 +986,12 @@
        destroy-on-close
        style="width: 80%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContentLabel" :icon="Printer" circle/>
        <el-button v-print="printContentLabel" :icon="Printer" circle @click="printNumber"/>
      </template>
      <print-custom-label id="childLabel"
                          :lastList = 'lastList'
                          :faceOrientation="labelRow.faceOrientation"
                          :lableType="labelRow.lableType"
                          :lastList='lastList'
                          :list="labelRow.list"
                          :type="labelRow.type"
                          style="width: 100%;height: 100%"/>
@@ -801,7 +1005,7 @@
        destroy-on-close
        style="width: 80%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContentLabelSemi" :icon="Printer" circle/>
        <el-button v-print="printContentLabelSemi" :icon="Printer" circle @click="printNumber"/>
      </template>
      <print-custom-label-semi id="childLabelSemi"
                               :faceOrientation="labelRow.faceOrientation"
@@ -818,24 +1022,26 @@
        :title="$t('processCard.processCardDetails')"
        destroy-on-close
        style="width: 80%;height:75% ">
      <sort-detail id="child" :processId="editRow.processId" :technologyNumber="editRow.technologyNumber" :process="editRow.process"/>
      <sort-detail id="child" :process="editRow.process" :processId="editRow.processId"
                   :technologyNumber="editRow.technologyNumber"/>
    </el-dialog>

    <!--   标签样式    -->
    <el-dialog
        id="titleStyle"
        :title="$t('processCard.labelStyle')"
        style="width: 90%;height:93%;margin-top: 3vh "
        v-model="titleStyleVisible"
        :close-on-click-modal="false"
        :close-on-press-escape="false"
        :title="$t('processCard.labelStyle')"
        destroy-on-close
        v-model="titleStyleVisible">
        style="width: 90%;height:91%;margin-top: 3vh ">
      <!--      <tag-style style="width: 100%;height: 100%"/>-->
      <tag-style-designer style="width: 100%;height: 100%"
                          :faceOrientation="labelRow.faceOrientation"
      <tag-style-designer :faceOrientation="labelRow.faceOrientation"
                          :lableType="labelRow.lableType"
                          :list="labelRow.list"
                          :type="labelRow.type"/>
                          :type="labelRow.type"
                          :landingSequence="labelRow.landingSequence"
                          style="width: 100%;height: 100%"/>
    </el-dialog>

    <!--    成品标签两列-->
@@ -846,12 +1052,30 @@
        destroy-on-close
        style="width: 80%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContentLabel" :icon="Printer" circle/>
        <el-tooltip
            class="box-item"
            effect="dark"
            :content="$t('processCard.yesTitle')"
            placement="top"
        >
          <el-button :icon="Printer" circle @click="printOrder(1)"/>
        </el-tooltip>
        <el-tooltip
            class="box-item"
            effect="dark"
            :content="$t('processCard.noTitle')"
            placement="top"
        >
          <el-button @click="printOrder(3)">
            <i class="vxe-icon-print"></i>
          </el-button>
        </el-tooltip>
      </template>
      <print-custom-label-x-j id="childLabel"
                              :faceOrientation="labelRow.faceOrientation"
                              :lableType="labelRow.lableType"
                              :list="labelRow.list"
                              :lastList='lastList'
                              :type="labelRow.type"
                              style="width: 100%;height: 100%"/>
    </el-dialog>
@@ -867,11 +1091,12 @@
        <el-button v-print="printContentLabel" :icon="Printer" circle/>
      </template>
      <print-custom-label-x-j-two id="childLabel"
                              :faceOrientation="labelRow.faceOrientation"
                              :lableType="labelRow.lableType"
                              :list="labelRow.list"
                              :type="labelRow.type"
                              style="width: 100%;height: 100%"/>
                                  :dataType="labelRow.dataType"
                                  :faceOrientation="labelRow.faceOrientation"
                                  :lableType="labelRow.lableType"
                                  :list="labelRow.list"
                                  :type="labelRow.type"
                                  style="width: 100%;height: 100%"/>
    </el-dialog>
  </div>
</template>
@@ -882,6 +1107,16 @@
  height: 92%;
}

.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}


:deep(#sizeCheck .el-dialog__body) {
  height: 90%;