From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +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/SelectPrintProject.vue | 160 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 141 insertions(+), 19 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
index dc747c2..fafb289 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -14,20 +14,25 @@
import companyInfo from "@/stores/sd/companyInfo"
import {remove} from "xe-utils";
import PrintProcess from "@/components/pp/PrintProcess.vue";
+import PrintProcessStraight from "@/components/pp/PrintProcessStraight.vue";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo"
+
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
const dialogTableVisible = ref(false)
const dialogTableVisibleLabelXJTwo = ref(false)
+const dialogTableVisibleStraight = ref(false)
let rowClickIndex = ref(null)
-
+const orderInfo = useOrderInfoStore()
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
let titleStyleVisible = ref(false)
let print = ref("1")
+let printStyle = ref("1")
//鏍囩
let labelRow = ref({
@@ -41,6 +46,13 @@
const company = companyInfo()
let hidePrintLabels = company.printLabel.hideButton;
+//鍊掑彊
+let flashback = ref(1)
+//钀芥灦椤哄簭
+let landingSequence= ref(1)
+//鍚堟灦鎵撳嵃
+let compound = ref(null)
+
const form = reactive({
date1: '',
orderId: '',
@@ -52,13 +64,17 @@
list: null,
printMergeVal: null,
like: null,
- project:null
+ project:null,
+ merge: null,
+ flashback:null,
+ compound:null,
+ landingSequence:null,
})
const getTableRow = (row, type) => {
switch (type) {
case 'edit' :{
if(parseInt(print.value)==1){
- router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1,printStyle:parseInt(printStyle.value) }})
}else{
router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:1 }})
}
@@ -66,16 +82,28 @@
break
}
case 'edit1' :{
- router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
+ if(parseInt(print.value)==1){
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2,printStyle:parseInt(printStyle.value) }})
+ }else{
+ router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:2 }})
+ }
break
}
case 'edit2' :{
- router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3 }})
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3,printStyle:parseInt(printStyle.value) }})
break
}
case 'edit3' :{
printRow.value.project=row.project_no
- dialogTableVisible.value = true
+ printRow.value.merge = company.flowCardMerge
+ printRow.value.flashback = flashback.value
+ printRow.value.compound = compound.value
+ printRow.value.landingSequence=landingSequence.value
+ if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
+ dialogTableVisibleStraight.value = true
+ }else{
+ dialogTableVisible.value = true
+ }
}
}
}
@@ -113,20 +141,22 @@
}
//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1 = getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
+if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
+ orderInfo.workOrderDate=getNowTime()
+}
+let startTime = orderInfo.workOrderDate[0]
+let endTime = orderInfo.workOrderDate[1]
let orderId=form.orderId
let project=form.project
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/selectPrintPrintProject/${startTime}/${endTime}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrintPrintProject/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
if(hidePrintLabels=="true"){
//鍒犻櫎涓嬫媺妗�
- remove(gridOptions.toolbarConfig.slots)
+ //remove(gridOptions.toolbarConfig.slots)
const button = {'code': 'printLabel',
status: 'primary',
'name': t('processCard.finishedProductPrinting2')}
@@ -143,6 +173,7 @@
gridOptions.toolbarConfig.buttons.push(button2)
}
+ orderInfo.workOrderDate = res.data.selectDate
produceList.value = deepClone(res.data.data)
xGrid.value.reloadData(produceList.value)
gridOptions.loading = false
@@ -157,9 +188,9 @@
let startTime = form.date1[0]
let endTime = form.date1[1]
- request.post(`/processCard/selectPrintPrintProject/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/selectPrintPrintProject/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
-
+ orderInfo.workOrderDate = res.data.selectDate
xGrid.value.loadData(res.data.data)
gridOptions.loading = false
} else {
@@ -211,6 +242,27 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
+ // {
+ // field: 'order_id',
+ // title: t('order.orderId'),
+ // filters: [{data: ''}],
+ // slots: {filter: 'num1_filter'},
+ // filterMethod: filterChanged
+ // },
+ {
+ field: 'glass_thickness',
+ title: t('order.totalThickness'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'glass_type',
+ title: t('ingredients.films'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
{
field: 'glass_total',
title: t('order.quantity'),
@@ -225,13 +277,21 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
+ {
+ field: 'labelPrintNum',
+ title: t('processCard.numberLabelPrintingOperations')
+ },
+ {
+ field: 'processPrintNum',
+ title: t('processCard.numberTimesProcessCardPrinted')
+ },
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
],
slots:{
- buttons: "toolbar_buttons"
+ buttons: "toolbar_buttons",
},
zoom: true,
custom: true
@@ -244,7 +304,7 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity",'area',]
+ const List = ["glass_total","glass_total_area","labelPrintNum",'processPrintNum',]
if (List.includes(column.field)) {
return footSum(data, column.field)
}
@@ -313,13 +373,22 @@
id: 'child',
})
+const printCount = ()=>{
+ request.post(`/processCard/updateProjectProcessPrintCount/${printRow.value.project}`).then((res) => {
+ if(res.code==='200'){
+ ElMessage.info(t('order.printingNumber')+':'+res.data)
+ getWorkOrder()
+ }
+ })
+}
+
</script>
<template>
<div style="width: 100%;height: 100%">
<div class="head">
<el-date-picker
- v-model="form.date1"
+ v-model="orderInfo.workOrderDate"
:start-placeholder="$t('basicData.startDate')"
:end-placeholder="$t('basicData.endDate')"
format="YYYY/MM/DD"
@@ -373,12 +442,36 @@
</div>
</template>
- <template #toolbar_buttons>
+ <template #toolbar_buttons="{ $grid }">
+ <vxe-select @change="changeOrderType" v-model="printStyle" >
+ <vxe-option value="1" :label="t('processCard.print1')"></vxe-option>
+ <vxe-option value="2" :label="t('processCard.print2')"></vxe-option>
+ </vxe-select>
+
+<!-- <el-button
+ v-if="hidePrintLabels=='true'"
+ type="primary"
+ @click="$grid.dispatchEvent('toolbar-button-click', { code: 'printLabel' })"
+ >
+ {{ t('processCard.finishedProductPrinting2') }}
+ </el-button>-->
+
+ <el-button
+ v-if="hidePrintLabels=='true'"
+ type="primary"
+ @click="$grid.dispatchEvent('toolbar-button-click', { code: 'detailPrinting' })"
+ >
+ {{ t('processCard.detailPrinting') }}
+ </el-button>
+ </template>
+
+ <template #toolbar_button2>
<vxe-select @change="changeOrderType" v-model="print" >
<vxe-option value="1" label="EPSON LQ-82KF ESC/P2"></vxe-option>
<vxe-option value="2" label="TSC TTP-244Pro"></vxe-option>
</vxe-select>
</template>
+
@@ -402,7 +495,9 @@
destroy-on-close
style="width: 80%;height:75%;overflow: auto ">
<template #header="{ close, titleId, titleClass }">
- <el-button v-print="printContentLabel" :icon="Printer" circle/>
+ <el-button
+ v-print="printContentLabel"
+ :icon="Printer" circle/>
</template>
<print-custom-label-x-j-two id="childLabel"
:faceOrientation="labelRow.faceOrientation"
@@ -419,7 +514,10 @@
destroy-on-close
style="width: 75%;height:75% ">
<template #header="{ close, titleId, titleClass }">
- <el-button v-print="printContent" :icon="Printer" circle />
+ <el-button
+ v-print="printContent"
+ @click="printCount"
+ :icon="Printer" circle />
</template>
<print-process
id="child"
@@ -427,6 +525,29 @@
:printList="printRow.list"
:printMerge="printRow.printMergeVal"
:printProject="printRow.project"
+ :merges="printRow.merge"
+ :flashback = "printRow.flashback"
+ :compound = "printRow.compound"
+ :landingSequence = "printRow.landingSequence"
+ 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"
+ :printProject="printRow.project"
+ :merges="printRow.merge"
style="width: 100%;height: 100%"/>
</el-dialog>
</div>
@@ -455,4 +576,5 @@
overflow-y: auto;
}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0