From 922812c5932382f0432d6f367607e00c0dc0b556 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Sat, 26 Feb 2022 17:53:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=E5=92=8CBU?=
=?UTF-8?q?G=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/yieldReport/com_defect_roll.vue | 20 ++-----
.../modules/yieldReport/com_end_tuning.vue | 7 ++-
.../modules/yieldReport/com_finish_roll.vue | 58 ++++++++++---------
.../yieldReport/com_produce_report_normal.vue | 21 ++++++-
.../yieldReport/com_replace_material.vue | 1 +
.../modules/yieldReport/com_start_produce.vue | 4 +-
6 files changed, 64 insertions(+), 47 deletions(-)
diff --git a/src/views/modules/yieldReport/com_defect_roll.vue b/src/views/modules/yieldReport/com_defect_roll.vue
index 7479dc7..329b292 100644
--- a/src/views/modules/yieldReport/com_defect_roll.vue
+++ b/src/views/modules/yieldReport/com_defect_roll.vue
@@ -9,7 +9,7 @@
-
@@ -343,10 +343,6 @@ export default {
/*检查不良代码*/
getDefectDesc(){
- if(this.pageData.defectCode == null || this.pageData.defectCode == ''){
- this.$message.error('请扫描不良代码!');
- return false;
- }
checkDefectCode(this.pageData).then(({data}) => {
//判断是否存在异常
if(data.code == 500){
@@ -360,6 +356,10 @@ export default {
/*报告不良代码*/
reportDefectFun(){
+ if(this.pageData.defectCode == null || this.pageData.defectCode == ''){
+ this.$message.error('请扫描不良代码!');
+ return false;
+ }
reportDefectCode(this.pageData).then(({data}) => {
if(data.code == 500){
this.$message.error(data.msg);
@@ -374,16 +374,6 @@ export default {
});
},
-
-
-
-
-
-
-
-
-
-
},
created() {
// this.factoryList()
diff --git a/src/views/modules/yieldReport/com_end_tuning.vue b/src/views/modules/yieldReport/com_end_tuning.vue
index 9760cbb..027af6e 100644
--- a/src/views/modules/yieldReport/com_end_tuning.vue
+++ b/src/views/modules/yieldReport/com_end_tuning.vue
@@ -19,7 +19,7 @@
-
-
+
+
{{scope.row[item.columnProp]}}
![]()
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index cfb63fe..67af05a 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -42,17 +42,17 @@
v-model="pageData.reportedFlag">是否报告产量
-
+
+
-
+
-
+
-
+
@@ -63,13 +63,13 @@
-
+
-
+
@@ -81,13 +81,13 @@
-
+
-
+
-
+
@@ -95,13 +95,13 @@
-
+
-
+
-
+
@@ -109,13 +109,13 @@
-
+
-
+
-
+
@@ -135,13 +135,13 @@
-
+
-
+
-
+
@@ -149,13 +149,13 @@
-
+
-
+
-
+
@@ -168,8 +168,8 @@
-
-
+
+
@@ -200,8 +200,9 @@
:width="item.columnWidth"
:label="item.columnLabel">
-
+
+
{{scope.row[item.columnProp]}}
![]()
@@ -891,4 +892,9 @@ div.table-input /deep/ input.el-input__inner{
padding: 5px 5px;
}
+/*统一的input内容颜色样式*/
+.customer-input-color-red /deep/ .el-input__inner {
+ color: red;
+}
+
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 4ca1386..527329f 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -60,7 +60,7 @@
{{ this.currentRollOps.rollNo }}
-
创建新卷
@@ -3136,6 +3136,21 @@ export default {
});
},
+ /*提示是否创建新卷*/
+ warnCreateNewRollConfirm(){
+ //禁用当按钮 操作完成 恢复
+ this.buttonTags.createNewRollFlag = true;
+ //提示操作
+ this.$confirm('确实要创建一个新卷吗?', '提示', {
+ confirmButtonText: '确认',
+ celButtonText: '取消',
+ type: 'warning'
+ }).then(() =>{
+ //执行创建新卷的操作
+ this.createNewRollFun();
+ });
+ },
+
//创建新卷的功能
createNewRollFun() {
//校验当前的功能是否可用
@@ -3148,6 +3163,8 @@ export default {
//调用创建卷的方法
this.createNewRollDo();
} else {
+ // 操作完成 恢复
+ this.buttonTags.createNewRollFlag = false;
this.$message.error(resultMap.msg)
}
});
@@ -3336,6 +3353,8 @@ export default {
//刷新当的按钮
this.refreshPageData();
} else {
+ //打开当前创建新卷的按钮
+ this.buttonTags.createNewRollFlag = false;
this.$message.error(data.msg);
}
});
diff --git a/src/views/modules/yieldReport/com_replace_material.vue b/src/views/modules/yieldReport/com_replace_material.vue
index 577ae1d..2d4dc87 100644
--- a/src/views/modules/yieldReport/com_replace_material.vue
+++ b/src/views/modules/yieldReport/com_replace_material.vue
@@ -168,6 +168,7 @@ export default {
//重置时间
this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD');
this.pageData.reportTime = this.dayjs(new Date()).format('HH:mm:ss');
+ this.pageData.downTimeQty = 0;
this.pageData.rmRollNo = '';
//自动获取焦点
this.$nextTick(() => {
diff --git a/src/views/modules/yieldReport/com_start_produce.vue b/src/views/modules/yieldReport/com_start_produce.vue
index 0b7d455..6897bec 100644
--- a/src/views/modules/yieldReport/com_start_produce.vue
+++ b/src/views/modules/yieldReport/com_start_produce.vue
@@ -16,10 +16,10 @@
-
+
-