From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +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 | 135 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 123 insertions(+), 12 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 080ee80..a905c33 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
@@ -12,30 +12,41 @@
import PrintProcess from '@/components/pp/PrintProcess.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
import PrintCustomLabel from '@/components/pp/PrintCustomLabel.vue'
+import PrintCustomLabelXJ from '@/components/pp/PrintCustomLabelXJ.vue'
import PrintCustomLabelSemi from '@/components/pp/PrintCustomLabelSemi.vue'
import SortDetail from '@/components/pp/SelectSortDetailProcessCard.vue'
+import SelectSortTable from '@/components/pp/SelectSortTable.vue'
import footSum from "@/hook/footSum"
import companyInfo from "@/stores/sd/companyInfo"
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
-
+import TagStyleDesigner from "@/components/pp/TagStyleDesigner.vue";
+import useUserInfoStore from "@/stores/userInfo";
const company = companyInfo()
-
+const userStore = useUserInfoStore()
+const userId = userStore.user.userId
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
+const dialogSortTable = ref(false)
const dialogTableVisible = ref(false)
const dialogTableVisibleLabel = ref(false)
+const dialogTableVisibleLabelXJ = ref(false)
const dialogTableVisibleCustomLabel = ref(false)
const printVisible = ref(false)
let selectRecords = ref(null)
-
+let titleStyleVisible = ref(false)
const selectRecordsData = ref({
printList: []
})
const xGrid = ref(null)
const xGridDetail = ref(null)
+
+//鎺掑簭
+let tableRow = ref({
+ orderId: null,
+})
//鎺掑簭
let editRow = ref({
@@ -191,6 +202,8 @@
titleSelectJson.value.dataType = res.data.type
xGrid.value.reloadData(newDataCollection)
gridOptions.loading = false
+
+
hideButton()
} else {
ElMessage.warning(res.msg)
@@ -291,7 +304,10 @@
{field: 'glass_address', title: t('processCard.glassAddress'), width: 90},
{field: 'quantity', title: t('order.quantity'), width: 90},
{field: 'total_area', title: t('order.area'), width: 90},
- {field: 'product_name', title: t('order.product'), width: 120},
+ {field: 'product_name', title: t('order.product'), width: 120,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
{
field: 'glass_child',
title: t('reportingWorks.glassChild'),
@@ -322,6 +338,8 @@
{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'},
],
// import: false,
@@ -399,7 +417,10 @@
id += selectRecords[i].id + "|"
}
}
- router.push({path: '/main/processCard/PrintLabel', query: {printList: JSON.stringify(selectRecords)}})
+ router.push({
+ path: '/main/processCard/PrintLabel',
+ query: {printList: JSON.stringify(selectRecords),printType:1}
+ })
break
}
@@ -419,7 +440,7 @@
}
router.push({
path: '/main/processCard/PrintCustomLabelSemi2',
- query: {printList: JSON.stringify(selectRecords)}
+ query: {printList: JSON.stringify(selectRecords),printType:1}
})
break
@@ -477,15 +498,22 @@
labelRow.value.type = type
labelRow.value.lableType = lableTypes
if (company.label === 1) {
- dialogTableVisibleLabel.value = true
+ if (company.printLabel.columnsLabel===1){
+ dialogTableVisibleLabelXJ.value = true
+ }
+ else{
+ dialogTableVisibleLabel.value = true
+ }
+
} else if (company.label === 2) {
router.push({
- path: '/main/processCard/PrintCustomLabel',
+ path: '/main/processCard/PrintCustomLabelCZ',
query: {
type: type,
faceOrientation: faceOrientation,
lableType: lableTypes,
- printList: JSON.stringify(selectRecords)
+ printList: JSON.stringify(selectRecords),
+ printType:1
}
})
}
@@ -499,12 +527,13 @@
dialogTableVisibleCustomLabel.value = true
} else if (company.label === 2) {
router.push({
- path: '/main/processCard/PrintCustomLabelSemi',
+ path: '/main/processCard/PrintCustomLabelSemiCZ',
query: {
type: type,
faceOrientation: faceOrientation,
lableType: lableTypes,
- printList: JSON.stringify(selectRecords)
+ printList: JSON.stringify(selectRecords),
+ printType:1
}
})
}
@@ -515,7 +544,8 @@
type: type,
faceOrientation: faceOrientation,
lableType: lableTypes,
- printList: JSON.stringify(selectRecords)
+ printList: JSON.stringify(selectRecords),
+ printType:1
}
})
@@ -547,6 +577,39 @@
printRow.value.like = "1"
// router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
dialogTableVisible.value = true
+ break
+ }
+ case 'sortTable': {
+
+ tableRow.value.orderId=JSON.stringify(data.value.printList)
+ // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
+ dialogSortTable.value = true
+ break
+ }
+ case 'printTest': {
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ // if (type === null || type === '' || type === undefined) {
+ // ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
+ // 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 + "|"
+ }
+ }
+
+ labelRow.value.list = JSON.stringify(selectRecords)
+ labelRow.value.faceOrientation = faceOrientation
+ labelRow.value.type = type
+ labelRow.value.lableType = lableTypes
+ titleStyleVisible.value = true
break
}
}
@@ -664,6 +727,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
@@ -707,6 +771,24 @@
style="width: 100%;height: 100%"/>
</el-dialog>
+ <!-- 鎴愬搧鏍囩涓ゅ垪-->
+ <el-dialog
+ id="sizeCustom"
+ v-model="dialogTableVisibleLabelXJ"
+ :title="$t('processCard.printLabel')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContentLabel" :icon="Printer" circle/>
+ </template>
+ <print-custom-label-x-j id="childLabel"
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :list="labelRow.list"
+ :type="labelRow.type"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
+
<!-- 灏忕墖鏍囩 -->
<el-dialog
id="sizeCustomSemi"
@@ -735,7 +817,31 @@
<sort-detail id="child" :processId="editRow.processId" :technologyNumber="editRow.technologyNumber" :process="editRow.process"/>
</el-dialog>
+ <!-- 鎺掑簭姹囨�绘煡璇�-->
+ <el-dialog
+ id="sizeCheck"
+ v-model="dialogSortTable"
+ :title="$t('processCard.sortSummary')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <select-sort-table id="child" :orderId="tableRow.orderId"/>
+ </el-dialog>
+<!-- 鏍囩鏍峰紡 -->
+ <el-dialog
+ id="titleStyle"
+ :title="$t('processCard.labelStyle')"
+ style="width: 90%;height:93%;margin-top: 3vh "
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ v-model="titleStyleVisible">
+ <!-- <tag-style style="width: 100%;height: 100%"/>-->
+ <tag-style-designer style="width: 100%;height: 100%"
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :list="labelRow.list"
+ :type="labelRow.type"/>
+ </el-dialog>
</div>
</template>
@@ -769,4 +875,9 @@
overflow-y: auto;
}
+:deep(#titleStyle .el-dialog__body){
+ height: 93%;
+ width: 100%;
+}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0