From 6a496cd9a081b0f1ba869255e13316b66895dac5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 15 十一月 2023 19:21:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/customerorder/schedule-table.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/plan/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue
index a5588d4..3780444 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>
@@ -67,7 +67,7 @@
<el-form-item>{{ scope.row.buyQtyDue }}</el-form-item>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
header-align="center"
align="center"
label="宸茶鍒掓暟閲�"
@@ -76,7 +76,7 @@
<template slot-scope="scope">
<el-form-item>{{ scope.row.requireNumber }}</el-form-item>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="remainderRequired"
header-align="center"
@@ -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,12 +222,17 @@
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);
})
+ this.dataForm.customer.forEach(item=>{
+ item.remainderRequired=item.buyQtyDue
+ })
},
dataFormSubmit() {
this.isSubmit = true
--
Gitblit v1.9.3