ERP_override.git

			@@ -568,13 +568,6 @@
			height: 100%;
			}

			.vxe-grid {
			/* 禁用浏览器默认选中 */
			-webkit-user-select: none;
			-moz-user-select: none;
			-ms-user-select: none;
			user-select: none;
			}

			:deep(#sizeCheck .el-dialog__body){
			height: 90%;

			@@ -42,10 +42,7 @@
			item.detail[0].technologyNumber = printMerge;
			});

			produceList.value.forEach(item =>{
			let technologyNumberMerge = printMerge.split('').join(',');
			item.detail[0].technologyNumberMerge = technologyNumberMerge
			})


			//合并打印工艺流程处理
			let process = produceList.value[0].detail[0].process
			@@ -65,8 +62,12 @@
			// 使用 filter 方法过滤出 "夹胶" 及其之后的对象
			produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
			}
			}
			}

			produceList.value.forEach(item =>{
			let technologyNumberMerge = printMerge.split('').join(',');
			item.detail[0].technologyNumberMerge = technologyNumberMerge
			})
			//处理编号列
			//定义存放编号数组
			const s01Values = [];

			@@ -47,7 +47,7 @@
			and a.type_id like concat('%',#{glassTypeId},'%')
			</if>
			<if test="product.id != null and product.id != ''">
			and a.id like like concat('%',#{product.id},'%')
			and a.id like concat('%',#{product.id},'%')
			</if>
			<if test="product.productName != null and product.productName != ''">
			and a.product_name like concat('%',#{product.productName},'%')

	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史