diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index cd0faf9..ece4e4b 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -16,12 +16,6 @@ export const getItemLists= data => createAPI(`/pms/qc/getItemLists`,'post',data) export const subDetailUpload= data => createAPI(`/pms/qc/subDetailUpload`,'post',data) export const queryMethodList= data => createAPI(`/pms/qc/queryMethodList`,'post',data) -// ===================================== 质检员信息 ===================================== -export const inspectorSearch = data => createAPI(`/pms/qc/inspectorSearch`,'post',data) -export const inspectorSave = data => createAPI(`/pms/qc/inspectorSave`,'post',data) -export const inspectorUpdate = data => createAPI(`/pms/qc/inspectorUpdate`,'post',data) -export const inspectorDelete = data => createAPI(`/pms/qc/inspectorDelete`,'post',data) - // ===================================== 检验模板 ===================================== export const templateSearch = data => createAPI(`/pms/qc/templateSearch`,'post',data) export const templateSave = data => createAPI(`/pms/qc/templateSave`,'post',data) @@ -84,12 +78,6 @@ export const getOperationDescList = data => createAPI(`/pms/qc/getOperationDescL export const getManufacturerList = data => createAPI(`/pms/qc/getManufacturerList`,'post',data) export const getPartTemplateLists = data => createAPI(`/pms/qc/getPartTemplateLists`,'post',data) export const qcPartAttributeEdit = data => createAPI(`/pms/qc/qcPartAttributeEdit`,'post',data) - -// ===================================== 类别属性设置 ===================================== -export const qcFamilyAttributeSearch = data => createAPI(`/pms/qc/qcFamilyAttributeSearch`,'post',data) -export const qcFamilyAttributeSave = data => createAPI(`/pms/qc/qcFamilyAttributeSave`,'post',data) -export const qcFamilyAttributeDelete = data => createAPI(`/pms/qc/qcFamilyAttributeDelete`,'post',data) -export const uploadFamilyAttributeExcel = data => createAPI(`/pms/qc/uploadFamilyAttributeExcel`,'post',data) export const queryFileId = data => createAPI(`/pms/qc/queryFileId`,'post',data) // ===================================== FAI检验 ===================================== diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index 9ac750a..50ebd2b 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -907,7 +907,6 @@ import { qcFAIInspectionSearch, // 查询FAI的检验记录 faiDetailSearch, // 查询FAI的检验明细 - inspectorSearch, // 查询检验员 faiRecordDelete, // 删除检验记录 saveFAIDetailedRecord, // 新增明细信息 saveFAISubmitResult, // 审核 @@ -3305,15 +3304,6 @@ }) }, - // 查询质检员信息列表 - inspectorSearch () { - inspectorSearch().then(({data}) => { - if (data.code === 0) { - this.options = data.rows - } - }) - }, - // 获取主信息数据列表 getDataList () { this.searchLoading = true @@ -3562,8 +3552,6 @@ } this.detailData.batchQualifiedQty = row.batchQualifiedQty this.getInspectionFormData() - this.inspectorSearch() - // this.acquisitionList = [] this.detailInformationFlag = true }, diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 57622fd..a268d1c 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -882,7 +882,6 @@ import { qcFQCInspectionSearch, // 查询FAI的检验记录 fqcDetailSearch, // 查询FAI的检验明细 - inspectorSearch, // 查询检验员 fqcRecordDelete, // 删除检验记录 saveFQCDetailedRecord, // 新增明细信息 saveFQCSubmitResult, // 审核 @@ -3278,15 +3277,6 @@ }) }, - // 查询检验类型 - inspectorSearch () { - inspectorSearch().then(({data}) => { - if (data.code === 0) { - this.options = data.rows - } - }) - }, - // 获取主信息数据列表 getDataList () { this.searchLoading = true @@ -3535,8 +3525,6 @@ } this.detailData.batchQualifiedQty = row.batchQualifiedQty this.getInspectionFormData() - this.inspectorSearch() - // this.acquisitionList = [] this.detailInformationFlag = true }, diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index b9016ed..3815e0c 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -904,7 +904,6 @@ import { qcIPQCInspectionSearch, // 查询IPQC的检验记录 ipqcDetailSearch, // 查询IPQC的检验明细 - inspectorSearch, // 查询检验员 ipqcRecordDelete, // 删除检验记录 saveIPQCDetailedRecord, // 新增明细信息 saveIPQCSubmitResult, // 审核 @@ -2967,15 +2966,6 @@ }) }, - // 查询检验员 - inspectorSearch () { - inspectorSearch().then(({data}) => { - if (data.code === 0) { - this.options = data.rows - } - }) - }, - // 获取基础数据列表S getBaseList (val,type) { this.tagNo = val @@ -3616,8 +3606,6 @@ } this.detailData.batchQualifiedQty = row.batchQualifiedQty this.getInspectionFormData() - this.inspectorSearch() - // this.acquisitionList = [] this.detailInformationFlag = true }, diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 8a099af..f7623e5 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -658,7 +658,6 @@ import { qcIQCInspectionSearch, // IQC检验记录查询 iqcDetailSearch, // iqc检验记录查询 - inspectorSearch, // 检验员查询 selectIQCSubDetailedRecord, // 查询子明细记录 checkIQCSubDetailValue, // 检查子明细中的实测值是否在规定范围 saveIQCDetailedRecord, // 新增明细信息 @@ -2328,15 +2327,6 @@ this.dataListSelections = val }, - // 查询检验类型 - inspectorSearch () { - inspectorSearch().then(({data}) => { - if (data.code === 0) { - this.options = data.rows - } - }) - }, - async Transfer (type) { if (type === '2') { if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) { @@ -2504,8 +2494,6 @@ } this.detailData.batchQualifiedQty = row.batchQualifiedQty this.getInspectionFormData() - this.inspectorSearch() - // this.acquisitionList = [] this.detailInformationFlag = true }, diff --git a/src/views/modules/qc/PQCResultEntry.vue b/src/views/modules/qc/PQCResultEntry.vue index 5d4174b..3c6a6ef 100644 --- a/src/views/modules/qc/PQCResultEntry.vue +++ b/src/views/modules/qc/PQCResultEntry.vue @@ -990,7 +990,6 @@ import { qcPQCInspectionSearch, // 查询FAI的检验记录 pqcDetailSearch, // 查询FAI的检验明细 - inspectorSearch, // 查询检验员 pqcRecordDelete, // 删除检验记录 savePQCDetailedRecord, // 新增明细信息 savePQCSubmitResult, // 审核 @@ -3619,15 +3618,6 @@ export default { }) }, - // 查询检验类型 - inspectorSearch () { - inspectorSearch().then(({data}) => { - if (data.code === 0) { - this.options = data.rows - } - }) - }, - // 获取主信息数据列表 getDataList () { this.searchLoading = true @@ -3876,8 +3866,6 @@ export default { } this.detailData.batchQualifiedQty = row.batchQualifiedQty this.getInspectionFormData() - this.inspectorSearch() - // this.acquisitionList = [] this.detailInformationFlag = true }, diff --git a/src/views/modules/qc/qcFamilyAttribute.vue b/src/views/modules/qc/qcFamilyAttribute.vue deleted file mode 100644 index 7abe151..0000000 --- a/src/views/modules/qc/qcFamilyAttribute.vue +++ /dev/null @@ -1,1482 +0,0 @@ - - - diff --git a/src/views/modules/qc/qcInspector.vue b/src/views/modules/qc/qcInspector.vue deleted file mode 100644 index be3ce14..0000000 --- a/src/views/modules/qc/qcInspector.vue +++ /dev/null @@ -1,482 +0,0 @@ - - - diff --git a/src/views/modules/qc/qc_upload.vue b/src/views/modules/qc/qc_upload.vue index 75c9213..e324be2 100644 --- a/src/views/modules/qc/qc_upload.vue +++ b/src/views/modules/qc/qc_upload.vue @@ -36,7 +36,6 @@ import { uploadExcel, // 导入项目文件 uploadTemplateExcel, // 导入模板文件 uploadPartAttributeExcel, // 导入物料属性文件 - uploadFamilyAttributeExcel, // 导入类别属性文件 queryFileId, // 查询文件ID getSiteAndBuByUserName } from "@/api/qc/qc.js" @@ -127,7 +126,7 @@ export default { this.$message.warning(data.msg); } }) - } else if (this.pageData.flag === 'template'){ + } else if (this.pageData.flag === 'template') { formData.set('site',this.bu) uploadTemplateExcel(formData).then(({data}) => { if (data.code === 0) { @@ -140,7 +139,7 @@ export default { this.$message.warning(data.msg); } }) - }else if (this.pageData.flag === 'partAttribute'){ + } else if (this.pageData.flag === 'partAttribute') { uploadPartAttributeExcel(formData).then(({data}) => { if (data.code === 0) { this.$message.success(data.msg); @@ -152,18 +151,6 @@ export default { this.$message.warning(data.msg); } }) - }else if (this.pageData.flag === 'familyAttribute'){ - uploadFamilyAttributeExcel(formData).then(({data}) => { - if (data.code === 0) { - this.$message.success(data.msg); - // 清空文件上传记录 - this.$refs.uploadFile.clearFiles(); - // 关闭窗口并刷新页面 - this.closeDialog(); - }else { - this.$message.warning(data.msg); - } - }) } this.bu = ''; }, @@ -177,7 +164,7 @@ export default { orderRef1: '', orderRef2: '' } - if(this.pageData.flag === 'item'){ // 检验项目 + if (this.pageData.flag === 'item') { // 检验项目 tempData.orderRef1 = 'qc'; tempData.orderRef2 = 'itemFormat'; await queryFileId(tempData).then(({data}) => { @@ -190,7 +177,7 @@ export default { }) } }) - }else if (this.pageData.flag === 'template'){ // 检验模板 + } else if (this.pageData.flag === 'template') { // 检验模板 tempData.orderRef1 = 'qc'; tempData.orderRef2 = 'templateFormat'; await queryFileId(tempData).then(({data}) => { @@ -203,7 +190,7 @@ export default { }) } }) - }else if (this.pageData.flag === 'partAttribute'){ // 物料属性设置 + } else if (this.pageData.flag === 'partAttribute') { // 物料属性设置 tempData.orderRef1 = 'qc'; tempData.orderRef2 = 'partAttributeFormat'; await queryFileId(tempData).then(({data}) => { @@ -216,19 +203,6 @@ export default { }) } }) - }else if (this.pageData.flag === 'familyAttribute'){ // 类别属性设置 - tempData.orderRef1 = 'qc'; - tempData.orderRef2 = 'familyAttributeFormat'; - await queryFileId(tempData).then(({data}) => { - if (data && data.code === 0) { - file.id = data.data.id - file.fileName = data.data.fileName - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - }) } await downLoadObjectFile(file).then(({data}) => { // 不限制文件下载类型