From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/plan/manufacturingorder/index.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index e3a8654..94c4bfd 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -223,14 +223,17 @@
</el-col>
</div>
<div style="margin-left: 50px;width: 100%;">
- <el-row style="margin-top: 10px;">
+ <el-row>
<el-col style="font-weight: bold;font-size: 14px;"><span>鎵� 娆� 鍙�: </span>{{ item.code.moNo2 }}</el-col>
</el-row>
- <el-row style="margin-top: 9px;font-size: 14px;">
+ <el-row style="margin-top: 6px;font-size: 14px;">
<el-col style="font-weight: bold;"><span>璁� 鍗� 鍙�: </span>{{ item.orderNo }}</el-col>
</el-row>
- <el-row style="margin-top: 9px;font-size: 14px;">
+ <el-row style="margin-top: 6px;font-size: 14px;">
<el-col style="font-weight: bold;"><span>瀹㈡埛鍚嶇О: </span>{{ item.cName }}</el-col>
+ </el-row>
+ <el-row style="margin-top: 6px;font-size: 14px;">
+ <el-col style="font-weight: bold;"><span>闆� 浠� 鍙�: </span>{{ item.partNo }}</el-col>
</el-row>
</div>
</div>
@@ -1135,6 +1138,7 @@
}
let no = (i+"").padStart(3,'0')
obj.code.moNo2 = data.moNo + no
+ obj.partNo = data.partNo
this.qrData.push(obj)
}
}
--
Gitblit v1.9.3