提交

廖井涛

2024-06-25 7df2252acc12b6af91d20d840d7592d7b06f7ce0

提交

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

@@ -179,7 +179,7 @@
              <el-option :label="$t('components.finishedProduct')" :value="1"/>
              <el-option :label="$t('components.semiFinishedProducts')" :value="2"/>
            </el-select>
            <el-select placeholder="订单表头">
            <el-select :placeholder="$t('components.orderHeader')">
              <el-option @click="addList(keys,item)"
                         v-for="(item,keys,index) in order"
                         :label="$t(item+'.'+keys)" :value="keys"/>

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -114,13 +114,13 @@
            hollowGasType:'* Способ наполнения',
            hollowType:'* Гель',
            hollowGlueDepth:'* Глубина клея по умолчанию',
            hollow:'',
            hollowUpdate:'',
            hollow:'Пустой',
            hollowUpdate:'Пустое обновление',
            interlayerThickness:'* Толщина слоя',
            interlayerType:'* Тип',
            interlayerColor:'* Цвет',
            interlayer:'',
            interlayerUpdate:'',
            interlayer:'Триплекс',
            interlayerUpdate:'Триплекс обновление',
            glassAttribute:'Свойства монолитного стекла',
            reset:'Сбросить',
            processFlowAttribute:'Свойства технологического процесса',
@@ -368,6 +368,18 @@
        deleteNo:'Ошибка удаления, проверьте обратную связь карты процесса',
        deleteNoProcedure:'Ошибка удаления, проверьте обратную связь операции',
        pleaseCheckTheRequiredData:'Выберите необходимые данные.',

        labelStyle:'Стиль метки',
        customLabelPrinting:'Настройка печати вкладок',
        sortingSuccessful:'Сортировать успешно',
        sorting:'Сортировка',
        pleaseSelect:'Выберите',
        processCardDetails:'Описание схемы',
        thisIsTheIndoorSurface:'Это внутренняя поверхность.',
        thisSideIsOutsideTheRoom:'Эта сторона снаружи комнаты.',
        finishedProductLabel:'Маркировка готовой продукции',
        halfProductLabel:'Маркировка полуфабрикатов',
        pleaseSelectCustomPrintLabelStyle:'Выберите другой стиль этикетки',
    },
    reportingWorks:{
        glassAddress:'Стеклянная маркировка',

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -368,6 +368,18 @@
        deleteNo:'删除失败，检查流程卡是否已报工',
        deleteNoProcedure:'删除失败，检查下工序是否已报工',
        pleaseCheckTheRequiredData:'请勾选需要的数据',

        labelStyle:'标签样式',
        customLabelPrinting:'自定义标签打印',
        sortingSuccessful:'排序成功',
        sorting:'排序',
        pleaseSelect:'请选择',
        processCardDetails:'流程卡明细',
        thisIsTheIndoorSurface:'此面为室内面',
        thisSideIsOutsideTheRoom:'此面为室外面',
        finishedProductLabel:'成品标签',
        halfProductLabel:'半品标签',
        pleaseSelectCustomPrintLabelStyle:'请选择自定义打印标签样式',
    },
    reportingWorks:{
        glassAddress:'片标记',

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

@@ -74,15 +74,15 @@
let pageState = null

//室内室外面
const stateValue = ref('此面为室内面')
const stateValue = ref(t('processCard.thisIsTheIndoorSurface'))
const stateOptions = [
  {
    value: '此面为室内面',
    label: '此面为室内面',
    value: t('processCard.thisIsTheIndoorSurface'),
    label: t('processCard.thisIsTheIndoorSurface'),
  },
  {
    value: '此面为室外面',
    label: '此面为室外面',
    value: t('processCard.thisSideIsOutsideTheRoom'),
    label: t('processCard.thisSideIsOutsideTheRoom'),
  },
]

@@ -91,11 +91,11 @@
const lableTypeOptions = [
  {
    value: '1',
    label: '成品标签',
    label: t('processCard.finishedProductLabel'),
  },
  {
    value: '2',
    label: '半品标签',
    label: t('processCard.halfProductLabel'),
  },
]

@@ -175,7 +175,7 @@
  },//表头参数
  columns: [
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {title: '操作', width: 55, slots: { default: 'button_slot' },fixed:"left"},
    {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},
    {
@@ -221,7 +221,7 @@
    buttons: [
      {code: 'print', name: t('processCard.print'), status: 'primary'},
      {code: 'printLabel', name: t('processCard.printLabel'), status: 'primary'},
      {code: 'customLabel', name: '自定义标签打印', status: 'primary'},
      {code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},

    ],
    // import: false,
@@ -302,7 +302,7 @@
          })
          request.post("/processCard/printSort", flowCardData.value).then((res) => {
            if (res.code == 200) {
              ElMessage.success("排序成功")
              ElMessage.success(t('processCard.sortingSuccessful'))
              //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
              router.push({
                path: '/main/processCard/PrintFlowCard',
@@ -322,7 +322,7 @@
            return
          }
          if (type===null||type===''||type===undefined){
            ElMessage.warning('请选择自定义打印标签样式')
            ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
            return
          }

@@ -390,60 +390,60 @@
      field: 'sort',
      width: 80,
      editRender: {name: 'input', attrs: {placeholder: ''}},
      title: '排序',
      title: t('processCard.sorting'),
    },
    {
      field: 'process_id',
      title: '流程卡号',
      title: t('processCard.processId'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'order_number',
      title: '序号',
      title: t('order.OrderNum'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'technology_number',
      title: '小片顺序',
      title: t('processCard.technologyNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'glass_address',
      title: '小片标记',
      title: t('processCard.glassAddress'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'quantity',
      title: '数量',
      title: t('order.quantity'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'child_width',
      title: '宽',
      title: t('order.width'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'child_height',
      title: '高',
      title: t('order.height'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'area',
      title: '面积',
      title: t('order.area'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
@@ -452,7 +452,7 @@

  toolbarConfig: {
    buttons: [
      {code: 'sort', name: '排序', status: 'primary'},
      {code: 'sort', name: t('processCard.sorting'), status: 'primary'},
    ],
    // import: false,
    // export: true,
@@ -488,8 +488,8 @@

<template>
  <div class="main-div-customer">
    <label>标签样式：</label>
    <el-select v-model="printType" clearable default-value="default_city" style="width: 120px">
    <label>{{$t('processCard.labelStyle')}}：</label>
    <el-select v-model="printType" clearable default-value="default_city" :placeholder="$t('processCard.pleaseSelect')" style="width: 120px">
      <el-option
          v-for="item in titleSelectJson['dataType']"
          :key="item.id"
@@ -498,7 +498,7 @@
      />
    </el-select>
    &nbsp;
    <el-select v-model="lableType" class="m-2" placeholder="成品标签" style="width: 140px">
    <el-select v-model="lableType" class="m-2" :placeholder="lableTypeOptions[0].label" style="width: 140px">
      <el-option
          v-for="item in lableTypeOptions"
          :key="item.value"
@@ -507,7 +507,7 @@
      />
    </el-select>
    &nbsp;
    <el-select v-model="stateValue" class="m-2" placeholder="室内外面" style="width: 140px">
    <el-select v-model="stateValue" class="m-2" :placeholder="stateOptions[0].label" style="width: 140px">
      <el-option
          v-for="item in stateOptions"
          :key="item.value"
@@ -583,7 +583,7 @@
    <el-dialog
        v-model="dialogTableVisibleCustomLabel"
        destroy-on-close
        title="自定义标签"
        :title="$t('processCard.labelStyle')"
        style="width: 80%;height:75% ">
      <PrintLabel :printList="selectRecords"
                  style="width: 100%;height: 100%" />
@@ -592,7 +592,7 @@
    <el-dialog
        @opened="openedTable"
        v-model="printVisible"
        title="流程卡明细"
        :title="$t('processCard.processCardDetails')"
        :close-on-click-modal="false"
        :close-on-press-escape="false"
        style="width: 80%;height:75% ">

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

@@ -186,7 +186,7 @@

  toolbarConfig: {
    buttons: [
      {'code': 'titleStyle', 'name': '标签样式',status: 'primary'}
      {'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'}
    ],

    zoom: true,
@@ -289,7 +289,7 @@
    </vxe-grid>
    <el-dialog
        id="titleStyle"
        :title="'标签样式'"
        :title="$t('processCard.labelStyle')"
        style="width: 70%;height:70% "
        :close-on-click-modal="false"
        :close-on-press-escape="false"