From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突
---
src/views/plan/masterproductionschedule/auto-manufacturingorder.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue b/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
index 76551ef..98b16cc 100644
--- a/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
+++ b/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
@@ -251,7 +251,7 @@
unit: item.unit,
workShop: null,
workshopTypeCode: 'M',
- requiredDate: null,
+ requiredDate: this.masterProduction.requiredDate,
id: item.id,
manufactureAttr: this.masterProduction.manufactureAttr,
isReportOperation: this.isReportOperation
@@ -417,7 +417,6 @@
},
getWorkShopOptions() {
remote('work_shop').then((response) => {
- console.log("楂樺帇",response);
if (response.data.code === 0) {
this.workShopOptions = response.data.data
} else {
--
Gitblit v1.9.3