From 4b1833ef54f6cbe367bbd1450d1a6cf5a9261570 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Wed, 29 Dec 2021 16:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9D=90=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/yieldReport/com_defect_roll.vue | 2 +-
.../modules/yieldReport/com_produce_down.vue | 2 +-
.../yieldReport/com_produce_report_normal.vue | 24 +++++++++----------
.../modules/yieldReport/com_produce_tool.vue | 22 ++++++++---------
4 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/views/modules/yieldReport/com_defect_roll.vue b/src/views/modules/yieldReport/com_defect_roll.vue
index fc444f8..432d872 100644
--- a/src/views/modules/yieldReport/com_defect_roll.vue
+++ b/src/views/modules/yieldReport/com_defect_roll.vue
@@ -30,7 +30,7 @@
-
+
diff --git a/src/views/modules/yieldReport/com_produce_down.vue b/src/views/modules/yieldReport/com_produce_down.vue
index 8cd847b..22881b5 100644
--- a/src/views/modules/yieldReport/com_produce_down.vue
+++ b/src/views/modules/yieldReport/com_produce_down.vue
@@ -43,7 +43,7 @@
-
+
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index a8d5593..8b819a9 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -8,43 +8,43 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{
this.showToolFlag = true;
- this.$refs.comProduceTool.init(this.scheduleData, this.operatorData, false)
+ this.$refs.comProduceTool.init(this.scheduleData, this.operatorData, 0)
});
},
diff --git a/src/views/modules/yieldReport/com_produce_tool.vue b/src/views/modules/yieldReport/com_produce_tool.vue
index 0d219e1..e451881 100644
--- a/src/views/modules/yieldReport/com_produce_tool.vue
+++ b/src/views/modules/yieldReport/com_produce_tool.vue
@@ -29,24 +29,24 @@
-
+
-
+
-
+
-
+
@@ -73,7 +73,7 @@ export default {
data() {
return {
titleCon: '刀模板',
- sfdcTimeList: [],
+ readonlyFlag: true,
scheduleData: {
site: this.$store.state.user.site,
userName: this.$store.state.user.name,
@@ -106,13 +106,11 @@ export default {
seqNo: '',
rollNo: '',
operatorId: '',
- replaceFlag: false,
toolInstanceId: '',
oriToolInstanceId: '',
consumeQty: 0,
oriConsumeQty: 0,
totalConsumeQty: 0,
- readonlyFlag: true,
checkFlag: false,
},
operatorData: {
@@ -130,13 +128,12 @@ export default {
methods: {
//初始化组件的参数
- init(scheduleData, operatorData, replaceFlag) {
+ init(scheduleData, operatorData, histSeqNo) {
+ debugger;
//初始化参数
this.scheduleData = scheduleData;
//初始化操作员对象
this.operatorData = JSON.parse(JSON.stringify(operatorData));
- //是否是切换
- this.pageData.replaceFlag = replaceFlag;
//设置参数
this.pageData.orderNo = scheduleData.orderNo;
this.pageData.itemNo = scheduleData.itemNo;
@@ -152,16 +149,18 @@ export default {
this.$refs.toolInstanceId.focus();
});
//区分是否是切换切换的
- if(replaceFlag){
+ if(histSeqNo > 0){
this.pageData.consumeQty = 0;
this.pageData.oriConsumeQty = 0;
this.pageData.totalConsumeQty = 0;
this.readonlyFlag = false;
+ this.replaceFlag = true;
}else{
this.pageData.consumeQty = '';
this.pageData.oriConsumeQty = '';
this.pageData.totalConsumeQty = '';
this.readonlyFlag = true;
+ this.replaceFlag = false;
}
},
@@ -177,7 +176,6 @@ export default {
return false;
}
checkToolInstanceId(this.pageData).then(({data}) => {
- //判断检查是否通过
//判断是否存在异常
if(data.code == 500){
this.$message.error(data.msg);