From 6ac9391135ded7e668d2d42f408f4a6c59b27d23 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 14 十月 2024 16:05:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 850 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 463 insertions(+), 387 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 6b28543..6f9a505 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,49 +9,81 @@
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 PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
-import PrintCustomLabel from '@/views/pp/processCard/PrintCustomLabel.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)
+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
+})
+
+//鎵撳嵃
+let printRow = ref({
+ list: null,
+ printMergeVal: null,
+ like: null
+})
+
+//鏍囩
+let labelRow = ref({
+ list: null,//鍕鹃�夌殑鏁版嵁
+ faceOrientation: null,//鍐呭闈�
+ type: null,//鏍囩妯℃澘
+ lableType: null//鏍囩绫诲瀷
+})
-const getTableRow = (row,type) =>{
+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({
@@ -91,16 +123,17 @@
]
//鏍囩绫诲瀷
+let filteredOptions = []
const lableType = ref('1')
const lableTypeOptions = [
{
value: '1',
label: t('processCard.finishedProductLabel'),
},
-/* {
- value: '2',
- label: t('processCard.halfProductLabel'),
- },*/
+ /* {
+ value: '2',
+ label: t('processCard.halfProductLabel'),
+ },*/
{
value: `${company.printLabel.labelValue}`,
label: `${company.printLabel.labelType}`,
@@ -110,11 +143,31 @@
label: `${company.printLabel.labelType3}`,
},
]
+let hidePrintLabels = company.printLabel.hideButton;
+
+if (hidePrintLabels == 'true') {
+ filteredOptions = lableTypeOptions.filter((option, index) => index !== 2);
+} else {
+ filteredOptions = lableTypeOptions;
+}
//鍚堢墖娴佺▼鍗℃墦鍗颁笅鎷夐�夐」
const printMerge = ref('')
-const printMergeOptions=[{}]
+const printMergeOptions = [{}]
+const printContent = ref({
+ id: 'child',
+
+})
+
+
+const printContentLabel = ref({
+ id: 'childLabel',
+})
+
+const printContentLabelSemi = ref({
+ id: 'childLabelSemi',
+})
//鎵撳嵃绫诲瀷
const printType = ref()
@@ -124,28 +177,34 @@
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 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))
+ 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
- console.log(produceList)
- produceList.forEach(item => {
- if(item.print_status == 1){
- item.print_status='宸叉墦鍗�'
- }
- else if (item.print_status == 0){
- item.print_status='鏈墦鍗�'
- }
- });
- xGrid.value.reloadData(produceList)
+ xGrid.value.reloadData(newDataCollection)
gridOptions.loading = false
+
+
+ hideButton()
} else {
ElMessage.warning(res.msg)
}
@@ -188,7 +247,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -200,7 +259,7 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {title: t('basicData.operate'), 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},
{
@@ -208,7 +267,7 @@
title: t('order.orderId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged, width: 120
},
{
field: 'process_id',
@@ -216,36 +275,60 @@
showOverflow: "ellipsis",
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: 120
},
{
field: 'project',
- title: t('order.project'),
+ title: t('order.project'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: 120
+ },
+ {
+ field: 'technology_number',
+ title: t('processCard.technologyNumber'),
+ showOverflow: "ellipsis",
+ width: 110,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ },
+ {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: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis"},
- {field: 'glass_address', title: t('processCard.glassAddress'),},
- {field: 'quantity', title: t('order.quantity'),},
- {field: 'total_area', title: t('order.area'),},
- {field: 'product_name', title: t('order.product'),},
- {field: 'glass_child', title: t('reportingWorks.glassChild'),filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
- {field: 'founder', title: t('processCard.founder'),},
- {field: 'splitFrame_time', title: t('processCard.splitFrameTime'),},
+ {field: 'founder', title: t('processCard.founder'), width: 120},
+ {field: 'splitFrame_time', title: t('processCard.splitFrameTime'), width: 120},
+ {
+ field: 'process', title: t('craft.process'), filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged, width: 160
+ },
{
field: 'print_status',
title: t('processCard.printStatus'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged, width: 120
},
],//琛ㄥご鎸夐挳
@@ -254,6 +337,10 @@
{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: "鎺掑簭姹囨��", status: 'primary'},
+ // {code: 'printTest', name: "娴嬭瘯鎵撳嵃", status: 'primary'},
+ // {code: 'printLike', name: "鍚岄厤缃墦鍗�", status: 'primary'},
],
// import: false,
// export: true,
@@ -263,34 +350,39 @@
},
data: null,//琛ㄦ牸鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity",'total_area',]
+ const List = ["quantity", 'total_area',]
if (List.includes(column.field)) {
return footSum(data, column.field)
}
return ''
})
]
- }
+ },
+
+
})
const gridEvents = {
- toolbarButtonClick ({ code}) {
+ toolbarButtonClick({code}) {
const $grid = xGrid.value
selectRecords = $grid.getCheckboxRecords()
- let type=printType.value
- let faceOrientation=stateValue.value
- let lableTypes=lableType.value
- let lableTitle=lableType.text
+ // 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){
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
return
}
@@ -303,15 +395,16 @@
id += selectRecords[i].id + "|"
}
}
-
- let printMergeVal=printMerge.value
- router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
-
+ printRow.value.list = JSON.stringify(selectRecords)
+ printRow.value.printMergeVal = printMerge.value
+ printRow.value.like = null
+ // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
+ dialogTableVisible.value = true
break
}
case 'printLabel': {
- if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
return
}
@@ -324,7 +417,31 @@
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
+ }
+ 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
}
@@ -346,7 +463,7 @@
ElMessage.success(t('processCard.sortingSuccessful'))
router.push({
path: '/main/processCard/PrintFlowCard',
- query: {orderId: orderId,random: Math.random()}
+ query: {orderId: orderId, random: Math.random()}
})
//location.reload();
@@ -357,11 +474,11 @@
break
}
case 'customLabel': {
- if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
return
}
- if (type===null||type===''||type===undefined){
+ if (type === null || type === '' || type === undefined) {
ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
return
}
@@ -374,20 +491,125 @@
id += selectRecords[i].id + "|"
}
}
+ if (lableTypes == 1) {
- if (lableTypes==1){
- router.push({path: '/main/processCard/PrintCustomLabel', 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
+ if (company.label === 1) {
+ if (company.printLabel.columnsLabel===1){
+ dialogTableVisibleLabelXJ.value = true
+ }
+ else{
+ dialogTableVisibleLabel.value = true
+ }
- }
- else if (lableTypes==2) {
- router.push({path: '/main/processCard/PrintCustomLabelSemi', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
+ } else if (company.label === 2) {
+ router.push({
+ path: '/main/processCard/PrintCustomLabelCZ',
+ query: {
+ type: type,
+ faceOrientation: faceOrientation,
+ lableType: lableTypes,
+ printList: JSON.stringify(selectRecords),
+ printType:1
+ }
+ })
+ }
- }else if (lableTypes==3) {
- router.push({path: '/main/processCard/PrintLabel1', 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
+ 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
+ }
+ })
+ }
+ } 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('璇峰～鍏ラ渶瑕佸悎骞剁殑灞�')
+ 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
+ }
+ 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
}
}
@@ -396,257 +618,50 @@
}
-
-const detailGridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'printFlowCard_2',
- 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
- },
- mouseConfig:{selected: true},//榧犳爣閫変腑
- keyboardConfig:{
- isArrow: true,
- isDel: true,
- isEnter: true,
- isTab: true,
- isEdit: true,
- isChecked: 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: t('processCard.sorting'),
- },
- {
- field: 'process_id',
- title: t('processCard.processId'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'order_number',
- title: t('order.OrderNum'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'technology_number',
- title: t('processCard.technologyNumber'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'glass_address',
- title: t('processCard.glassAddress'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'quantity',
- title: t('order.quantity'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'child_width',
- title: t('order.width'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged,
- sortable: true,
- },
- {
- field: 'child_height',
- title: t('order.height'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged,
- sortable: true,
- },
- {
- field: 'area',
- title: t('order.area'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
-
- ],
- //琛ㄥ崟楠岃瘉
- editRules: {
- sort: [
- //type: 'number', min: 0, message: '璇疯緭鍏ュぇ浜庣瓑浜�0鐨勬暟鍊�' ,
- {
- validator ({ cellValue }) {
- const regex = /^[1-9]\d*$/
- if (!regex.test(cellValue)) {
- return new Error(t('basicData.msg.greater0'))
-
- }
- }}
- ],
- },
- menuConfig: {
- body: {
- //鍙抽敭鑿滃崟
- options: [
- [
- {
- code: 'copyChecked',
- name: t('basicData.selectSame'),
- prefixIcon: 'vxe-icon-copy',
- visible: true,
- disabled: false
- },
- {
- code: 'copyAll',
- name: t('basicData.sameAfterwards'),
- prefixIcon: 'vxe-icon-feedback',
- visible: true,
- disabled: false
- },
- {
- code: 'clearChecked',
- name: t('basicData.clearSelection'),
- prefixIcon: 'vxe-icon-indicator',
- visible: true,
- disabled: false
- },
- ]
- ]
- }
- },
- //琛ㄥご鎸夐挳
- toolbarConfig: {
- buttons: [
- {code: 'sort', name: t('processCard.sorting'), 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",'area',]
- if (List.includes(column.field)) {
- return footSum(data, column.field)
- }
- return ''
- })
- ]
- }
-})
-
-
-const gridEventsDetail = {
- menuClick({menu, row, column}) {
- const $grid = xGridDetail.value
- if ($grid) {
- switch (menu.code) {
- case 'copyChecked' : {
- let result = toolbarButtonClickEvent()
- if (result.cell === "sort"){
- if (result) {
- const dataList = xGridDetail.value.getTableData().visibleData
- const val = dataList[result.start][result.cell]
- dataList.forEach((item, index) => {
- if (index >= result.start && index <= result.end) {
- item[result.cell] = val
- }
- })
- }
- }
-
- break
- }
- case 'copyAll' : {
- let result = toolbarButtonClickEvent()
- if (result.cell === "sort" ) {
- if (result) {
- const dataList = xGridDetail.value.getTableData().visibleData
- const val = dataList[result.start][result.cell]
- dataList.forEach((item, index) => {
- if (index >= result.start) {
- item[result.cell] = val
- }
- })
- }
- }
- break
- }
- case 'clearChecked' : {
- let result = toolbarButtonClickEvent()
- if (result.cell === "sort" ) {
- if (result) {
- const dataList = xGridDetail.value.getTableData().visibleData
- dataList.forEach((item, index) => {
- if (index >= result.start && index <= result.end) {
- item[result.cell] = ''
- }
- })
- }
- }
- break
- }
- }
- }
- },
-
-}
const openedTable = () => {
- let detail =ref(produceDetailList.value)
+ let detail = ref(produceDetailList.value)
xGridDetail.value.reloadData(detail.value)
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'; // 鏄剧ず璇ユ寜閽�
+ }
+ })
+}
+
+
+// 鐩戝惉鎵撳嵃瀹屾垚浜嬩欢
+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'))
+
+ }
+ })
}
</script>
<template>
<div class="main-div-customer">
- <el-input clearable :placeholder="$t('processCard.mergePrinting')" v-model="printMerge" style="width: 90px"></el-input>
+ <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" clearable default-value="default_city" :placeholder="$t('processCard.pleaseSelect')" style="width: 120px">
+ <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"
@@ -655,16 +670,17 @@
/>
</el-select>
- <el-select v-model="lableType" class="m-2" :placeholder="lableTypeOptions[0].label" style="width: 140px">
+ <el-select v-model="lableType" :placeholder="lableTypeOptions[0].label" class="m-2" style="width: 140px">
<el-option
- v-for="item in lableTypeOptions"
+ v-for="item in filteredOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
- <el-select v-model="stateValue" class="m-2" :placeholder="$t('processCard.pleaseSelect')" clearable allow-create filterable style="width: 140px">
+ <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"
@@ -675,8 +691,7 @@
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
- height="600px"
- max-height="100%"
+ height="100%"
v-bind="gridOptions"
v-on="gridEvents"
@@ -696,12 +711,12 @@
</template>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
-<!-- v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
+ <!-- v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')"
- link
+ <el-button link
+ size="small"
type="primary"
- size="small">
+ @click="getTableRow(row,'edit')">
{{ $t('basicData.edit') }}
</el-button>
@@ -710,8 +725,9 @@
<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>
@@ -719,89 +735,149 @@
</vxe-grid>
+ <!-- 娴佺▼鍗℃墦鍗� -->
<el-dialog
+ id="sizePrintCalrd"
v-model="dialogTableVisible"
- destroy-on-close
:title="$t('processCard.print')"
- style="width: 80%;height:75% ">
- <PrintProcess :printList="selectRecords"
- style="width: 100%;height: 100%" />
+ 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"
+ 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%" />
- </el-dialog>
-
- <el-dialog
- 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="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
- @opened="openedTable"
+ 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')"
- :close-on-click-modal="false"
- :close-on-press-escape="false"
+ destroy-on-close
style="width: 80%;height:75% ">
- <vxe-grid
- ref="xGridDetail"
- class="mytable-scrollbar"
- max-height="100%"
- height="550px"
- size="small"
- v-bind="detailGridOptions"
- v-on="gridEventsDetail">
-
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in detailGridOptions.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>
-
- <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>
+ <sort-detail id="child" :processId="editRow.processId" :technologyNumber="editRow.technologyNumber" :process="editRow.process"/>
</el-dialog>
+ <!-- 鎺掑簭姹囨�绘煡璇�-->
+ <el-dialog
+ id="sizeCheck"
+ v-model="dialogSortTable"
+ title="鎺掑簭姹囨��"
+ 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%;
+ height: 92%;
}
-.vxe-grid {
- /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
+
+: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