From f264ba7ad305a6750941cb781c6cad0d30e1b73d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Tue, 7 Nov 2023 17:31:57 +0800 Subject: [PATCH] =?UTF-8?q?2023-11-07=20=E8=AE=BE=E5=A4=87=E5=92=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B92?= 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 | 203 +++++++++++++++---- src/views/modules/qc/FQCResultEntry.vue | 203 +++++++++++++++---- src/views/modules/qc/IPQCResultEntry.vue | 218 ++++++++++++++++----- src/views/modules/qc/qcFamilyAttribute.vue | 5 +- src/views/modules/qc/qcItem.vue | 5 +- src/views/modules/qc/qcMethod.vue | 5 +- src/views/modules/qc/qcPartAttribute.vue | 5 +- src/views/modules/qc/qcTemplate.vue | 5 +- 9 files changed, 523 insertions(+), 127 deletions(-) diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index a8bf8bc..03d2e43 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -136,6 +136,7 @@ export const getPartInformation = data => createAPI(`/pms/qc/getPartInformation` export const getSpecialOperationList = data => createAPI(`/pms/qc/getSpecialOperationList`,'post',data) 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) // ===================================== 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 acb959c..77707c9 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -187,17 +187,17 @@ - + 机台 - + - 物料编码 + 物料编码 @@ -312,7 +312,7 @@ :value = "i.inspectorNo"> - + + + 关闭 + + + + + +
+ + + + + + + + + + + + 查询 + + + + + + + +
+ + 关闭 + @@ -602,7 +650,8 @@ InspectionTypeSearch, // 搜索所有检验类型 disposalMeasuresSearch, // 获取处置措施列表 getRollNo, // 模糊查询标签号 - rollNoEnter // 标签号回车事件 + rollNoEnter, // 标签号回车事件 + queryPartList // 查询物料集合 } from "@/api/qc/qc.js"; import Chooselist from '@/views/modules/common/Chooselist_eam'; import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; @@ -959,7 +1008,7 @@ columnWidth: 120, }, { - columnProp: 'inspectorNo', + columnProp: 'inspectorName', headerAlign: "center", align: "center", columnLabel: '质检员', @@ -999,6 +1048,7 @@ disposalRemark: '', inspectionResult: '', inspectorNo: '', + inspectorName: '', inspectionRemark: '', submitFlag: '', cinvSourceCode: '', @@ -1254,6 +1304,13 @@ message: ' ', trigger: 'change' } + ], + partNoType: [ + { + required: true, + message: ' ', + trigger: 'change' + } ] }, resourceList: [], @@ -1316,7 +1373,52 @@ checked: false, typeOptions: [], disposalMeasuresOptions: [], - timeout: null + timeout: null, + partData: { + site: this.$store.state.user.site, + partNo: '', + partDesc: '', + sku: '' + }, + partDetailList: [ + { + columnProp: 'partNo', + headerAlign: "center", + align: "center", + columnLabel: '物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'partDesc', + headerAlign: "center", + align: "center", + columnLabel: '物料名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'sku', + headerAlign: "center", + align: "center", + columnLabel: 'SKU', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + ], + partModelFlag: false } }, mounted () { @@ -1438,10 +1540,10 @@ strVal = this.modalData.resourceDesc this.$refs.baseList.init(val, strVal) } - if (val === 206) { - strVal = this.modalData.partNo - this.$refs.baseList.init(val, strVal) - } + // if (val === 206) { + // strVal = this.modalData.partNo + // this.$refs.baseList.init(val, strVal) + // } }) }, @@ -1459,27 +1561,27 @@ this.modalData.resourceId = val.resource_id this.modalData.resourceDesc = val.resource_desc } - if (this.tagNo === 206) { - this.modalData.partNo = val.part_no - this.modalData.partDesc = val.part_desc - // 获取物料的其他信息 - this.getPartInformation() - } + // if (this.tagNo === 206) { + // this.modalData.partNo = val.part_no + // this.modalData.partDesc = val.part_desc + // // 获取物料的其他信息 + // this.getPartInformation() + // } }, - // 获取物料其它信息 - getPartInformation () { - getPartInformation(this.modalData).then(({data}) => { - if (data && data.code === 0) { - this.modalData.spec = data.rows[0].spec - this.modalData.sku = data.rows[0].sku - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - }) - }, + // // 获取物料其它信息 + // getPartInformation () { + // getPartInformation(this.modalData).then(({data}) => { + // if (data && data.code === 0) { + // this.modalData.spec = data.rows[0].spec + // this.modalData.sku = data.rows[0].sku + // } else { + // this.$alert(data.msg, '错误', { + // confirmButtonText: '确定' + // }) + // } + // }) + // }, // 获取机台列表 getResourceList(){ @@ -1608,7 +1710,7 @@ this.$message.warning('请选择工单！') return } - if (this.modalData.partNo === '' || this.modalData.partNo == null) { + if (this.modalData.specialTaskFlag !== 'Y' && (this.modalData.partNo === '' || this.modalData.partNo == null)) { this.$message.warning('请选择物料！') return } @@ -1616,7 +1718,7 @@ this.$message.warning('请选择工序！') return } - if (this.modalData.resourceId === '' || this.modalData.resourceId == null) { + if (this.modalData.specialTaskFlag !== 'Y' && (this.modalData.resourceId === '' || this.modalData.resourceId == null)) { this.$message.warning('请选择机台！') return } @@ -1724,6 +1826,21 @@ }) }, + // 获取物料列表 + queryPartList () { + // 查询所有物料 + queryPartList(this.partData).then(({data}) => { + if (data && data.code === 0) { + this.partList = data.rows + this.partModelFlag = true + }else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + // 选中检验模板 getRowData (row) { this.modalData.templateId = row.templateId @@ -1731,6 +1848,15 @@ this.templateModelFlag = false }, + // 选中物料 + getRowData2 (row) { + this.modalData.partNo = row.partNo + this.modalData.partDesc = row.partDesc + this.modalData.sku = row.sku + this.modalData.spec = row.spec + this.partModelFlag = false + }, + selectFlag(){ return true; }, @@ -1932,10 +2058,10 @@ this.$message.warning('请选择检验结论！') return } - if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) { - 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' @@ -1967,7 +2093,7 @@ this.saveInformationData.inspectionNo = this.detailData.inspectionNo this.saveInformationData.disposalMeasures = this.detailData.disposalMeasures this.saveInformationData.disposalRemark = this.detailData.disposalRemark - this.saveInformationData.inspectorNo = this.detailData.inspectorNo + this.saveInformationData.inspectorNo = this.$store.state.user.name this.saveInformationData.inspectionResult = this.detailData.inspectionResult this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.rollQty = this.detailData.rollQty @@ -2000,6 +2126,7 @@ this.detailData.disposalRemark = row.disposalRemark this.detailData.inspectionResult = row.inspectionResult this.detailData.inspectorNo = row.inspectorNo + this.detailData.inspectorName = row.inspectorName this.detailData.inspectionRemark = row.inspectionRemark this.detailData.cinvSourceCode = row.cinvSourceCode this.detailData.sku = row.sku diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 7e343bc..781760c 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -185,17 +185,17 @@ - + 机台 - + - 物料编码 + 物料编码 @@ -310,7 +310,7 @@ :value = "i.inspectorNo"> - + + + 关闭 + + + + + +
+ + + + + + + + + + + + 查询 + + + + + + + +
+ + 关闭 + @@ -600,7 +648,8 @@ InspectionTypeSearch, // 搜索所有检验类型 disposalMeasuresSearch, // 获取处置措施列表 getRollNo, // 模糊查询标签号 - rollNoEnter // 标签号回车事件 + rollNoEnter, // 标签号回车事件 + queryPartList // 查询物料集合 } from "@/api/qc/qc.js"; import Chooselist from '@/views/modules/common/Chooselist_eam'; import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'; @@ -957,7 +1006,7 @@ columnWidth: 120, }, { - columnProp: 'inspectorNo', + columnProp: 'inspectorName', headerAlign: "center", align: "center", columnLabel: '质检员', @@ -997,6 +1046,7 @@ disposalRemark: '', inspectionResult: '', inspectorNo: '', + inspectorName: '', inspectionRemark: '', submitFlag: '', cinvSourceCode: '', @@ -1252,6 +1302,13 @@ message: ' ', trigger: 'change' } + ], + partNoType: [ + { + required: true, + message: ' ', + trigger: 'change' + } ] }, resourceList: [], @@ -1314,7 +1371,52 @@ checked: false, typeOptions: [], disposalMeasuresOptions: [], - timeout: null + timeout: null, + partData: { + site: this.$store.state.user.site, + partNo: '', + partDesc: '', + sku: '' + }, + partDetailList: [ + { + columnProp: 'partNo', + headerAlign: "center", + align: "center", + columnLabel: '物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'partDesc', + headerAlign: "center", + align: "center", + columnLabel: '物料名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'sku', + headerAlign: "center", + align: "center", + columnLabel: 'SKU', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + ], + partModelFlag: false } }, mounted () { @@ -1436,10 +1538,10 @@ strVal = this.modalData.resourceDesc this.$refs.baseList.init(val, strVal) } - if (val === 206) { - strVal = this.modalData.partNo - this.$refs.baseList.init(val, strVal) - } + // if (val === 206) { + // strVal = this.modalData.partNo + // this.$refs.baseList.init(val, strVal) + // } }) }, @@ -1457,27 +1559,27 @@ this.modalData.resourceId = val.resource_id this.modalData.resourceDesc = val.resource_desc } - if (this.tagNo === 206) { - this.modalData.partNo = val.part_no - this.modalData.partDesc = val.part_desc - // 获取物料的其他信息 - this.getPartInformation() - } + // if (this.tagNo === 206) { + // this.modalData.partNo = val.part_no + // this.modalData.partDesc = val.part_desc + // // 获取物料的其他信息 + // this.getPartInformation() + // } }, - // 获取物料其它信息 - getPartInformation () { - getPartInformation(this.modalData).then(({data}) => { - if (data && data.code === 0) { - this.modalData.spec = data.rows[0].spec - this.modalData.sku = data.rows[0].sku - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - }) - }, + // // 获取物料其它信息 + // getPartInformation () { + // getPartInformation(this.modalData).then(({data}) => { + // if (data && data.code === 0) { + // this.modalData.spec = data.rows[0].spec + // this.modalData.sku = data.rows[0].sku + // } else { + // this.$alert(data.msg, '错误', { + // confirmButtonText: '确定' + // }) + // } + // }) + // }, // 获取机台列表 getResourceList(){ @@ -1606,7 +1708,7 @@ this.$message.warning('请选择工单！') return } - if (this.modalData.partNo === '' || this.modalData.partNo == null) { + if (this.modalData.specialTaskFlag !== 'Y' && (this.modalData.partNo === '' || this.modalData.partNo == null)) { this.$message.warning('请选择物料！') return } @@ -1614,7 +1716,7 @@ this.$message.warning('请选择工序！') return } - if (this.modalData.resourceId === '' || this.modalData.resourceId == null) { + if (this.modalData.specialTaskFlag !== 'Y' && (this.modalData.resourceId === '' || this.modalData.resourceId == null)) { this.$message.warning('请选择机台！') return } @@ -1722,6 +1824,21 @@ }) }, + // 获取物料列表 + queryPartList () { + // 查询所有物料 + queryPartList(this.partData).then(({data}) => { + if (data && data.code === 0) { + this.partList = data.rows + this.partModelFlag = true + }else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + // 选中检验模板 getRowData (row) { this.modalData.templateId = row.templateId @@ -1729,6 +1846,15 @@ this.templateModelFlag = false }, + // 选中物料 + getRowData2 (row) { + this.modalData.partNo = row.partNo + this.modalData.partDesc = row.partDesc + this.modalData.sku = row.sku + this.modalData.spec = row.spec + this.partModelFlag = false + }, + selectFlag(){ return true; }, @@ -1930,10 +2056,10 @@ this.$message.warning('请选择检验结论！') return } - if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) { - 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' @@ -1965,7 +2091,7 @@ this.saveInformationData.inspectionNo = this.detailData.inspectionNo this.saveInformationData.disposalMeasures = this.detailData.disposalMeasures this.saveInformationData.disposalRemark = this.detailData.disposalRemark - this.saveInformationData.inspectorNo = this.detailData.inspectorNo + this.saveInformationData.inspectorNo = this.$store.state.user.name this.saveInformationData.inspectionResult = this.detailData.inspectionResult this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.rollQty = this.detailData.rollQty @@ -1998,6 +2124,7 @@ this.detailData.disposalRemark = row.disposalRemark this.detailData.inspectionResult = row.inspectionResult this.detailData.inspectorNo = row.inspectorNo + this.detailData.inspectorName = row.inspectorName this.detailData.inspectionRemark = row.inspectionRemark this.detailData.cinvSourceCode = row.cinvSourceCode this.detailData.sku = row.sku diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 301b1f1..5e5125f 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -196,17 +196,17 @@ - + 机台 - + - 物料编码 + 物料编码 @@ -224,10 +224,10 @@ - - - - + + + + @@ -331,7 +331,7 @@ :value = "i.inspectorNo"> - + + + 关闭 + + + + + +
+ + + + + + + + + + + + 查询 + + + + + + + +
+ + 关闭 + @@ -607,7 +655,6 @@ saveIPQCSubDetailed, // 新增子明细信息 selectIPQCSubDetailedRecord, // 子明细记录信息查询 checkIPQCIsSubmit, // 检查是否已提交 - checkIPQCSubDetailValue, // 检查子明细中的实测值是否在规定范围 getOperationList, // 查询工序列表 getResourceList, // 查询机台列表 getPartList, // 查询物料列表 @@ -619,7 +666,8 @@ InspectionTypeSearch, // 搜索所有检验类型 disposalMeasuresSearch, // 获取处置措施列表 getRollNo, // 模糊查询标签号 - rollNoEnter // 标签号回车事件 + rollNoEnter, // 标签号回车事件 + queryPartList // 查询物料集合 } from "@/api/qc/qc.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js' @@ -686,8 +734,8 @@ inspectionNo:'', partNo: '', partDesc: '', - inspectionTypeNo:'101', - inspectionTypeName:'IPQC', + inspectionTypeNo:'', + inspectionTypeName:'', inspectorNo:'', inspectorName:'', submit_flag:'', @@ -776,7 +824,7 @@ columnWidth: 100, }, { - columnProp: 'inspectionTypeName', + columnProp: 'inspectionTypeNo', headerAlign: "center", align: "center", columnLabel: '检验类型', @@ -997,7 +1045,7 @@ columnWidth: 120, }, { - columnProp: 'inspectorNo', + columnProp: 'inspectorName', headerAlign: "center", align: "center", columnLabel: '质检员', @@ -1037,6 +1085,7 @@ disposalRemark: '', inspectionResult: '', inspectorNo: '', + inspectorName: '', inspectionRemark: '', submitFlag: '', cinvSourceCode: '', @@ -1303,6 +1352,13 @@ message: ' ', trigger: 'change' } + ], + partNoType: [ + { + required: true, + message: ' ', + trigger: 'change' + } ] }, batchHandleAddModalFlag: false, @@ -1319,6 +1375,12 @@ inspectionTypeNo: '', inspectionTypeName: '' }, + partData: { + site: this.$store.state.user.site, + partNo: '', + partDesc: '', + sku: '' + }, templateList: [], templateModelFlag: false, templateDetailList: [ @@ -1359,10 +1421,49 @@ fixed: '', }, ], + partDetailList: [ + { + columnProp: 'partNo', + headerAlign: "center", + align: "center", + columnLabel: '物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'partDesc', + headerAlign: "center", + align: "center", + columnLabel: '物料名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'sku', + headerAlign: "center", + align: "center", + columnLabel: 'SKU', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + ], checked: false, typeOptions: [], disposalMeasuresOptions: [], - timeout: null + timeout: null, + partModelFlag: false } }, mounted () { @@ -1610,10 +1711,10 @@ strVal = this.modalData.resourceDesc this.$refs.baseList.init(val, strVal) } - if (val === 206) { - strVal = this.modalData.partNo - this.$refs.baseList.init(val, strVal) - } + // if (val === 206) { + // strVal = this.modalData.partNo + // this.$refs.baseList.init(val, strVal) + // } }) }, @@ -1631,27 +1732,27 @@ this.modalData.resourceId = val.resource_id this.modalData.resourceDesc = val.resource_desc } - if (this.tagNo === 206) { - this.modalData.partNo = val.part_no - this.modalData.partDesc = val.part_desc - // 获取物料的其他信息 - this.getPartInformation() - } + // if (this.tagNo === 206) { + // this.modalData.partNo = val.part_no + // this.modalData.partDesc = val.part_desc + // // 获取物料的其他信息 + // this.getPartInformation() + // } }, - // 获取物料其它信息 - getPartInformation () { - getPartInformation(this.modalData).then(({data}) => { - if (data && data.code === 0) { - this.modalData.spec = data.rows[0].spec - this.modalData.sku = data.rows[0].sku - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - }) - }, + // // 获取物料其它信息 + // getPartInformation () { + // getPartInformation(this.modalData).then(({data}) => { + // if (data && data.code === 0) { + // this.modalData.spec = data.rows[0].spec + // this.modalData.sku = data.rows[0].sku + // } else { + // this.$alert(data.msg, '错误', { + // confirmButtonText: '确定' + // }) + // } + // }) + // }, // 获取工序列表 getOperationList () { @@ -1783,6 +1884,21 @@ }) }, + // 获取物料列表 + queryPartList () { + // 查询所有物料 + queryPartList(this.partData).then(({data}) => { + if (data && data.code === 0) { + this.partList = data.rows + this.partModelFlag = true + }else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + // 选中检验模板 getRowData (row) { this.modalData.templateId = row.templateId @@ -1790,6 +1906,15 @@ this.templateModelFlag = false }, + // 选中物料 + getRowData2 (row) { + this.modalData.partNo = row.partNo + this.modalData.partDesc = row.partDesc + this.modalData.sku = row.sku + this.modalData.spec = row.spec + this.partModelFlag = false + }, + // 是否新增特殊任务 changeSpecialTask () { // 先重置数据 @@ -1861,7 +1986,7 @@ this.$message.warning('请选择检验类型！') return } - if (this.modalData.partNo === '' || this.modalData.partNo == null) { + if (this.modalData.specialTaskFlag !== 'Y' && (this.modalData.partNo === '' || this.modalData.partNo == null)) { this.$message.warning('请选择物料！') return } @@ -1869,7 +1994,7 @@ this.$message.warning('请选择工序！') return } - if (this.modalData.resourceId === '' || this.modalData.resourceId == null) { + if (this.modalData.specialTaskFlag !== 'Y' && (this.modalData.resourceId === '' || this.modalData.resourceId == null)) { this.$message.warning('请选择机台！') return } @@ -1980,10 +2105,10 @@ this.$message.warning('请选择检验结论！') return } - if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) { - 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' @@ -2013,7 +2138,7 @@ this.saveInformationData.inspectionNo = this.detailData.inspectionNo this.saveInformationData.disposalMeasures = this.detailData.disposalMeasures this.saveInformationData.disposalRemark = this.detailData.disposalRemark - this.saveInformationData.inspectorNo = this.detailData.inspectorNo + this.saveInformationData.inspectorNo = this.$store.state.user.name this.saveInformationData.inspectionResult = this.detailData.inspectionResult this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.rollQty = this.detailData.rollQty @@ -2046,6 +2171,7 @@ this.detailData.disposalRemark = row.disposalRemark this.detailData.inspectionResult = row.inspectionResult this.detailData.inspectorNo = row.inspectorNo + this.detailData.inspectorName = row.inspectorName this.detailData.inspectionRemark = row.inspectionRemark this.detailData.cinvSourceCode = row.cinvSourceCode this.detailData.sku = row.sku diff --git a/src/views/modules/qc/qcFamilyAttribute.vue b/src/views/modules/qc/qcFamilyAttribute.vue index 4a05ebe..37fd045 100644 --- a/src/views/modules/qc/qcFamilyAttribute.vue +++ b/src/views/modules/qc/qcFamilyAttribute.vue @@ -879,7 +879,10 @@ // 查询检验类型 InspectionTypeSearch(){ - InspectionTypeSearch().then(({data}) => { + let tempData = { + site: this.$store.state.user.site + } + 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 47e2bf7..e8e0416 100644 --- a/src/views/modules/qc/qcItem.vue +++ b/src/views/modules/qc/qcItem.vue @@ -523,7 +523,10 @@ }, // 查询检验类型 InspectionTypeSearch(){ - InspectionTypeSearch().then(({data}) => { + let tempData = { + site: this.$store.state.user.site + } + 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 e53a2c8..6b5835c 100644 --- a/src/views/modules/qc/qcMethod.vue +++ b/src/views/modules/qc/qcMethod.vue @@ -485,7 +485,10 @@ }, // 查询检验类型 InspectionTypeSearch(){ - InspectionTypeSearch().then(({data}) => { + let tempData = { + site: this.$store.state.user.site + } + 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 55f70a4..ed6610c 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -937,7 +937,10 @@ // 查询检验类型 InspectionTypeSearch(){ - InspectionTypeSearch().then(({data}) => { + let tempData = { + site: this.$store.state.user.site + } + 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 0580c3b..c3eb61d 100644 --- a/src/views/modules/qc/qcTemplate.vue +++ b/src/views/modules/qc/qcTemplate.vue @@ -842,7 +842,10 @@ // 查询检验类型 InspectionTypeSearch(){ - InspectionTypeSearch().then(({data}) => { + let tempData = { + site: this.$store.state.user.site + } + InspectionTypeSearch(tempData).then(({data}) => { if (data.code === 0) { this.options = data.rows }