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/PrintCustomLabel.vue | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
similarity index 80%
rename from north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
rename to north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
index 6344c6f..99bbc21 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
@@ -26,14 +26,19 @@
printList: []
})
+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}/${lableType}`, data.value).then((res) => {
if (res.code == 200) {
@@ -88,7 +93,6 @@
"{display:block;padding-top:1px}}";
//
content.innerHTML = el.outerHTML;
- // // console.log("el.outerHTML", el.outerHTML);
body.appendChild(style);
// 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
@@ -103,13 +107,17 @@
//淇敼鐩稿悓浜у搧鍚嶇О鏍囩
const updataProductName = () => {
-
for (let i = 0; i < lastList.value.length; i++) {
let prefix = lastList.value[i].processId.substring(0, 11);
+ let orderId= lastList.value[i].orderId
let enName= lastList.value[i].productAbbreviation
+ let project=lastList.value[i].project
lastList.value.forEach(obj => {
if (prefix === obj.processId.substring(0, 11)){
obj.productAbbreviation = enName
+ }
+ if (orderId === obj.orderId){
+ obj.project=project
}
})
}
@@ -117,18 +125,20 @@
</script>
<template>
- <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
- <div id="print" :class="company.printLabel.className.custom.printFlowCardName()">
- <div v-for="(item1,id) in lastList" :class="company.printLabel.className.custom.entiretyName()">
- <div class="row4">{{ faceOrientation }}</div>
- <div v-for="(item,id) in labelList" :class="company.printLabel.className.custom.contentRowName()">
- <div v-if="item.title==null" class="row1">{{ item.title }}</div>
- <div v-else class="row1">{{ item.title }}:</div>
- <div class="row2" style="width: 100%;"><input v-model="item1[item.name]" @keyup="updataProductName()" style="background-color: #D5EAFF;border: none;"/></div>
+ <div id="print" :class="company.printLabel.className.custom.printFlowCardName()">
+ <div v-for="(item1,id) in lastList" :class="company.printLabel.className.custom.entiretyName()">
+ <div class="row4">{{ faceOrientation }}</div>
+ <div v-for="(item,id) in labelList" :class="company.printLabel.className.custom.contentRowName()">
+ <div v-if="item.title==null" class="row1">{{ item.title }}</div>
+ <div v-else class="row1">{{ item.title }}:</div>
+ <div class="row2" style="width: 100%;"><input v-model="item1[item.name]" @keyup="updataProductName()" style="border: none;"/></div>
+ </div>
+ <div v-html="company.printLabel.custom(item1)"></div>
</div>
- <div v-html="company.printLabel.custom(item1)"></div>
</div>
- </div>
+
+
+
</template>
@@ -149,12 +159,17 @@
width: 100px;
}
+.print{
+ width: 100%;
+ height: 100%;
+}
+
/*鎴�*/
.printFlowCard_finished {
/*
font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
*/
- flex-wrap: wrap;
+ flex-wrap: nowrap;
display: flex;
flex-direction: column;
}
@@ -213,7 +228,6 @@
input{
width: 100%;
- background-color: #D5EAFF;
border: none;
}
--
Gitblit v1.8.0