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 | 1154 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 841 insertions(+), 313 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 ea2da80..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
@@ -9,43 +9,97 @@
import {changeFilterEvent, filterChanged} from "@/hook"
import {VXETable} from "vxe-table";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
-import PrintProcess from '@/views/pp/processCard/PrintProcess.vue'
+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'
+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";
+import { ElCheckbox } from 'element-plus'
+
+
+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 printVisible= 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)
+const selectRecordsData = ref({
+ printList: []
+})
const xGrid = ref(null)
-const xGridDetail =ref(null)
+const xGridDetail = ref(null)
+//鎺掑簭
+let tableRow = ref({
+ orderId: null,
+})
+//鎺掑簭
+let editRow = ref({
+ processId: null,
+ technologyNumber: null,
+ process:null
+})
-const getTableRow = (row,type) =>{
+//鎵撳嵃
+let printRow = ref({
+ list: null,
+ printMergeVal: null,
+ like: null,
+ merge: null,
+ printFc:null,
+ flashback:null,
+ landingSequence:null,
+ compound:null
+})
+
+//鏍囩
+let labelRow = ref({
+ list: null,//鍕鹃�夌殑鏁版嵁
+ faceOrientation: null,//鍐呭闈�
+ type: null,//鏍囩妯℃澘
+ lableType: null//鏍囩绫诲瀷
+})
+
+//鍊掑彊
+let flashback = ref(1)
+//钀芥灦椤哄簭
+let landingSequence= ref(1)
+//鍚堟灦鎵撳嵃
+let compound = ref(null)
+
+const getTableRow = (row, type) => {
switch (type) {
- case 'edit' :{
- request.post(`/processCard/printFlowCardDetails/${row.process_id}/${row.technology_number}`,filterData.value).then((res) => {
- if (res.code == 200) {
+ case 'edit' : {
+ editRow.value.processId = row.process_id
+ editRow.value.technologyNumber = row.technology_number
+ editRow.value.process = row.process
+ printVisible.value = true
- produceDetailList.value = (res.data.data)
- printVisible.value=true
-
- } else {
-
- ElMessage.warning(res.msg)
-
- }
- })
+ // router.push({path: '/sort-detail', query: {processId: row.process_id,technologyNumber:row.technology_number}})
break
}
-
}
}
-
//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
let filterData = ref({
@@ -60,6 +114,7 @@
})
+
//瀹氫箟椤甸潰鎬婚〉鏁�
let pageTotal = ref('')
//瀹氫箟鏁版嵁杩斿洖缁撴灉
@@ -70,22 +125,110 @@
let pageNum = $ref(1)
let pageState = null
+//瀹ゅ唴瀹ゅ闈�
+const stateValue = ref('')
+const stateOptions = [
+ {
+ value: t('processCard.thisIsTheIndoorSurface'),
+ label: t('processCard.thisIsTheIndoorSurface'),
+ },
+ {
+ value: t('processCard.thisSideIsOutsideTheRoom'),
+ label: t('processCard.thisSideIsOutsideTheRoom'),
+ },
+]
+
+//鏍囩绫诲瀷
+let filteredOptions = []
+const lableType = ref('1')
+const lableTypeOptions = [
+ {
+ value: '1',
+ label: t('processCard.finishedProductLabel'),
+ },
+ /* {
+ value: '2',
+ label: t('processCard.halfProductLabel'),
+ },*/
+ {
+ value: `${company.printLabel.labelValue}`,
+ label: `${company.printLabel.labelType}`,
+ },
+ {
+ value: `${company.printLabel.labelValue3}`,
+ label: `${company.printLabel.labelType3}`,
+ },
+]
+let hidePrintLabels = company.printLabel.hideButton;
+let btnType = company.printBtn;
+
+if (hidePrintLabels == 'true') {
+ filteredOptions = lableTypeOptions.filter((option, index) => index !== 2);
+} else {
+ filteredOptions = lableTypeOptions;
+}
+
+//鍚堢墖娴佺▼鍗℃墦鍗颁笅鎷夐�夐」
+const printMerge = ref('')
+const printMergeOptions = [{}]
+
+const printContent = ref({
+ id: 'child',
+
+})
+
+
+const printContentLabel = ref({
+ id: 'childLabel',
+})
+
+const printContentLabelSemi = ref({
+ id: 'childLabelSemi',
+})
+
+//鎵撳嵃绫诲瀷
+const printType = ref()
+
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ dataType: [],
+})
+
+const data = ref({
+ printList: []
+})
+
const {currentRoute} = useRouter()
const route = currentRoute.value
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/${orderId}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrint/${inquiryMode}`, data.value).then((res) => {
if (res.code == 200) {
- produceList = produceList.value.concat(deepClone(res.data.data))
- xGrid.value.reloadData(produceList)
+ let newDataCollection = [];
+ for (let i = 0; i < res.data.data.length; i++) {
+ res.data.data[i].detail.forEach((item) => {
+ newDataCollection.push(item);
+ })
+ }
+
+ titleSelectJson.value.dataType = res.data.type
+ xGrid.value.reloadData(newDataCollection)
gridOptions.loading = false
+
+
+ hideHead()
} else {
ElMessage.warning(res.msg)
}
})
+
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -104,13 +247,14 @@
const gridOptions = reactive({
+ toolbar: true,
loading: true,
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'printFlowCard_1',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -135,7 +279,7 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {title: '鎿嶄綔', width: 55, slots: { default: 'button_slot' },fixed:"left"},
+ {title: t('basicData.operate'), width: 55, slots: {default: 'button_slot'}, fixed: "left"},
{type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
@@ -143,239 +287,82 @@
title: t('order.orderId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged, width: 120
},
{
field: 'process_id',
- title: '娴佺▼鍗″彿',
+ title: t('processCard.processId'),
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged, width: 140
},
{
field: 'customer_name',
- title: '瀹㈡埛鍚嶇О',
+ title: t('customer.customerName'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged, width: 120
},
{
field: 'project',
- title: '椤圭洰鍚嶇О',
+ title: t('order.project'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {field: 'technology_number', title: '灏忕墖椤哄簭', showOverflow: "ellipsis"},
- {field: 'glass_address', title: '灏忕墖鏍囪',},
- {field: 'quantity', title: '鏁伴噺',},
- {field: 'total_area', title: '闈㈢Н',},
- {field: 'product_name', title: '浜у搧鍚嶇О',},
- {field: 'glass_child', title: '鍗曠墖鍚嶇О',},
- {field: 'founder', title: '鍒嗘灦鍛�',},
- {field: 'splitFrame_time', title: '鍒嗘灦鏃堕棿',},
- ],//琛ㄥご鎸夐挳
-
- toolbarConfig: {
- buttons: [
- {code: 'print', name: '鎵撳嵃娴佺▼鍗�', status: 'primary'},
- {code: 'printLabel', name: '鎵撳嵃鏍囩', status: 'primary'},
- ],
- // import: false,
- // export: true,
- //print: true,
- zoom: true,
- custom: true
- },
- data: null,//琛ㄦ牸鏁版嵁
- //鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- return[
- columns.map((column, columnIndex) => {
- if (columnIndex === 0) {
- return t('basicData.total')
- }
- const List = ["quantity",'total_area',]
- if (List.includes(column.field)) {
- return footSum(data, column.field)
- }
- return ''
- })
- ]
- }
-})
-
-const gridEvents = {
- toolbarButtonClick ({ code}) {
- const $grid = xGrid.value
- selectRecords = $grid.getCheckboxRecords()
- if ($grid) {
- switch (code) {
- case 'print': {
- if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
- ElMessage.warning(t('searchOrder.msgList.checkOrder'))
- 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 + "|"
- }
- }
- router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords)}})
-
- break
- }
-
- case 'printLabel': {
- if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
- ElMessage.warning(t('searchOrder.msgList.checkOrder'))
- 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 + "|"
- }
- }
- router.push({path: '/main/processCard/PrintLabel', query: {printList: JSON.stringify(selectRecords)}})
-
- break
- }
- case 'sort': {
- const $table = xGridDetail.value
- let data = $table.getTableData().fullData
- let flowCardData = ref({
- flowCard: data,
- })
- request.post("/processCard/printSort", flowCardData.value).then((res) => {
- if (res.code == 200) {
- ElMessage.success("鎺掑簭鎴愬姛")
- //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
- router.push({
- path: '/main/processCard/PrintFlowCard',
- query: {orderId: orderId,random: Math.random()}
- })
-
- //location.reload();
- } else {
- ElMessage.warning(res.msg)
- }
- })
- break
- }
- }
- }
- },
-}
-
-
-const detailGridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
- showFooter: true,//鏄剧ず鑴�
- printConfig: {},
- importConfig: {},
- exportConfig: {},
- scrollX: {enabled: true},
- scrollY: {enabled: true, gt: 0},//寮�鍚櫄鎷熸粴鍔�
- showOverflow: true,
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- // remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },//琛ㄥご鍙傛暟
- columns: [
- {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
- {
- field: 'sort',
- width: 80,
- editRender: {name: 'input', attrs: {placeholder: ''}},
- title: '鎺掑簭',
- },
- {
- field: 'process_id',
- title: '娴佺▼鍗″彿',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'order_number',
- title: '搴忓彿',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ width: 120
},
{
field: 'technology_number',
- title: '灏忕墖椤哄簭',
+ title: t('processCard.technologyNumber'),
+ showOverflow: "ellipsis",
+ 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},
+ {field: 'total_area', title: t('order.area'), width: 90},
+ {field: 'product_name', title: t('order.product'), width: 120,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {
+ field: 'glass_child',
+ title: t('reportingWorks.glassChild'),
+ width: 120,
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
+ {field: 'founder', title: t('processCard.founder'), width: 120},
+ {field: 'splitFrame_time', title: t('processCard.splitFrameTime'), width: 120},
{
- field: 'glass_address',
- title: '灏忕墖鏍囪',
- filters: [{data: ''}],
+ field: 'process', title: t('craft.process'), filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged, width: 160
},
{
- field: 'quantity',
- title: '鏁伴噺',
+ field: 'print_status',
+ title: t('processCard.printStatus'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'child_width',
- title: '瀹�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'child_height',
- title: '楂�',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'area',
- title: '闈㈢Н',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged, width: 120
},
],//琛ㄥご鎸夐挳
toolbarConfig: {
+ slots:{
+ buttons: "toolbar_buttons"
+ },
buttons: [
- {code: 'sort', 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,
@@ -385,115 +372,477 @@
},
data: null,//琛ㄦ牸鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity",'area',]
+ const List = ["quantity", 'total_area',]
if (List.includes(column.field)) {
return footSum(data, column.field)
}
return ''
})
]
- }
+ },
+
+
})
-const openedTable = () => {
- let detail =ref(produceDetailList.value)
- xGridDetail.value.reloadData(detail.value)
+const gridEvents = {
+ toolbarButtonClick({code}) {
+ const $grid = xGrid.value
+ selectRecords = $grid.getCheckboxRecords()
+ // selectRecords.forEach(obj => {
+ // delete obj.print_status;
+ // });
+ let type = printType.value
+ let faceOrientation = stateValue.value
+ let lableTypes = lableType.value
+ let lableTitle = lableType.text
+ if ($grid) {
+ switch (code) {
+ //鎵撳嵃娴佺▼鍗�
+ case 'print': {
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ 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 = 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}})
+ 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'))
+ 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 + "|"
+ }
+ }
+ router.push({
+ path: '/main/processCard/PrintLabel',
+ query: {printList: JSON.stringify(selectRecords),printType:1}
+ })
+
+ break
+ }
+ //鏍囩鎵撳嵃2
+ case 'printLabel2': {
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ 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 + "|"
+ }
+ }
+ router.push({
+ path: '/main/processCard/PrintCustomLabelSemi2',
+ query: {printList: JSON.stringify(selectRecords),printType:1}
+ })
+
+ break
+ }
+ //鎺掑簭姹囨��
+ case 'sort': {
+ const $table = xGridDetail.value
+ let data = $table.getTableData().fullData
+ let flowCardData = ref({
+ flowCard: data,
+ })
+ for (let i = 0; i < flowCardData.value.flowCard.length; i++) {
+ const regex = /^[1-9]\d*$/
+ if (!regex.test(flowCardData.value.flowCard[i].sort)) {
+ ElMessage.warning(t('basicData.msg.greater0'))
+ return; // 濡傛灉鏈変竴涓笉鏄暣鏁�
+ }
+ }
+ request.post("/processCard/printSort", flowCardData.value).then((res) => {
+ if (res.code == 200) {
+ ElMessage.success(t('processCard.sortingSuccessful'))
+ router.push({
+ path: '/main/processCard/PrintFlowCard',
+ query: {orderId: orderId, random: Math.random()}
+ })
+
+ //location.reload();
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+ break
+ }
+ //鑷畾涔夋墦鍗�
+ case 'customLabel': {
+ 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 + "|"
+ }
+ }
+ //鎴愬搧鏍囩1
+ if (lableTypes == 1) {
+
+ labelRow.value.list = JSON.stringify(selectRecords)
+ labelRow.value.faceOrientation = faceOrientation
+ labelRow.value.type = type
+ labelRow.value.lableType = lableTypes
+ if (company.label === 1) {
+ if (company.printLabel.columnsLabel===1){
+ dialogTableVisibleLabelXJ.value = true
+ }
+ else{
+ dialogTableVisibleLabel.value = true
+ }
+
+ }
+ //甯稿窞椤圭洰
+ else if (company.label === 2) {
+ router.push({
+ path: '/main/processCard/PrintCustomLabelCZ',
+ query: {
+ type: type,
+ faceOrientation: faceOrientation,
+ lableType: lableTypes,
+ printList: JSON.stringify(selectRecords),
+ printType:1
+ }
+ })
+ }
+
+ }
+ //鎴愬搧鏍囩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) {
+ router.push({
+ path: '/main/processCard/PrintCustomLabelSemiCZ',
+ query: {
+ type: type,
+ faceOrientation: faceOrientation,
+ lableType: lableTypes,
+ printList: JSON.stringify(selectRecords),
+ printType:1
+ }
+ })
+ }
+ }
+ //鎴愬搧鏍囩3 甯稿窞椤圭洰
+ else if (lableTypes == 3) {
+ router.push({
+ path: '/main/processCard/PrintLabel1',
+ query: {
+ type: type,
+ faceOrientation: faceOrientation,
+ lableType: lableTypes,
+ printList: JSON.stringify(selectRecords),
+ printType:1
+ }
+ })
+
+ }
+
+
+ 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(t('rework.msg1'))
+ 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}})
+ if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
+ dialogTableVisibleStraight.value = true
+ }else{
+ 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
+ }
+ }
+ }
+ },
}
+
+const openedTable = () => {
+ let detail = ref(produceDetailList.value)
+ xGridDetail.value.reloadData(detail.value)
+ addListener(xGridDetail.value, detailGridOptions)
+}
+
+
+//鍒ゆ柇鏌愪釜鎸夐挳 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 = () => {
+
+ selectRecordsData.value.printList = selectRecords
+ let printState = 0
+ request.post(`/processCard/updatePrintState/${printState}`, selectRecordsData.value).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ } else {
+
+ ElMessage.warning(t('basicData.msg.saveFail'))
+
+ }
+ })
+}
+
+function onFlashbackChange(checked) {
+ flashback.value = checked ? 0 : 1
+}
+
+function onlandingSequenceChange(checked) {
+ landingSequence.value = checked ? 0 : 1
+}
</script>
<template>
- <div class="main-div-customer">
- <vxe-grid
- ref="xGrid"
- class="mytable-scrollbar"
- height="600px"
- max-height="100%"
- v-bind="gridOptions"
- v-on="gridEvents"
+ <div style="width: 100%;height: 100%">
+ <div class="head">
+ <el-input v-show="isVisible" v-model="printMerge" :placeholder="$t('processCard.mergePrinting')" clearable
+ style="width: 90px"></el-input>
+
+ <label>{{ $t('processCard.labelStyle') }}锛�</label>
+ <el-select v-model="printType" :placeholder="$t('processCard.pleaseSelect')" clearable default-value="default_city"
+ style="width: 120px">
+ <el-option
+ v-for="item in titleSelectJson['dataType']"
+ :key="item.id"
+ :label="item.name"
+ :value="item.name"
+ />
+ </el-select>
+
+ <el-select v-model="lableType" :placeholder="lableTypeOptions[0].label" class="m-2" style="width: 140px">
+ <el-option
+ v-for="item in filteredOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+
+ <el-select v-model="stateValue" :placeholder="$t('processCard.pleaseSelect')" allow-create class="m-2" clearable
+ filterable style="width: 140px">
+ <el-option
+ v-for="item in stateOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </div>
-
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{ item.title + ': ' }}</span>
- <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
- <span v-else>{{ row[item.field] }}</span>
-
- </li>
- </ul>
- </template>
-
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
-<!-- v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')"
- link
- type="primary"
- size="small">
- {{ $t('basicData.edit') }}
- </el-button>
-
- </template>
-
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input type="text"
- v-model="option.data"
- @input="changeFilterEvent($event, option, $panel)"/>
- </div>
- </div>
- </template>
-
-
- </vxe-grid>
- <el-dialog
- v-model="dialogTableVisible"
- destroy-on-close
- title="娴佺▼鍗℃墦鍗�"
- style="width: 80%;height:75% ">
- <PrintProcess :printList="selectRecords"
- style="width: 100%;height: 100%" />
- </el-dialog>
-
- <el-dialog
- v-model="dialogTableVisibleLabel"
- destroy-on-close
- title="鏍囩鎵撳嵃"
- style="width: 80%;height:75% ">
- <PrintLabel :printList="selectRecords"
- style="width: 100%;height: 100%" />
- </el-dialog>
-
- <el-dialog
- @opened="openedTable"
- v-model="printVisible"
- title="娴佺▼鍗℃槑缁�"
- :close-on-click-modal="false"
- :close-on-press-escape="false"
- style="width: 80%;height:75% ">
+ <div class="main-table">
<vxe-grid
- ref="xGridDetail"
+ ref="xGrid"
+ :checkbox-config="{labelField: 'name', highlight: true, range: true}"
class="mytable-scrollbar"
- max-height="100%"
- height="600px"
- size="small"
- v-bind="detailGridOptions"
- v-on="gridEvents">
+ height="100%"
+ 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 }">
<ul class="expand-wrapper">
- <li v-for="(item,index) in detailGridOptions.columns" v-show="item.field!=undefined ">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
<span style="font-weight: bold">{{ item.title + ': ' }}</span>
<span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
<span v-else>{{ row[item.field] }}</span>
@@ -502,25 +851,204 @@
</ul>
</template>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <!-- v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
+ <template #button_slot="{ row }">
+ <el-button link
+ size="small"
+ type="primary"
+ @click="getTableRow(row,'edit')">
+ {{ $t('basicData.edit') }}
+ </el-button>
+
+ </template>
+
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="text"
- v-model="option.data"
+ <input v-model="option.data"
+ type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
+
</vxe-grid>
+ </div>
+ <!-- 娴佺▼鍗℃墦鍗� -->
+ <el-dialog
+ id="sizePrintCalrd"
+ v-model="dialogTableVisible"
+ :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
+ id="child"
+ :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>
+
+ <!-- 鎴愬搧鏍囩-->
+ <el-dialog
+ id="sizeCustom"
+ v-model="dialogTableVisibleLabel"
+ :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 id="childLabel"
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :list="labelRow.list"
+ :type="labelRow.type"
+ 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"
+ v-model="dialogTableVisibleCustomLabel"
+ :title="$t('processCard.labelStyle')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContentLabelSemi" :icon="Printer" circle/>
+ </template>
+ <print-custom-label-semi id="childLabelSemi"
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :list="labelRow.list"
+ :type="labelRow.type"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
+
+ <!-- 鎺掑簭-->
+ <el-dialog
+ id="sizeCheck"
+ v-model="printVisible"
+ :title="$t('processCard.processCardDetails')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <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>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 100%;
+
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
+
+
+:deep(#sizeCheck .el-dialog__body) {
+ height: 90%;
+ width: 100%;
+}
+
+:deep(#sizePrintCalrd .el-dialog__body) {
+ height: 85%;
+ width: 100%;
+ 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;
+}
+
+:deep(#titleStyle .el-dialog__body){
+ height: 93%;
+ width: 100%;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0