diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue index 0bc3b3e..3419e09 100644 --- a/src/views/modules/eam/eamWorkPlanForCheck.vue +++ b/src/views/modules/eam/eamWorkPlanForCheck.vue @@ -127,22 +127,22 @@ - + - + - 点检模板 + 点检模板 - + - + - + - + - + - + @@ -191,7 +191,7 @@ - + diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index 585af89..61f2acd 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -364,6 +364,7 @@ 添加 删除 + 批量新增
@@ -394,6 +395,22 @@ + + + + + + + + + + + + 保存 + 关闭 + + + - + @@ -1057,6 +1074,11 @@ resourceList: [], operationList: [], partList: [], + batchHandleAddModalFlag: false, + batchAddData: { + samplingLocation: '', + samplingNumber: '' + } } }, mounted () { @@ -1505,6 +1527,10 @@ selectFAISubDetailedRecord(this.subDetailData).then(({data}) => { this.tableData = data.rows }) + this.batchAddData = { + samplingLocation: '', + samplingNumber: '' + } this.subDetailFlag = true; }, @@ -1594,6 +1620,38 @@ }) }, + // 批量新增操作 + batchHandleAdd (td) { + checkFAIIsSubmit(td).then(({data}) => { + if (data.flag != 1) { + this.batchHandleAddModalFlag = true + } else { + this.$alert("记录已提交！", '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + + // 批量新增行 + batchHandleAddModal () { + for (let i = 0; i < this.batchAddData.samplingNumber; i++) { + let obj = {} + obj.samplingLocation = this.batchAddData.samplingLocation + obj.subDetailValue = "" + this.tableData.push(obj) + } + this.batchHandleAddModalFlag = false + }, + + // 回车事件 + nextFocus(index) { + let aaa = `${index + 1}` + this.$nextTick(() => { + this.$refs[aaa].focus() + }) + }, + //删除 handleDeleteBtn(td) { checkFAIIsSubmit(td).then(({data}) => { @@ -1618,7 +1676,7 @@ }) }) this.$message({ - message: "删除成功，记得保存修改喔！", + message: "删除成功！", type: "success", }) return diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 224b5e2..cbb8e3e 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -362,6 +362,7 @@ 添加 删除 + 批量新增
@@ -392,6 +393,22 @@ + + + + + + + + + + + + 保存 + 关闭 + + + - + @@ -1053,6 +1070,11 @@ resourceList: [], operationList: [], partList: [], + batchHandleAddModalFlag: false, + batchAddData: { + samplingLocation: '', + samplingNumber: '' + } } }, mounted () { @@ -1491,6 +1513,10 @@ selectFQCSubDetailedRecord(this.subDetailData).then(({data}) => { this.tableData = data.rows }) + this.batchAddData = { + samplingLocation: '', + samplingNumber: '' + } this.subDetailFlag = true; }, @@ -1580,6 +1606,38 @@ }) }, + // 批量新增操作 + batchHandleAdd (td) { + checkFQCIsSubmit(td).then(({data}) => { + if (data.flag != 1) { + this.batchHandleAddModalFlag = true + } else { + this.$alert("记录已提交！", '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + + // 批量新增行 + batchHandleAddModal () { + for (let i = 0; i < this.batchAddData.samplingNumber; i++) { + let obj = {} + obj.samplingLocation = this.batchAddData.samplingLocation + obj.subDetailValue = "" + this.tableData.push(obj) + } + this.batchHandleAddModalFlag = false + }, + + // 回车事件 + nextFocus(index) { + let aaa = `${index + 1}` + this.$nextTick(() => { + this.$refs[aaa].focus() + }) + }, + //删除 handleDeleteBtn(td) { checkFQCIsSubmit(td).then(({data}) => { @@ -1604,7 +1662,7 @@ }); }); this.$message({ - message: "删除成功，记得保存修改喔！", + message: "删除成功！", type: "success", }); //this.$refs.tb.clearSelection(); diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 97d503c..757be5a 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -439,6 +439,7 @@ 添加 删除 + 批量新增
@@ -469,6 +470,22 @@ + + + + + + + + + + + + 保存 + 关闭 + + + { this.tableData = data.rows }) - this.subDetailFlag = true; + this.batchAddData = { + samplingLocation: '', + samplingNumber: '' + } + this.subDetailFlag = true }, // 审核按钮 @@ -1774,6 +1800,38 @@ }) }, + // 批量新增操作 + batchHandleAdd (td) { + checkIPQCIsSubmit(td).then(({data}) => { + if (data.flag != 1) { + this.batchHandleAddModalFlag = true + } else { + this.$alert("记录已提交！", '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + + // 批量新增行 + batchHandleAddModal () { + for (let i = 0; i < this.batchAddData.samplingNumber; i++) { + let obj = {} + obj.samplingLocation = this.batchAddData.samplingLocation + obj.subDetailValue = "" + this.tableData.push(obj) + } + this.batchHandleAddModalFlag = false + }, + + // 回车事件 + nextFocus(index) { + let aaa = `${index + 1}` + this.$nextTick(() => { + this.$refs[aaa].focus() + }) + }, + //删除 handleDeleteBtn(td) { checkIPQCIsSubmit(td).then(({data}) => { @@ -1798,7 +1856,7 @@ }); }); this.$message({ - message: "删除成功，记得保存修改喔！", + message: "删除成功!", type: "success", }); return; diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 9bc130b..ee4e144 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -331,7 +331,7 @@ @@ -349,7 +349,7 @@ - + @@ -1166,6 +1166,10 @@ selectIQCSubDetailedRecord(this.subDetailData).then(({data}) => { this.tableData = data.rows }) + this.batchAddData = { + samplingLocation: '', + samplingNumber: '' + } this.subDetailFlag = true }, // 删除检验记录 @@ -1311,7 +1315,6 @@ }, // 回车事件 nextFocus(index) { - console.log(index) let aaa = `${index + 1}` this.$nextTick(() => { this.$refs[aaa].focus() diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index 362efc4..7b9fafc 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -104,7 +104,7 @@ - 物料编码: + 物料编码: @@ -113,7 +113,10 @@ - + + + + @@ -630,6 +633,7 @@ createTime: '', createBy: this.$store.state.user.name, attributeType: 'A', + exemptInspection: '' }, detailData:{ site: this.$store.state.user.site, @@ -703,6 +707,18 @@ status: true, fixed: '', }, + { + columnProp: 'exemptInspection', + headerAlign: "center", + align: "center", + columnLabel: '是否免检', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, { columnProp: 'attributeRemark', headerAlign: "center", @@ -1030,6 +1046,7 @@ updateBy: this.$store.state.user.name, createBy: this.$store.state.user.name, attributeType: 'A', + exemptInspection: '' }; this.modalDisableFlag = false; this.modalFlag = true; @@ -1069,6 +1086,15 @@ this.$message.warning('请选择物料名称！') return } + let obj = document.getElementsByName('isExemptInspection') + let s = '' + for (let i = 0; i < obj.length; i++) { + if (obj[i].checked) { + s += obj[i].value + ',' + } + } + s = s.substring(0, s.length - 1) + this.modalData.exemptInspection = s if(this.modalData.flag === '1'){ qcPartAttributeSave(this.modalData).then(({data}) => { if (data && data.code === 0) {