From 7d142c1e8db2024d35dba11385e9cb328fadf581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Wed, 8 Nov 2023 11:25:12 +0800 Subject: [PATCH] =?UTF-8?q?2023-11-08=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 | 3 +- src/views/modules/qc/FAIResultEntry.vue | 103 +++++++++++++++++---- src/views/modules/qc/FQCResultEntry.vue | 102 ++++++++++++++++---- src/views/modules/qc/IPQCResultEntry.vue | 99 ++++++++++++++++---- src/views/modules/qc/qcFamilyAttribute.vue | 6 +- src/views/modules/qc/qcItem.vue | 8 +- src/views/modules/qc/qcMethod.vue | 8 +- src/views/modules/qc/qcPartAttribute.vue | 8 +- src/views/modules/qc/qcTemplate.vue | 8 +- 9 files changed, 275 insertions(+), 70 deletions(-) diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index 03d2e43..4695404 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -25,7 +25,7 @@ export const templateSearch = data => createAPI(`/pms/qc/templateSearch`,'post', export const templateSave = data => createAPI(`/pms/qc/templateSave`,'post',data) export const templateUpdate = data => createAPI(`/pms/qc/templateUpdate`,'post',data) export const templateDelete = data => createAPI(`/pms/qc/templateDelete`,'post',data) -export const InspectionTypeSearch = data => createAPI(`/pms/qc/InspectionTypeSearch`,'post',data) +export const inspectionTypeSearch = data => createAPI(`/pms/qc/inspectionTypeSearch`,'post',data) export const objectSearch = data => createAPI(`/pms/qc/objectSearch`,'post',data) export const templateDetailsSearch = data => createAPI(`/pms/qc/templateDetailsSearch`,'post',data) export const addItemDetails = data => createAPI(`/pms/qc/addItemDetails`,'post',data) @@ -137,6 +137,7 @@ export const getSpecialOperationList = data => createAPI(`/pms/qc/getSpecialOper export const getRollNo = data => createAPI(`/pms/qc/getRollNo`,'post',data) export const rollNoEnter = data => createAPI(`/pms/qc/rollNoEnter`,'post',data) export const queryPartList = data => createAPI(`/pms/qc/queryPartList`,'post',data) +export const umSearch = data => createAPI(`/pms/qc/umSearch`,'post',data) // ===================================== IQC检验 ===================================== export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data) diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index 77707c9..5a9ad3b 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -213,14 +213,24 @@ - - - 检验模板 检验模板 + + + + + + + + + @@ -265,6 +275,9 @@ + + + @@ -322,8 +335,8 @@ - - + + 上传文件 @@ -647,11 +660,12 @@ queryTemplateList, // 获取检验模板列表 getPartInformation, // 获取物料信息 getSpecialOperationList, // 获取特殊工序列表 - InspectionTypeSearch, // 搜索所有检验类型 + inspectionTypeSearch, // 搜索所有检验类型 disposalMeasuresSearch, // 获取处置措施列表 getRollNo, // 模糊查询标签号 rollNoEnter, // 标签号回车事件 - queryPartList // 查询物料集合 + queryPartList, // 查询物料集合 + umSearch // 查询单位列表 } from "@/api/qc/qc.js"; import Chooselist from '@/views/modules/common/Chooselist_eam'; import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; @@ -730,7 +744,9 @@ templateName: '', specialTaskFlag: '', workCenterNo: '', - rollNo: '' + rollNo: '', + umId: '', + umName: '' }, // 展示列集 columnList: [ @@ -968,6 +984,19 @@ fixed: '', columnWidth: 80, }, + { + columnProp: 'umName', + headerAlign: "center", + align: "center", + columnLabel: '单位', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, { columnProp: 'inspectionRemark', headerAlign: "center", @@ -1053,7 +1082,9 @@ submitFlag: '', cinvSourceCode: '', sku: '', - spec: '' + spec: '', + umId: '', + umName: '' }, detailInformationFlag:false, detailList:[], @@ -1311,6 +1342,13 @@ message: ' ', trigger: 'change' } + ], + umIdType: [ + { + required: true, + message: ' ', + trigger: 'change' + } ] }, resourceList: [], @@ -1418,7 +1456,8 @@ fixed: '', }, ], - partModelFlag: false + partModelFlag: false, + umList: [] } }, mounted () { @@ -1427,13 +1466,34 @@ }) }, created () { + // 数据列表 this.getDataList() + // 收藏 this.favoriteIsOk() - this.InspectionTypeSearch() + // 检验类型 + this.inspectionTypeSearch() + // 处置措施列表 this.disposalMeasuresSearch() + // 单位 + this.umSearch() + // 查看 质量任务生成规则控制 动控是否开启 + this.queryController() }, methods: { + // 查询单位 + umSearch(){ + let tempData = { + site: this.$store.state.user.site, + active: 'Y' + } + umSearch(tempData).then(({data}) => { + if (data.code === 0) { + this.umList = data.rows + } + }) + }, + // 标签号回车事件 rollNoEnter () { let tempData = { @@ -1516,11 +1576,11 @@ }, // 查询检验类型 - InspectionTypeSearch(){ + inspectionTypeSearch(){ let tempData = { site: this.$store.state.user.site } - InspectionTypeSearch(tempData).then(({data}) => { + inspectionTypeSearch(tempData).then(({data}) => { if (data.code === 0) { this.typeOptions = data.rows } @@ -1672,7 +1732,9 @@ templateName: '', specialTaskFlag: '', workCenterNo: '', - rollNo: '' + rollNo: '', + umId: this.umList[0].umId, + umName: this.umList[0].umName } // 获取选中框 let obj = document.getElementsByName('specialTask') @@ -1702,6 +1764,7 @@ // 新增FAI巡检记录 saveData(){ + console.log(this.modalData) if (this.modalData.seqNo === '' || this.modalData.seqNo == null) { this.$message.warning('请选择派工单！') return @@ -1726,6 +1789,10 @@ this.$message.warning('请填写送检数量！') return } + if (this.modalData.umId === '' || this.modalData.umId == null) { + this.$message.warning('请选择单位！') + return + } if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) { this.$message.warning('请选择检验模板！') return @@ -1773,8 +1840,6 @@ // 新增 addModal(){ - // 查看 质量任务生成规则控制 动控是否开启 - this.queryController() this.modalData = { flag: '1', site: this.$store.state.user.site, @@ -1801,7 +1866,9 @@ templateName: '', specialTaskFlag: '', workCenterNo: '', - rollNo: '' + rollNo: '', + umId: this.umList[0].umId, + umName: this.umList[0].umName } this.operationList = [] this.resourceList = [] @@ -2131,6 +2198,8 @@ this.detailData.cinvSourceCode = row.cinvSourceCode this.detailData.sku = row.sku this.detailData.spec = row.spec + this.detailData.umId = row.umId + this.detailData.umName = row.umName this.getInspectionFormData() this.inspectorSearch() this.detailInformationFlag = true diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 781760c..15992bb 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -211,14 +211,24 @@ - - - 检验模板 检验模板 + + + + + + + + + @@ -263,6 +273,9 @@ + + + @@ -320,8 +333,8 @@ - - + + 上传文件 @@ -645,11 +658,12 @@ queryTemplateList, // 获取检验模板列表 getPartInformation, // 获取物料信息 getSpecialOperationList, // 获取特殊工序列表 - InspectionTypeSearch, // 搜索所有检验类型 + inspectionTypeSearch, // 搜索所有检验类型 disposalMeasuresSearch, // 获取处置措施列表 getRollNo, // 模糊查询标签号 rollNoEnter, // 标签号回车事件 - queryPartList // 查询物料集合 + queryPartList, // 查询物料集合 + umSearch // 查询单位列表 } from "@/api/qc/qc.js"; import Chooselist from '@/views/modules/common/Chooselist_eam'; import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; @@ -728,7 +742,9 @@ templateName: '', specialTaskFlag: '', workCenterNo: '', - rollNo: '' + rollNo: '', + umId: '', + umName: '' }, // 展示列集 columnList: [ @@ -966,6 +982,19 @@ fixed: '', columnWidth: 80, }, + { + columnProp: 'umName', + headerAlign: "center", + align: "center", + columnLabel: '单位', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, { columnProp: 'inspectionRemark', headerAlign: "center", @@ -1051,7 +1080,9 @@ submitFlag: '', cinvSourceCode: '', sku: '', - spec: '' + spec: '', + umId: '', + umName: '' }, detailInformationFlag:false, detailList:[], @@ -1309,6 +1340,13 @@ message: ' ', trigger: 'change' } + ], + umIdType: [ + { + required: true, + message: ' ', + trigger: 'change' + } ] }, resourceList: [], @@ -1416,7 +1454,8 @@ fixed: '', }, ], - partModelFlag: false + partModelFlag: false, + umList: [] } }, mounted () { @@ -1425,13 +1464,34 @@ }) }, created () { + // 数据列表 this.getDataList() + // 收藏 this.favoriteIsOk() - this.InspectionTypeSearch() + // 检验类型 + this.inspectionTypeSearch() + // 处置措施 this.disposalMeasuresSearch() + // 单位 + this.umSearch() + // 查看 质量任务生成规则控制 动控是否开启 + this.queryController() }, methods: { + // 查询单位 + umSearch(){ + let tempData = { + site: this.$store.state.user.site, + active: 'Y' + } + umSearch(tempData).then(({data}) => { + if (data.code === 0) { + this.umList = data.rows + } + }) + }, + // 标签号回车事件 rollNoEnter () { let tempData = { @@ -1514,11 +1574,11 @@ }, // 查询检验类型 - InspectionTypeSearch(){ + inspectionTypeSearch(){ let tempData = { site: this.$store.state.user.site } - InspectionTypeSearch(tempData).then(({data}) => { + inspectionTypeSearch(tempData).then(({data}) => { if (data.code === 0) { this.typeOptions = data.rows } @@ -1670,7 +1730,9 @@ templateName: '', specialTaskFlag: '', workCenterNo: '', - rollNo: '' + rollNo: '', + umId: this.umList[0].umId, + umName: this.umList[0].umName } // 获取选中框 let obj = document.getElementsByName('specialTask') @@ -1724,6 +1786,10 @@ this.$message.warning('请填写送检数量！') return } + if (this.modalData.umId === '' || this.modalData.umId == null) { + this.$message.warning('请选择单位！') + return + } if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) { this.$message.warning('请选择检验模板！') return @@ -1771,8 +1837,6 @@ // 新增 addModal(){ - // 查看 质量任务生成规则控制 动控是否开启 - this.queryController() this.modalData = { flag: '1', site: this.$store.state.user.site, @@ -1799,7 +1863,9 @@ templateName: '', specialTaskFlag: '', workCenterNo: '', - rollNo: '' + rollNo: '', + umId: this.umList[0].umId, + umName: this.umList[0].umName } this.operationList = [] this.resourceList = [] @@ -2129,6 +2195,8 @@ this.detailData.cinvSourceCode = row.cinvSourceCode this.detailData.sku = row.sku this.detailData.spec = row.spec + this.detailData.umId = row.umId + this.detailData.umName = row.umName this.getInspectionFormData() this.inspectorSearch() this.detailInformationFlag = true diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 5e5125f..41bab55 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -231,7 +231,17 @@ - + + + + + + + @@ -284,6 +294,9 @@ + + + @@ -341,8 +354,8 @@ - - + + 上传文件 @@ -663,11 +676,12 @@ queryTemplateList, // 获取检验模板列表 getPartInformation, // 获取物料信息 getSpecialOperationList, // 获取特殊工序列表 - InspectionTypeSearch, // 搜索所有检验类型 + inspectionTypeSearch, // 搜索所有检验类型 disposalMeasuresSearch, // 获取处置措施列表 getRollNo, // 模糊查询标签号 rollNoEnter, // 标签号回车事件 - queryPartList // 查询物料集合 + queryPartList, // 查询物料集合 + umSearch // 查询单位列表 } from "@/api/qc/qc.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js' @@ -754,7 +768,9 @@ templateName: '', specialTaskFlag: '', workCenterNo: '', - rollNo: '' + rollNo: '', + umId: '', + umName: '' }, // 展示列集 columnList: [ @@ -1005,6 +1021,19 @@ fixed: '', columnWidth: 80, }, + { + columnProp: 'umName', + headerAlign: "center", + align: "center", + columnLabel: '单位', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, { columnProp: 'inspectionRemark', headerAlign: "center", @@ -1090,7 +1119,9 @@ submitFlag: '', cinvSourceCode: '', sku: '', - spec: '' + spec: '', + umId: '', + umName: '' }, detailInformationFlag:false, detailList:[], @@ -1359,6 +1390,13 @@ message: ' ', trigger: 'change' } + ], + umIdType: [ + { + required: true, + message: ' ', + trigger: 'change' + } ] }, batchHandleAddModalFlag: false, @@ -1463,7 +1501,8 @@ typeOptions: [], disposalMeasuresOptions: [], timeout: null, - partModelFlag: false + partModelFlag: false, + umList: [] } }, mounted () { @@ -1472,12 +1511,32 @@ }) }, created () { + // 数据列表 this.getDataList() + // 收藏 this.favoriteIsOk() - this.InspectionTypeSearch() + // 检验类型 + this.inspectionTypeSearch() + // 处置措施 this.disposalMeasuresSearch() + // 单位 + this.umSearch() + // 查看 质量任务生成规则控制 动控是否开启 + this.queryController() }, methods: { + // 查询单位 + umSearch(){ + let tempData = { + site: this.$store.state.user.site, + active: 'Y' + } + umSearch(tempData).then(({data}) => { + if (data.code === 0) { + this.umList = data.rows + } + }) + }, // 标签号回车事件 rollNoEnter () { @@ -1562,11 +1621,11 @@ }, // 查询检验类型 - InspectionTypeSearch(){ + inspectionTypeSearch(){ let tempData = { site: this.$store.state.user.site } - InspectionTypeSearch(tempData).then(({data}) => { + inspectionTypeSearch(tempData).then(({data}) => { if (data.code === 0) { this.typeOptions = data.rows } @@ -1689,7 +1748,7 @@ }) }, - // 查询检验类型 + // 查询检验员 inspectorSearch(){ inspectorSearch().then(({data}) => { if (data.code === 0) { @@ -1831,8 +1890,6 @@ }, addModal(){ - // 查看 质量任务生成规则控制 动控是否开启 - this.queryController() this.modalData = { flag: '1', site: this.$store.state.user.site, @@ -1859,7 +1916,9 @@ templateName: '', specialTaskFlag: '', workCenterNo: '', - rollNo: '' + rollNo: '', + umId: this.umList[0].umId, + umName: this.umList[0].umName } this.operationList = [] this.resourceList = [] @@ -1944,7 +2003,9 @@ templateName: '', specialTaskFlag: '', workCenterNo: '', - rollNo: '' + rollNo: '', + umId: this.umList[0].umId, + umName: this.umList[0].umName } // 获取选中框 let obj = document.getElementsByName('specialTask') @@ -2002,6 +2063,10 @@ this.$message.warning('请填写送检数量！') return } + if (this.modalData.umId === '' || this.modalData.umId == null) { + this.$message.warning('请选择单位！') + return + } if (this.controlData.baseData === '控制' && (this.modalData.templateId == null || this.modalData.templateId === '')) { this.$message.warning('请选择检验模板！') return @@ -2176,6 +2241,8 @@ this.detailData.cinvSourceCode = row.cinvSourceCode this.detailData.sku = row.sku this.detailData.spec = row.spec + this.detailData.umId = row.umId + this.detailData.umName = row.umName this.getInspectionFormData() this.inspectorSearch() this.detailInformationFlag = true diff --git a/src/views/modules/qc/qcFamilyAttribute.vue b/src/views/modules/qc/qcFamilyAttribute.vue index 37fd045..c0b11dc 100644 --- a/src/views/modules/qc/qcFamilyAttribute.vue +++ b/src/views/modules/qc/qcFamilyAttribute.vue @@ -832,7 +832,7 @@ created () { this.getDataList(); this.favoriteIsOk(); - this.InspectionTypeSearch(); + this.inspectionTypeSearch(); }, methods: { /** @@ -878,11 +878,11 @@ }, // 查询检验类型 - InspectionTypeSearch(){ + inspectionTypeSearch(){ let tempData = { site: this.$store.state.user.site } - InspectionTypeSearch(tempData).then(({data}) => { + inspectionTypeSearch(tempData).then(({data}) => { if (data.code === 0) { this.options = data.rows } diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue index e8e0416..d1fc3b5 100644 --- a/src/views/modules/qc/qcItem.vue +++ b/src/views/modules/qc/qcItem.vue @@ -185,7 +185,7 @@ qcItemSave, // 新增项目 qcItemUpdate, // 修改项目 qcItemDelete, // 删除项目 - InspectionTypeSearch + inspectionTypeSearch } from "@/api/qc/qc.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' @@ -461,7 +461,7 @@ created () { this.getDataList() this.favoriteIsOk() - this.InspectionTypeSearch() + this.inspectionTypeSearch() }, methods: { /** @@ -522,11 +522,11 @@ this.getDataList() }, // 查询检验类型 - InspectionTypeSearch(){ + inspectionTypeSearch(){ let tempData = { site: this.$store.state.user.site } - InspectionTypeSearch(tempData).then(({data}) => { + inspectionTypeSearch(tempData).then(({data}) => { if (data.code === 0) { this.options = data.rows } diff --git a/src/views/modules/qc/qcMethod.vue b/src/views/modules/qc/qcMethod.vue index 6b5835c..98c6742 100644 --- a/src/views/modules/qc/qcMethod.vue +++ b/src/views/modules/qc/qcMethod.vue @@ -147,7 +147,7 @@ qcMethodSave, // 检验方法新增 qcMethodUpdate, // 检验方法修改 qcMethodDelete, // 检验方法删除 - InspectionTypeSearch, // 搜索所有检验类型 + inspectionTypeSearch, // 搜索所有检验类型 } from "@/api/qc/qc.js" import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' export default { @@ -320,7 +320,7 @@ created () { this.getDataList() this.favoriteIsOk() - this.InspectionTypeSearch() + this.inspectionTypeSearch() }, methods: { /** @@ -484,11 +484,11 @@ } }, // 查询检验类型 - InspectionTypeSearch(){ + inspectionTypeSearch(){ let tempData = { site: this.$store.state.user.site } - InspectionTypeSearch(tempData).then(({data}) => { + inspectionTypeSearch(tempData).then(({data}) => { if (data.code === 0) { this.options = data.rows } diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index ed6610c..4be357b 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -567,7 +567,7 @@ deletePartAttributeDetails, // 删除物料属性模板 saveAttributeDetailed, // 新增物料属性模板详情 getPartTemplateLists, // 获取模板列表 - InspectionTypeSearch, // 搜索所有检验类型 + inspectionTypeSearch, // 搜索所有检验类型 getOperationDescList, // 查询工序列表 getManufacturerList, // 查询供应商列表 getAllResourceList // 查询机台列表 @@ -889,7 +889,7 @@ created () { this.getDataList(); this.favoriteIsOk(); - this.InspectionTypeSearch(); + this.inspectionTypeSearch(); }, methods: { @@ -936,11 +936,11 @@ }, // 查询检验类型 - InspectionTypeSearch(){ + inspectionTypeSearch(){ let tempData = { site: this.$store.state.user.site } - InspectionTypeSearch(tempData).then(({data}) => { + inspectionTypeSearch(tempData).then(({data}) => { if (data.code === 0) { this.options = data.rows } diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue index c3eb61d..4cc4376 100644 --- a/src/views/modules/qc/qcTemplate.vue +++ b/src/views/modules/qc/qcTemplate.vue @@ -420,7 +420,7 @@ templateSave, // 新增模板 templateUpdate, // 修改模板 templateDelete, // 删除模板 - InspectionTypeSearch, // 搜索所有检验类型 + inspectionTypeSearch, // 搜索所有检验类型 objectSearch, // 搜索所有设备 templateDetailsSearch, // 查询明细列表 addItemDetails, // 新增项目的检验明细 @@ -801,7 +801,7 @@ }, created () { this.getDataList() - this.InspectionTypeSearch() + this.inspectionTypeSearch() this.favoriteIsOk() }, methods: { @@ -841,11 +841,11 @@ }, // 查询检验类型 - InspectionTypeSearch(){ + inspectionTypeSearch(){ let tempData = { site: this.$store.state.user.site } - InspectionTypeSearch(tempData).then(({data}) => { + inspectionTypeSearch(tempData).then(({data}) => { if (data.code === 0) { this.options = data.rows }