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

廖井涛

2025-09-29 2ad329b52d19e48bcdc9013aaf3fcee460456548

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

@@ -437,17 +437,17 @@

        <template #toolbar_buttons="{ $grid }">
          <vxe-select @change="changeOrderType" v-model="printStyle" >
            <vxe-option value="1" label="11列4行"></vxe-option>
            <vxe-option value="2" label="6行3列"></vxe-option>
            <vxe-option value="1" :label="t('processCard.print1')"></vxe-option>
            <vxe-option value="2" :label="t('processCard.print2')"></vxe-option>
          </vxe-select>
          &nbsp;&nbsp;
          <el-button
<!--          <el-button
              v-if="hidePrintLabels=='true'"
              type="primary"
              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'printLabel' })"
          >
            {{ t('processCard.finishedProductPrinting2') }}
          </el-button>
          </el-button>-->
          &nbsp;&nbsp;
          <el-button
              v-if="hidePrintLabels=='true'"