From b97e00dae4fa017c8273e41fb0f24cf7c7c69a33 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 25 十一月 2024 13:28:35 +0800
Subject: [PATCH] 工程打印标签调整
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue | 129 +++++++++++++++++++++++++++++--------------
1 files changed, 87 insertions(+), 42 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 5dd725f..ab4941e 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
@@ -47,7 +47,7 @@
let editRow = ref({
processId: null,
technologyNumber: null,
- process:null
+ process: null
})
//鎵撳嵃
@@ -241,7 +241,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -291,25 +291,29 @@
title: t('order.OrderNum'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged,width: 100
+ filterMethod: filterChanged, width: 100
},
{
field: 'technology_number',
title: t('processCard.technologyNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged,width: 100
+ 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: 'printQuantity', title: t('processCard.printQuantity'), width: 90,
+ editRender: {name: 'input', attrs: {placeholder: ''}},
+ },
{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
@@ -337,15 +341,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,
@@ -375,7 +397,7 @@
})
const gridEvents = {
- toolbarButtonClick({code}) {
+ async toolbarButtonClick({code}) {
const $grid = xGrid.value
selectRecords = $grid.getCheckboxRecords()
// selectRecords.forEach(obj => {
@@ -425,7 +447,7 @@
}
router.push({
path: '/main/processCard/PrintLabel',
- query: {printList: JSON.stringify(selectRecords),printType:2}
+ query: {printList: JSON.stringify(selectRecords), printType: 2}
})
break
@@ -446,7 +468,7 @@
}
router.push({
path: '/main/processCard/PrintCustomLabelSemi2',
- query: {printList: JSON.stringify(selectRecords),printType:2}
+ query: {printList: JSON.stringify(selectRecords), printType: 2}
})
break
@@ -514,7 +536,7 @@
faceOrientation: faceOrientation,
lableType: lableTypes,
printList: JSON.stringify(selectRecords),
- printType:2
+ printType: 2
}
})
}
@@ -535,7 +557,7 @@
faceOrientation: faceOrientation,
lableType: lableTypes,
printList: JSON.stringify(selectRecords),
- printType:2
+ printType: 2
}
})
}
@@ -547,7 +569,7 @@
faceOrientation: faceOrientation,
lableType: lableTypes,
printList: JSON.stringify(selectRecords),
- printType:2
+ printType: 2
}
})
@@ -582,6 +604,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
@@ -630,15 +657,32 @@
labelRow.value.faceOrientation = faceOrientation
labelRow.value.type = type
labelRow.value.lableType = lableTypes
- labelRow.value.dataType=1
- 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);
+ });
}
}
}
@@ -659,7 +703,7 @@
if (hidePrintLabels == 'true') {
return button.code !== 'printLabel' && button.code !== 'printLabel2';
} else {
- return true && button.code !== 'printLike' && button.code !== 'printLabel3'&& button.code !== 'printTest'; // 鏄剧ず璇ユ寜閽�
+ return true && button.code !== 'printLike' && button.code !== 'printLabel3' && button.code !== 'printTest'; // 鏄剧ず璇ユ寜閽�
}
})
}
@@ -718,17 +762,17 @@
</el-select>
<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"
- :column-config="{resizable: true}"
- :row-config="{isCurrent: true, isHover: true}"
- :data="tableData"
- :checkbox-config="{labelField: 'name', highlight: true, range: true}">
+ v-on="gridEvents">
- >
+ >
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<template #content="{ row }">
@@ -759,8 +803,8 @@
<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>
@@ -796,9 +840,9 @@
<el-button v-print="printContentLabel" :icon="Printer" circle/>
</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%"/>
@@ -829,24 +873,25 @@
: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:93%;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"
+ style="width: 100%;height: 100%"/>
</el-dialog>
<!-- 鎴愬搧鏍囩涓ゅ垪-->
@@ -878,12 +923,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"
- :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>
</div>
</template>
--
Gitblit v1.8.0