From 4652431ce329b4dec6c4dcc0758d5c4ff97e0666 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期六, 11 十一月 2023 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/product/workbench/returnmaterial-form.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/product/workbench/returnmaterial-form.vue b/src/views/product/workbench/returnmaterial-form.vue
index 8f14f2f..1376234 100644
--- a/src/views/product/workbench/returnmaterial-form.vue
+++ b/src/views/product/workbench/returnmaterial-form.vue
@@ -32,18 +32,18 @@
>
</el-table-column>
<el-table-column
- prop="partBatchNo"
+ prop="ifsBatchNo"
header-align="center"
align="center"
- label="闆朵欢鎵瑰彿"
+ label="鎵瑰彿"
>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="specs"
header-align="center"
align="center"
label="瑙勬牸鍨嬪彿"
- >
+ > -->
</el-table-column>
<el-table-column
prop="returnQuantity"
@@ -162,6 +162,8 @@
feed.returnQuantity = this.dataList[i].returnQuantity
feed.returnLocationId = this.dataList[i].returnLocationId
feed.workstationId = this.workstationId
+ feed.ifsWdr = this.dataList[i].ifsWdr
+ feed.partNo = this.dataList[i].partNo
feeds.push(feed)
}
if (feeds.length > 0) {
--
Gitblit v1.9.3