diff --git a/cclqms-vue/src/i18n/locales/qc.cn.js b/cclqms-vue/src/i18n/locales/qc.cn.js index 6e471e3..d2d4f6e 100644 --- a/cclqms-vue/src/i18n/locales/qc.cn.js +++ b/cclqms-vue/src/i18n/locales/qc.cn.js @@ -639,6 +639,7 @@ module.exports = { exportInfoSheet: '导出信息', addInspectionRecord: '新增检验记录', tagNo: '标签号', + tagBatchNo: '标签/批次号', tagNoSupplierBatch: '标签号/供应商批次', noticeNo: '通知单号', enterNoticeNo: '请输入通知单号', @@ -816,6 +817,7 @@ module.exports = { sendTime: '送检时间', inspectionCycleH: '检验周期(h)', tagBarcode: '标签条码', + tagBatchNo: '标签/批次号', materialCode: '物料编码', materialName: '物料名称', spec: '规格型号', diff --git a/cclqms-vue/src/i18n/locales/qc.en.js b/cclqms-vue/src/i18n/locales/qc.en.js index a7befe0..e545219 100644 --- a/cclqms-vue/src/i18n/locales/qc.en.js +++ b/cclqms-vue/src/i18n/locales/qc.en.js @@ -639,6 +639,7 @@ module.exports = { exportInfoSheet: 'Export info', addInspectionRecord: 'Add inspection record', tagNo: 'Tag No.', + tagBatchNo: 'Tag/Batch No.', tagNoSupplierBatch: 'Tag No./Supplier Batch', noticeNo: 'Notice No.', enterNoticeNo: 'Please enter notice number', @@ -817,6 +818,7 @@ module.exports = { sendTime: 'Submission time', inspectionCycleH: 'Inspection cycle (h)', tagBarcode: 'Tag barcode', + tagBatchNo: 'Tag/Batch No.', materialCode: 'Part code', materialName: 'Part name', spec: 'Specification', diff --git a/cclqms-vue/src/mixins/qcItemObjectBatchDeviceMixin.js b/cclqms-vue/src/mixins/qcItemObjectBatchDeviceMixin.js index e49416b..2d403c0 100644 --- a/cclqms-vue/src/mixins/qcItemObjectBatchDeviceMixin.js +++ b/cclqms-vue/src/mixins/qcItemObjectBatchDeviceMixin.js @@ -34,32 +34,21 @@ export default { }) }, getRowDeviceOptions (row) { - const classification = (row.equipmentClassification || '').trim() - if (!classification) { - return [] - } - const list = this.itemObjectEquipmentList || [] - const options = list - .filter(item => (item.equipmentClassification || '').trim() === classification) - .map(item => ({ - objectID: item.equipmentNo, - objectDesc: item.equipmentDesc || item.equipmentNo - })) + const options = [...(row.objectList || [])] if (row.equipmentNo && !options.some(opt => opt.objectID === row.equipmentNo)) { - const selected = list.find(item => item.equipmentNo === row.equipmentNo) + const selected = (this.itemObjectEquipmentList || []).find( + item => item.equipmentNo === row.equipmentNo + ) if (selected) { options.unshift({ objectID: selected.equipmentNo, objectDesc: selected.equipmentDesc || selected.equipmentNo }) } else { - const fallback = (row.objectList || []).find(opt => opt.objectID === row.equipmentNo) - if (fallback) { - options.unshift({ - objectID: fallback.objectID, - objectDesc: fallback.objectDesc || fallback.objectID - }) - } + options.unshift({ + objectID: row.equipmentNo, + objectDesc: row.equipmentNo + }) } } return options diff --git a/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue index 14dea46..9703fbe 100644 --- a/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue @@ -321,18 +321,19 @@ fixed="right" header-align="center" align="center" - width="100" + width="130" :label="$t('qc.common.operation')"> @@ -619,6 +620,9 @@
+ + {{ $t('qc.iqcPage.dataCollect') }} + {{ $t('qc.iqcPage.workFile') }} @@ -656,10 +660,11 @@ prop="" header-align="center" align="center" - min-width="80" + width="110" :label="$t('qc.common.operation')"> { + if (data.code === 0) { + this.changeMyString(data.rows) + this.getInspectionFormData() + this.$message({ + message: this.$t('qc.entry.dataCollectSuccess'), + type: 'success', + duration: 1500 + }) + } else { + this.$message({ + message: data.msg, + type: 'warning', + duration: 1500 + }) + } + this.loadFlag = false + }) + }, + // 获取用户角色 getUserRoleList () { getUserRoleList().then(({data}) => { @@ -4975,11 +5014,13 @@ let exportFlag = this.isAuth(this.menuId+":export") let importFromFqcFlag = this.isAuth(this.menuId+":importFromFqc") let importSelectedFqcFlag = this.isAuth(this.menuId+":importSelectedFqc") + let dataCollectFlag = this.isAuth(this.menuId+":dataCollect") let fileListFlag = this.isAuth(this.menuId+":fileList") let subDetailImportFlag = this.isAuth(this.menuId+":subDetailImport") let itemImportFlag = this.isAuth(this.menuId+":itemImport") let templateImportFlag = this.isAuth(this.menuId+":templateImport") let uploadImageFlag = this.isAuth(this.menuId+":uploadImage") + let dataCollectByItemFlag = this.isAuth(this.menuId+":dataCollectByItem") let subDetailInputFlag = this.isAuth(this.menuId+":subDetailInput") let applyFlag = this.isAuth(this.menuId+":apply") let updateFlag = this.isAuth(this.menuId+":update") @@ -5012,11 +5053,13 @@ this.authExport = !exportFlag this.authImportFromFqc = !importFromFqcFlag this.authImportSelectedFqc = !importSelectedFqcFlag + this.authDataCollect = !dataCollectFlag this.authFileList = !fileListFlag this.authSubDetailImport = !subDetailImportFlag this.authItemImport = !itemImportFlag this.authTemplateImport = !templateImportFlag this.authUploadImage = !uploadImageFlag + this.authDataCollectByItem = !dataCollectByItemFlag this.authSubDetailInput = !subDetailInputFlag this.authApply = !applyFlag this.authUpdate = !updateFlag diff --git a/cclqms-vue/src/views/modules/qc/SQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/SQCResultEntry.vue index 2cd2b0d..78c24bf 100644 --- a/cclqms-vue/src/views/modules/qc/SQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/SQCResultEntry.vue @@ -28,7 +28,7 @@ @@ -380,11 +336,12 @@ - + - + + - + + {{ $t('qc.common.materialCode') }} @@ -424,14 +382,19 @@ - + + {{ $t('qc.table.sender') }} + + + + @@ -448,10 +411,7 @@ - - {{ $t('qc.table.sender') }} - - + +
@@ -981,26 +942,24 @@ - +
- + - - - - + - + - {{ $t('qc.common.search') }} + {{ $t('qc.common.search') }} + +
- + {{ $t('qc.common.close') }} @@ -1555,11 +1525,14 @@ // 添加固定的状态列 fields['状态'] = 'state' // 添加动态列 - this.columnList1.forEach(item => { + this.visibleColumnList1.forEach(item => { fields[item.columnLabel] = item.columnProp }) return fields }, + visibleColumnList1 () { + return this.filterMainTableColumns(this.columnList1 || []) + }, visibleDetailColumnList () { return (this.detailColumnList || []) .filter((item) => item.status !== false) @@ -1769,7 +1742,7 @@ columnProp: 'rollNo', headerAlign: "center", align: "center", - columnLabel: '标签条码', + columnLabel: '标签/批次号', columnHidden: false, columnImage: false, columnSortable: false, @@ -1824,7 +1797,7 @@ headerAlign: "center", align: "center", columnLabel: '检验类型', - columnHidden: false, + columnHidden: true, columnImage: false, columnSortable: false, sortLv: 0, @@ -1896,7 +1869,7 @@ headerAlign: "center", align: "left", columnLabel: '工单号', - columnHidden: false, + columnHidden: true, columnImage: false, columnSortable: false, sortLv: 0, @@ -1914,7 +1887,7 @@ headerAlign: "center", align: "center", columnLabel: '下达号', - columnHidden: false, + columnHidden: true, columnImage: false, columnSortable: false, sortLv: 0, @@ -1932,7 +1905,7 @@ headerAlign: "center", align: "center", columnLabel: '行号', - columnHidden: false, + columnHidden: true, columnImage: false, columnSortable: false, sortLv: 0, @@ -1950,7 +1923,7 @@ headerAlign: "center", align: "left", columnLabel: '工序', - columnHidden: false, + columnHidden: true, columnImage: false, columnSortable: false, sortLv: 0, @@ -1968,7 +1941,7 @@ headerAlign: "center", align: "left", columnLabel: '机台', - columnHidden: false, + columnHidden: true, columnImage: false, columnSortable: false, sortLv: 0, @@ -1986,7 +1959,7 @@ headerAlign: "center", align: "left", columnLabel: '加工中心', - columnHidden: false, + columnHidden: true, columnImage: false, columnSortable: false, sortLv: 0, @@ -2826,34 +2799,35 @@ partList: [], SQCSelections: [], rules: { - seqNoType: [ - { - required: true, - message: ' ', - trigger: ['blur','change'] - } - ], - orderNoType: [ - { - required: true, - message: ' ', - trigger: ['blur','change'] - } - ], - operationDescType: [ - { - required: true, - message: ' ', - trigger: ['blur','change'] - } - ], - resourceIdType: [ - { - required: true, - message: ' ', - trigger: ['blur','change'] - } - ], + // 派工单号、工单号、工序、机台：库存检验新增不需要，校验已去掉 + // seqNoType: [ + // { + // required: true, + // message: ' ', + // trigger: ['blur','change'] + // } + // ], + // orderNoType: [ + // { + // required: true, + // message: ' ', + // trigger: ['blur','change'] + // } + // ], + // operationDescType: [ + // { + // required: true, + // message: ' ', + // trigger: ['blur','change'] + // } + // ], + // resourceIdType: [ + // { + // required: true, + // message: ' ', + // trigger: ['blur','change'] + // } + // ], rollQtyType: [ { required: true, @@ -2861,13 +2835,13 @@ trigger: ['blur','change'] } ], - inspectionTypeNoType: [ - { - required: true, - message: ' ', - trigger: ['blur','change'] - } - ], + // inspectionTypeNoType: [ + // { + // required: true, + // message: ' ', + // trigger: ['blur','change'] + // } + // ], partNoType: [ { required: true, @@ -2926,7 +2900,14 @@ partDesc: '', sku: '', cinvSourceCode: '', + page: 1, + limit: 20 }, + partPageIndex: 1, + partPageSize: 20, + partTotalPage: 0, + partLoading: false, + partHasSearched: false, templateList: [], templateModelFlag: false, templateDetailList: [ @@ -2990,18 +2971,8 @@ 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, + columnWidth: 200, + showOverflowTooltip: true, fixed: '', }, { @@ -3263,7 +3234,9 @@ if (!label) return label const labelMap = { '检验单号': 'qc.table.inspectionNo', - '标签条码': 'qc.table.tagBarcode', + '标签条码': 'qc.table.tagBatchNo', + '标签号': 'qc.table.tagBatchNo', + '标签/批次号': 'qc.table.tagBatchNo', '检验结论': 'qc.table.inspectionResult', '处置措施': 'qc.table.disposalMeasures', '检验类型': 'qc.table.inspectionType', @@ -4207,22 +4180,80 @@ }) }, - // 获取物料列表 + // 打开物料选择弹框（不自动查询，需点击查询按钮） + openPartDialog () { + if (!this.modalData.bu) { + this.$message.warning(this.$t('qc.common.pleaseSelectBu')) + return + } + this.partPageIndex = 1 + this.partList = [] + this.partTotalPage = 0 + this.partHasSearched = false + this.partModelFlag = true + }, + + // 物料弹框查询（重置到第一页） + searchPartList () { + this.partPageIndex = 1 + this.queryPartList() + }, + + // 获取物料列表（分页） queryPartList () { this.partData.bu = this.modalData.bu - // 查询所有物料 - if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '' && this.partData.cinvSourceCode === '') { - this.partList = [] - this.partModelFlag = true - } else { - queryPartList(this.partData).then(({data}) => { - if (data && data.code === 0) { - this.partList = data.rows - this.partModelFlag = true - }else { - this.$message.error(data.msg) + this.partData.page = this.partPageIndex + this.partData.limit = this.partPageSize + this.partLoading = true + queryPartList(this.partData).then(({data}) => { + this.partLoading = false + if (data && data.code === 0) { + this.partHasSearched = true + if (data.page) { + this.partList = data.page.list || [] + this.partPageIndex = data.page.currPage + this.partPageSize = data.page.pageSize + this.partTotalPage = data.page.totalCount + } else { + this.partList = data.rows || [] + this.partTotalPage = this.partList.length } - }) + } else { + this.$message.error(data.msg) + } + }).catch(() => { + this.partLoading = false + }) + }, + + partSizeChangeHandle (val) { + if (!this.partHasSearched) return + this.partPageSize = val + this.partPageIndex = 1 + this.queryPartList() + }, + + partCurrentChangeHandle (val) { + if (!this.partHasSearched) return + this.partPageIndex = val + this.queryPartList() + }, + + closePartDialog () { + this.partList = [] + this.partPageIndex = 1 + this.partTotalPage = 0 + this.partLoading = false + this.partHasSearched = false + this.partData = { + site: '', + bu: '', + partNo: '', + partDesc: '', + sku: '', + cinvSourceCode: '', + page: 1, + limit: this.partPageSize } }, @@ -4261,15 +4292,8 @@ this.modalData.sku = row.sku this.modalData.invdefinetype = row.invdefinetype this.modalData.cinvSourceCode = row.cinvSourceCode - this.partData = { - site: '', - bu: '', - partNo: '', - partDesc: '', - sku: '', - cinvSourceCode: '', - } this.partModelFlag = false + this.closePartDialog() }, // 是否新增特殊任务 @@ -4342,30 +4366,31 @@ this.$message.warning(this.$t('qc.common.pleaseSelectBu')) return } - if (this.modalData.seqNo === '' || this.modalData.seqNo == null) { - this.$message.warning(this.$t('qc.entry.selectDispatchNo')) - return - } - if (this.modalData.orderNo === '' || this.modalData.orderNo == null) { - this.$message.warning(this.$t('qc.entry.selectWorkOrder')) - return - } - if (this.modalData.inspectionTypeNo === '' || this.modalData.inspectionTypeNo == null) { - this.$message.warning(this.$t('qc.entry.selectInspectionTypeSop')) - return - } + // 派工单号、工单号、工序、机台：库存检验新增不需要，校验已去掉 + // if (this.modalData.seqNo === '' || this.modalData.seqNo == null) { + // this.$message.warning(this.$t('qc.entry.selectDispatchNo')) + // return + // } + // if (this.modalData.orderNo === '' || this.modalData.orderNo == null) { + // this.$message.warning(this.$t('qc.entry.selectWorkOrder')) + // return + // } + // if (this.modalData.inspectionTypeNo === '' || this.modalData.inspectionTypeNo == null) { + // this.$message.warning(this.$t('qc.entry.selectInspectionTypeSop')) + // return + // } if (this.modalData.partNo === '' || this.modalData.partNo == null) { this.$message.warning(this.$t('qc.entry.selectPart')) return } - if (this.modalData.operationDesc === '' || this.modalData.operationDesc == null) { - this.$message.warning(this.$t('qc.entry.selectOp')) - return - } - if (this.modalData.resourceId === '' || this.modalData.resourceId == null) { - this.$message.warning(this.$t('qc.entry.selectMachine')) - return - } + // if (this.modalData.operationDesc === '' || this.modalData.operationDesc == null) { + // this.$message.warning(this.$t('qc.entry.selectOp')) + // return + // } + // if (this.modalData.resourceId === '' || this.modalData.resourceId == null) { + // this.$message.warning(this.$t('qc.entry.selectMachine')) + // return + // } if (this.modalData.inspectorBy === '' || this.modalData.inspectorBy == null) { this.$message.warning(this.$t('qc.entry.selectSender')) return @@ -5131,11 +5156,14 @@ }, filterMainTableColumns (columns) { - return this.normalizeMainTableDateColumns(this.ensureMainTableReleaseLineColumns((columns || []).filter(item => { + // 库存检验列表隐藏：派工单号、工单号、下达号、行号、工序、机台、加工中心、检验类型 + const hideProps = ['seqNo', 'orderNo', 'releaseNo', 'lineNo', 'operationDesc', 'resourceDesc', 'workCenterDesc', 'inspectionTypeNo', 'inspectionTypeName'] + const hideLabels = ['派工单号', '工单号', '下达号', '行号', '工序', '机台', '加工中心', '检验类型'] + return this.normalizeMainTableDateColumns((columns || []).filter(item => { const prop = item && item.columnProp ? String(item.columnProp) : '' const label = item && item.columnLabel ? String(item.columnLabel) : '' - return prop !== 'seqNo' && label !== '派工单号' - }))) + return hideProps.indexOf(prop) === -1 && hideLabels.indexOf(label) === -1 + })) }, normalizeMainTableDateColumns (columns) { diff --git a/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue b/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue index 662d4f4..6616350 100644 --- a/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue +++ b/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue @@ -354,11 +354,11 @@ + :visible.sync="dieMoldAddModalFlag" width="580px" class="part-edit-dialog">
- + @@ -374,28 +374,29 @@ - + + + + + + - + - + - - - - - +