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/PrintFlowCard.vue | 217 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 188 insertions(+), 29 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 fd99b52..cafc314 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
@@ -10,6 +10,7 @@
import {VXETable} from "vxe-table";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import PrintProcess from '@/components/pp/PrintProcess.vue'
+import PrintProcessStraight from '@/components/pp/PrintProcessStraight.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
import PrintCustomLabel from '@/components/pp/PrintCustomLabel.vue'
import PrintCustomLabelXJ from '@/components/pp/PrintCustomLabelXJ.vue'
@@ -21,6 +22,9 @@
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
import TagStyleDesigner from "@/components/pp/TagStyleDesigner.vue";
import useUserInfoStore from "@/stores/userInfo";
+import { ElCheckbox } from 'element-plus'
+
+
const company = companyInfo()
const userStore = useUserInfoStore()
const userId = userStore.user.userId
@@ -33,6 +37,7 @@
const dialogTableVisibleLabel = ref(false)
const dialogTableVisibleLabelXJ = ref(false)
const dialogTableVisibleCustomLabel = ref(false)
+const dialogTableVisibleStraight = ref(false)
const printVisible = ref(false)
let selectRecords = ref(null)
let titleStyleVisible = ref(false)
@@ -59,7 +64,12 @@
let printRow = ref({
list: null,
printMergeVal: null,
- like: null
+ like: null,
+ merge: null,
+ printFc:null,
+ flashback:null,
+ landingSequence:null,
+ compound:null
})
//鏍囩
@@ -70,6 +80,12 @@
lableType: null//鏍囩绫诲瀷
})
+//鍊掑彊
+let flashback = ref(1)
+//钀芥灦椤哄簭
+let landingSequence= ref(1)
+//鍚堟灦鎵撳嵃
+let compound = ref(null)
const getTableRow = (row, type) => {
switch (type) {
@@ -144,6 +160,7 @@
},
]
let hidePrintLabels = company.printLabel.hideButton;
+let btnType = company.printBtn;
if (hidePrintLabels == 'true') {
filteredOptions = lableTypeOptions.filter((option, index) => index !== 2);
@@ -187,7 +204,9 @@
let orderId = route.query.orderId
data.value.printList = JSON.parse(route.query.printList)
+let printFc = route.query.printNumberFc
let inquiryMode = route.query.checkedValue
+
// 绗竴娆″姞杞芥煡璇�
request.post(`/processCard/selectPrint/${inquiryMode}`, data.value).then((res) => {
@@ -204,7 +223,7 @@
gridOptions.loading = false
- hideButton()
+ hideHead()
} else {
ElMessage.warning(res.msg)
}
@@ -228,6 +247,7 @@
const gridOptions = reactive({
+ toolbar: true,
loading: true,
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -296,10 +316,11 @@
field: 'technology_number',
title: t('processCard.technologyNumber'),
showOverflow: "ellipsis",
- width: 110,
+ width: 120,
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged,
+ sortable: true
},
{field: 'glass_address', title: t('processCard.glassAddress'), width: 90},
{field: 'quantity', title: t('order.quantity'), width: 90},
@@ -333,14 +354,15 @@
],//琛ㄥご鎸夐挳
toolbarConfig: {
+ slots:{
+ buttons: "toolbar_buttons"
+ },
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: 'sortTable', name: t('processCard.sortSummary'), status: 'primary'},
- // {code: 'printTest', name: "娴嬭瘯鎵撳嵃", status: 'primary'},
- // {code: 'printLike', name: "鍚岄厤缃墦鍗�", status: 'primary'},
+ // {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: 'sortTable', name: t('processCard.sortSummary'), status: 'primary'},
],
// import: false,
// export: true,
@@ -381,6 +403,7 @@
let lableTitle = lableType.text
if ($grid) {
switch (code) {
+ //鎵撳嵃娴佺▼鍗�
case 'print': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -398,11 +421,21 @@
printRow.value.list = JSON.stringify(selectRecords)
printRow.value.printMergeVal = printMerge.value
printRow.value.like = null
+ printRow.value.merge = company.flowCardMerge
+ printRow.value.printFc= printFc
+ printRow.value.flashback = flashback.value
+ printRow.value.landingSequence=landingSequence.value
+ printRow.value.compound = compound.value
// 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 'printLabel': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -424,6 +457,7 @@
break
}
+ //鏍囩鎵撳嵃2
case 'printLabel2': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -445,6 +479,7 @@
break
}
+ //鎺掑簭姹囨��
case 'sort': {
const $table = xGridDetail.value
let data = $table.getTableData().fullData
@@ -473,6 +508,7 @@
})
break
}
+ //鑷畾涔夋墦鍗�
case 'customLabel': {
if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -491,6 +527,7 @@
id += selectRecords[i].id + "|"
}
}
+ //鎴愬搧鏍囩1
if (lableTypes == 1) {
labelRow.value.list = JSON.stringify(selectRecords)
@@ -505,7 +542,9 @@
dialogTableVisibleLabel.value = true
}
- } else if (company.label === 2) {
+ }
+ //甯稿窞椤圭洰
+ else if (company.label === 2) {
router.push({
path: '/main/processCard/PrintCustomLabelCZ',
query: {
@@ -518,14 +557,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: {
@@ -537,7 +580,9 @@
}
})
}
- } else if (lableTypes == 3) {
+ }
+ //鎴愬搧鏍囩3 甯稿窞椤圭洰
+ else if (lableTypes == 3) {
router.push({
path: '/main/processCard/PrintLabel1',
query: {
@@ -560,7 +605,7 @@
return
}
if (printMerge.value === null || printMerge.value === '') {
- ElMessage.warning('璇峰～鍏ラ渶瑕佸悎骞剁殑灞�')
+ ElMessage.warning(t('rework.msg1'))
return
}
@@ -576,7 +621,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': {
@@ -624,18 +673,29 @@
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'; // 鏄剧ず璇ユ寜閽�
- }
- })
+
+//鍒ゆ柇鏌愪釜鎸夐挳 code 鏄惁瑕佹樉绀�
+function isButtonVisible(code) {
+ // 濡傛灉瑕侀殣钘� printLabel/printLabel2
+ if (hidePrintLabels && (code === 'printLabel' || code === 'printLabel2')) {
+ return false
+ }
+ // 濡傛灉 btnType 涓� 1锛岃闅愯棌 customLabel
+ if (btnType === 1 && code === 'customLabel') {
+ return false
+ }
+ 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 = () => {
@@ -652,6 +712,13 @@
})
}
+function onFlashbackChange(checked) {
+ flashback.value = checked ? 0 : 1
+}
+
+function onlandingSequenceChange(checked) {
+ landingSequence.value = checked ? 0 : 1
+}
</script>
<template>
@@ -700,8 +767,77 @@
v-bind="gridOptions"
v-on="gridEvents"
-
>
+ <!-- 鑷畾涔� toolbar_buttons 鎻掓Ы -->
+ <template #toolbar_buttons="{ $grid }">
+
+
+ <!-- 鎵嬪姩鍐欏嚭鎵�鏈夋寜閽� -->
+ <el-button
+ v-if="isButtonVisible('print')"
+ type="primary"
+ style="margin-right:8px;"
+ @click="$grid.dispatchEvent('toolbar-button-click', { code: 'print' })"
+ >
+ {{ t('processCard.print') }}
+ </el-button>
+
+ <el-button
+ v-if="isButtonVisible('customLabel')"
+ type="primary"
+ style="margin-right:8px;"
+ @click="$grid.dispatchEvent('toolbar-button-click', { code: 'customLabel' })"
+ >
+ {{ t('processCard.customLabelPrinting') }}
+ </el-button>
+
+ <el-button
+ v-if="isButtonVisible('printLabel')"
+ type="primary"
+ style="margin-right:8px;"
+ @click="$grid.dispatchEvent('toolbar-button-click', { code: 'printLabel' })"
+ >
+ {{ t('processCard.labelPrinting') }}
+ </el-button>
+
+ <el-button
+ v-if="isButtonVisible('printLabel2')"
+ type="primary"
+ style="margin-right:8px;"
+ @click="$grid.dispatchEvent('toolbar-button-click', { code: 'printLabel2' })"
+ >
+ {{ t('processCard.labelPrinting2') }}
+ </el-button>
+
+ <el-button
+ v-if="isButtonVisible('sortTable')"
+ type="primary"
+ style="margin-right:8px;"
+ @click="$grid.dispatchEvent('toolbar-button-click', { code: 'sortTable' })"
+ >
+ {{ t('processCard.sortSummary') }}
+ </el-button>
+
+ <el-checkbox
+ :model-value="flashback === 0"
+ @change="onFlashbackChange"
+ >
+ {{ t('processCard.flashback') }}
+ </el-checkbox>
+ <el-checkbox
+ :model-value="landingSequence === 0"
+ @change="onlandingSequenceChange"
+ >
+ {{ t('processCard.landingSequence') }}
+ </el-checkbox>
+ <el-input
+ v-model="compound"
+ :placeholder="$t('processCard.printCompound')"
+ clearable
+ style="margin-left:20px; width: 110px;"
+ />
+
+ </template>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<template #content="{ row }">
@@ -756,6 +892,29 @@
:printLike="printRow.like"
:printList="printRow.list"
:printMerge="printRow.printMergeVal"
+ :printFc="printRow.printFc"
+ :merges="printRow.merge"
+ :flashback = "printRow.flashback"
+ :landingSequence = "printRow.landingSequence"
+ :compound = "printRow.compound"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
+
+ <el-dialog
+ id="sizePrintCalrd"
+ v-model="dialogTableVisibleStraight"
+ :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-straight
+ id="child"
+ :printLike="printRow.like"
+ :printList="printRow.list"
+ :printMerge="printRow.printMergeVal"
+ :merges="printRow.merge"
style="width: 100%;height: 100%"/>
</el-dialog>
--
Gitblit v1.8.0