ERP_override.git

			@@ -13,9 +13,7 @@
			this.tick = setInterval(()=>{

			if(typeof queue === 'object' && Array.isArray(queue)){
			if (queue.length > 0) {
			console.log(printer)
			hiprintTemplate.value.print2(queue[0],{printer:printer})
			if (queue.length > 0) {hiprintTemplate.value.print2(queue[0],{printer:printer})
			queue.shift(); // 打印任务，并从队列中移除
			}else{
			clearInterval(this.tick)
			@@ -30,6 +28,6 @@
			}

			},
			5000)
			500)
			};

			@@ -192,13 +192,22 @@
			filterMethod: filterChanged,
			width: '78px'
			},
			{
			field: 'building_number',
			title: t('order.buildingNumber'),
			sortable: true,
			filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged,
			width: '120px'
			},
			{field: 'baiscQuantity', title: t('processCard.quantityToDivided'), showOverflow: "ellipsis", width: '80px'},
			{field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '80px'},
			{field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
			{field: 'thickness', title: t('processCard.glassThickness'), width: '80px'},
			{field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'},
			{field: 'remarks', title: t('processCard.notes'), width: '85px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
			{field: 'processing_note', title: t('order.processingNote'), width: '85px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
			{field: 'processing_note', title: t('order.processingNote'), width: '105px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
			{field: 'bend_radius', title: t('order.bendRadius'), width: '120px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged,sortable: true,}

			],//表头按钮
			@@ -307,6 +316,15 @@
			filterMethod: filterChanged,
			width:70
			},
			{
			field: 'building_number',
			title: t('order.buildingNumber'),
			sortable: true,
			filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged,
			width: '120px'
			},
			{field: 'width', title: t('order.width'), showOverflow: "ellipsis",width:70},
			{field: 'height', title: t('order.height'),width:70},
			{field: 'quantity', title: t('order.quantity'),width:70},

			@@ -263,7 +263,8 @@
			ods.S02,
			ods.S03,
			ods.S04,
			ods.S05
			ods.S05,
			od.building_number
			from sd.order_detail as od
			left join sd.order_glass_detail as ogd
			on od.order_id = ogd.order_id and od.order_number = ogd.order_number

	north-glass-erp/northglass-erp/src/hook/queue.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史