From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 17:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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