diff --git a/src/api/production/generateReport.js b/src/api/production/generateReport.js index 4b7448a..1d7f14a 100644 --- a/src/api/production/generateReport.js +++ b/src/api/production/generateReport.js @@ -39,3 +39,7 @@ export const transFerSearch= data => createAPI(`dailyPlan/transFerSearch`, 'post export const getTransPrintData= data => createAPI(`dailyPlan/getTransPrintData`, 'post', data); export const getPartCardPrintData= data => createAPI(`dailyPlan/getPartCardPrintData`, 'post', data); + +export const getSfdcList= data => createAPI(`dailyPlan/getSfdcList`, 'post', data); + +export const cancelSfdc= data => createAPI(`dailyPlan/cancelSfdc`, 'post', data); diff --git a/src/views/modules/production/cancelSfdc.vue b/src/views/modules/production/cancelSfdc.vue new file mode 100644 index 0000000..166dfa9 --- /dev/null +++ b/src/views/modules/production/cancelSfdc.vue @@ -0,0 +1,676 @@ + + + + + diff --git a/src/views/modules/production/print_seqNo_label.js b/src/views/modules/production/print_seqNo_label.js index 50cedb8..15bee7f 100644 --- a/src/views/modules/production/print_seqNo_label.js +++ b/src/views/modules/production/print_seqNo_label.js @@ -13,22 +13,22 @@ export function printSeqNoLabel(printList) { LODOP.NewPage(); LODOP.SET_PRINT_PAGESIZE(0,1000,700,""); LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.seqNo); - LODOP.ADD_PRINT_TEXT(90,8,108,25,"Part:"); + LODOP.ADD_PRINT_TEXT(88,8,108,25,"Part:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(90,65,175,25,printData.partDesc); + LODOP.ADD_PRINT_TEXT(88,50,200,50,printData.partDesc); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(143,8,128,24,"Operator:"); + LODOP.ADD_PRINT_TEXT(153,8,128,24,"Operator:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(143,110,140,20,printData.operatorName); + LODOP.ADD_PRINT_TEXT(153,110,140,20,printData.operatorName); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(116,8,113,25,"Shift:"); + LODOP.ADD_PRINT_TEXT(132,8,113,25,"Shift:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(116,110,139,25,printData.sShiftNo); + LODOP.ADD_PRINT_TEXT(132,110,139,25,printData.sShiftNo); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(41,8,98,25,"Job No:"); @@ -37,16 +37,16 @@ export function printSeqNoLabel(printList) { LODOP.ADD_PRINT_TEXT(41,110,136,25,printData.seqNo); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(168,8,94,25,"Order No:"); + LODOP.ADD_PRINT_TEXT(173,8,94,25,"Order No:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(168,110,141,25,printData.orderNo); + LODOP.ADD_PRINT_TEXT(173,110,141,25,printData.orderNo); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(66,8,96,25,"Q.T.Y:"); + LODOP.ADD_PRINT_TEXT(64,8,96,25,"Q.T.Y:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qtyRequired+printData.umid+' | '+printData.weight+'公斤'); + LODOP.ADD_PRINT_TEXT(64,110,138,24,printData.qtyRequired+printData.umid+' | '+printData.weight+'公斤'); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(194,8,128,25,"MFG Date:"); diff --git a/src/views/modules/production/print_stock_label.js b/src/views/modules/production/print_stock_label.js index cba3aab..49f250a 100644 --- a/src/views/modules/production/print_stock_label.js +++ b/src/views/modules/production/print_stock_label.js @@ -13,40 +13,40 @@ export function printMaterialLabel(printList) { LODOP.NewPage(); LODOP.SET_PRINT_PAGESIZE(0,1000,700,""); LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.seqNo); - LODOP.ADD_PRINT_TEXT(90,8,133,25,"WareHouse ID:"); + LODOP.ADD_PRINT_TEXT(112,8,133,25,"WareHouse ID:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(90,110,140,25,printData.wareHouseDesc); + LODOP.ADD_PRINT_TEXT(112,110,140,25,printData.wareHouseDesc); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(143,8,103,24,"Batch No:"); + LODOP.ADD_PRINT_TEXT(154,8,103,24,"Batch No:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(143,110,140,20,printData.batchNo); + LODOP.ADD_PRINT_TEXT(154,110,140,20,printData.batchNo); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(116,8,124,25,"Location ID:"); + LODOP.ADD_PRINT_TEXT(133,8,124,25,"Location ID:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(116,110,139,25,printData.locationId); + LODOP.ADD_PRINT_TEXT(133,110,139,25,printData.locationId); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(41,8,132,25,"Part:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(41,61,185,25,printData.partDesc); + LODOP.ADD_PRINT_TEXT(41,56,195,55,printData.partDesc); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(168,8,82,25,"Order No:"); + LODOP.ADD_PRINT_TEXT(175,8,82,25,"Order No:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(168,110,141,25,printData.orderNo); + LODOP.ADD_PRINT_TEXT(175,110,141,25,printData.orderNo); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(66,8,81,25,"Q.T.Y:"); + LODOP.ADD_PRINT_TEXT(91,8,81,25,"Q.T.Y:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qty+printData.umid); + LODOP.ADD_PRINT_TEXT(91,110,138,24,printData.qty+printData.umid); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(194,8,113,25,"Trans Date:"); diff --git a/src/views/modules/production/print_transNo_label.js b/src/views/modules/production/print_transNo_label.js index ff66cc8..dac6289 100644 --- a/src/views/modules/production/print_transNo_label.js +++ b/src/views/modules/production/print_transNo_label.js @@ -13,22 +13,22 @@ export function printTransNoLabel(printList) { LODOP.NewPage(); LODOP.SET_PRINT_PAGESIZE(0,1000,700,""); LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.transNo); - LODOP.ADD_PRINT_TEXT(90,8,108,25,"Part:"); + LODOP.ADD_PRINT_TEXT(82,8,108,25,"Part:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(90,65,175,25,printData.partDesc); + LODOP.ADD_PRINT_TEXT(82,55,195,56,printData.partDesc); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(143,8,77,24,"Job No:"); + LODOP.ADD_PRINT_TEXT(155,8,77,24,"Job No:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(143,110,140,20,printData.seqNo); + LODOP.ADD_PRINT_TEXT(155,110,140,20,printData.seqNo); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(116,8,113,25,"Equip No:"); + LODOP.ADD_PRINT_TEXT(134,8,113,22,"Equip No:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(116,110,139,25,printData.workCenterNo); + LODOP.ADD_PRINT_TEXT(134,110,139,25,printData.workCenterNo); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(41,8,98,25,"Trans No:"); @@ -37,16 +37,16 @@ export function printTransNoLabel(printList) { LODOP.ADD_PRINT_TEXT(41,110,136,25,printData.transNo); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(168,8,94,25,"Order No:"); + LODOP.ADD_PRINT_TEXT(175,8,94,25,"Order No:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(168,110,141,25,printData.orderNo); + LODOP.ADD_PRINT_TEXT(175,110,141,25,printData.orderNo); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(66,8,121,25,"Trans Q.T.Y:"); + LODOP.ADD_PRINT_TEXT(61,8,121,25,"Trans Q.T.Y:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.transQty+printData.umid); + LODOP.ADD_PRINT_TEXT(61,110,138,24,printData.transQty+printData.umid); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(194,8,97,25,"Trans Date:"); diff --git a/src/views/modules/taskmanage/taskReport.vue b/src/views/modules/taskmanage/taskReport.vue index 34027e5..ebb4773 100644 --- a/src/views/modules/taskmanage/taskReport.vue +++ b/src/views/modules/taskmanage/taskReport.vue @@ -231,6 +231,9 @@ export default { }) }, tableRowClassName({row, rowIndex}) { + if (row.chatLastType == '有新消息') { + return 'newChat' + } if (row.status == '未受理' && this.dayjs(this.dayjs()).diff(row.createdDate, 'minutes') / 60 >= 12) { return 'finish' } @@ -293,7 +296,9 @@ export default { .mod-config .not-processing { background-color: #ffff00; } - +.mod-config .newChat { + background-color: #00d9ff; +} .mod-config .processing { / / background-color: #5f0e3f; }