From 8ac7bed2e7d52a6bbcb44ecfb1e11a0b1244e85e Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 13 十二月 2023 14:53:50 +0800
Subject: [PATCH] modified: src/views/plan/manufacturingorder/routing.vue
---
src/views/plan/manufacturingorder/index.vue | 94 +++++++++++++++++++++++++++++------------------
1 files changed, 58 insertions(+), 36 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index f1276ae..ec2c361 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -211,17 +211,25 @@
<el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
<el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
<el-row>
- <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
+ <el-col :span="10" :offset="3">鎵规鍙�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
</el-row>
<el-row>
- <el-col :span="10" :offset="3">杞﹂棿璁㈠崟鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.moNo2 }}</el-col>
+ <el-col :span="10" :offset="3">璁㈠崟鍙凤細</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
</el-row>
<el-row>
- <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
+ <el-col :span="10" :offset="3">瀹㈡埛鍚嶇О锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">杞﹂棿璁㈠崟浜岀淮鐮侊細</el-col>
<el-col :span="10">
- <vueQr :text="JSON.stringify(item)" :size="80" :margin="2"></vueQr>
+ <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
</el-col>
</el-row>
</el-card>
@@ -235,21 +243,29 @@
</el-dialog>
<div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;padding: 0;">
<div id="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-bottom:10px;font-size: 16px !important;">
- <el-row>
- <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">杞﹂棿璁㈠崟鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.moNo2 }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
- <el-col :span="10">
- <vueQr :text="JSON.stringify(item)" :size="110" :margin="2"></vueQr>
- </el-col>
- </el-row>
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="padding-top:0px;margin-bottom:10px;font-size: 16px !important;">
+ <el-row style="font-size:12px;">
+ <el-col :span="10" :offset="3">鎵规鍙�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
+ </el-row>
+ <el-row style="font-size:12px;">
+ <el-col :span="10" :offset="3">璁㈠崟鍙凤細</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
+ </el-row>
+ <el-row style="font-size:12px;">
+ <el-col :span="10" :offset="3">瀹㈡埛鍚嶇О锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
+ </el-row>
+ <el-row style="font-size:12px;">
+ <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
+ </el-row>
+ <el-row style="font-size:12px;">
+ <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
+ <el-col :span="10">
+ <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
+ </el-col>
+ </el-row>
</el-card>
</div>
</div>
@@ -479,7 +495,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '120',
prop: 'printRequirement',
label: '鍗板瓧瑕佹眰',
@@ -496,7 +512,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '120',
prop: 'scrapQty',
@@ -571,7 +587,7 @@
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '120',
prop: 'outerColor',
label: '澶栨姢棰滆壊',
@@ -589,7 +605,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '120',
@@ -638,7 +654,7 @@
searchInfoType: 'datetimerange',
formatter: this.formatDutyDate
},
- {
+ /* {
minWidth: '120',
prop: 'bomConfirmStatus',
label: 'BOM鐘舵��',
@@ -700,7 +716,7 @@
}
return formatVal
}
- },
+ }, */
{
minWidth: '200',
prop: 'remark',
@@ -710,7 +726,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '100',
prop: 'oriIfsOrderNo',
label: '鍘烮FS璁㈠崟鍙�',
@@ -745,8 +761,8 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
- {
+ }, */
+ /* {
minWidth: '100',
prop: 'qtyApply',
label: '鐢宠鏁伴噺',
@@ -754,7 +770,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '140',
width: '120',
@@ -777,7 +793,7 @@
searchInfoType: 'datetimerange',
formatter: this.formatDutyDate
},
- {
+ /* {
minWidth: '120',
prop: 'ifsSync',
label: '璁㈠崟鍚屾ERP',
@@ -851,7 +867,7 @@
}
return formatVal
}
- },
+ }, */
{
minWidth: '100',
prop: 'factoryName',
@@ -1152,15 +1168,21 @@
initQrData(data){
this.qrData = []
if(data){
+ console.log(data);
let index = Number(data.qtyRequired) + Number(data.scrapQty)
if(index>0){
for(var i=1;i<= index;i++){
let obj = {
- moNo: data.moNo,
- moNo2: null,
+ orderNo: data.customerOrderNo,
+ cName: data.customerName,
+ pName: data.partName,
+ code: {
+ moNo: data.moNo,
+ moNo2: null,
+ }
}
let no = (i+"").padStart(3,'0')
- obj.moNo2 = data.moNo + no
+ obj.code.moNo2 = data.moNo + no
this.qrData.push(obj)
}
}
--
Gitblit v1.9.3