From 6371e0890178fe1fdd9c36f72373a141add90d92 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 12 十二月 2023 17:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/manufacturingorder/index.vue | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index e9822f7..ec2c361 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -211,6 +211,10 @@
<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;">{{ 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.orderNo }}</el-col>
</el-row>
@@ -239,25 +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;">{{ item.customerOrderNo }}</el-col>
- </el-row>
- <el-row>
- <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.code)" :size="80" :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>
--
Gitblit v1.9.3