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/feed-form.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/views/product/workbench/feed-form.vue b/src/views/product/workbench/feed-form.vue
index 95816f1..e895b0a 100644
--- a/src/views/product/workbench/feed-form.vue
+++ b/src/views/product/workbench/feed-form.vue
@@ -29,26 +29,26 @@
>
</el-table-column>
<el-table-column
- prop="partName"
+ prop="partDescription"
header-align="center"
align="center"
- label="闆朵欢"
+ label="闆朵欢鎻忚堪"
>
</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> -->
<el-table-column
prop="suppliedQuantity"
header-align="center"
@@ -203,7 +203,6 @@
partNoList.push(partNoLists)
}
getCheckRawPart(partNoList).then((response) => {
- console.log(response)
if (response.data.code === 0) {
// 闇�瑕佸瘑鐮佺‘璁ゆ儏鍐�
if (response.data.data.success === false) {
@@ -243,7 +242,15 @@
partBatchNo: this.dataList[i].partBatchNo,
systemNo: this.dataList[i].systemNo,
partName: this.dataList[i].partName,
- unit: this.dataList[i].unit ? this.dataList[i].unit : ''
+ unit: this.dataList[i].unit ? this.dataList[i].unit : '',
+ partNo: this.dataList[i].partNo,
+ ifsBatchNo: this.dataList[i].ifsBatchNo,
+ ifsWdr: this.dataList[i].ifsWdr,
+ locationNo: this.dataList[i].locationNo,
+ serialNo:this.dataList[i].serialNo,
+ engChgLevel:this.dataList[i].engChgLevel,
+ configurationId:this.dataList[i].configurationId,
+ activitySeq:this.dataList[i].activitySeq
}
feeds.push(feed)
}
--
Gitblit v1.9.3