From 7c11333dfda4506e28973ac0636100a70e91afa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
<411641505@qq.com>
Date: Fri, 20 Oct 2023 09:30:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BE=85=E6=A3=80=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/qc/pendinginspect/iqc.vue | 14 +-
src/views/mes/qc/pendinginspect/oqc.vue | 330 ++++++++++++++++++++++++
src/views/mes/qc/pendinginspect/pqc.vue | 2 +-
3 files changed, 338 insertions(+), 8 deletions(-)
diff --git a/src/views/mes/qc/pendinginspect/iqc.vue b/src/views/mes/qc/pendinginspect/iqc.vue
index 47c78de..9dc9b36 100644
--- a/src/views/mes/qc/pendinginspect/iqc.vue
+++ b/src/views/mes/qc/pendinginspect/iqc.vue
@@ -177,7 +177,7 @@
返回
保 存
- 完成
+ 完成
取 消
@@ -231,13 +231,13 @@ export default {
}
},
created() {
- this.getList();
+ this.reset();
},
methods: {
// 取消按钮
cancel() {
- this.open = false;
- this.reset();
+ const obj = { path: "/mes/qc/pendinginspect" };
+ this.$tab.closeOpenPage(obj);
},
// 表单重置
reset() {
@@ -272,7 +272,7 @@ export default {
majQuantity: null,
minQuantity: null,
checkResult: null,
- reciveDate: null,
+ reciveDate: this.$route.params.recordTime,
inspectDate: null,
inspector: null,
status: "PREPARE",
@@ -317,9 +317,9 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
this.$modal.confirm('是否完成来料检验单编制？【完成后将不能更改】').then(function(){
- that.form.status = 'CONFIRMED';
+ that.form.status = 'FINISHED';
that.submitForm();
- that.open = false;
+ that.cancel();
});
}
});
diff --git a/src/views/mes/qc/pendinginspect/oqc.vue b/src/views/mes/qc/pendinginspect/oqc.vue
index e69de29..4b0203d 100644
--- a/src/views/mes/qc/pendinginspect/oqc.vue
+++ b/src/views/mes/qc/pendinginspect/oqc.vue
@@ -0,0 +1,330 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 检测项
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/mes/qc/pendinginspect/pqc.vue b/src/views/mes/qc/pendinginspect/pqc.vue
index a918d5a..aa96f6d 100644
--- a/src/views/mes/qc/pendinginspect/pqc.vue
+++ b/src/views/mes/qc/pendinginspect/pqc.vue
@@ -351,7 +351,7 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
this.$modal.confirm('是否完成检验单编制？【完成后将不能更改】').then(function(){
- that.form.status = 'CONFIRMED';
+ that.form.status = 'FINISHED';
that.submitForm();
that.cancel();
});