From a6a7b0bbf6f67fb1a2a1619296202c9e29915325 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 15 十一月 2023 10:24:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/customerorder/schedule-table.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/plan/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue
index a5588d4..7cbc453 100644
--- a/src/views/plan/customerorder/schedule-table.vue
+++ b/src/views/plan/customerorder/schedule-table.vue
@@ -31,7 +31,7 @@
width="120px"
>
<template slot-scope="scope">
- <el-form-item>{{ scope.row.customerOrderNo }}</el-form-item>
+ <el-form-item>{{ scope.row.contractNo }}</el-form-item>
</template>
</el-table-column>
<el-table-column
@@ -53,7 +53,7 @@
>
<template slot-scope="scope">
<el-form-item class="inline-el-hidden">{{
- scope.row.partName
+ scope.row.productName
}}</el-form-item>
</template>
</el-table-column>
@@ -103,7 +103,7 @@
width="60px"
>
<template slot-scope="scope">
- <span>{{ scope.row.unit }}</span>
+ <span>{{ scope.row.otcUnit }}</span>
</template>
</el-table-column>
<el-table-column
@@ -138,7 +138,7 @@
width="160px"
>
<template slot-scope="scope">
- <el-form-item>{{ scope.row.wantedDeliveryDate }}</el-form-item>
+ <el-form-item>{{ scope.row.deliveryDate }}</el-form-item>
</template>
</el-table-column>
<el-table-column
@@ -222,11 +222,13 @@
this.dataForm.customer = []
const _that = this
customer.forEach((item) => {
+ console.log(item);
const outPutBatchList = []
_that.$set(item, 'outPutBatchList', outPutBatchList)
customerList.push(item)
})
this.dataForm.customer = JSON.parse(JSON.stringify(customerList))
+ console.log(this.dataForm.customer);
})
},
dataFormSubmit() {
--
Gitblit v1.9.3