diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index 8918e45..098e420 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -149,6 +149,7 @@ export const getHuanXianSysUserList = data => createAPI(`/pms/pqc/getHuanXianSys export const getAllUserList = data => createAPI(`/pms/pqc/getAllUserList`,'post',data) export const queryResourceList2 = data => createAPI(`/pms/pqc/queryResourceList2`,'post',data) export const querySopNum = data => createAPI(`/pms/pqc/querySopNum`,'post',data) +export const previewSopFile = data => createAPI(`/pms/pqc/previewSopFile`,'post',data,'download') // ===================================== IPQC检验 ===================================== export const qcIPQCInspectionSearch = data => createAPI(`/pms/qc/qcIPQCInspectionSearch`,'post',data) diff --git a/src/views/modules/qc/PQCResultEntry.vue b/src/views/modules/qc/PQCResultEntry.vue index 7ee943a..5924f4d 100644 --- a/src/views/modules/qc/PQCResultEntry.vue +++ b/src/views/modules/qc/PQCResultEntry.vue @@ -313,7 +313,7 @@ 物料编码 - + @@ -344,15 +344,14 @@ - + - 查询SOP编号 - 预览SOP + 预览SOP @@ -418,19 +417,7 @@ 关闭 - - - - - - 关闭 - - + @@ -466,27 +453,28 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + 预览SOP @@ -498,22 +486,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - +
@@ -544,7 +532,7 @@ :height="500" :data="detailList" border - style="width: 100%;"> + style="width: 100%;margin-top: 10px"> 点击输入 - - - - - - + + + + + + + + + + + + + + + + + + + + + + { + let type = 'application/pdf;charset=UTF-8' + const blob = new Blob([data], { type: type }) + console.log(blob,type) + // 创建URL来生成预览 + const fileURL = URL.createObjectURL(blob) + // 在新标签页中打开文件预览 + window.open(fileURL, '_blank') + }) }, queryALLPartList(){ queryPartDescByNo(this.partModalData).then(({data})=>{ @@ -3610,6 +3618,7 @@ export default { this.modalData.partNo = row.partNo this.modalData.partDesc = row.partDesc this.operationDescInput() + this.querySopNum() this.partFlag = false }, @@ -3812,10 +3821,10 @@ export default { Transfer (type) { if (type === '2') { - if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) { - this.$message.warning('请选择检验结论!') - return - } + // 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 @@ -3965,6 +3974,8 @@ export default { this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.state = row.state + this.detailData.sopType = row.sopType + this.detailData.sopUrl = row.sopUrl if (row.state === '待检验') { this.detailData.passQty = row.samplingQty } else { diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index 61872fb..a932927 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -1899,7 +1899,6 @@ // 获取工序列表 getOperationList () { - this.$message.success(this.operationData) getOperationDescList(this.operationData).then(({data}) => { if (data && data.code === 0) { this.operationList = data.rows