ERP_override.git

			@@ -35,6 +35,7 @@
			merges:null,
			printFc:null,
			flashback:null,
			landingSequence:null,
			compound:null
			})

			@@ -70,13 +71,14 @@
			compound = null
			}
			let name=company.companyName
			let sole = company.soleQRCode

			let printNumberFc = props.printFc
			data.value.printList = JSON.parse(props.printList)
			let flowCardCount = ''
			onMounted(() => {
			if(props.printProject!=null){
			request.post(`/processCard/getSelectPrintProject/${printProject}/${merges}/${props.flashback}`).then((res) => {
			request.post(`/processCard/getSelectPrintProject/${printProject}/${merges}/${props.flashback}/${props.landingSequence}`).then((res) => {
			if (res.code == 200) {
			load(res.data.data)
			} else {
			@@ -85,7 +87,7 @@
			}
			})
			}else{
			request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}`, data.value).then((res) => {
			request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}/${props.landingSequence}`, data.value).then((res) => {
			if (res.code == 200) {
			load(res.data.data)
			} else {
			@@ -103,11 +105,17 @@
			const handleGetQRCode = async () => {
			let technologyNumber=''
			for (let i = 0; i < produceList.value.length; i++) {
			if (produceList.value[i].detail[0].qrcode!="" && produceList.value[i].detail[0].qrcode!=null){
			technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 转换为字符串以便处理每个字符,合并标签
			}else {
			technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 转换为字符串以便处理每个字符
			if (sole==true){
			if (produceList.value[i].detail[0].qrcode!="" && produceList.value[i].detail[0].qrcode!=null){
			technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 转换为字符串以便处理每个字符,合并标签
			}else {
			technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 转换为字符串以便处理每个字符
			}
			}
			else{
			technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 转换为字符串以便处理每个字符
			}

			produceList.value[i].detail[0]["qrcodeList"] = []; // 初始化一个空数组用来存储 QR Code
			if (compound == null ){
			const processId = produceList.value[i].detail[0].process_id;
			@@ -305,7 +313,8 @@
			<td class="tdNowrap">客户名称：</td>
			<td colspan="2">{{ items.customer_name }}</td>
			<td class="tdNowrap">项目名称：</td>
			<td colspan="4" style="min-width: 250px;">{{ items.project }}</td>
			<td v-if="name=='洛阳北方玻璃技术股份有限公司'" colspan="4" style="min-width: 250px;">{{ items.projectBatch }}</td>
			<td v-else colspan="4" style="min-width: 250px;">{{ items.project }}</td>
			<td class="tdNowrap">工艺流程：</td>
			<td :colspan="2+item.processList.length*2" style="width: 500px">{{ items.process }}</td>
			</tr>
			@@ -399,7 +408,7 @@
			<tr v-for="(qrCodeItem,index) in item.detail" :key="index">
			<td colspan="31">
			<span style="display: flex;">
			<span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 20%">
			<span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 250px">
			<div class='qrCode' style="width: 80px;height: 80px;">
			<img :src=qrCodeItems.qrcode>
			</div>