From 3bfff48245e0eb8affcbf2a16fb2c75eb1cff8bb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 14 四月 2025 11:10:40 +0800
Subject: [PATCH] 模拟计算发送数据处理
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 71 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 438e7f3..062129b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -61,7 +61,8 @@
let printRow = ref({
list: null,
printMergeVal: null,
- like: null
+ like: null,
+ merge: null
})
//鏍囩
@@ -146,6 +147,7 @@
},
]
let hidePrintLabels = company.printLabel.hideButton;
+let btnType = company.printBtn;
if (hidePrintLabels == 'true') {
filteredOptions = lableTypeOptions.filter((option, index) => index !== 2);
@@ -190,6 +192,7 @@
data.value.printList = JSON.parse(route.query.printList)
let inquiryMode = route.query.checkedValue
+
// 绗竴娆″姞杞芥煡璇�
request.post(`/processCard/selectPrint/${inquiryMode}`, data.value).then((res) => {
@@ -206,7 +209,8 @@
gridOptions.loading = false
- hideButton()
+ hideButton();
+ hideHead()
} else {
ElMessage.warning(res.msg)
}
@@ -383,6 +387,7 @@
let lableTitle = lableType.text
if ($grid) {
switch (code) {
+ //鎵撳嵃娴佺▼鍗�
case 'print': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -400,6 +405,7 @@
printRow.value.list = JSON.stringify(selectRecords)
printRow.value.printMergeVal = printMerge.value
printRow.value.like = null
+ printRow.value.merge = company.flowCardMerge
// router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
dialogTableVisibleStraight.value = true
@@ -409,7 +415,7 @@
break
}
-
+ //鏍囩鎵撳嵃
case 'printLabel': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -431,6 +437,7 @@
break
}
+ //鏍囩鎵撳嵃2
case 'printLabel2': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -452,6 +459,7 @@
break
}
+ //鎺掑簭姹囨��
case 'sort': {
const $table = xGridDetail.value
let data = $table.getTableData().fullData
@@ -480,6 +488,7 @@
})
break
}
+ //鑷畾涔夋墦鍗�
case 'customLabel': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -498,6 +507,7 @@
id += selectRecords[i].id + "|"
}
}
+ //鎴愬搧鏍囩1
if (lableTypes == 1) {
labelRow.value.list = JSON.stringify(selectRecords)
@@ -512,7 +522,9 @@
dialogTableVisibleLabel.value = true
}
- } else if (company.label === 2) {
+ }
+ //甯稿窞椤圭洰
+ else if (company.label === 2) {
router.push({
path: '/main/processCard/PrintCustomLabelCZ',
query: {
@@ -525,14 +537,18 @@
})
}
- } 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
if (company.label === 1) {
dialogTableVisibleCustomLabel.value = true
- } else if (company.label === 2) {
+ }
+ //甯稿窞椤圭洰
+ else if (company.label === 2) {
router.push({
path: '/main/processCard/PrintCustomLabelSemiCZ',
query: {
@@ -544,7 +560,9 @@
}
})
}
- } else if (lableTypes == 3) {
+ }
+ //鎴愬搧鏍囩3 甯稿窞椤圭洰
+ else if (lableTypes == 3) {
router.push({
path: '/main/processCard/PrintLabel1',
query: {
@@ -583,7 +601,11 @@
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
+ if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
+ dialogTableVisibleStraight.value = true
+ }else{
+ dialogTableVisible.value = true
+ }
break
}
case 'sortTable': {
@@ -634,15 +656,34 @@
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'; // 鏄剧ず璇ユ寜閽�
+ // 鏍规嵁 hidePrintLabels 杩囨护 printLabel 鍜� printLabel2 鎸夐挳
+ if (hidePrintLabels === 'true') {
+ if (button.code === 'printLabel' || button.code === 'printLabel2') {
+ return false; // 闅愯棌 printLabel 鍜� printLabel2
+ }
}
- })
+ // 濡傛灉 printBtn 涓� '1'锛屽垯闅愯棌 customLabel 鎸夐挳
+ if (btnType == 1 && button.code === 'customLabel') {
+ console.log('Hiding customLabel button');
+ return false; // 闅愯棌 customLabel 鎸夐挳
+ }
+
+ // 榛樿鎯呭喌涓嬭繑鍥� true锛屼繚鐣欏叾浠栨寜閽�
+ return true;
+ });
}
+
+const hideHead = () => {
+
+ // 鍒ゆ柇 btnType 鏄惁绛変簬 '1' (鍙互鏍规嵁闇�瑕佽皟鏁翠负鏁板瓧 1)
+ if (btnType == 1) {
+ const headDiv = document.querySelector('.head');
+ if (headDiv) {
+ headDiv.style.display = 'none'; // 闅愯棌 class="head" 鐨� div
+ }
+ }
+}
// 鐩戝惉鎵撳嵃瀹屾垚浜嬩欢
const printNumber = () => {
@@ -763,6 +804,7 @@
:printLike="printRow.like"
:printList="printRow.list"
:printMerge="printRow.printMergeVal"
+ :merges="printRow.merge"
style="width: 100%;height: 100%"/>
</el-dialog>
@@ -780,6 +822,7 @@
:printLike="printRow.like"
:printList="printRow.list"
:printMerge="printRow.printMergeVal"
+ :merges="printRow.merge"
style="width: 100%;height: 100%"/>
</el-dialog>
--
Gitblit v1.8.0