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 | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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 7978e56..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
@@ -308,6 +308,9 @@
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,
@@ -338,16 +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: 'invertSelection', 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,
@@ -377,7 +397,7 @@
})
const gridEvents = {
- toolbarButtonClick({code}) {
+ async toolbarButtonClick({code}) {
const $grid = xGrid.value
selectRecords = $grid.getCheckboxRecords()
// selectRecords.forEach(obj => {
@@ -584,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
--
Gitblit v1.8.0