From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue | 654 +++++++++++++++-------------------------------------------
1 files changed, 174 insertions(+), 480 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue
index ab05bcb..2297eb0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue
@@ -15,11 +15,16 @@
import PrintCustomLabelSemi from '@/components/pp/PrintCustomLabelSemi.vue'
import PrintCustomLabelXJ from '@/components/pp/PrintCustomLabelTwo.vue'
import PrintCustomLabelXJTwo from '@/components/pp/PrintCustomLabelXJTwo.vue'
+import PrintCustomLabelProject from '@/components/pp/PrintCustomLabelProject.vue'
import SortDetail from '@/components/pp/SelectSortDetailProcessCard.vue'
import footSum from "@/hook/footSum"
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 QueuePrinter from "@/hook/queue"
+import TagStyleSet from "@/hook/tagStyleSet";
+import {createTemplate} from "@/hook/createTemplateTag";
const company = companyInfo()
@@ -32,6 +37,7 @@
const dialogTableVisibleCustomLabel = ref(false)
const dialogTableVisibleLabelXJ = ref(false)
const dialogTableVisibleLabelXJTwo = ref(false)
+const dialogTableVisibleLabelProject = ref(false)
const printVisible = ref(false)
let selectRecords = ref(null)
let titleStyleVisible = ref(false)
@@ -43,11 +49,15 @@
const xGrid = ref(null)
const xGridDetail = ref(null)
+
+
+const tagType = ref()
+
//鎺掑簭
let editRow = ref({
processId: null,
technologyNumber: null,
- process:null
+ process: null
})
//鎵撳嵃
@@ -63,107 +73,53 @@
faceOrientation: null,//鍐呭闈�
type: null,//鏍囩妯℃澘
lableType: null,//鏍囩绫诲瀷
- dataType: null//鏍囩绫诲瀷
+ dataType: null,//鏍囩绫诲瀷
+ detailType: 0//鏄惁鏄伐绋嬫槑缁嗘墦鍗�
})
-const getTableRow = (row, type) => {
- switch (type) {
- case 'edit' : {
- editRow.value.processId = row.process_id
- editRow.value.technologyNumber = row.technology_number
- editRow.value.process = row.process
- printVisible.value = true
+onMounted(async () => {
+ await getTags();
+ await hiprint.init();
- // router.push({path: '/sort-detail', query: {processId: row.process_id,technologyNumber:row.technology_number}})
- break
- }
- }
+})
+let hiprintTemplate = ref()
+
+
+
+
+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-printTemplate2",{grid:true});
+ const json = tag.value.value
+ hiprintTemplate.value.update(json)
}
-//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
-let filterData = ref({
-
- orderGlassDetail: {
- productionId: '',
- },
- orderDetail: {
- orderId: '',
- productId: '',
- productName: '',
- }
-
-
-})
-
-//瀹氫箟椤甸潰鎬婚〉鏁�
-let pageTotal = ref('')
-//瀹氫箟鏁版嵁杩斿洖缁撴灉
-let produceList = ref([])
-//瀹氫箟鏁版嵁杩斿洖缁撴灉
-let produceDetailList = ref([])
-//瀹氫箟褰撳墠椤垫暟
-let pageNum = $ref(1)
-let pageState = null
-
-//瀹ゅ唴瀹ゅ闈�
-const stateValue = ref('')
-const stateOptions = [
- {
- value: t('processCard.thisIsTheIndoorSurface'),
- label: t('processCard.thisIsTheIndoorSurface'),
- },
- {
- value: t('processCard.thisSideIsOutsideTheRoom'),
- label: t('processCard.thisSideIsOutsideTheRoom'),
- },
-]
-
//鏍囩绫诲瀷
-let filteredOptions = []
const lableType = ref('1')
-const lableTypeOptions = [
- {
- value: '1',
- label: t('processCard.finishedProductLabel'),
- },
- /* {
- value: '2',
- label: t('processCard.halfProductLabel'),
- },*/
- {
- value: `${company.printLabel.labelValue}`,
- label: `${company.printLabel.labelType}`,
- },
- {
- value: `${company.printLabel.labelValue3}`,
- label: `${company.printLabel.labelType3}`,
- },
-]
-let hidePrintLabels = company.printLabel.hideButton;
-
-if (hidePrintLabels == 'true') {
- filteredOptions = lableTypeOptions.filter((option, index) => index !== 2);
-} else {
- filteredOptions = lableTypeOptions;
-}
//鍚堢墖娴佺▼鍗℃墦鍗颁笅鎷夐�夐」
-const printMerge = ref('')
-const printMergeOptions = [{}]
const printContent = ref({
id: 'child',
})
-
const printContentLabel = ref({
id: 'childLabel',
})
-const printContentLabelSemi = ref({
- id: 'childLabelSemi',
-})
//鎵撳嵃绫诲瀷
const printType = ref()
@@ -177,6 +133,15 @@
printList: []
})
+const getTags = () => {
+ request.get('tagStyle/getTagList').then(res => {
+ res.data.forEach(item => {
+ item.value = JSON.parse(item.value)
+ })
+ tags.value = res.data
+ })
+}
+
const {currentRoute} = useRouter()
const route = currentRoute.value
@@ -186,9 +151,8 @@
request.post(`/processCard/selectPrintProjectDetails/${projectNo}`).then((res) => {
if (res.code == 200) {
- xGrid.value.loadData(res.data.data)
+ xGrid.value.reloadData(res.data.data)
gridOptions.loading = false
- hideButton()
} else {
ElMessage.warning(res.msg)
}
@@ -231,7 +195,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -254,7 +218,7 @@
},
{
field: 'stock_id',
- title: '鐗堝浘鍙�',
+ title: t('processCard.layoutNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
@@ -270,13 +234,9 @@
toolbarConfig: {
buttons: [
-
- {code: 'printLabel3', name: '鎴愬搧鎵撳嵃2', status: 'primary'},
- // {code: 'printLike', name: "鍚岄厤缃墦鍗�", status: 'primary'},
+ {code: 'printLabel3', name: t('basicData.print'), status: 'primary'},
+ {code: 'printSmallPiece', name: t('灏忕墖鎵撳嵃'), status: 'primary'},
],
- // import: false,
- // export: true,
- //print: true,
zoom: true,
custom: true
},
@@ -296,262 +256,54 @@
})
]
},
-
-
})
const gridEvents = {
toolbarButtonClick({code}) {
const $grid = xGrid.value
selectRecords = $grid.getCheckboxRecords()
- // selectRecords.forEach(obj => {
- // delete obj.print_status;
- // });
let type = printType.value
- let faceOrientation = stateValue.value
+ let faceOrientation = ''
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'))
- return
- }
-
- let id = ""
- for (let i = 0; i < selectRecords.length; i++) {
- if (i + 1 === selectRecords.length) {
- id += selectRecords[i].id
- } else {
- id += selectRecords[i].id + "|"
- }
- }
- printRow.value.list = JSON.stringify(selectRecords)
- printRow.value.printMergeVal = printMerge.value
- printRow.value.like = null
- // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
- dialogTableVisible.value = true
- break
- }
-
- case 'printLabel': {
- if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
- ElMessage.warning(t('searchOrder.msgList.checkOrder'))
- return
- }
-
- let id = ""
- for (let i = 0; i < selectRecords.length; i++) {
- if (i + 1 === selectRecords.length) {
- id += selectRecords[i].id
- } else {
- id += selectRecords[i].id + "|"
- }
- }
- router.push({
- path: '/main/processCard/PrintLabel',
- query: {printList: JSON.stringify(selectRecords),printType:2}
- })
-
- break
- }
- case 'printLabel2': {
- if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
- ElMessage.warning(t('searchOrder.msgList.checkOrder'))
- return
- }
-
- let id = ""
- for (let i = 0; i < selectRecords.length; i++) {
- if (i + 1 === selectRecords.length) {
- id += selectRecords[i].id
- } else {
- id += selectRecords[i].id + "|"
- }
- }
- router.push({
- path: '/main/processCard/PrintCustomLabelSemi2',
- query: {printList: JSON.stringify(selectRecords),printType:2}
- })
-
- break
- }
- case 'sort': {
- const $table = xGridDetail.value
- let data = $table.getTableData().fullData
- let flowCardData = ref({
- flowCard: data,
- })
- for (let i = 0; i < flowCardData.value.flowCard.length; i++) {
- const regex = /^[1-9]\d*$/
- if (!regex.test(flowCardData.value.flowCard[i].sort)) {
- ElMessage.warning(t('basicData.msg.greater0'))
- return; // 濡傛灉鏈変竴涓笉鏄暣鏁�
- }
- }
- request.post("/processCard/printSort", flowCardData.value).then((res) => {
- if (res.code == 200) {
- ElMessage.success(t('processCard.sortingSuccessful'))
- router.push({
- path: '/main/processCard/PrintFlowCard',
- query: {orderId: orderId, random: Math.random()}
- })
-
- //location.reload();
- } else {
- ElMessage.warning(res.msg)
- }
- })
- break
- }
- case 'customLabel': {
- if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
- ElMessage.warning(t('searchOrder.msgList.checkOrder'))
- return
- }
- if (type === null || type === '' || type === undefined) {
- ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
- return
- }
-
- let id = ""
- for (let i = 0; i < selectRecords.length; i++) {
- if (i + 1 === selectRecords.length) {
- id += selectRecords[i].id
- } else {
- id += selectRecords[i].id + "|"
- }
- }
- if (lableTypes == 1) {
- labelRow.value.list = JSON.stringify(selectRecords)
- labelRow.value.faceOrientation = faceOrientation
- labelRow.value.type = type
- labelRow.value.lableType = lableTypes
- lastList.value = []
- if (company.label === 1) {
- dialogTableVisibleLabel.value = true
- } else if (company.label === 2) {
- router.push({
- path: '/main/processCard/PrintCustomLabelCZ',
- query: {
- type: type,
- faceOrientation: faceOrientation,
- lableType: lableTypes,
- printList: JSON.stringify(selectRecords),
- printType:2
- }
- })
- }
-
- } else if (lableTypes == 2) {
- labelRow.value.list = JSON.stringify(selectRecords)
- labelRow.value.faceOrientation = faceOrientation
- labelRow.value.type = type
- labelRow.value.lableType = lableTypes
- lastList.value = []
- if (company.label === 1) {
- dialogTableVisibleCustomLabel.value = true
- } else if (company.label === 2) {
- router.push({
- path: '/main/processCard/PrintCustomLabelSemiCZ',
- query: {
- type: type,
- faceOrientation: faceOrientation,
- lableType: lableTypes,
- printList: JSON.stringify(selectRecords),
- printType:2
- }
- })
- }
- } else if (lableTypes == 3) {
- router.push({
- path: '/main/processCard/PrintLabel1',
- query: {
- type: type,
- faceOrientation: faceOrientation,
- lableType: lableTypes,
- printList: JSON.stringify(selectRecords),
- printType:2
- }
- })
-
- }
-
-
- break
- }
- case 'printLike': {
- if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
- ElMessage.warning(t('searchOrder.msgList.checkOrder'))
- return
- }
- if (printMerge.value === null || printMerge.value === '') {
- ElMessage.warning('璇峰～鍏ラ渶瑕佸悎骞剁殑灞�')
- return
- }
-
- let id = ""
- for (let i = 0; i < selectRecords.length; i++) {
- if (i + 1 === selectRecords.length) {
- id += selectRecords[i].id
- } else {
- id += selectRecords[i].id + "|"
- }
- }
- printRow.value.list = JSON.stringify(selectRecords)
- printRow.value.printMergeVal = printMerge.value
- printRow.value.like = "1"
- // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
- dialogTableVisible.value = true
- break
- }
- case 'printTest': {
- if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
- ElMessage.warning(t('searchOrder.msgList.checkOrder'))
- return
- }
- // if (type === null || type === '' || type === undefined) {
- // ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
- // return
- // }
-
- let id = ""
- for (let i = 0; i < selectRecords.length; i++) {
- if (i + 1 === selectRecords.length) {
- id += selectRecords[i].id
- } else {
- id += selectRecords[i].id + "|"
- }
- }
-
- labelRow.value.list = JSON.stringify(selectRecords)
- labelRow.value.faceOrientation = faceOrientation
- labelRow.value.type = type
- labelRow.value.lableType = lableTypes
- titleStyleVisible.value = true
- break
- }
case 'printLabel3': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
- ElMessage.warning(t('璇烽�夋嫨宸ョ▼瀵瑰簲鐨勭増鍥惧彿'))
+ ElMessage.warning(t('processCard.projectMsg1'))
return
}
- let id = ""
- for (let i = 0; i < selectRecords.length; i++) {
- if (i + 1 === selectRecords.length) {
- id += selectRecords[i].id
- } else {
- id += selectRecords[i].id + "|"
- }
+ if (tag.value.name == null || tag.value.name == '') {
+ ElMessage.warning(t('processCard.projectMsg2'))
+ return
}
-
+ let name = company.companyName
labelRow.value.list = JSON.stringify(selectRecords)
- labelRow.value.type = '鎭掗懌甯︽暟閲�'
- labelRow.value.dataType=3
- dialogTableVisibleLabelXJTwo.value = true
-
-
+ if (name == '鏂扮枂鎭掗懌鐜荤拑绉戞妧鏈夐檺鍏徃') {
+ labelRow.value.type = '鎭掗懌甯︽暟閲�'
+ labelRow.value.dataType = 3
+ dialogTableVisibleLabelXJTwo.value = true
+ } else {
+ labelRow.value.type = tag.value.name
+ labelRow.value.dataType = 3
+ labelRow.value.lableType = lableTypes
+ labelRow.value.switch = true
+ lastList.value = []
+ dialogTableVisibleLabelProject.value = true
+ }
+ break
+ }
+ case 'printSmallPiece': {
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
+ ElMessage.warning(t('processCard.projectMsg1'))
+ return
+ }
+ let stock_id=[]
+ for (let i=0;i<selectRecords.length;i++){
+ stock_id.push(selectRecords[i].stock_id)
+ }
+ console.log(stock_id)
+ router.push({path: '/main/processCard/printProjectDetailSmallPiece', query: {projectNo: projectNo,stockId:JSON.stringify(stock_id)}})
break
}
}
@@ -560,44 +312,55 @@
}
-const openedTable = () => {
- let detail = ref(produceDetailList.value)
- xGridDetail.value.reloadData(detail.value)
- addListener(xGridDetail.value, detailGridOptions)
-}
-
-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'; // 鏄剧ず璇ユ寜閽�
+const printObjectProcess = (type) => {
+ 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
+ }
}
})
-}
-
-// 鐩戝惉鎵撳嵃瀹屾垚浜嬩欢
-const printNumber = () => {
-
- selectRecordsData.value.printList = selectRecords
- let printState = 0
- request.post(`/processCard/updatePrintState/${printState}`, selectRecordsData.value).then((res) => {
- if (res.code == 200 && res.data === true) {
- } else {
-
- ElMessage.warning(t('basicData.msg.saveFail'))
-
- }
- })
+ //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)
}
</script>
<template>
<div class="main-div-customer">
+ <div>
+ <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>
+ </div>
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
@@ -620,130 +383,19 @@
</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>
-
- </template>
-
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
- @keyup.enter.native="$panel.confirmFilter()"
- @input="changeFilterEvent($event, option, $panel)"/>
+ @input="changeFilterEvent($event, option, $panel)"
+ @keyup.enter.native="$panel.confirmFilter()"/>
</div>
</div>
</template>
</vxe-grid>
- <!-- 娴佺▼鍗℃墦鍗� -->
- <el-dialog
- id="sizePrintCalrd"
- v-model="dialogTableVisible"
- :title="$t('processCard.print')"
- destroy-on-close
- style="width: 75%;height:75% ">
- <template #header="{ close, titleId, titleClass }">
- <el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
- </template>
- <print-process
- id="child"
- :printLike="printRow.like"
- :printList="printRow.list"
- :printMerge="printRow.printMergeVal"
- style="width: 100%;height: 100%"/>
- </el-dialog>
-
- <!-- 鎴愬搧鏍囩-->
- <el-dialog
- id="sizeCustom"
- v-model="dialogTableVisibleLabel"
- :title="$t('processCard.printLabel')"
- destroy-on-close
- style="width: 80%;height:75% ">
- <template #header="{ close, titleId, titleClass }">
- <el-button v-print="printContentLabel" :icon="Printer" circle/>
- </template>
- <print-custom-label id="childLabel"
- :lastList = 'lastList'
- :faceOrientation="labelRow.faceOrientation"
- :lableType="labelRow.lableType"
- :list="labelRow.list"
- :type="labelRow.type"
- style="width: 100%;height: 100%"/>
- </el-dialog>
-
- <!-- 灏忕墖鏍囩 -->
- <el-dialog
- id="sizeCustomSemi"
- v-model="dialogTableVisibleCustomLabel"
- :title="$t('processCard.labelStyle')"
- destroy-on-close
- style="width: 80%;height:75% ">
- <template #header="{ close, titleId, titleClass }">
- <el-button v-print="printContentLabelSemi" :icon="Printer" circle/>
- </template>
- <print-custom-label-semi id="childLabelSemi"
- :faceOrientation="labelRow.faceOrientation"
- :lableType="labelRow.lableType"
- :list="labelRow.list"
- :type="labelRow.type"
- style="width: 100%;height: 100%"/>
- </el-dialog>
-
- <!-- 鎺掑簭-->
- <el-dialog
- id="sizeCheck"
- v-model="printVisible"
- :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"/>
- </el-dialog>
-
- <!-- 鏍囩鏍峰紡 -->
- <el-dialog
- id="titleStyle"
- :title="$t('processCard.labelStyle')"
- style="width: 90%;height:93%;margin-top: 3vh "
- :close-on-click-modal="false"
- :close-on-press-escape="false"
- destroy-on-close
- v-model="titleStyleVisible">
- <!-- <tag-style style="width: 100%;height: 100%"/>-->
- <tag-style-designer style="width: 100%;height: 100%"
- :faceOrientation="labelRow.faceOrientation"
- :lableType="labelRow.lableType"
- :list="labelRow.list"
- :type="labelRow.type"/>
- </el-dialog>
-
- <!-- 鎴愬搧鏍囩涓ゅ垪-->
- <el-dialog
- id="sizeCustom"
- v-model="dialogTableVisibleLabelXJ"
- :title="$t('processCard.printLabel')"
- destroy-on-close
- style="width: 80%;height:75% ">
- <template #header="{ close, titleId, titleClass }">
- <el-button v-print="printContentLabel" :icon="Printer" circle/>
- </template>
- <print-custom-label-x-j id="childLabel"
- :faceOrientation="labelRow.faceOrientation"
- :lableType="labelRow.lableType"
- :list="labelRow.list"
- :type="labelRow.type"
- style="width: 100%;height: 100%"/>
- </el-dialog>
<!-- 鎴愬搧鏍囩涓ゅ垪鏂扮枂-->
<el-dialog
@@ -756,12 +408,54 @@
<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"
- :dataType="labelRow.dataType"
- 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>
+
+ <!-- 鎴愬搧鏍囩宸ョ▼鎵撳嵃-->
+ <el-dialog
+ id="sizeCustom"
+ v-model="dialogTableVisibleLabelProject"
+ :title="$t('processCard.printLabel')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+<!-- <el-button :icon="Printer" circle @click="printObjectProcess(1)"/>-->
+<!-- <el-button @click="printObjectProcess(3)" >{{ $t('processCard.noTitle') }}</el-button>-->
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ :content="$t('processCard.yesTitle')"
+ placement="top"
+ >
+ <el-button :icon="Printer" circle @click="printObjectProcess(1)"/>
+ </el-tooltip>
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ :content="$t('processCard.noTitle')"
+ placement="top"
+ >
+ <el-button @click="printObjectProcess(3)">
+ <i class="vxe-icon-print"></i>
+ </el-button>
+ </el-tooltip>
+ </template>
+ <print-custom-label-project id="childLabel"
+ :detailType="labelRow.detailType"
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :lastList='lastList'
+ :list="labelRow.list"
+ :switch="labelRow.switch"
+ :titleList="labelRow.titleList"
+ :type="labelRow.type"
+
+ style="width: 100%;height: 100%"/>
</el-dialog>
</div>
</template>
--
Gitblit v1.8.0