From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +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/PrintFlowCardDetails.vue | 530 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 396 insertions(+), 134 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
index 8ea3d58..c3b4eee 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
+++ b/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()
@@ -35,7 +37,7 @@
const printVisible = ref(false)
let selectRecords = ref(null)
let titleStyleVisible = ref(false)
-
+let lastList = ref([])
const selectRecordsData = ref({
printList: []
})
@@ -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
})
@@ -125,9 +130,21 @@
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;
+let btnType = company.printBtn;
if (hidePrintLabels == 'true') {
filteredOptions = lableTypeOptions.filter((option, index) => index !== 2);
@@ -164,16 +181,88 @@
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
let orderId = route.query.orderId
data.value.printList = JSON.parse(route.query.printList)
-
+let type = parseInt(route.query.type)
let inquiryMode = route.query.checkedValue
// 绗竴娆″姞杞芥煡璇�
-request.post(`/processCard/selectPrintDetails/${inquiryMode}`, data.value).then((res) => {
+request.post(`/processCard/selectPrintDetails/${inquiryMode}/${type}`, data.value).then((res) => {
if (res.code == 200) {
let newDataCollection = [];
@@ -182,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
@@ -229,7 +332,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -244,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'),
@@ -279,18 +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: 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'),
@@ -314,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,
@@ -352,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'))
@@ -385,7 +547,7 @@
dialogTableVisible.value = true
break
}
-
+ //鏍囩鎵撳嵃 甯稿窞
case 'printLabel': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -400,10 +562,14 @@
id += selectRecords[i].id + "|"
}
}
- router.push({path: '/main/processCard/PrintLabel', query: {printList: JSON.stringify(selectRecords)}})
+ router.push({
+ path: '/main/processCard/PrintLabel',
+ query: {printList: JSON.stringify(selectRecords), printType: 2}
+ })
break
}
+ //鏍囩鎵撳嵃2 甯稿窞
case 'printLabel2': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -420,7 +586,7 @@
}
router.push({
path: '/main/processCard/PrintCustomLabelSemi2',
- query: {printList: JSON.stringify(selectRecords)}
+ query: {printList: JSON.stringify(selectRecords), printType: 2}
})
break
@@ -453,6 +619,7 @@
})
break
}
+ //鑷畾涔夋垚鍝佹爣绛炬墦鍗�
case 'customLabel': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -471,52 +638,65 @@
id += selectRecords[i].id + "|"
}
}
+ //鎴愬搧鏍囩1
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) {
+ }
+ //甯稿窞椤圭洰
+ else if (company.label === 2) {
router.push({
- path: '/main/processCard/PrintCustomLabel',
+ path: '/main/processCard/PrintCustomLabelCZ',
query: {
type: type,
faceOrientation: faceOrientation,
lableType: lableTypes,
- printList: JSON.stringify(selectRecords)
+ printList: JSON.stringify(selectRecords),
+ 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
labelRow.value.lableType = lableTypes
+ lastList.value = []
if (company.label === 1) {
dialogTableVisibleCustomLabel.value = true
- } else if (company.label === 2) {
+ }
+ //甯稿窞椤圭洰
+ else if (company.label === 2) {
router.push({
- path: '/main/processCard/PrintCustomLabelSemi',
+ path: '/main/processCard/PrintCustomLabelSemiCZ',
query: {
type: type,
faceOrientation: faceOrientation,
lableType: lableTypes,
- printList: JSON.stringify(selectRecords)
+ printList: JSON.stringify(selectRecords),
+ printType: 2
}
})
}
- } else if (lableTypes == 3) {
+ }
+ //鎴愬搧鏍囩3
+ else if (lableTypes == 3) {
router.push({
path: '/main/processCard/PrintLabel1',
query: {
type: type,
faceOrientation: faceOrientation,
lableType: lableTypes,
- printList: JSON.stringify(selectRecords)
+ printList: JSON.stringify(selectRecords),
+ printType: 2
}
})
@@ -531,7 +711,7 @@
return
}
if (printMerge.value === null || printMerge.value === '') {
- ElMessage.warning('璇峰～鍏ラ渶瑕佸悎骞剁殑灞�')
+ ElMessage.warning(t('rework.msg1'))
return
}
@@ -551,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
@@ -568,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
@@ -581,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
}
@@ -597,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);
+ });
}
}
}
@@ -621,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'; // 鏄剧ず璇ユ寜閽�
+ // 濡傛灉 type 涓嶄负绌烘椂锛岄殣钘� print 鎸夐挳
+ if (btnType == 1 && button.code === 'print') {
+ return false; // 闅愯棌 print 鎸夐挳
}
- })
-}
+
+ // 鏍规嵁 hidePrintLabels 鐨勫�煎垽鏂槸鍚﹂殣钘� printLabel銆乸rintLabel2 鍜� customLabel
+ if (hidePrintLabels == 'true') {
+ return button.code !== 'printLabel' && button.code !== 'printLabel2' && button.code !== 'customLabel';
+ } else {
+ // 濡傛灉 hidePrintLabels 涓嶆槸 'true'锛屽垯闅愯棌 printLike銆乸rintLabel3 鍜� 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 {
@@ -648,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>
-
- <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>
-
- <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>
-
- <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>
+
+ <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>
+
+ <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>
+
+ <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>
+
+ <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"
@@ -738,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"
@@ -756,11 +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"
:faceOrientation="labelRow.faceOrientation"
:lableType="labelRow.lableType"
+ :lastList='lastList'
:list="labelRow.list"
:type="labelRow.type"
style="width: 100%;height: 100%"/>
@@ -774,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"
@@ -791,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>
<!-- 鎴愬搧鏍囩涓ゅ垪-->
@@ -819,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>
@@ -840,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>
@@ -855,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%;
--
Gitblit v1.8.0