From 1f9c32908a68eef81f549b6986a9bc1f05056108 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 16 十一月 2023 16:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/masterproductionschedule/auto-manufacturingorder.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue b/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
index fab06e0..4f87083 100644
--- a/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
+++ b/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
@@ -155,7 +155,7 @@
</el-select>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="isReportOperation"
label="IFS杞﹂棿璁㈠崟鎺ユ敹鏃舵姤鍛婂伐搴�"
align="center"
@@ -163,7 +163,7 @@
<template slot-scope="scope">
<span>{{ scope.row.isReportOperation ? '鏄�' : '鍚�' }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</div>
</div>
@@ -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,6 +417,7 @@
},
getWorkShopOptions() {
remote('work_shop').then((response) => {
+ console.log("楂樺帇",response);
if (response.data.code === 0) {
this.workShopOptions = response.data.data
} else {
--
Gitblit v1.9.3