From db7fa7f22b1803c5baedc92777398abbb7fbb959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Mon, 15 May 2023 16:50:20 +0800 Subject: [PATCH] 12 --- src/views/modules/qc/IQCResultEntry.vue | 12 +- src/views/modules/qc/qcFamilyAttribute.vue | 2 + src/views/modules/qc/qcItem.vue | 4 +- src/views/modules/qc/qcPartAttribute.vue | 28 ++++- src/views/modules/qc/qcTemplate.vue | 6 +- src/views/modules/qc/qc_upload.vue | 134 ++++++++++++++++++++- 6 files changed, 175 insertions(+), 11 deletions(-) diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 5428ede..6f85696 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -34,11 +34,11 @@ + value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"> - + value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"> @@ -291,8 +291,8 @@ width="100" label="操作"> @@ -730,7 +730,7 @@ columnProp: 'maxValue', headerAlign: "center", align: "left", - columnLabel: '上限值', + columnLabel: '最大值', columnHidden: false, columnImage: false, columnSortable: false, @@ -742,7 +742,7 @@ columnProp: 'minValue', headerAlign: "center", align: "left", - columnLabel: '下限值', + columnLabel: '最小值', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/qc/qcFamilyAttribute.vue b/src/views/modules/qc/qcFamilyAttribute.vue index 9e0e43b..103d0b5 100644 --- a/src/views/modules/qc/qcFamilyAttribute.vue +++ b/src/views/modules/qc/qcFamilyAttribute.vue @@ -935,6 +935,8 @@ qcUpload(){ let currentData = { flag: 'familyAttribute', + createBy: this.$store.state.user.name, + site: this.$store.state.user.site, }; //打开组件 去做新增业务 this.$nextTick(() => { diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue index fd76b42..3f94765 100644 --- a/src/views/modules/qc/qcItem.vue +++ b/src/views/modules/qc/qcItem.vue @@ -247,7 +247,7 @@ columnProp: 'defaultValue', headerAlign: 'center', align: 'left', - columnLabel: '参照值', + columnLabel: '标准值', columnHidden: false, columnImage: false, columnSortable: false, @@ -515,6 +515,8 @@ qcUpload(){ let currentData = { flag: 'item', + createBy: this.$store.state.user.name, + site: this.$store.state.user.site, }; //打开组件 去做新增业务 this.$nextTick(() => { diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index 105b361..335116b 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -119,7 +119,7 @@ - + @@ -573,6 +573,30 @@ status: true, fixed: '', }, + { + columnProp: 'defaultSamplingQuantity', + headerAlign: "center", + align: "left", + columnLabel: '默认检验数量', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'defaultSamplingProportion', + headerAlign: "center", + align: "left", + columnLabel: '默认检验比例', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, ], // 快速添加 fastAddFlag:false, @@ -988,6 +1012,8 @@ qcUpload(){ let currentData = { flag: 'partAttribute', + createBy: this.$store.state.user.name, + site: this.$store.state.user.site, }; //打开组件 去做新增业务 this.$nextTick(() => { diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue index 9c1e746..95183d3 100644 --- a/src/views/modules/qc/qcTemplate.vue +++ b/src/views/modules/qc/qcTemplate.vue @@ -222,7 +222,7 @@ header-align="center" align="right" min-width="80" - label="上限值"> + label="最大值">