From 43e115a7de2c763c36d79e610a3abb1d833ea892 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 05 八月 2024 10:21:52 +0800
Subject: [PATCH] 修改发货报表
---
north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue | 181 +++++++++++++++++++++++++++++++++++---------
1 files changed, 142 insertions(+), 39 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue
index eb6bb5c..310e8a4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue
@@ -11,7 +11,8 @@
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import PrintProcess from '@/components/pp/PrintProcessReplenish.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
-import PrintCustomLabel from '@/views/pp/processCard/PrintCustomLabel.vue'
+import PrintCustomLabel from '@/components/pp/PrintRepairCustomLabel.vue'
+import PrintCustomLabelSemi from '@/components/pp/PrintRepairCustomLabelSemi.vue'
import footSum from "@/hook/footSum"
import {Search} from "@element-plus/icons-vue";
import companyInfo from "@/stores/sd/companyInfo"
@@ -89,6 +90,14 @@
printMergeVal:null
})
+//鏍囩
+let labelRow = ref({
+ list:null,//鍕鹃�夌殑鏁版嵁
+ faceOrientation:null,//鍐呭闈�
+ type:null,//鏍囩妯℃澘
+ lableType:null//鏍囩绫诲瀷
+})
+
//瀹ゅ唴瀹ゅ闈�
const stateValue = ref('')
const stateOptions = [
@@ -104,7 +113,7 @@
//鏍囩绫诲瀷
let filteredOptions=[]
-const lableType = ref('1')
+const lableType = ref('2')
const lableTypeOptions = [
{
value: '1',
@@ -141,8 +150,17 @@
})
+const printContentLabel = ref({
+ id: 'childLabel',
+})
+
+const printContentLabelSemi = ref({
+ id: 'childLabelSemi',
+})
+
+
//鎵撳嵃绫诲瀷
-const printType = ref()
+const printType = ref('灏忕墖鏍囩')
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
@@ -192,6 +210,7 @@
request.post(`/Replenish/selectPrint/${startTime}/${endTime}`, filterData.value).then((res) => {
if (res.code == 200) {
+
xGrid.value.loadData(res.data.data)
titleSelectJson.value.dataType = res.data.type
gridOptions.loading = false
@@ -226,7 +245,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'PrintReplenishFlowCard',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -259,49 +278,67 @@
title: t('order.orderId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ width:110
},
{
field: 'process_id',
title: t('processCard.processId'),
showOverflow: "ellipsis",
+ sortable: true,
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ width:140
},
{
field: 'customer_name',
title: t('customer.customerName'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ width:110
},
{
field: 'project',
title: t('order.project'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ width:110
},
- {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis"},
- {field: 'glass_address', title: t('processCard.glassAddress'),},
- {field: 'patch_num', title: t('order.quantity'),},
- {field: 'patch_area', title: t('order.area'),},
- {field: 'responsible_team', title: t('reportingWorks.responsibleTeam'),},
- {field: 'responsible_equipment', title: t('reportingWorks.responsibleEquipment'),},
- {field: 'responsible_personnel', title: t('reportingWorks.responsiblePersonnel'),},
- {field: 'patch_type', title: t('reportingWorks.breakageType'),},
- {field: 'patch_reason', title: t('reportingWorks.breakageReason'),},
- {field: 'patch_processes', title: t('reportingWorks.responsibleProcess'),},
- {field: 'product_name', title: t('order.product'),},
- {field: 'glass_child', title: t('reportingWorks.glassChild'),},
+ {
+ field: 'order_number',
+ title: t('order.OrderNum'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width:100
+ },
+ {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis",
+ width:90},
+ {field: 'glass_address', title: t('processCard.glassAddress'),
+ width:110},
+ {field: 'patch_num', title: t('order.quantity'),
+ width:70},
+ {field: 'patch_area', title: t('order.area'),width:80},
+ {field: 'responsible_team', title: t('reportingWorks.responsibleTeam'),width:110},
+ {field: 'responsible_equipment', title: t('reportingWorks.responsibleEquipment'),width:110},
+ {field: 'responsible_personnel', title: t('reportingWorks.responsiblePersonnel'),width:110},
+ {field: 'patch_type', title: t('reportingWorks.breakageType'),width:110},
+ {field: 'patch_reason', title: t('reportingWorks.breakageReason'),width:110},
+ {field: 'patch_processes', title: t('reportingWorks.responsibleProcess'),width:110},
+ {field: 'product_name', title: t('order.product'),width:110},
+ {field: 'glass_child', title: t('reportingWorks.glassChild'),width:110},
+ {field: 'reporting_work_id', title: t('reportingWorks.reportingWorkId'),width:120},
],//琛ㄥご鎸夐挳
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'},
],
// import: false,
// export: true,
@@ -317,7 +354,7 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity",'total_area',]
+ const List = ["patch_num",'patch_area',]
if (List.includes(column.field)) {
return footSum(data, column.field)
}
@@ -421,17 +458,56 @@
id += selectRecords[i].id + "|"
}
}
-
if (lableTypes==1){
- router.push({path: '/main/Replenish/PrintRepairCustomLabel', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
+
+ labelRow.value.list=JSON.stringify(selectRecords)
+ labelRow.value.faceOrientation=faceOrientation
+ labelRow.value.type=type
+ labelRow.value.lableType= lableTypes
+ dialogTableVisibleLabel.value=true
+ //router.push({path: '/main/processCard/PrintCustomLabel', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
}
- else {
- router.push({path: '/main/Replenish/PrintRepairCustomLabelSemi', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
+ else if (lableTypes==2) {
+ labelRow.value.list=JSON.stringify(selectRecords)
+ labelRow.value.faceOrientation=faceOrientation
+ labelRow.value.type=type
+ labelRow.value.lableType= lableTypes
+ dialogTableVisibleCustomLabel.value=true
+ //router.push({path: '/main/processCard/PrintCustomLabelSemi', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
+
+ }else
+ if (lableTypes==3) {
+ router.push({path: '/main/processCard/PrintLabel1', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
}
+ break
+ }
+ case 'printLike': {
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ if(printMerge.value===null ||printMerge.value===''){
+ ElMessage.warning('璇峰～鍏ラ渶瑕佸悎骞剁殑灞�')
+ return
+ }
+
+ let id = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ id += selectRecords[i].id
+ } else {
+ id += selectRecords[i].id + "|"
+ }
+ }
+ printRow.value.list = JSON.stringify(selectRecords)
+ 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
break
}
}
@@ -575,9 +651,9 @@
gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
// 杩欓噷鏍规嵁 hidePrintLabels 鐨勫�煎喅瀹氭槸鍚﹂殣钘� printLabel 鍜� printLabel2
if (hidePrintLabels=='true') {
- return button.code !== 'printLabel' && button.code !== 'printLabel2';
+ return button.code !== 'printLabel' && button.code !== 'printLabel2' ;
} else {
- return true; // 涓嶉殣钘忎换浣曟寜閽�
+ return true && button.code !=='printLike'; // 鏄剧ず璇ユ寜閽�
}
})
}
@@ -603,7 +679,6 @@
<div class="main-div-customer">
<el-date-picker
v-model="form.date1"
- :default-time="defaultTime"
:end-placeholder="$t('basicData.endDate')"
:start-placeholder="$t('basicData.startDate')"
format="YYYY/MM/DD"
@@ -618,8 +693,8 @@
</el-button>
- <el-input clearable :placeholder="$t('processCard.mergePrinting')" v-model="printMerge" style="width: 90px"></el-input>
-
+<!-- <el-input clearable :placeholder="$t('processCard.mergePrinting')" v-model="printMerge" style="width: 90px"></el-input>-->
+<!-- -->
<label>{{$t('processCard.labelStyle')}}锛�</label>
<el-select v-model="printType" clearable default-value="default_city" :placeholder="$t('processCard.pleaseSelect')" style="width: 120px">
<el-option
@@ -650,8 +725,7 @@
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
- height="600px"
- max-height="100%"
+ height="100%"
v-bind="gridOptions"
v-on="gridEvents"
@@ -703,28 +777,47 @@
<template #header="{ close, titleId, titleClass }">
<el-button v-print="printContent" @click="printNumber" :icon="Printer" circle />
</template>
- <print-process id="child" :printList="printRow.list" :printMerge="printRow.printMergeVal"
+ <print-process id="child" :printList="printRow.list" :printMerge="printRow.printMergeVal" :printLike="printRow.like"
style="width: 100%;height: 100%" />
</el-dialog>
+ <!-- 鎴愬搧鏍囩-->
<el-dialog
+ id="sizeCustom"
v-model="dialogTableVisibleLabel"
destroy-on-close
:title="$t('processCard.printLabel')"
style="width: 80%;height:75% ">
- <PrintLabel :printList="selectRecords"
- style="width: 100%;height: 100%" />
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContentLabel" :icon="Printer" circle />
+ </template>
+ <print-custom-label id="childLabel"
+ :list="labelRow.list"
+ :faceOrientation="labelRow.faceOrientation"
+ :type="labelRow.type"
+ :lableType="labelRow.lableType"
+ style="width: 100%;height: 100%" />
</el-dialog>
+ <!-- 灏忕墖鏍囩 -->
<el-dialog
+ id="sizeCustomSemi"
v-model="dialogTableVisibleCustomLabel"
destroy-on-close
:title="$t('processCard.labelStyle')"
style="width: 80%;height:75% ">
- <PrintLabel :printList="selectRecords"
- style="width: 100%;height: 100%" />
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContentLabelSemi" :icon="Printer" circle />
+ </template>
+ <print-custom-label-semi id="childLabelSemi"
+ :list="labelRow.list"
+ :faceOrientation="labelRow.faceOrientation"
+ :type="labelRow.type"
+ :lableType="labelRow.lableType"
+ style="width: 100%;height: 100%" />
</el-dialog>
+<!-- 鎺掑簭-->
<el-dialog
id="sizeCheck"
v-model="printVisible"
@@ -741,7 +834,7 @@
<style scoped>
.main-div-customer {
width: 99%;
- height: 100%;
+ height: 94%;
}
@@ -756,5 +849,15 @@
overflow-y: auto;
}
+:deep(#sizeCustom .el-dialog__body){
+ height: 85%;
+ width: 100%;
+ overflow-y: auto;
+}
+:deep(#sizeCustomSemi .el-dialog__body){
+ height: 85%;
+ width: 100%;
+ overflow-y: auto;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0