From 06e34523b4bb5342b2d113aab6ad21792cfd8eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Sun, 12 Nov 2023 15:43:06 +0800 Subject: [PATCH] =?UTF-8?q?2023-11-12=20=E8=AE=BE=E5=A4=87=E5=92=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qc/qc.js | 1 + src/views/modules/qc/FAIResultEntry.vue | 59 +++++++-- src/views/modules/qc/FQCResultEntry.vue | 59 +++++++-- src/views/modules/qc/IPQCResultEntry.vue | 52 ++++++-- src/views/modules/qc/IQCResultEntry.vue | 43 ++++++- src/views/modules/qc/sub_detail_upload.vue | 142 +++++++++++++++++++++ 6 files changed, 319 insertions(+), 37 deletions(-) create mode 100644 src/views/modules/qc/sub_detail_upload.vue diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index 4695404..25cfdea 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -13,6 +13,7 @@ export const qcItemUpdate = data => createAPI(`/pms/qc/qcItemUpdate`,'post',data export const qcItemDelete = data => createAPI(`/pms/qc/qcItemDelete`,'post',data) export const uploadExcel = data => createAPI(`/pms/qc/uploadExcel`,'post',data) export const getItemLists= data => createAPI(`/pms/qc/getItemLists`,'post',data) +export const subDetailUpload= data => createAPI(`/pms/qc/subDetailUpload`,'post',data) // ===================================== 质检员信息 ===================================== export const inspectorSearch = data => createAPI(`/pms/qc/inspectorSearch`,'post',data) diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index f4ab879..68c2179 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -335,11 +335,12 @@ - - + + 上传文件 + 子明细导入 @@ -376,6 +377,17 @@ + + + + + @@ -658,7 +672,6 @@ saveFAIInspection, // 新增FAI检验 queryController, // 检查动控 queryTemplateList, // 获取检验模板列表 - getPartInformation, // 获取物料信息 getSpecialOperationList, // 获取特殊工序列表 inspectionTypeSearch, // 搜索所有检验类型 disposalMeasuresSearch, // 获取处置措施列表 @@ -666,23 +679,25 @@ rollNoEnter, // 标签号回车事件 queryPartList, // 查询物料集合 umSearch // 查询单位列表 - } from "@/api/qc/qc.js"; + } from "@/api/qc/qc.js" import { getTableDefaultListLanguage, getTableUserListLanguage, } from "@/api/table.js" - import Chooselist from '@/views/modules/common/Chooselist_eam'; - import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; - import {deleteObjectFile} from '@/api/eam/eam.js'; + import Chooselist from '@/views/modules/common/Chooselist_eam' + import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js' + import {deleteObjectFile} from '@/api/eam/eam.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' - import qcFAIUploadFile from "./qc_FAI_upload_file"; - import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"; + import qcFAIUploadFile from "./qc_FAI_upload_file" + import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file" + import subDetailUpload from "./sub_detail_upload" /*上传文件的組件*/ export default { components: { Chooselist, qcFAIUploadFile, - comQcItemImageUploadFile + comQcItemImageUploadFile, + subDetailUpload }, data () { return { @@ -1222,6 +1237,7 @@ samplingQty: '', rollQty: '', itemList:[], + unqualifiedQty: '' }, detailColumnList: [ { @@ -1674,6 +1690,21 @@ }, methods: { + // 子明细导入 + subDetailUpload () { + let currentData = { + flag: 'FAI', + site: this.$store.state.user.site, + inspectionNo: this.detailData.inspectionNo + + } + //打开组件 去做新增业务 + this.$nextTick(() => { + this.$refs.subDetailUpload.init(currentData) + }) + }, + + // 查询单位 umSearch(){ let tempData = { @@ -2344,7 +2375,6 @@ // } } this.saveDetailInformation() - this.$message({message: '操作成功', type: 'success', duration: 1500, onClose: () => {}}) }, // 新增明细信息 @@ -2357,11 +2387,18 @@ this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.rollQty = this.detailData.rollQty this.saveInformationData.samplingQty = this.detailData.samplingQty + this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) saveFAIDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { this.getDataList() this.detailInformationFlag = false + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 38cac51..09723d9 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -250,7 +250,7 @@ - + @@ -333,11 +333,12 @@ - - + + 上传文件 + 子明细导入 @@ -374,6 +375,17 @@ + + + + + @@ -664,23 +678,25 @@ rollNoEnter, // 标签号回车事件 queryPartList, // 查询物料集合 umSearch // 查询单位列表 - } from "@/api/qc/qc.js"; + } from "@/api/qc/qc.js" import { getTableDefaultListLanguage, getTableUserListLanguage, } from "@/api/table.js" - import Chooselist from '@/views/modules/common/Chooselist_eam'; - import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; - import {deleteObjectFile} from '@/api/eam/eam.js'; + import Chooselist from '@/views/modules/common/Chooselist_eam' + import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js' + import {deleteObjectFile} from '@/api/eam/eam.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' - import qcFAIUploadFile from "./qc_FAI_upload_file"; - import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"; + import qcFAIUploadFile from "./qc_FAI_upload_file" + import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file" + import subDetailUpload from "./sub_detail_upload" /*上传文件的組件*/ export default { components: { Chooselist, qcFAIUploadFile, - comQcItemImageUploadFile + comQcItemImageUploadFile, + subDetailUpload }, data () { return { @@ -1220,6 +1236,7 @@ samplingQty: '', rollQty: '', itemList:[], + unqualifiedQty: '' }, detailColumnList: [ { @@ -1672,6 +1689,20 @@ }, methods: { + // 子明细导入 + subDetailUpload () { + let currentData = { + flag: 'FQC', + site: this.$store.state.user.site, + inspectionNo: this.detailData.inspectionNo + + } + //打开组件 去做新增业务 + this.$nextTick(() => { + this.$refs.subDetailUpload.init(currentData) + }) + }, + // 查询单位 umSearch(){ let tempData = { @@ -2342,7 +2373,6 @@ // } } this.saveDetailInformation() - this.$message({message: '操作成功', type: 'success', duration: 1500, onClose: () => {}}) }, // 新增明细信息 @@ -2355,11 +2385,18 @@ this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.rollQty = this.detailData.rollQty this.saveInformationData.samplingQty = this.detailData.samplingQty + this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) saveFQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { this.getDataList() this.detailInformationFlag = false + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index f8c16da..ffc0f54 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -271,7 +271,7 @@ - + @@ -354,11 +354,12 @@ - - + + 上传文件 + 子明细导入 @@ -395,6 +396,17 @@ + + + + + @@ -674,7 +688,6 @@ saveOsInspection, // 新增检验记录 queryController, // 检查动控 queryTemplateList, // 获取检验模板列表 - getPartInformation, // 获取物料信息 getSpecialOperationList, // 获取特殊工序列表 inspectionTypeSearch, // 搜索所有检验类型 disposalMeasuresSearch, // 获取处置措施列表 @@ -693,12 +706,14 @@ import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import qcFAIUploadFile from "./qc_FAI_upload_file" import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file" + import subDetailUpload from "./sub_detail_upload"; /*上传文件的組件*/ export default { components: { Chooselist, qcFAIUploadFile, - comQcItemImageUploadFile + comQcItemImageUploadFile, + subDetailUpload }, data () { return { @@ -1264,6 +1279,7 @@ samplingQty: '', rollQty: '', itemList:[], + unqualifiedQty: '' }, detailColumnList: [ { @@ -1724,6 +1740,20 @@ }, methods: { + // 子明细导入 + subDetailUpload () { + let currentData = { + flag: 'IPQC', + site: this.$store.state.user.site, + inspectionNo: this.detailData.inspectionNo + + }; + //打开组件 去做新增业务 + this.$nextTick(() => { + this.$refs.subDetailUpload.init(currentData); + }) + }, + // 查询单位 umSearch(){ let tempData = { @@ -2369,10 +2399,6 @@ this.$message.warning('请选择检验结论！') return } - // if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == 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' @@ -2394,7 +2420,6 @@ // } } this.saveDetailInformation() - this.$message({message: '操作成功', type: 'success', duration: 1500, onClose: () => {}}) }, // 新增明细信息 @@ -2407,11 +2432,18 @@ this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.rollQty = this.detailData.rollQty this.saveInformationData.samplingQty = this.detailData.samplingQty + this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { this.getDataList() this.detailInformationFlag = false + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 592f163..d2a2a76 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -128,7 +128,7 @@ - + @@ -205,11 +205,12 @@ - - + + 上传文件 + 子明细导入 @@ -246,6 +247,17 @@ + + + + + @@ -424,12 +438,14 @@ import {deleteObjectFile} from '@/api/eam/eam.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import qcFAIUploadFile from "./qc_FAI_upload_file" - import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"; + import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file" + import subDetailUpload from "./sub_detail_upload" export default { components: { Chooselist, qcFAIUploadFile, - comQcItemImageUploadFile + comQcItemImageUploadFile, + subDetailUpload }, data () { return { @@ -1115,6 +1131,7 @@ inspectorNo: '', inspectionRemark: '', itemList:[], + unqualifiedQty: '' }, // 子明细数据对象 tableData: [], @@ -1157,6 +1174,21 @@ this.getTableUserColumn(this.$route.meta.menuId+'table2',2) }, methods: { + + // 子明细导入 + subDetailUpload () { + let currentData = { + flag: 'IQC', + site: this.$store.state.user.site, + inspectionNo: this.detailData.inspectionNo + + } + //打开组件 去做新增业务 + this.$nextTick(() => { + this.$refs.subDetailUpload.init(currentData) + }) + }, + // 获取处置措施列表 disposalMeasuresSearch(){ let tempData = { @@ -1394,6 +1426,7 @@ this.saveInformationData.inspectorNo = this.$store.state.user.name this.saveInformationData.inspectionResult = this.detailData.inspectionResult this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark + this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) saveIQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/qc/sub_detail_upload.vue b/src/views/modules/qc/sub_detail_upload.vue new file mode 100644 index 0000000..15bd481 --- /dev/null +++ b/src/views/modules/qc/sub_detail_upload.vue @@ -0,0 +1,142 @@ + + + +