From 109abb8739a7ee8a7e4e3a0fb81152262deea18d Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Wed, 19 Aug 2026 15:45:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cclqms-vue/src/api/qc/qc.js | 16 + cclqms-vue/src/i18n/locales/qc.cn.js | 22 +- cclqms-vue/src/i18n/locales/qc.en.js | 24 +- .../views/modules/qc/IQCBatchPurchaseAdd.vue | 170 +-- .../src/views/modules/qc/IQCResultEntry.vue | 1 + .../views/modules/qc/file_collect_upload.vue | 133 ++ .../src/views/modules/qc/qcPartAttribute.vue | 1193 +++++++++++++---- .../src/views/modules/qc/qc_spec_upload.vue | 48 +- 8 files changed, 1202 insertions(+), 405 deletions(-) create mode 100644 cclqms-vue/src/views/modules/qc/file_collect_upload.vue diff --git a/cclqms-vue/src/api/qc/qc.js b/cclqms-vue/src/api/qc/qc.js index d470427..124267e 100644 --- a/cclqms-vue/src/api/qc/qc.js +++ b/cclqms-vue/src/api/qc/qc.js @@ -1,4 +1,5 @@ import { createAPI } from "@/utils/httpRequest.js"; +import httpRequest from '@/utils/httpRequest' // ===================================== 检验方法 ===================================== export const qcMethodSearch = data => createAPI(`/pms/qc/qcMethodSearch`,'post',data) @@ -103,6 +104,14 @@ export const qcPartFileCollectBatchAdd = data => createAPI(`/pms/qc/qcPartFileCo export const qcPartFileCollectBatchSave = data => createAPI(`/pms/qc/qcPartFileCollectBatchSave`,'post',data) export const qcPartFileCollectBatchDelete = data => createAPI(`/pms/qc/qcPartFileCollectBatchDelete`,'post',data) export const qcPartFileCollectReplace = data => createAPI(`/pms/qc/qcPartFileCollectReplace`,'post',data) +export const qcPartFileCollectUpload = data => createAPI(`/pms/qc/qcPartFileCollectUpload`,'post',data) +export const downloadQcPartFileCollectTemplate = () => { + return httpRequest({ + url: httpRequest.adornUrl('/pms/qc/downloadQcPartFileCollectTemplate'), + method: 'get', + responseType: 'blob' + }) +} export const queryFileId = data => createAPI(`/pms/qc/queryFileId`,'post',data) export const getPartDefectTracking = data => createAPI(`/pms/qc/getPartDefectTracking`,'post',data) export const saveDefectTracking = data => createAPI(`/pms/qc/saveDefectTracking`,'post',data) @@ -120,6 +129,13 @@ export const deletePatrolConfig = data => createAPI(`/pms/qc/deletePatrolConfig` export const getAllOperationDescList = data => createAPI(`/pms/qc/getAllOperationDescList`,'post',data) export const patrolConfigUpload = data => createAPI(`/pms/qc/patrolConfigUpload`,'post',data) export const qcSpecUpload = data => createAPI(`/pms/qc/qcSpecUpload`,'post',data) +export const downloadQcSpecTemplate = () => { + return httpRequest({ + url: httpRequest.adornUrl('/pms/qc/downloadQcSpecTemplate'), + method: 'get', + responseType: 'blob' + }) +} export const updateLabelTemplate = data => createAPI(`/pms/qc/updateLabelTemplate`,'post',data) // ===================================== FAI检验 ===================================== diff --git a/cclqms-vue/src/i18n/locales/qc.cn.js b/cclqms-vue/src/i18n/locales/qc.cn.js index 5fe9944..386b15f 100644 --- a/cclqms-vue/src/i18n/locales/qc.cn.js +++ b/cclqms-vue/src/i18n/locales/qc.cn.js @@ -148,7 +148,13 @@ module.exports = { }, specImport: { dialogTitle: '检验标准导入', - dragHintComma: '将文件拖到此处,或' + dragHintComma: '将文件拖到此处,或', + templateFileName: '质检项目导入模板.xlsx' + }, + fileCollectImport: { + dialogTitle: '文件采集配置导入', + dragHintComma: '将文件拖到此处,或', + templateFileName: '文件采集配置导入模板.xlsx' }, patrolImport: { dialogTitle: '巡检配置导入', @@ -1100,6 +1106,7 @@ module.exports = { detail: '详情', uploadFile: '上传文件', projectImport: '项目导入', + fileCollectImport: '配置导入', colIpqcMethod: 'IPQC检验方式', colSupplierId: '供应商编码', colSupplierNameCol: '供应商名称', @@ -1121,7 +1128,7 @@ module.exports = { selectQcSpecCopyRow: '请先勾选要复制的质检项目！', selectQcSpecCopyTarget: '请选择目标物料！', dialogQcSpecCopy: '复制质检项目', - qcSpecCopyHint: '将当前主物料下勾选的质检项目复制到所选其它物料（已存在则覆盖）', + qcSpecCopyHint: '将当前主物料下勾选的质检项目复制到所选物料（均新增一行，不覆盖已有项目）', qcSpecCopyAvailableParts: '可选物料', qcSpecCopyAddSelected: '加入已选（{count}）', qcSpecCopyAddedParts: '已选物料（{count}）', @@ -1132,6 +1139,7 @@ module.exports = { selectQcSpecCopyAddedTarget: '请先将目标物料加入已选清单！', qcSpecCopyConfirm: '确认将 {itemCount} 个质检项目复制到 {targetCount} 个物料吗？', qcSpecCopySuccess: '复制成功', + qcSpecCopySourcePart: '原物料', colSort: '排序', dragToSort: '拖拽调整排序', qcSpecRowNoMissing: '当前项目缺少排序号，无法移动！', @@ -1187,7 +1195,15 @@ module.exports = { updateSuccess: '更新成功', updateFail: '更新失败', addSelectedTooltip: '添加选中项目', - removeSelectedTooltip: '移除选中项目' + removeSelectedTooltip: '移除选中项目', + qcSpecAddSelected: '添加选中（{count}）', + qcSpecAddPendingItems: '本次新增（{count}）', + qcSpecAddRemovePending: '从本次新增中移除', + dialogQcSpecAddFill: '填写项目信息', + qcSpecAddSameInspectionTypeOnly: '请勾选相同检验类型的项目', + qcSpecAddEmptyPending: '请先添加项目', + qcSpecAddDiscardPending: '本次新增尚未保存，确定关闭吗？', + qcSpecAddSaveSuccess: '新增成功' }, deviceMaintenancePage: { exportPrefix: '外采设备维护', diff --git a/cclqms-vue/src/i18n/locales/qc.en.js b/cclqms-vue/src/i18n/locales/qc.en.js index ed0cf61..ef6fbc4 100644 --- a/cclqms-vue/src/i18n/locales/qc.en.js +++ b/cclqms-vue/src/i18n/locales/qc.en.js @@ -148,7 +148,13 @@ module.exports = { }, specImport: { dialogTitle: 'Inspection standard import', - dragHintComma: 'Drag file here, or ' + dragHintComma: 'Drag file here, or ', + templateFileName: 'QC_Spec_Import_Template.xlsx' + }, + fileCollectImport: { + dialogTitle: 'File collection config import', + dragHintComma: 'Drag file here, or ', + templateFileName: 'File_Collect_Import_Template.xlsx' }, patrolImport: { dialogTitle: 'Patrol configuration import', @@ -793,7 +799,7 @@ module.exports = { ipqcTemplate: 'IPQC templates', itemsSuffix: 'items', remark: 'Remark', - + }, fqcPage: { fqcTemplate: 'FQC templates' @@ -1101,6 +1107,7 @@ module.exports = { detail: 'Detail', uploadFile: 'Upload file', projectImport: 'Project import', + fileCollectImport: 'Config import', colIpqcMethod: 'IPQC inspection method', colSupplierId: 'Supplier code', colSupplierNameCol: 'Supplier name', @@ -1122,7 +1129,7 @@ module.exports = { selectQcSpecCopyRow: 'Please select QC items to copy first!', selectQcSpecCopyTarget: 'Please select target material(s)!', dialogQcSpecCopy: 'Copy QC items', - qcSpecCopyHint: 'Copy selected QC items from the current main material to other selected materials (overwrite if exists)', + qcSpecCopyHint: 'Copy selected QC items from the current main material to selected materials (always add a new row, do not overwrite existing items)', qcSpecCopyAvailableParts: 'Available materials', qcSpecCopyAddSelected: 'Add selected ({count})', qcSpecCopyAddedParts: 'Selected materials ({count})', @@ -1133,6 +1140,7 @@ module.exports = { selectQcSpecCopyAddedTarget: 'Add target material(s) to the selected list first!', qcSpecCopyConfirm: 'Copy {itemCount} QC item(s) to {targetCount} material(s)?', qcSpecCopySuccess: 'Copied successfully', + qcSpecCopySourcePart: 'Source', colSort: 'Sort', dragToSort: 'Drag to reorder', qcSpecRowNoMissing: 'The selected item has no sort number and cannot be moved!', @@ -1188,7 +1196,15 @@ module.exports = { updateSuccess: 'Updated successfully', updateFail: 'Update failed', addSelectedTooltip: 'Add selected items', - removeSelectedTooltip: 'Remove selected items' + removeSelectedTooltip: 'Remove selected items', + qcSpecAddSelected: 'Add selected ({count})', + qcSpecAddPendingItems: 'Added this time ({count})', + qcSpecAddRemovePending: 'Remove from added list', + dialogQcSpecAddFill: 'Fill item details', + qcSpecAddSameInspectionTypeOnly: 'Please select items with the same inspection type', + qcSpecAddEmptyPending: 'Please add items first', + qcSpecAddDiscardPending: 'Added items are not saved yet. Close anyway?', + qcSpecAddSaveSuccess: 'Added successfully' }, deviceMaintenancePage: { exportPrefix: 'External equipment maintenance', diff --git a/cclqms-vue/src/views/modules/qc/IQCBatchPurchaseAdd.vue b/cclqms-vue/src/views/modules/qc/IQCBatchPurchaseAdd.vue index a255ed0..bbe8971 100644 --- a/cclqms-vue/src/views/modules/qc/IQCBatchPurchaseAdd.vue +++ b/cclqms-vue/src/views/modules/qc/IQCBatchPurchaseAdd.vue @@ -6,20 +6,6 @@ @keyup.enter.native="searchList"> - - - - {{ i.sitename }} - - {{ i.buDesc }} - - - - - - @@ -27,27 +13,27 @@ - + - + - + - + - + @@ -148,21 +134,34 @@ - - - - - - - - - {{ $t('qc.table.sender') }} - - - + + + + + + {{ i.sitename }} + + {{ i.buDesc }} + + + + + + + + + {{ $t('qc.table.sender') }} + + + + + + - {{ $t('qc.common.confirm') }} + {{ $t('qc.common.confirm') }} {{ $t('qc.common.close') }} @@ -222,9 +221,7 @@ export default { userBuList: [], dataList: [], selectedRows: [], - selectionSyncing: false, searchData: { - bu: '', site: '', poOrderNo: '', poItemNo: '', @@ -239,6 +236,7 @@ export default { }, createDialogVisible: false, createForm: { + bu: '', inspectorBy: '', inspectorByName: '', }, @@ -267,11 +265,6 @@ export default { sitename, })) }, - selectedSupplierText() { - if (!this.selectedRows.length) return '' - const row = this.selectedRows[0] - return [row.supplierNo, row.supplierDesc].filter(Boolean).join(' / ') - }, }, created() { this.calcTableHeight() @@ -288,29 +281,32 @@ export default { }, methods: { calcTableHeight() { - this.tableHeight = Math.max(320, window.innerHeight - (this.embedded ? 280 : 320)) + this.tableHeight = Math.max( + 320, + window.innerHeight - (this.embedded ? 280 : 320) + ) }, loadBuList() { - getSiteAndBuByUserName({ userName: this.$store.state.user.name }).then(({ data }) => { - if (data && data.code === 0) { - this.userBuList = data.rows || [] - this.initDefaultBuSite() + getSiteAndBuByUserName({ userName: this.$store.state.user.name }).then( + ({ data }) => { + if (data && data.code === 0) { + this.userBuList = data.rows || [] + this.initDefaultBuSite() + } } - }) + ) }, initDefaultBuSite() { - if (!this.searchData.bu && this.userBuList.length) { - this.searchData.bu = this.userBuList[0].buNo - } if (!this.searchData.site && this.poSiteList.length) { this.searchData.site = this.poSiteList[0].site } + if (!this.createForm.bu && this.userBuList.length) { + this.createForm.bu = this.userBuList[0].buNo + } }, resetSearch() { - const bu = this.searchData.bu const site = this.searchData.site this.searchData = { - bu, site, poOrderNo: '', poItemNo: '', @@ -327,10 +323,6 @@ export default { this.selectedRows = [] }, searchList() { - if (!this.searchData.bu) { - this.$message.warning(this.$t('qc.common.pleaseSelectBu')) - return - } if (!this.searchData.site) { this.$message.warning(this.$t('qc.iqcPage.selectSite')) return @@ -353,7 +345,6 @@ export default { this.searchLoading = true this.selectedRows = [] searchPoOrderInfoForBatch({ - bu: this.searchData.bu, site: this.searchData.site, userName: this.$store.state.user.name, poOrderNo: this.searchData.poOrderNo, @@ -372,7 +363,8 @@ export default { this.dataList = (data.rows || []).map((row, index) => { const pending = Number(row.pendingInspectQty) const arrival = Number(row.currentArrivalQty) - let defaultQty = !Number.isNaN(pending) && pending > 0 ? pending : arrival + let defaultQty = + !Number.isNaN(pending) && pending > 0 ? pending : arrival if (Number.isNaN(defaultQty)) defaultQty = undefined return { ...row, @@ -390,7 +382,9 @@ export default { } }) } else { - this.$message.error((data && data.msg) || this.$t('qc.common.systemError')) + this.$message.error( + (data && data.msg) || this.$t('qc.common.systemError') + ) } this.searchLoading = false }) @@ -399,47 +393,20 @@ export default { }) }, handleSelectionChange(rows) { - if (this.selectionSyncing) return - if (!rows.length) { - this.selectedRows = [] - return - } - const supplierSet = new Set(rows.map((r) => String(r.supplierNo || ''))) - if (supplierSet.size <= 1) { - this.selectedRows = rows - return - } - // 不同供应商不能同批创建：保留已选供应商（或首条），并提示，不灰掉其他行 - this.$message.warning(this.$t('qc.iqcPage.batchSupplierDiff')) - const keepSupplier = this.selectedRows.length - ? String(this.selectedRows[0].supplierNo || '') - : String(rows[0].supplierNo || '') - const keepRows = rows.filter((r) => String(r.supplierNo || '') === keepSupplier) - this.selectedRows = keepRows - this.selectionSyncing = true - this.$nextTick(() => { - if (this.$refs.batchTable) { - this.$refs.batchTable.clearSelection() - keepRows.forEach((row) => this.$refs.batchTable.toggleRowSelection(row, true)) - } - this.$nextTick(() => { - this.selectionSyncing = false - }) - }) + this.selectedRows = rows || [] }, openCreateDialog() { if (!this.selectedRows.length) { this.$message.warning(this.$t('qc.iqcPage.batchSelectRows')) return } - const supplierSet = new Set(this.selectedRows.map((r) => String(r.supplierNo || ''))) - if (supplierSet.size > 1) { - this.$message.warning(this.$t('qc.iqcPage.batchSupplierDiff')) - return - } for (let i = 0; i < this.selectedRows.length; i++) { const row = this.selectedRows[i] - if (row.sendInspectQty === '' || row.sendInspectQty == null || Number(row.sendInspectQty) <= 0) { + if ( + row.sendInspectQty === '' || + row.sendInspectQty == null || + Number(row.sendInspectQty) <= 0 + ) { this.$message.warning( this.$t('qc.iqcPage.batchSendQtyRequired', { po: row.poOrderNo, @@ -450,19 +417,22 @@ export default { } } this.createForm = { + bu: + this.createForm.bu || + (this.userBuList.length ? this.userBuList[0].buNo : ''), inspectorBy: '', inspectorByName: '', } this.createDialogVisible = true }, openSenderDialog() { - if (!this.searchData.bu) { + if (!this.createForm.bu) { this.$message.warning(this.$t('qc.common.pleaseSelectBu')) return } this.operatorData = { flag: '3', - bu: this.searchData.bu, + bu: this.createForm.bu, roleId: '', adminID: '', adminName: '', @@ -477,7 +447,9 @@ export default { this.operatorList = data.rows || [] } else { this.operatorList = [] - this.$message.error((data && data.msg) || this.$t('qc.common.systemError')) + this.$message.error( + (data && data.msg) || this.$t('qc.common.systemError') + ) } }) }, @@ -498,12 +470,16 @@ export default { this.operatorModelFlag = false }, confirmCreate() { + if (!this.createForm.bu) { + this.$message.warning(this.$t('qc.common.pleaseSelectBu')) + return + } if (!this.createForm.inspectorBy) { this.$message.warning(this.$t('qc.entry.selectSender')) return } const submitList = this.selectedRows.map((row) => ({ - bu: this.searchData.bu, + bu: this.createForm.bu, site: row.site || this.searchData.site, inspectionTypeNo: '105', inspectionTypeName: 'IQC', @@ -531,7 +507,7 @@ export default { })) this.createLoading = true batchSaveIQCInspection({ - bu: this.searchData.bu, + bu: this.createForm.bu, inspectorBy: this.createForm.inspectorBy, userName: this.createForm.inspectorBy, taskSource: '任务新增', @@ -545,7 +521,9 @@ export default { this.$emit('created') this.searchList() } else { - this.$message.error((data && data.msg) || this.$t('qc.common.systemError')) + this.$message.error( + (data && data.msg) || this.$t('qc.common.systemError') + ) } this.createLoading = false }) diff --git a/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue index b584d99..aa7cbff 100644 --- a/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue @@ -4190,6 +4190,7 @@ export default { }, onBatchPurchaseCreated() { + this.batchPurchaseAddFlag = false this.getDataList() }, diff --git a/cclqms-vue/src/views/modules/qc/file_collect_upload.vue b/cclqms-vue/src/views/modules/qc/file_collect_upload.vue new file mode 100644 index 0000000..78a7af8 --- /dev/null +++ b/cclqms-vue/src/views/modules/qc/file_collect_upload.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue b/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue index 40fd5fb..e43e921 100644 --- a/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue +++ b/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue @@ -949,6 +949,8 @@ {{ $t('qc.common.add') }} + {{ $t('qc.partAttributePage.fileCollectImport') }} + :visible.sync="operationModelFlag" width="420px" append-to-body @close="onOperationDialogClose">
@@ -1247,7 +1249,7 @@ + :visible.sync="resourceModelFlag" width="420px" append-to-body @close="onResourceDialogClose">
@@ -1282,7 +1284,7 @@ + :visible.sync="manufacturerModelFlag" width="520px" append-to-body>
@@ -1328,7 +1330,7 @@ + :visible.sync="customerModelFlag" width="520px" append-to-body>
@@ -1478,14 +1480,15 @@ - - -
- + +
+ + style="width: 160px"> {{ i.sitename }} @@ -1498,105 +1501,282 @@ + style="width: 140px"> - + - + {{ $t('qc.common.search') }} -
-
- -
-
- - {{ $t('qc.iqcPage.optionalItemList') }} - ({{ qcSpecItemList1.length }}) +
+
+ {{ $t('qc.iqcPage.optionalItemList') }} + + {{ $t('qc.partAttributePage.qcSpecAddSelected', { count: qcSpecItemSelections1.length }) }} + +
+
+ + + + + + + + + + + + + + +
- - - - - - - - - - - -
- -
- - - - - - +
+
+ + {{ $t('qc.partAttributePage.qcSpecAddPendingItems', { count: qcSpecPendingList.length }) }} + + + {{ $t('qc.partAttributePage.qcSpecCopyClearAdded') }} - -
- - -
-
- - {{ $t('qc.iqcPage.selectedItemList') }} - ({{ qcSpecItemList2.length }})
- - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + {{ $t('qc.common.confirm') }} + {{ $t('qc.common.cancel') }} + + - -
- {{ $t('qc.common.close') }} + + +
+ + + + + + + + + + + + + + + + + + + + + + + {{ $t('qc.table.process') }} + +
+ + +
+ + + + + + {{ $t('qc.table.machine') }} + +
+ + +
+ + + + + + {{ $t('qc.table.supplier') }} + +
+ + +
+ + + + + + {{ $t('qc.table.customerName') }} + +
+ + +
+ + + +
+ + {{ $t('qc.common.confirm') }} + {{ $t('qc.common.cancel') }} + @@ -1621,67 +1801,79 @@ -
- {{ $t('qc.partAttributePage.qcSpecCopyAvailableParts') }} - - {{ $t('qc.partAttributePage.qcSpecCopyAddSelected', { count: qcSpecCopyPartSelections.length }) }} - +
+
+ {{ $t('qc.partAttributePage.qcSpecCopyAvailableParts') }} + + {{ $t('qc.partAttributePage.qcSpecCopyAddSelected', { count: qcSpecCopyPartSelections.length }) }} + +
+
+ + + + + + + + + + +
+ +
- - - - - - - - - - - - -
- - {{ $t('qc.partAttributePage.qcSpecCopyAddedParts', { count: qcSpecCopyAddedParts.length }) }} - - - {{ $t('qc.partAttributePage.qcSpecCopyClearAdded') }} - +
+
+ + {{ $t('qc.partAttributePage.qcSpecCopyAddedParts', { count: qcSpecCopyAddedParts.length }) }} + + + {{ $t('qc.partAttributePage.qcSpecCopyClearAdded') }} + +
+
+ + + + + + + + + +
- - - - - - - - -
+ + +
@@ -2287,6 +2482,7 @@ import BomListComponent from './bomListComponent' import RoutingListComponent from './routingListComponent' import PatrolConfigUpload from './patrol_config_upload' import QcSpecUpload from './qc_spec_upload' +import FileCollectUpload from './file_collect_upload' import Sortable from 'sortablejs' export default { components: { @@ -2298,6 +2494,7 @@ export default { RoutingListComponent, PatrolConfigUpload, QcSpecUpload, + FileCollectUpload, }, data() { return { @@ -2356,6 +2553,21 @@ export default { qcSpecItemList2: [], qcSpecItemSelections1: [], qcSpecItemSelections2: [], + qcSpecPendingList: [], + qcSpecAddSaveLoading: false, + qcSpecAddFillDialogFlag: false, + qcSpecAddSelecting: false, + qcSpecAddApplyData: { + inspectionTypeNo: '', + ipqcInspectionMethod: '', + operation: '', + resourceID: '', + resourceDesc: '', + manufacturerID: '', + manufacturerName: '', + customerID: '', + customerName: '', + }, qcSpecWarningDialogFlag: false, qcSpecWarningLoading: false, qcSpecWarningSaveLoading: false, @@ -3392,6 +3604,24 @@ export default { qcSpecSyncTypeIsIpqc() { return this.qcSpecSyncData.inspectionTypeNo === '101' }, + qcSpecAddApplyIsIqc() { + return String(this.qcSpecAddApplyData.inspectionTypeNo) === '105' + }, + qcSpecAddApplyIsIpqc() { + return String(this.qcSpecAddApplyData.inspectionTypeNo) === '101' + }, + qcSpecAddApplyCanOperation() { + return !!this.qcSpecAddApplyData.inspectionTypeNo && !this.qcSpecAddApplyIsIqc + }, + qcSpecAddApplyCanResource() { + return this.qcSpecAddApplyCanOperation + }, + qcSpecAddApplyCanManufacturer() { + return this.qcSpecAddApplyIsIqc + }, + qcSpecAddApplyCanCustomer() { + return this.qcSpecAddApplyCanOperation + }, }, methods: { @@ -3514,6 +3744,20 @@ export default { this.fileCollectLoading = false }) }, + fileCollectUploadModal() { + if (!this.partCurrentRow || !this.partCurrentRow.partNo) { + this.$message.warning(this.$t('qc.partAttributePage.selectPartForTemplate')) + return + } + const currentData = { + site: this.partCurrentRow.site, + partNo: this.partCurrentRow.partNo, + createBy: this.$store.state.user.name, + } + this.$nextTick(() => { + this.$refs.fileCollectUpload.init(currentData) + }) + }, fileCollectSizeChange(val) { this.fileCollectPageSize = val this.fileCollectPageIndex = 1 @@ -3914,7 +4158,7 @@ export default { this.fileCollectDeleteLoading = true qcPartFileCollectBatchDelete({ site: this.partCurrentRow.site, - buNo: this.partCurrentRow.buNo, + //buNo: this.partCurrentRow.buNo, partNo: this.partCurrentRow.partNo, idList: this.fileCollectSelections.map((r) => r.id), }) @@ -4205,6 +4449,10 @@ export default { this.$nextTick(() => { if (this.$refs.qcSpecCopyPartTable) { this.$refs.qcSpecCopyPartTable.clearSelection() + this.$refs.qcSpecCopyPartTable.doLayout() + } + if (this.$refs.qcSpecCopyAddedTable) { + this.$refs.qcSpecCopyAddedTable.doLayout() } this.getQcSpecCopyPartList() }) @@ -4216,6 +4464,14 @@ export default { const rowKey = this.getQcSpecCopyPartRowKey(row) return this.qcSpecCopyAddedParts.some((item) => this.getQcSpecCopyPartRowKey(item) === rowKey) }, + isQcSpecCopySourcePart(row) { + return !!( + this.partCurrentRow && + row && + row.partNo === this.partCurrentRow.partNo && + (!row.site || !this.partCurrentRow.site || row.site === this.partCurrentRow.site) + ) + }, isQcSpecCopyPartSelectable(row) { return !this.isQcSpecCopyPartAdded(row) }, @@ -4296,7 +4552,15 @@ export default { this.qcSpecCopyPageIndex = data.page.currPage this.qcSpecCopyPageSize = data.page.pageSize this.qcSpecCopyTotalPage = data.page.totalCount - this.$nextTick(() => this.restoreQcSpecCopyPartSelection()) + this.$nextTick(() => { + this.restoreQcSpecCopyPartSelection() + if (this.$refs.qcSpecCopyPartTable) { + this.$refs.qcSpecCopyPartTable.doLayout() + } + if (this.$refs.qcSpecCopyAddedTable) { + this.$refs.qcSpecCopyAddedTable.doLayout() + } + }) } else { this.$message.error(data.msg) } @@ -4365,6 +4629,7 @@ export default { if (this.$refs.qcSpecTable) { this.$refs.qcSpecTable.clearSelection() } + this.refreshQcSpecList() } else { this.$message.error(data.msg) } @@ -4492,21 +4757,33 @@ export default { isQcSpecIqcType(row) { return row && String(row.inspectionTypeNo) === '105' }, + qcSpecRowAllowsOperation(row) { + return !!row && !this.isQcSpecIqcType(row) + }, + qcSpecRowAllowsResource(row) { + return this.qcSpecRowAllowsOperation(row) + }, + qcSpecRowAllowsManufacturer(row) { + return this.isQcSpecIqcType(row) + }, + qcSpecRowAllowsCustomer(row) { + return this.qcSpecRowAllowsOperation(row) + }, /** 批量编辑：非 IQC 可选工序 */ qcSpecCanSelectOperation(row) { - return this.editQcSpecBatchVisible && !this.isQcSpecIqcType(row) + return this.editQcSpecBatchVisible && this.qcSpecRowAllowsOperation(row) }, /** 批量编辑：非 IQC 可选机台 */ qcSpecCanSelectResource(row) { - return this.editQcSpecBatchVisible && !this.isQcSpecIqcType(row) + return this.editQcSpecBatchVisible && this.qcSpecRowAllowsResource(row) }, /** 批量编辑：IQC 可选供应商 */ qcSpecCanSelectManufacturer(row) { - return this.editQcSpecBatchVisible && this.isQcSpecIqcType(row) + return this.editQcSpecBatchVisible && this.qcSpecRowAllowsManufacturer(row) }, /** 批量编辑：非 IQC 可选客户 */ qcSpecCanSelectCustomer(row) { - return this.editQcSpecBatchVisible && !this.isQcSpecIqcType(row) + return this.editQcSpecBatchVisible && this.qcSpecRowAllowsCustomer(row) }, /** 机台查询 site：模板新增用 detailData，质检项目用 partCurrentRow */ resolveResourceSite() { @@ -4519,64 +4796,23 @@ export default { }, openQcSpecManufacturerPicker(row) { if (!this.qcSpecCanSelectManufacturer(row)) return - this.qcSpecPickerRow = row - this.dataListManufacturerSelections = [] - this.manufacturerData.site = this.partCurrentRow.site - this.manufacturerData.manufacturerID = '' - this.manufacturerData.manufacturerName = '' - this.manufacturerPageIndex = 1 - this.fetchManufacturerList(true, false) + this.openQcSpecLinkedManufacturerPicker(row) }, openQcSpecCustomerPicker(row) { if (!this.qcSpecCanSelectCustomer(row)) return - this.qcSpecPickerRow = row - this.dataListCustomerSelections = [] - this.customerData.site = this.partCurrentRow.site - this.customerData.customerID = '' - this.customerData.customerName = '' - this.customerPageIndex = 1 - this.fetchCustomerList(true, false) + this.openQcSpecLinkedCustomerPicker(row) }, openQcSpecOperationPicker(row) { if (!this.qcSpecCanSelectOperation(row)) return - this.qcSpecPickerRow = row - this.operationSelections = [] - this.operationData.site = this.partCurrentRow.site - this.operationData.operationDesc = row.operation || '' - this.operationPageIndex = 1 - this.fetchOperationList(true, true) + this.openQcSpecLinkedOperationPicker(row) }, openQcSpecResourcePicker(row) { if (!this.qcSpecCanSelectResource(row)) return - this.qcSpecPickerRow = row - this.resourceSelections = [] - this.resourceData.site = this.resolveResourceSite() - this.resourceData.resourceId = '' - this.resourceData.resourceDesc = '' - getAllResourceList(this.resourceData).then(({ data }) => { - if (data && data.code === 0) { - this.resourceList = data.rows || [] - this.resourceModelFlag = true - this.$nextTick(() => { - if (!this.$refs.resourceTable) return - if (row.resourceID) { - const match = this.resourceList.find( - (r) => r.resourceId === row.resourceID - ) - if (match) { - this.$refs.resourceTable.setCurrentRow(match) - this.resourceSelections = [match] - } - } - }) - } else { - this.$message.error(data.msg) - } - }) + this.openQcSpecLinkedResourcePicker(row) }, addQcSpecModal() { this.qcSpecSearchData.site = this.partCurrentRow.site - this.qcSpecSearchData.buNo = this.partCurrentRow.buNo + this.qcSpecSearchData.buNo = this.buList.length > 0 ? this.buList[0].buNo : '' this.qcSpecSearchData.partNo = this.partCurrentRow.partNo this.qcSpecSearchData.inspectionTypeNo = '' this.qcSpecSearchData.itemNo = '' @@ -4585,9 +4821,69 @@ export default { this.qcSpecItemList2 = [] this.qcSpecItemSelections1 = [] this.qcSpecItemSelections2 = [] + this.qcSpecPendingList = [] + this.qcSpecAddFillDialogFlag = false + this.resetQcSpecAddApplyData() this.loadDetailListForQcSpec().then(() => { this.getQcSpecItemList() this.qcSpecAddFlag = true + this.$nextTick(() => { + if (this.$refs.qcSpecItemTable1) { + this.$refs.qcSpecItemTable1.doLayout() + } + if (this.$refs.qcSpecPendingTable) { + this.$refs.qcSpecPendingTable.doLayout() + } + }) + }) + }, + getQcSpecAddItemKey(row) { + if (!row) return '' + return `${row.site || ''}_${row.buNo || ''}_${row.itemNo || ''}_${row.inspectionTypeNo || ''}` + }, + getQcSpecPendingRowKey(row) { + if (!row) return '' + return row._pendingKey || this.getQcSpecAddItemKey(row) + }, + createQcSpecPendingKey(row) { + return `${this.getQcSpecAddItemKey(row)}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}` + }, + isQcSpecAddItemPending(row) { + const rowKey = this.getQcSpecAddItemKey(row) + return this.qcSpecPendingList.some((item) => this.getQcSpecAddItemKey(item) === rowKey) + }, + getQcSpecAddLockedInspectionType() { + if (this.qcSpecItemSelections1 && this.qcSpecItemSelections1.length) { + return this.qcSpecItemSelections1[0].inspectionTypeNo + } + return '' + }, + isSameQcSpecAddInspectionType(row, inspectionTypeNo) { + return String(row && row.inspectionTypeNo) === String(inspectionTypeNo) + }, + isQcSpecAddItemSelectable(row) { + const lockedType = this.getQcSpecAddLockedInspectionType() + if (!lockedType) return true + return this.isSameQcSpecAddInspectionType(row, lockedType) + }, + normalizeQcSpecAddSelection(val) { + const rows = val || [] + if (rows.length === 0) return [] + const lockedType = rows[0].inspectionTypeNo + return rows.filter((row) => this.isSameQcSpecAddInspectionType(row, lockedType)) + }, + restoreQcSpecAddSelection(rows) { + this.qcSpecAddSelecting = true + this.$nextTick(() => { + const table = this.$refs.qcSpecItemTable1 + if (table) { + table.clearSelection() + rows.forEach((row) => table.toggleRowSelection(row, true)) + } + this.qcSpecItemSelections1 = rows + this.$nextTick(() => { + this.qcSpecAddSelecting = false + }) }) }, getQcSpecItemList() { @@ -4596,29 +4892,252 @@ export default { this.qcSpecItemList1 = data.rows || [] } }) - qcSpecSearch({ - site: this.qcSpecSearchData.site, - partNo: this.qcSpecSearchData.partNo, - buNo: this.qcSpecSearchData.buNo, - inspectionTypeNo: this.qcSpecSearchData.inspectionTypeNo, - }).then(({ data }) => { - if (data && data.code === 0) { - this.qcSpecItemList2 = data.rows || [] - } - }) }, qcSpecItemClickRow1(row) { + if (!this.isQcSpecAddItemSelectable(row)) { + this.$message.warning( + this.$t('qc.partAttributePage.qcSpecAddSameInspectionTypeOnly') + ) + return + } this.$refs.qcSpecItemTable1.toggleRowSelection(row) }, qcSpecItemClickRow2(row) { this.$refs.qcSpecItemTable2.toggleRowSelection(row) }, qcSpecSelectionItem1(val) { - this.qcSpecItemSelections1 = val + if (this.qcSpecAddSelecting) return + const normalized = this.normalizeQcSpecAddSelection(val) + if (normalized.length !== (val || []).length) { + this.$message.warning( + this.$t('qc.partAttributePage.qcSpecAddSameInspectionTypeOnly') + ) + this.restoreQcSpecAddSelection(normalized) + return + } + this.qcSpecItemSelections1 = normalized }, qcSpecSelectionItem2(val) { this.qcSpecItemSelections2 = val }, + createEmptyQcSpecAddApplyData() { + return { + inspectionTypeNo: '', + ipqcInspectionMethod: '', + operation: '', + resourceID: '', + resourceDesc: '', + manufacturerID: '', + manufacturerName: '', + customerID: '', + customerName: '', + } + }, + resetQcSpecAddApplyData() { + this.qcSpecAddApplyData = this.createEmptyQcSpecAddApplyData() + }, + onQcSpecAddApplyTypeChange() { + if (!this.qcSpecAddApplyData.inspectionTypeNo) { + this.qcSpecAddApplyData.ipqcInspectionMethod = '' + this.qcSpecAddApplyData.operation = '' + this.qcSpecAddApplyData.resourceID = '' + this.qcSpecAddApplyData.resourceDesc = '' + this.qcSpecAddApplyData.manufacturerID = '' + this.qcSpecAddApplyData.manufacturerName = '' + this.qcSpecAddApplyData.customerID = '' + this.qcSpecAddApplyData.customerName = '' + return + } + if (!this.qcSpecAddApplyIsIpqc) { + this.qcSpecAddApplyData.ipqcInspectionMethod = '' + } + if (this.qcSpecAddApplyIsIqc) { + this.qcSpecAddApplyData.operation = '' + this.qcSpecAddApplyData.resourceID = '' + this.qcSpecAddApplyData.resourceDesc = '' + this.qcSpecAddApplyData.customerID = '' + this.qcSpecAddApplyData.customerName = '' + } else { + this.qcSpecAddApplyData.manufacturerID = '' + this.qcSpecAddApplyData.manufacturerName = '' + } + }, + clearQcSpecAddApplyOperation() { + this.qcSpecAddApplyData.operation = '' + this.clearQcSpecAddApplyResource() + }, + clearQcSpecAddApplyResource() { + this.qcSpecAddApplyData.resourceID = '' + this.qcSpecAddApplyData.resourceDesc = '' + }, + clearQcSpecAddApplyManufacturer() { + this.qcSpecAddApplyData.manufacturerID = '' + this.qcSpecAddApplyData.manufacturerName = '' + }, + clearQcSpecAddApplyCustomer() { + this.qcSpecAddApplyData.customerID = '' + this.qcSpecAddApplyData.customerName = '' + }, + clearQcSpecPendingLinkedField(row, field) { + if (!row) return + if (field === 'operation') { + this.$set(row, 'operation', '') + this.$set(row, 'resourceID', '') + this.$set(row, 'resourceDesc', '') + return + } + if (field === 'resource') { + this.$set(row, 'resourceID', '') + this.$set(row, 'resourceDesc', '') + return + } + if (field === 'manufacturer') { + this.$set(row, 'manufacturerID', '') + this.$set(row, 'manufacturerName', '') + return + } + if (field === 'customer') { + this.$set(row, 'customerID', '') + this.$set(row, 'customerName', '') + } + }, + openQcSpecAddApplyOperationPicker() { + if (!this.qcSpecAddApplyCanOperation) return + this.openQcSpecLinkedOperationPicker(this.qcSpecAddApplyData) + }, + openQcSpecAddApplyResourcePicker() { + if (!this.qcSpecAddApplyCanResource) return + this.openQcSpecLinkedResourcePicker(this.qcSpecAddApplyData) + }, + openQcSpecAddApplyManufacturerPicker() { + if (!this.qcSpecAddApplyCanManufacturer) return + this.openQcSpecLinkedManufacturerPicker(this.qcSpecAddApplyData) + }, + openQcSpecAddApplyCustomerPicker() { + if (!this.qcSpecAddApplyCanCustomer) return + this.openQcSpecLinkedCustomerPicker(this.qcSpecAddApplyData) + }, + fillQcSpecUnmaintainedFields(row, source) { + if (!row || !source) return 0 + if ( + source.inspectionTypeNo && + String(row.inspectionTypeNo) !== String(source.inspectionTypeNo) + ) { + return 0 + } + let applied = 0 + if ( + String(row.inspectionTypeNo) === '101' && + this.qcSpecHasValue(source.ipqcInspectionMethod) && + !this.qcSpecHasValue(row.ipqcInspectionMethod) + ) { + this.$set(row, 'ipqcInspectionMethod', source.ipqcInspectionMethod) + applied++ + } + if (this.qcSpecRowAllowsOperation(row) && this.qcSpecHasValue(source.operation) && !this.qcSpecHasValue(row.operation)) { + this.$set(row, 'operation', source.operation) + applied++ + } + if ( + this.qcSpecRowAllowsResource(row) && + this.qcSpecHasValue(source.resourceID) && + !this.qcSpecHasValue(row.resourceID) + ) { + this.$set(row, 'resourceID', source.resourceID) + this.$set(row, 'resourceDesc', source.resourceDesc || '') + applied++ + } + if ( + this.qcSpecRowAllowsManufacturer(row) && + this.qcSpecHasValue(source.manufacturerID) && + !this.qcSpecHasValue(row.manufacturerID) + ) { + this.$set(row, 'manufacturerID', source.manufacturerID) + this.$set(row, 'manufacturerName', source.manufacturerName || '') + applied++ + } + if ( + this.qcSpecRowAllowsCustomer(row) && + this.qcSpecHasValue(source.customerID) && + !this.qcSpecHasValue(row.customerID) + ) { + this.$set(row, 'customerID', source.customerID) + this.$set(row, 'customerName', source.customerName || '') + applied++ + } + return applied + }, + applyQcSpecAddFillFields(row, source) { + if (!row || !source) return + if ( + source.inspectionTypeNo && + String(row.inspectionTypeNo) !== String(source.inspectionTypeNo) + ) { + return + } + if ( + String(row.inspectionTypeNo) === '101' && + this.qcSpecHasValue(source.ipqcInspectionMethod) + ) { + this.$set(row, 'ipqcInspectionMethod', source.ipqcInspectionMethod) + } + if (this.qcSpecRowAllowsOperation(row) && this.qcSpecHasValue(source.operation)) { + this.$set(row, 'operation', source.operation) + } + if (this.qcSpecRowAllowsResource(row) && this.qcSpecHasValue(source.resourceID)) { + this.$set(row, 'resourceID', source.resourceID) + this.$set(row, 'resourceDesc', source.resourceDesc || '') + } + if ( + this.qcSpecRowAllowsManufacturer(row) && + this.qcSpecHasValue(source.manufacturerID) + ) { + this.$set(row, 'manufacturerID', source.manufacturerID) + this.$set(row, 'manufacturerName', source.manufacturerName || '') + } + if (this.qcSpecRowAllowsCustomer(row) && this.qcSpecHasValue(source.customerID)) { + this.$set(row, 'customerID', source.customerID) + this.$set(row, 'customerName', source.customerName || '') + } + }, + resolveQcSpecAddFillInspectionType() { + if (this.qcSpecSearchData.inspectionTypeNo) { + return this.qcSpecSearchData.inspectionTypeNo + } + const types = [ + ...new Set( + (this.qcSpecItemSelections1 || []) + .map((item) => item.inspectionTypeNo) + .filter((type) => type !== null && type !== undefined && type !== '') + ), + ] + return types.length === 1 ? types[0] : '' + }, + openQcSpecAddFillDialog() { + if (this.qcSpecItemSelections1.length === 0) { + this.$message.warning( + this.$t('qc.partAttributePage.selectAvailableItems') + ) + return + } + const normalized = this.normalizeQcSpecAddSelection(this.qcSpecItemSelections1) + if (normalized.length !== this.qcSpecItemSelections1.length) { + this.$message.warning( + this.$t('qc.partAttributePage.qcSpecAddSameInspectionTypeOnly') + ) + this.restoreQcSpecAddSelection(normalized) + return + } + this.resetQcSpecAddApplyData() + this.qcSpecAddApplyData.inspectionTypeNo = this.resolveQcSpecAddFillInspectionType() + this.onQcSpecAddApplyTypeChange() + this.qcSpecAddFillDialogFlag = true + }, + confirmQcSpecAddFill() { + this.addQcSpecItem() + this.qcSpecAddFillDialogFlag = false + this.resetQcSpecAddApplyData() + }, addQcSpecItem() { if (this.qcSpecItemSelections1.length === 0) { this.$message.warning( @@ -4626,67 +5145,77 @@ export default { ) return } - let inData = { + this.qcSpecItemSelections1.forEach((item) => { + const filled = this.fillQcSpecFromTemplate({ ...item }) + this.applyQcSpecAddFillFields(filled, this.qcSpecAddApplyData) + this.$set(filled, '_pendingKey', this.createQcSpecPendingKey(filled)) + this.qcSpecPendingList.push(filled) + }) + this.qcSpecItemSelections1 = [] + this.$nextTick(() => { + if (this.$refs.qcSpecItemTable1) { + this.$refs.qcSpecItemTable1.clearSelection() + } + }) + }, + removeQcSpecPendingItem(row) { + const rowKey = this.getQcSpecPendingRowKey(row) + this.qcSpecPendingList = this.qcSpecPendingList.filter( + (item) => this.getQcSpecPendingRowKey(item) !== rowKey + ) + }, + clearQcSpecPendingList() { + if (this.qcSpecPendingList.length === 0) return + this.qcSpecPendingList = [] + }, + confirmQcSpecAdd() { + if (this.qcSpecPendingList.length === 0) { + this.$message.warning(this.$t('qc.partAttributePage.qcSpecAddEmptyPending')) + return + } + this.qcSpecAddSaveLoading = true + qcSpecSave({ site: this.partCurrentRow.site, - buNo: this.partCurrentRow.buNo, partNo: this.partCurrentRow.partNo, createBy: this.$store.state.user.name, - itemList: this.qcSpecItemSelections1.map((item) => - this.fillQcSpecFromTemplate({ ...item }) - ), - } - qcSpecSave(inData).then(({ data }) => { - if (data && data.code === 0) { - this.getQcSpecItemList() - this.qcSpecItemSelections1 = [] - } else { - this.$message.error(data.msg) - } + itemList: this.qcSpecPendingList, }) + .then(({ data }) => { + this.qcSpecAddSaveLoading = false + if (data && data.code === 0) { + this.qcSpecPendingList = [] + this.qcSpecAddFlag = false + this.$message.success(this.$t('qc.partAttributePage.qcSpecAddSaveSuccess')) + } else { + this.$message.error(data.msg) + } + }) + .catch(() => { + this.qcSpecAddSaveLoading = false + }) }, - deleteQcSpecItem() { - if (this.qcSpecItemSelections2.length === 0) { - this.$message.warning( - this.$t('qc.partAttributePage.selectExistingItems') - ) + beforeCloseQcSpecAddDialog(done) { + if (!this.qcSpecPendingList.length) { + done() return } this.$confirm( - this.$t('qc.partAttributePage.deleteSelectedQcSpecConfirm'), + this.$t('qc.partAttributePage.qcSpecAddDiscardPending'), this.$t('qc.common.tip'), { confirmButtonText: this.$t('qc.common.confirm'), cancelButtonText: this.$t('qc.common.cancel'), type: 'warning', } - ).then(() => { - let count = 0 - let successCount = 0 - this.qcSpecItemSelections2.forEach((item) => { - qcSpecDelete({ - site: this.partCurrentRow.site, - buNo: this.partCurrentRow.buNo, - partNo: this.partCurrentRow.partNo, - itemNo: item.itemNo, - inspectionTypeNo: item.inspectionTypeNo, - rowNo: item.rowNo, - }).then(({ data }) => { - count++ - if (data && data.code === 0) { - successCount++ - } - if (count === this.qcSpecItemSelections2.length) { - this.getQcSpecItemList() - this.qcSpecItemSelections2 = [] - this.$message.success( - this.$t('qc.partAttributePage.deleteSuccessCount', { - count: successCount, - }) - ) - } - }) - }) - }) + ) + .then(() => done()) + .catch(() => {}) + }, + onQcSpecAddDialogClose() { + this.qcSpecPendingList = [] + this.qcSpecAddFillDialogFlag = false + this.resetQcSpecAddApplyData() + this.refreshQcSpecList() }, resetQcSpecBatchFillData() { this.qcSpecBatchFillData = { @@ -4714,8 +5243,8 @@ export default { return } this.resetQcSpecBatchFillData() - if (this.partCurrentRow.buNo) { - this.qcSpecBatchFillData.buNo = this.partCurrentRow.buNo + if (this.buList.length > 0) { + this.qcSpecBatchFillData.buNo = this.buList[0].buNo } if (this.qcSpecFilterType) { this.qcSpecBatchFillData.inspectionTypeNo = this.qcSpecFilterType @@ -4759,15 +5288,18 @@ export default { this.clearQcSpecLevelProgramme(this.qcSpecBatchFillData) } }, - openQcSpecBatchFillOperationPicker() { - this.qcSpecPickerRow = this.qcSpecBatchFillData + openQcSpecLinkedOperationPicker(target) { + if (!target) return + this.qcSpecPickerRow = target this.operationSelections = [] - this.operationData.operationDesc = this.qcSpecBatchFillData.operation || '' + this.operationData.site = this.partCurrentRow.site + this.operationData.operationDesc = target.operation || '' this.operationPageIndex = 1 this.fetchOperationList(true, true) }, - openQcSpecBatchFillResourcePicker() { - this.qcSpecPickerRow = this.qcSpecBatchFillData + openQcSpecLinkedResourcePicker(target) { + if (!target) return + this.qcSpecPickerRow = target this.resourceSelections = [] this.resourceData.site = this.resolveResourceSite() this.resourceData.resourceId = '' @@ -4778,9 +5310,9 @@ export default { this.resourceModelFlag = true this.$nextTick(() => { if (!this.$refs.resourceTable) return - if (this.qcSpecBatchFillData.resourceID) { + if (target.resourceID) { const match = this.resourceList.find( - (r) => r.resourceId === this.qcSpecBatchFillData.resourceID + (r) => r.resourceId === target.resourceID ) if (match) { this.$refs.resourceTable.setCurrentRow(match) @@ -4793,8 +5325,9 @@ export default { } }) }, - openQcSpecBatchFillManufacturerPicker() { - this.qcSpecPickerRow = this.qcSpecBatchFillData + openQcSpecLinkedManufacturerPicker(target) { + if (!target) return + this.qcSpecPickerRow = target this.dataListManufacturerSelections = [] this.manufacturerData.site = this.partCurrentRow.site this.manufacturerData.manufacturerID = '' @@ -4802,8 +5335,9 @@ export default { this.manufacturerPageIndex = 1 this.fetchManufacturerList(true, false) }, - openQcSpecBatchFillCustomerPicker() { - this.qcSpecPickerRow = this.qcSpecBatchFillData + openQcSpecLinkedCustomerPicker(target) { + if (!target) return + this.qcSpecPickerRow = target this.dataListCustomerSelections = [] this.customerData.site = this.partCurrentRow.site this.customerData.customerID = '' @@ -4811,6 +5345,18 @@ export default { this.customerPageIndex = 1 this.fetchCustomerList(true, false) }, + openQcSpecBatchFillOperationPicker() { + this.openQcSpecLinkedOperationPicker(this.qcSpecBatchFillData) + }, + openQcSpecBatchFillResourcePicker() { + this.openQcSpecLinkedResourcePicker(this.qcSpecBatchFillData) + }, + openQcSpecBatchFillManufacturerPicker() { + this.openQcSpecLinkedManufacturerPicker(this.qcSpecBatchFillData) + }, + openQcSpecBatchFillCustomerPicker() { + this.openQcSpecLinkedCustomerPicker(this.qcSpecBatchFillData) + }, buildQcSpecBatchFillPayload(overwrite) { const d = this.qcSpecBatchFillData const payload = { @@ -5279,7 +5825,7 @@ export default { ).then(() => { qcSpecDelete({ site: this.partCurrentRow.site, - buNo: this.partCurrentRow.buNo, + buNo: row.buNo, partNo: this.partCurrentRow.partNo, itemNo: row.itemNo, inspectionTypeNo: row.inspectionTypeNo, @@ -7958,14 +8504,20 @@ export default { } .qc-spec-copy-content { - padding: 14px 18px 16px; + height: 100%; + display: flex; + flex-direction: column; + min-height: 0; + padding: 10px 18px 8px; background: #ffffff; + overflow: hidden; } .qc-spec-copy-search-form { display: flex; flex-wrap: wrap; align-items: center; + flex-shrink: 0; margin-bottom: 2px; } @@ -7973,11 +8525,42 @@ export default { margin: 0 14px 8px 0; } +.qc-spec-copy-available, +.qc-spec-copy-selected { + display: flex; + flex-direction: column; + min-height: 0; +} + +.qc-spec-copy-available { + flex: 1.5; +} + +.qc-spec-copy-selected { + flex: 1; +} + +.qc-spec-copy-table-wrap { + position: relative; + flex: 1; + min-height: 0; +} + +.qc-spec-copy-table-wrap .el-table { + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + height: 100% !important; +} + .qc-spec-copy-section-header { display: flex; align-items: center; justify-content: space-between; flex-wrap: wrap; + flex-shrink: 0; min-height: 36px; margin-bottom: 6px; } @@ -7996,11 +8579,12 @@ export default { display: flex; flex-wrap: wrap; align-items: center; + flex-shrink: 0; margin-top: 8px; } .qc-spec-copy-added-header { - margin-top: 10px; + margin-top: 8px; padding-top: 8px; border-top: 1px solid #dcdfe6; } @@ -8010,6 +8594,56 @@ export default { font-size: 17px; } +.qc-spec-add-apply-link { + color: #409eff; + cursor: pointer; +} + +.qc-spec-add-apply-link:hover { + text-decoration: underline; +} + +.qc-spec-add-apply-link.is-disabled { + color: #c0c4cc; + cursor: not-allowed; + text-decoration: none; +} + +.qc-spec-add-apply-input { + position: relative; + width: 100%; +} + +.qc-spec-add-apply-input /deep/ .is-clearable .el-input__inner { + padding-right: 28px; +} + +.qc-spec-add-apply-clear { + position: absolute; + right: 8px; + top: 50%; + transform: translateY(-50%); + z-index: 2; + font-size: 14px; + line-height: 1; + cursor: pointer; + color: #c0c4cc; +} + +.qc-spec-add-apply-clear:hover { + color: #909399; +} + +.qc-spec-pending-clear-btn { + color: #f56c6c; + padding: 0 2px; + margin-left: 2px; +} + +.qc-spec-pending-clear-btn:hover { + color: #f78989; +} + .qc-spec-warning-dialog { padding: 16px 20px 12px; background: #f5f7fa; @@ -8344,14 +8978,25 @@ export default { \ No newline at end of file +