diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index 3321472..cd5430e 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -129,7 +129,8 @@ export const getPartList = data => createAPI(`/pms/qc/getPartList`,'post',data) export const saveOsInspection = data => createAPI(`/pms/qc/saveOsInspection`,'post',data) export const getAllResourceList = data => createAPI(`/pms/qc/getAllResourceList`,'post',data) export const getOrderNoList = data => createAPI(`/pms/qc/getOrderNoList`,'post',data) - +export const queryController = data => createAPI(`/pms/qc/queryController`,'post',data) +export const queryTemplateList = data => createAPI(`/pms/qc/queryTemplateList`,'post',data) // ===================================== IQC检验 ===================================== export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data) diff --git a/src/views/modules/eam/eamPropertiesModel.vue b/src/views/modules/eam/eamPropertiesModel.vue index 34d1c59..72a492e 100644 --- a/src/views/modules/eam/eamPropertiesModel.vue +++ b/src/views/modules/eam/eamPropertiesModel.vue @@ -919,8 +919,7 @@ message: '操作成功', type: 'success', duration: 1500, - onClose: () => { - } + onClose: () => {} }) } else { this.$alert(data.msg, '错误', { diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index 61f2acd..4f5f3ba 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -170,14 +170,6 @@ - - - - - - - - @@ -193,8 +185,15 @@ + + 检验模板 + 检验模板 + + + + - + @@ -227,7 +226,7 @@ - + @@ -324,6 +323,17 @@ 点击输入 + + + + + +
+ + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + +
+ + { if (data && data.code === 0) { @@ -1208,8 +1328,27 @@ } }, + // 检查动控是否开启 + queryController () { + let tempData = { + controlNo: '10004', + site: this.$store.state.user.site, + } + queryController(tempData).then(({data}) => { + if (data && data.code === 0) { + this.controlData = data.rows + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + // 新增 addModal(){ + // 查看 质量任务生成规则控制 动控是否开启 + this.queryController() this.modalData = { flag: '1', site: this.$store.state.user.site, @@ -1231,7 +1370,9 @@ batchRollNo: '', spec: '', sku: '', - specialRequirements: '' + specialRequirements: '', + templateId: '', + templateName: '' }; this.operationList = []; this.resourceList = []; @@ -1240,6 +1381,28 @@ this.modalFlag = true; }, + // 获取检验模板列表 + queryTemplateList () { + // 查询所有检验模板 + queryTemplateList(this.templateData).then(({data}) => { + if (data && data.code === 0) { + this.templateList = data.rows + this.templateModelFlag = true + }else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + + // 选中检验模板 + getRowData (row) { + this.modalData.templateId = row.templateId + this.modalData.templateName = row.templateName + this.templateModelFlag = false + }, + selectFlag(){ return true; }, @@ -1423,49 +1586,36 @@ Transfer(){ if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) { - this.$alert('请选择检验结论！', '错误', { - confirmButtonText: '确定' - }) - return false + this.$message.warning('请选择检验结论！') + return } if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) { - this.$alert('请选择检验员！', '错误', { - confirmButtonText: '确定' - }) - return false + this.$message.warning('请选择检验员！') + return } - // if (this.detailData.inspectionResult == 'Y' && (this.detailData.disposalMeasures == '特采' || this.detailData.disposalMeasures == '拒收')) { - // this.$alert('合格不予处置措施，请查看！', '错误', { - // confirmButtonText: '确定' - // }) - // return false - // } for (let i = 0; i < this.detailList.length; i++) { if(this.detailList[i].itemResult === '' || this.detailList[i].itemResult == null){ - // this.$alert(this.detailList[i].itemDesc+'是否合格未确认！', '错误', { - // confirmButtonText: '确定' - // }) - // return false this.detailList[i].itemResult = 'Y' } - if(this.detailList[i].valueTypeDb === 'N') { - checkFAISubDetailValue(this.detailList[i]).then(({data}) => { - if (data.flag == 2 && this.detailList[i].itemResult === 'Y') { - this.$confirm(this.detailList[i].itemDesc + ' 中实测值不在合格范围！是否保存为合格？', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.saveDetailInformation() - }).then(() => { - return false - }) - }else { - this.saveDetailInformation() - } - }) - } + // if(this.detailList[i].valueTypeDb === 'N') { + // checkFAISubDetailValue(this.detailList[i]).then(({data}) => { + // if (data.flag == 2 && this.detailList[i].itemResult === 'Y') { + // this.$confirm(this.detailList[i].itemDesc + ' 中实测值不在合格范围！是否保存为合格？', '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + // this.saveDetailInformation() + // }).then(() => { + // return false + // }) + // }else { + // this.saveDetailInformation() + // } + // }) + // } } + this.saveDetailInformation() this.$message({message: '操作成功', type: 'success', duration: 1500, onClose: () => {}}) }, @@ -1477,6 +1627,7 @@ this.saveInformationData.inspectorNo = this.detailData.inspectorNo this.saveInformationData.inspectionResult = this.detailData.inspectionResult this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark + this.saveInformationData.rollQty = this.detailData.rollQty this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) saveFAIDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index cbb8e3e..d155c84 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -168,14 +168,6 @@ - - - - - - - - @@ -191,8 +183,15 @@ + + 检验模板 + 检验模板 + + + + - + @@ -225,7 +224,7 @@ - + @@ -322,6 +321,17 @@ 点击输入 + + + + + +
+ + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + +
+ + { if (data && data.code === 0) { @@ -1204,8 +1324,27 @@ } }, + // 检查动控是否开启 + queryController () { + let tempData = { + controlNo: '10004', + site: this.$store.state.user.site, + } + queryController(tempData).then(({data}) => { + if (data && data.code === 0) { + this.controlData = data.rows + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + // 新增 addModal(){ + // 查看 质量任务生成规则控制 动控是否开启 + this.queryController() this.modalData = { flag: '1', site: this.$store.state.user.site, @@ -1227,7 +1366,9 @@ batchRollNo: '', spec: '', sku: '', - specialRequirements: '' + specialRequirements: '', + templateId: '', + templateName: '' }; this.operationList = []; this.resourceList = []; @@ -1236,6 +1377,28 @@ this.modalFlag = true; }, + // 获取检验模板列表 + queryTemplateList () { + // 查询所有检验模板 + queryTemplateList(this.templateData).then(({data}) => { + if (data && data.code === 0) { + this.templateList = data.rows + this.templateModelFlag = true + }else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + + // 选中检验模板 + getRowData (row) { + this.modalData.templateId = row.templateId + this.modalData.templateName = row.templateName + this.templateModelFlag = false + }, + selectFlag(){ return true; }, @@ -1419,39 +1582,36 @@ Transfer(){ if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) { - this.$alert('请选择检验结论！', '错误', { - confirmButtonText: '确定' - }) - return false + this.$message.warning('请选择检验结论！') + return } if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) { - this.$alert('请选择检验员！', '错误', { - confirmButtonText: '确定' - }) - return false + this.$message.warning('请选择检验员！') + return } for (let i = 0; i < this.detailList.length; i++) { if(this.detailList[i].itemResult === '' || this.detailList[i].itemResult == null){ this.detailList[i].itemResult = 'Y' } - if(this.detailList[i].valueTypeDb === 'N') { - checkFQCSubDetailValue(this.detailList[i]).then(({data}) => { - if (data.flag == 2 && this.detailList[i].itemResult === 'Y') { - this.$confirm(this.detailList[i].itemDesc + ' 中实测值不在合格范围！是否保存为合格？', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.saveDetailInformation() - }).then(() => { - return false - }) - }else { - this.saveDetailInformation() - } - }) - } + // if(this.detailList[i].valueTypeDb === 'N') { + // checkFQCSubDetailValue(this.detailList[i]).then(({data}) => { + // if (data.flag == 2 && this.detailList[i].itemResult === 'Y') { + // this.$confirm(this.detailList[i].itemDesc + ' 中实测值不在合格范围！是否保存为合格？', '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + // this.saveDetailInformation() + // }).then(() => { + // return false + // }) + // }else { + // this.saveDetailInformation() + // } + // }) + // } } + this.saveDetailInformation() this.$message({message: '操作成功', type: 'success', duration: 1500, onClose: () => {}}) }, @@ -1463,6 +1623,7 @@ this.saveInformationData.inspectorNo = this.detailData.inspectorNo this.saveInformationData.inspectionResult = this.detailData.inspectionResult this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark + this.saveInformationData.rollQty = this.detailData.rollQty this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) saveFQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 757be5a..7377431 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -220,7 +220,12 @@ - + + + + 检验模板 + 检验模板 + @@ -253,7 +258,7 @@ - + @@ -350,6 +355,17 @@ 点击输入 + + +