|
|
|
@ -515,7 +515,8 @@ |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="Transfer">保存</el-button> |
|
|
|
<el-button type="primary" @click="Transfer('1')">应用</el-button> |
|
|
|
<el-button type="primary" @click="Transfer('2')">保存</el-button> |
|
|
|
<el-button type="primary" @click="detailInformationFlag=false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
@ -1627,7 +1628,8 @@ |
|
|
|
operatorName: '', |
|
|
|
responsiblePerson: '', |
|
|
|
responsiblePersonName: '', |
|
|
|
subDetailList: [] |
|
|
|
subDetailList: [], |
|
|
|
type: '' |
|
|
|
}, |
|
|
|
detailColumnList: [ |
|
|
|
{ |
|
|
|
@ -3450,36 +3452,33 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
Transfer () { |
|
|
|
if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) { |
|
|
|
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.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures === '')) { |
|
|
|
this.$message.warning('请选择处置措施！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.detailList.length > 0 && this.detailData.inspectionResult === '不合格') { |
|
|
|
const flag = this.detailList.some(item => item.itemResult === 'N') |
|
|
|
if (!flag) { |
|
|
|
this.$message.warning('请选择不合格项目！') |
|
|
|
Transfer (type) { |
|
|
|
if (type === '2') { |
|
|
|
if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) { |
|
|
|
this.$message.warning('请选择检验结论！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.detailData.inspectionResult === '不合格' && (this.detailData.disposalMeasures == null || this.detailData.disposalMeasures === '')) { |
|
|
|
this.$message.warning('请选择处置措施！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.detailList.length > 0 && this.detailData.inspectionResult === '不合格') { |
|
|
|
const flag = this.detailList.some(item => item.itemResult === 'N') |
|
|
|
if (!flag) { |
|
|
|
this.$message.warning('请选择不合格项目！') |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
if (this.detailData.inspectionResult !== '不合格') { |
|
|
|
this.detailData.disposalMeasures = '' |
|
|
|
this.detailData.disposalRemark = '' |
|
|
|
} |
|
|
|
} |
|
|
|
if (this.detailData.inspectionResult !== '不合格') { |
|
|
|
this.detailData.disposalMeasures = '' |
|
|
|
this.detailData.disposalRemark = '' |
|
|
|
} |
|
|
|
this.saveDetailInformation() |
|
|
|
this.saveDetailInformation(type) |
|
|
|
}, |
|
|
|
|
|
|
|
// 新增明细信息 |
|
|
|
saveDetailInformation () { |
|
|
|
saveDetailInformation (type) { |
|
|
|
this.saveInformationData.site = this.detailData.site |
|
|
|
this.saveInformationData.buNo = this.detailData.buNo |
|
|
|
this.saveInformationData.inspectionNo = this.detailData.inspectionNo |
|
|
|
@ -3496,6 +3495,7 @@ |
|
|
|
this.saveInformationData.operator = this.detailData.operator |
|
|
|
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson |
|
|
|
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) |
|
|
|
this.saveInformationData.type = type |
|
|
|
// this.saveInformationData.subDetailList = this.acquisitionList |
|
|
|
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
|
fengyuan_yang
1 year ago