diff --git a/src/views/modules/qc/FQASResultEntry.vue b/src/views/modules/qc/FQASResultEntry.vue index 93668a2..613df83 100644 --- a/src/views/modules/qc/FQASResultEntry.vue +++ b/src/views/modules/qc/FQASResultEntry.vue @@ -27,10 +27,8 @@ - + - - @@ -42,6 +40,8 @@ + + @@ -59,8 +59,6 @@ - - - @@ -187,11 +185,8 @@ - - - - 上传文件 + 工作文件 @@ -368,6 +363,11 @@ + + + 上传文件 + + - + @@ -698,6 +698,24 @@ fixed: '', columnWidth: 120, }, + { + userId: this.$store.state.user.name, + functionId: 301016, + serialNumber: '301016Table1OrderRefType', + tableId: "301016Table1", + tableName: "FQAS检验记录表", + columnProp: 'orderRefType', + headerAlign: "center", + align: "center", + columnLabel: '检验任务类型', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120, + }, { userId: this.$store.state.user.name, functionId: 301016, @@ -796,7 +814,7 @@ tableName: "FQAS检验记录表", columnProp: 'partDesc', headerAlign: "center", - align: "center", + align: "left", columnLabel: '物料名称', columnHidden: false, columnImage: false, @@ -886,7 +904,7 @@ tableName: "FQAS检验记录表", columnProp: 'inspectionRemark', headerAlign: "center", - align: "center", + align: "left", columnLabel: '质检备注', columnHidden: false, columnImage: false, @@ -1830,7 +1848,8 @@ deleteFile (row) { let tempData = { site: row.orderRef1, - inspectionNo: row.orderRef2 + inspectionNo: row.orderRef2, + buNo: row.orderRef4 } this.$confirm('确定要删除此文件?', '提示', { confirmButtonText: '确定', @@ -2173,15 +2192,6 @@ this.$message.warning('检验单号 ' + tempData2 + ' 的处置措施未选择！') return } - // this.submitData.site = row.site - // this.submitData.inspectionNo = row.inspectionNo - // this.submitData.inspectionResult = row.inspectionResult - // if (row.inspectionResult == '不合格' && (row.disposalMeasures == '' || row.disposalMeasures == null)){ - // this.$alert('处置措施未选择！', '错误', { - // confirmButtonText: '确定' - // }) - // return false - // } this.$confirm(`已确认单据信息无误，确定审核该 ` + this.FQASSelections.length + ` 条记录`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 2e0ef2f..d70a74d 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -26,17 +26,8 @@ - - - - - - - - - - + @@ -46,6 +37,14 @@ + + + + + + + + - - - - - - + @@ -245,16 +239,13 @@ - - - - - - - + + + + @@ -293,11 +284,6 @@ - - - - - @@ -318,12 +304,6 @@ - - - - - - @@ -336,15 +316,19 @@ - - 数据采集 - - - + + + + + + + + + @@ -356,8 +340,8 @@ - - + + @@ -388,7 +372,8 @@ - 上传文件 + 工作文件 + 明细导入 @@ -567,13 +552,12 @@ - - - - - + + + + @@ -695,12 +679,6 @@ - - - - - - 查询 @@ -735,6 +713,11 @@ + + + 上传文件 + + - + @@ -893,6 +876,12 @@ subDetailUpload }, watch: { + detailData: { + deep: true, + handler: function (newV, oldV) { + this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty + } + }, detailList: { deep: true, handler: function (newV, oldV) { @@ -948,8 +937,6 @@ inspectionTypeNo: '', partNo: '', partDesc: '', - cinvSourceCode: '', - sku: '', disposalMeasures: '', page: 1, limit: 10, @@ -981,10 +968,7 @@ resourceDesc: '', rollQty: '', seqNo: '', - batchRollNo: '', spec: '', - sku: '', - cinvSourceCode: '', qtyrequired: '', lotsize:'', specialRequirements: '', @@ -1035,24 +1019,6 @@ fixed: '', columnWidth: 120, }, - { - userId: this.$store.state.user.name, - functionId: 301014, - serialNumber: '301014Table1BatchRollNo', - tableId: "301014Table1", - tableName: "IPQC检验记录表", - columnProp: 'batchRollNo', - headerAlign: "center", - align: "center", - columnLabel: '老卷号', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100, - }, { userId: this.$store.state.user.name, functionId: 301014, @@ -1269,42 +1235,6 @@ fixed: '', columnWidth: 150, }, - { - userId: this.$store.state.user.name, - functionId: 301014, - serialNumber: '301014Table1cinvSourceCode', - tableId: "301014Table1", - tableName: "IPQC检验记录表", - columnProp: 'cinvSourceCode', - headerAlign: "center", - align: "center", - columnLabel: 'PN', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100, - }, - { - userId: this.$store.state.user.name, - functionId: 301014, - serialNumber: '301014Table1Sku', - tableId: "301014Table1", - tableName: "IPQC检验记录表", - columnProp: 'sku', - headerAlign: "center", - align: "center", - columnLabel: 'SKU', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100, - }, { userId: this.$store.state.user.name, functionId: 301014, @@ -1313,7 +1243,7 @@ tableName: "IPQC检验记录表", columnProp: 'partDesc', headerAlign: "center", - align: "center", + align: "left", columnLabel: '物料名称', columnHidden: false, columnImage: false, @@ -1385,7 +1315,7 @@ tableName: "IPQC检验记录表", columnProp: 'inspectionRemark', headerAlign: "center", - align: "center", + align: "left", columnLabel: '质检备注', columnHidden: false, columnImage: false, @@ -1504,15 +1434,15 @@ inspectorName: '', inspectionRemark: '', submitFlag: '', - cinvSourceCode: '', - sku: '', spec: '', umId: '', umName: '', operator: '', operatorName: '', responsiblePerson: '', - responsiblePersonName: '' + responsiblePersonName: '', + passQty: '', + notPassQty: '' }, detailInformationFlag: false, detailList: [], @@ -1534,7 +1464,9 @@ operatorName: '', responsiblePerson: '', responsiblePersonName: '', - subDetailList: [] + subDetailList: [], + passQty: '', + notPassQty: '' }, detailColumnList: [ { @@ -1846,14 +1778,12 @@ seqDetailData: { orderNo: '', seqNo: '', - sku: '', - cinvSourceCode:'', partNo: '', partDesc: '', operationDesc: '', qtyrequired: '', lotsize: '', - status: '下达' + status: '已下达' }, seqDetailColumnList: [ { @@ -1892,24 +1822,6 @@ sortLv: 0, status: true, }, - { - userId: this.$store.state.user.name, - functionId: 301014, - serialNumber: '301014Table3Sku', - tableId: "301014Table3", - tableName: "派工单号表", - fixed: '', - columnWidth: 80, - columnProp: 'sku', - headerAlign: "center", - align: "center", - columnLabel: 'SKU', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - }, { userId: this.$store.state.user.name, functionId: 301014, @@ -2116,8 +2028,6 @@ bu: '', partNo: '', partDesc: '', - sku: '', - cinvSourceCode: '', }, templateList: [], templateModelFlag: false, @@ -2184,30 +2094,6 @@ status: true, fixed: '', }, - { - columnProp: 'sku', - headerAlign: "center", - align: "center", - columnLabel: 'SKU', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, - { - columnProp: 'cinvSourceCode', - headerAlign: "center", - align: "center", - columnLabel: 'PN', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - } ], checked: false, typeOptions: [], @@ -2525,8 +2411,6 @@ this.modalData.partNo = '' this.modalData.partDesc = '' this.modalData.spec = '' - this.modalData.sku = '' - this.modalData.cinvSourceCode = '' this.modalData.templateId = '' this.modalData.templateName = '' } @@ -2553,6 +2437,8 @@ } if (type === 1) { this.detailData.unqualifiedQty = val + } else if (type === 2) { + this.detailData.passQty = val } }, @@ -2602,8 +2488,6 @@ this.modalData.partNo = data.rows[0].partNo this.modalData.partDesc = data.rows[0].partDesc this.modalData.spec = data.rows[0].spec - this.modalData.sku = data.rows[0].sku - this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -2776,7 +2660,8 @@ deleteFile (row) { let tempData = { site: row.orderRef1, - inspectionNo: row.orderRef2 + inspectionNo: row.orderRef2, + buNo: row.orderRef4 } this.$confirm('确定要删除此文件?', '提示', { confirmButtonText: '确定', @@ -2858,7 +2743,6 @@ // 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: '确定' @@ -2879,8 +2763,6 @@ this.modalData.partNo = data.rows[0].partNo this.modalData.partDesc = data.rows[0].partDesc this.modalData.spec = data.rows[0].spec - this.modalData.sku = data.rows[0].sku - this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode this.modalData.operationDesc = data.rows[0].operationDesc this.modalData.qtyrequired = data.rows[0].qtyrequired this.modalData.lotsize = data.rows[0].lotsize @@ -2921,8 +2803,6 @@ this.modalData.partNo = this.partList[0].partNo this.modalData.partDesc = this.partList[0].partDesc this.modalData.spec = this.partList[0].spec - this.modalData.sku = this.partList[0].sku - this.modalData.cinvSourceCode = this.partList[0].cinvSourceCode } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -2968,10 +2848,7 @@ resourceDesc: '', rollQty: '', seqNo: '', - batchRollNo: '', spec: '', - sku: '', - cinvSourceCode: '', specialRequirements: '', templateId: '', templateName: '', @@ -3010,7 +2887,7 @@ queryPartList () { this.partData.bu = this.modalData.bu // 查询所有物料 - if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '' && this.partData.cinvSourceCode === '') { + if (this.partData.partNo === '' && this.partData.partDesc === '') { this.partList = [] this.partModelFlag = true } else { @@ -3036,7 +2913,6 @@ // 选中派工单号 getRowData1 (row) { - this.modalData.sku = row.sku this.modalData.partNo = row.partNo this.modalData.partDesc = row.partDesc this.modalData.orderNo = row.orderNo @@ -3055,16 +2931,12 @@ getRowData2 (row) { this.modalData.partNo = row.partNo this.modalData.partDesc = row.partDesc - this.modalData.sku = row.sku this.modalData.spec = row.spec - this.modalData.cinvSourceCode = row.cinvSourceCode this.partData = { site: '', bu: '', partNo: '', partDesc: '', - sku: '', - cinvSourceCode: '', } this.partModelFlag = false }, @@ -3091,10 +2963,7 @@ resourceDesc: '', rollQty: '', seqNo: '', - batchRollNo: '', spec: '', - sku: '', - cinvSourceCode: '', specialRequirements: '', templateId: '', templateName: '', @@ -3312,6 +3181,8 @@ this.saveInformationData.operator = this.detailData.operator this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) + this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty + this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty // this.saveInformationData.subDetailList = this.acquisitionList saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { @@ -3382,9 +3253,6 @@ 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 - this.detailData.cinvSourceCode = row.cinvSourceCode this.detailData.spec = row.spec this.detailData.umId = row.umId this.detailData.umName = row.umName @@ -3392,6 +3260,8 @@ this.detailData.operatorName = row.operatorName this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePersonName = row.responsiblePersonName + this.detailData.passQty = row.passQty + this.detailData.notPassQty = row.notPassQty this.getInspectionFormData() this.inspectorSearch() // this.acquisitionList = [] @@ -3802,13 +3672,12 @@ site: this.modalData.bu.at(0), seqNo: this.seqDetailData.seqNo, orderNo: this.seqDetailData.orderNo, - sku: this.seqDetailData.sku, partDesc: this.seqDetailData.partDesc, partNo: this.seqDetailData.partNo, operationDesc: this.seqDetailData.operationDesc, status: this.seqDetailData.status } - if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){ + if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){ this.seqInfoList = [] } else { searchSeqInfo(tempData).then(({data}) => { @@ -3826,11 +3695,10 @@ this.seqDetailData = { seqNo : '', orderNo: '', - sku: '', partNo: '', partDesc: '', operationDesc: '', - status: '下达' + status: '已下达' } this.seqInfoList = [] }, diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 112754b..5c6ffd5 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -33,7 +33,7 @@ - + @@ -81,14 +81,14 @@ - + - - + - + - - + 查询 @@ -217,7 +217,7 @@ - 上传文件 + 工作文件 @@ -394,6 +394,11 @@ + + + 上传文件 + + - + @@ -832,7 +837,7 @@ tableName: "IQC检验记录表", columnProp: 'partDesc', headerAlign: "center", - align: "center", + align: "left", columnLabel: '物料名称', columnHidden: false, columnImage: false, @@ -932,6 +937,78 @@ fixed: '', columnWidth: 130, }, + { + userId: this.$store.state.user.name, + functionId: 301006, + serialNumber: '301006Table1RefInfo1', + tableId: "301006Table1", + tableName: "IQC检验记录表", + columnProp: 'refInfo1', + headerAlign: "center", + align: "center", + columnLabel: '关联单号1', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 130, + }, + { + userId: this.$store.state.user.name, + functionId: 301006, + serialNumber: '301006Table1RefInfo2', + tableId: "301006Table1", + tableName: "IQC检验记录表", + columnProp: 'refInfo2', + headerAlign: "center", + align: "center", + columnLabel: '关联单号2', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 130, + }, + { + userId: this.$store.state.user.name, + functionId: 301006, + serialNumber: '301006Table1RefInfo3', + tableId: "301006Table1", + tableName: "IQC检验记录表", + columnProp: 'refInfo3', + headerAlign: "center", + align: "center", + columnLabel: '关联单号3', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 130, + }, + { + userId: this.$store.state.user.name, + functionId: 301006, + serialNumber: '301006Table1RefInfo4', + tableId: "301006Table1", + tableName: "IQC检验记录表", + columnProp: 'refInfo4', + headerAlign: "center", + align: "center", + columnLabel: '关联单号4', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 130, + }, { userId: this.$store.state.user.name, functionId: 301006, @@ -994,7 +1071,7 @@ tableName: "IQC检验记录表", columnProp: 'inspectionRemark', headerAlign: "center", - align: "center", + align: "left", columnLabel: '质检备注', columnHidden: false, columnImage: false, @@ -1978,7 +2055,8 @@ deleteFile (row) { let tempData = { site: row.orderRef1, - inspectionNo: row.orderRef2 + inspectionNo: row.orderRef2, + buNo: row.orderRef4 } this.$confirm('确定要删除此文件?', '提示', { confirmButtonText: '确定', @@ -2116,8 +2194,8 @@ this.saveInformationData.operator = this.detailData.operator this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) - this.saveInformationData.passQty = this.detailData.passQty - this.saveInformationData.notPassQty = this.detailData.notPassQty + this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty + this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty // this.saveInformationData.subDetailList = this.acquisitionList saveIQCDetailedRecord(this.saveInformationData).then(({data}) => { if (data && data.code === 0) { @@ -2335,15 +2413,6 @@ this.$message.warning('检验单号 ' + tempData2 + ' 的处置措施未选择！') return } - // this.submitData.site = row.site - // this.submitData.inspectionNo = row.inspectionNo - // this.submitData.inspectionResult = row.inspectionResult - // if (row.inspectionResult == '不合格' && (row.disposalMeasures == '' || row.disposalMeasures == null)){ - // this.$alert('处置措施未选择！', '错误', { - // confirmButtonText: '确定' - // }) - // return false - // } this.$confirm(`已确认单据信息无误，确定审核该 ` + this.IQCSelections.length + ` 条记录`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue index e359ef4..ad2a116 100644 --- a/src/views/modules/qc/qcItem.vue +++ b/src/views/modules/qc/qcItem.vue @@ -65,7 +65,6 @@ :height="height" :data="dataList" border - v-loading="dataListLoading" style="width: 100%;">