From ace95320b2520e9c16cf09b7673ca52935756e97 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 七月 2024 16:56:47 +0800
Subject: [PATCH] 补片返工审核添加编号字段，标签打印打印方式修改成和流程卡打印相同，补片同步修改，修改流程卡打印查询和不同配置流程卡打印方式，添加部分字段
---
north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabelSemi.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairCustomLabelSemi.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabelSemi.vue
similarity index 88%
rename from north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairCustomLabelSemi.vue
rename to north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabelSemi.vue
index 672534b..e785701 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintRepairCustomLabelSemi.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabelSemi.vue
@@ -24,21 +24,29 @@
})
+let props = defineProps({
+ list:null,//鍕鹃�夌殑鏁版嵁
+ faceOrientation:null,//鍐呭闈�
+ type:null,//鏍囩妯℃澘
+ lableType:null//鏍囩绫诲瀷
+})
+
const {currentRoute} = useRouter()
const route = currentRoute.value
-data.value.printList = JSON.parse(route.query.printList)
-const type = route.query.type
-const faceOrientation = route.query.faceOrientation
-const lableType = route.query.lableType
+let type = props.type
+let faceOrientation = props.faceOrientation
+let lableType = props.lableType
+data.value.printList = JSON.parse(props.list)
onMounted(() => {
- request.post(`/processCard/getSelectPrintCustomLabel/${type}`, data.value).then((res) => {
+ request.post(`/Replenish/getSelectPrintCustomLabel/${type}`, data.value).then((res) => {
if (res.code == 200) {
produceList.value = deepClone(res.data.title)
list.value = deepClone(res.data.data)
const data = produceList.value[0].value
dataList = JSON.parse(`[${data}]`);
+
labelList = dataList[0]
for (let i = 0; i < list.value.length; i++) {
let count= list.value[i].data.length
@@ -48,6 +56,7 @@
}
}
}
+
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -83,7 +92,6 @@
"{display:block;padding-top:1px}}";
//
content.innerHTML = el.outerHTML;
- // // console.log("el.outerHTML", el.outerHTML);
body.appendChild(style);
// 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
@@ -98,13 +106,12 @@
</script>
<template>
- <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
<div class="printFlowCard_semi" id="print">
<div v-for="(item1,id) in lastList" class="entirety_semi">
<div class="row4">{{faceOrientation}}</div>
<div v-for="(item,id) in labelList" class="contentRow">
<div class="row1">{{ item.title }}:</div>
- <div class="row2">{{ item1.order[item.name] }}</div>
+ <div class="row2">{{ item1[item.name] }}</div>
</div>
<div class="row3">
--
Gitblit v1.8.0