Merge branch 'master' of http://bore.pub:10439/r/ERP_override
| | |
| | | productName:'order.product', |
| | | edgingType:"order.edgingType", |
| | | buildingNumber:'order.buildingNumber', |
| | | icon:'order.icon', |
| | | orderClassify:'order.orderClassify', |
| | | packType:'order.packType', |
| | | deliveryDate:'order.deliveryDate', |
| | | batch:'order.batch', |
| | | salesman:'order.salesman', |
| | | alType:'order.alType', |
| | | customerBatch:'order.customerBatch', |
| | | contacts:'order.contacts', |
| | | deliveryAddress:'order.deliveryAddress', |
| | | processingNote:'order.processingNote', |
| | | remarks:'product.msg.remarks', |
| | | customerAbbreviation:'customer.customerAbbreviation' |
| | | customerAbbreviation:'customer.customerAbbreviation', |
| | | productAbbreviation:'product.msg.productAbbreviation', |
| | | processId:'processCard.processId', |
| | | createTime:'下单日期', |
| | | orderNumber:'order.OrderNum', |
| | | technologyNumber:'processCard.technologyNumber', |
| | | process:'orderBasicData.process', |
| | | color:'mainIngredient.films', |
| | | figureNumber:'图号', |
| | | colourCeramicGlaze:'彩釉图号', |
| | | glassNumber:"reportingWorks.glassNumber", |
| | | remarks1:'备注1', |
| | | remarks2:'备注2', |
| | | remarks3:'备注3', |
| | | remarks4:'备注4', |
| | | filmNumber:'膜号' |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | }) |
| | | |
| | |
| | | margin: 0; |
| | | padding: 0; |
| | | } |
| | | @page { |
| | | size: auto; |
| | | margin: 8mm 16mm 20mm 16mm; |
| | | |
| | | @media print { |
| | | body { |
| | | margin: 8mm 16mm 20mm 16mm; |
| | | } |
| | | } |
| | | |
| | | |
| | |
| | | background-color: black; |
| | | color: black; |
| | | } |
| | | @page { |
| | | size: auto; |
| | | margin: 8mm 16mm 20mm 16mm; |
| | | |
| | | @media print { |
| | | @page { |
| | | size: auto; |
| | | margin: 8mm 16mm 20mm 16mm; |
| | | |
| | | } |
| | | } |
| | | |
| | | |
| | |
| | | |
| | | |
| | | |
| | | @page { |
| | | size: auto; /* auto is the initial value */ |
| | | margin: 12mm 4mm 2mm 6mm /* this affects the margin in the printer settings */ |
| | | |
| | | } |
| | | |
| | | @media print { |
| | | div { |
| | | page-break-inside: avoid; |
| | | } |
| | | @page { |
| | | size: auto; /* auto is the initial value */ |
| | | margin: 12mm 4mm 2mm 6mm /* this affects the margin in the printer settings */ |
| | | |
| | | } |
| | | } |
| | | |
| | | </style> |
| | |
| | | |
| | | |
| | | |
| | | @page { |
| | | size: auto; /* auto is the initial value */ |
| | | margin: 2mm 2mm 2mm 2mm; /* this affects the margin in the printer settings */ |
| | | |
| | | } |
| | | |
| | | @media print { |
| | | div { |
| | | page-break-inside: avoid; |
| | | } |
| | | @page { |
| | | size: auto; /* auto is the initial value */ |
| | | margin: 2mm 2mm 2mm 2mm; /* this affects the margin in the printer settings */ |
| | | |
| | | } |
| | | } |
| | | |
| | | </style> |
| | |
| | | |
| | | |
| | | |
| | | @page { |
| | | size: auto; /* auto is the initial value */ |
| | | margin: 2mm 2mm 2mm 2mm; /* this affects the margin in the printer settings */ |
| | | |
| | | } |
| | | |
| | | @media print { |
| | | div { |
| | | page-break-inside: avoid; |
| | | } |
| | | @page { |
| | | size: auto; /* auto is the initial value */ |
| | | margin: 2mm 2mm 2mm 2mm; /* this affects the margin in the printer settings */ |
| | | |
| | | } |
| | | } |
| | | |
| | | </style> |
| | |
| | | |
| | | |
| | | |
| | | @page { |
| | | size: auto; /* auto is the initial value */ |
| | | margin: 13mm 4mm 0mm 4mm; /* this affects the margin in the printer settings */ |
| | | |
| | | } |
| | | |
| | | @media print { |
| | | div { |
| | | page-break-inside: avoid; |
| | | } |
| | | @page { |
| | | size: auto; /* auto is the initial value */ |
| | | margin: 13mm 4mm 0mm 4mm; /* this affects the margin in the printer settings */ |
| | | |
| | | } |
| | | } |
| | | |
| | | </style> |
| | |
| | | |
| | | |
| | | |
| | | @page { |
| | | size: auto; /* auto is the initial value */ |
| | | margin: 13mm 4mm 0mm 4mm; /* this affects the margin in the printer settings */ |
| | | |
| | | } |
| | | |
| | | @media print { |
| | | div { |
| | | page-break-inside: avoid; |
| | | } |
| | | @page { |
| | | size: auto; /* auto is the initial value */ |
| | | margin: 13mm 4mm 0mm 4mm; /* this affects the margin in the printer settings */ |
| | | |
| | | } |
| | | } |
| | | |
| | | </style> |
| | |
| | | if(result){ |
| | | const dataList = xGrid.value.getTableData().visibleData |
| | | const val = getNestedProperty(dataList[result.start],result.cell) |
| | | let numbers = parseInt(val.match(/(\d+)$/)) |
| | | const string=val.replace(/\d+$/, '') |
| | | |
| | | const numbersArr = [] |
| | | const regex = /\d+/g |
| | | let match |
| | | while ((match = regex.exec(val))) { |
| | | numbersArr.push({ number: match[0], index: match.index }); |
| | | } |
| | | let numbers=numbersArr[numbersArr.length-1] |
| | | var subStr1 = val.substring(numbers.index); |
| | | var subStr2 = val.substring(0, numbers.index); |
| | | let number = parseInt(subStr1.match(/\d/)) |
| | | var reg =new RegExp(number,"g") |
| | | dataList.forEach((item,index) =>{ |
| | | if(index>=result.start ){ |
| | | setNestedValue(item,result.cell,string+numbers) |
| | | numbers=numbers+1 |
| | | let newStr = subStr1.replace(reg, number); |
| | | setNestedValue(item,result.cell,subStr2+newStr) |
| | | number=number+1 |
| | | } |
| | | |
| | | }) |
| | |
| | | if (result) { |
| | | const dataList = xGrid.value.getTableData().visibleData |
| | | const val = getNestedProperty(dataList[result.start], result.cell) |
| | | let numbers = parseInt(val.match(/(\d+)$/)) |
| | | const numbersArr = [] |
| | | const regex = /\d+/g |
| | | let match |
| | | while ((match = regex.exec(val))) { |
| | | numbersArr.push({ number: match[0], index: match.index }); |
| | | } |
| | | let numbers=numbersArr[numbersArr.length-1] |
| | | var subStr1 = val.substring(numbers.index); |
| | | var subStr2 = val.substring(0, numbers.index); |
| | | let number = parseInt(subStr1.match(/\d/)) |
| | | var reg =new RegExp(number,"g") |
| | | dataList.forEach((item,index) =>{ |
| | | if(index >= result.start && index <= result.end){ |
| | | let newStr = subStr1.replace(reg, number); |
| | | setNestedValue(item,result.cell,subStr2+newStr) |
| | | number=number+1 |
| | | } |
| | | |
| | | }) |
| | | /*let numbers = parseInt(val.match(/(\d+)$/)) |
| | | const string=val.replace(/\d+$/, '') |
| | | dataList.forEach((item, index) => { |
| | | if (index >= result.start && index <= result.end) { |
| | | setNestedValue(item, result.cell, string + numbers) |
| | | numbers = numbers + 1 |
| | | } |
| | | }) |
| | | })*/ |
| | | |
| | | } |
| | | gridOptions.menuConfig.body.options[0][5].disabled = false |
| | |
| | | od.edging_type as edgingType, |
| | | p.remarks, |
| | | c.customer_abbreviation as customerAbbreviation, |
| | | od.other_columns |
| | | p.product_abbreviation as productAbbreviation, |
| | | fc.process_id as processId, |
| | | o.create_time as createTime, |
| | | JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber, |
| | | JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S02' )) AS figureNumber, |
| | | JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S03' )) AS colourCeramicGlaze, |
| | | JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S04' )) AS remarks1, |
| | | JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S05' )) AS remarks2, |
| | | JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S06' )) AS remarks3, |
| | | JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S07' )) AS remarks4, |
| | | JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S08' )) AS remarks5, |
| | | p.remarks as filmNumber |
| | | from sd.order as o |
| | | left join sd.order_detail as od on o.order_id = od.order_id |
| | | left join flow_card as fc on o.order_id = fc.order_id and |
| | | od.order_number = fc.order_number |
| | | left join sd.product as p on p.id=od.product_id |
| | | left join sd.customer as c on c.id = o.customer_id |
| | | left join sd.product_detail as pd on pd.prod_id=p.id and pd.sort_num=od.order_number |
| | | where fc.process_id = #{processId} |
| | | and fc.technology_number = #{technologyNumber} |
| | | group by od.order_number, width, height |