diff --git a/src/views/modules/sampleTracking/projectProofTracking.vue b/src/views/modules/sampleTracking/projectProofTracking.vue index e83cb7d..690662a 100644 --- a/src/views/modules/sampleTracking/projectProofTracking.vue +++ b/src/views/modules/sampleTracking/projectProofTracking.vue @@ -954,22 +954,18 @@ - - - + @change="handleOneKeyProofingNoChange" + @select="handleOneKeyProofingNoChange($event.applyNo)" + /> @@ -1133,22 +1129,18 @@ - - - + @change="handleProofDialogProofingNoChange" + @select="handleProofDialogProofingNoChange($event.applyNo)" + /> diff --git a/src/views/modules/sampleTracking/projectProofTracking/mixins/oneKeyDialog.js b/src/views/modules/sampleTracking/projectProofTracking/mixins/oneKeyDialog.js index 739f0cd..d09f5ca 100644 --- a/src/views/modules/sampleTracking/projectProofTracking/mixins/oneKeyDialog.js +++ b/src/views/modules/sampleTracking/projectProofTracking/mixins/oneKeyDialog.js @@ -175,6 +175,11 @@ export default { return } if (previousProjectNo.toUpperCase() !== projectNo.toUpperCase()) { + // 只有切换项目才清理旧打样信息;同项目重新查询选项不清空手工单号。 + this.oneKeyForm.proofingNo = '' + this.oneKeyForm.requiredDeliveryDate = '' + this.oneKeyForm.baseline = '' + this.oneKeyForm.planStartDate = '' // 项目编码变化后需清理旧料号,避免跨项目保留旧料号与角色信息。 this.oneKeyForm.testPartNo = '' this.oneKeyForm.partDesc = '' @@ -185,8 +190,13 @@ export default { this.oneKeyProjectNoSnapshot = projectNo this.loadOneKeyProofingApplyOptions(projectNo, { keepCurrentIfMissing: false }) }, + queryOneKeyProofingNoSuggestions (queryString, callback) { + const keyword = String(queryString || '').trim().toUpperCase() + callback(this.oneKeyProofingApplyOptions.filter(item => item && String(item.applyNo || '').toUpperCase().indexOf(keyword) > -1)) + }, handleOneKeyProofingNoChange (proofingNo) { const selectedNo = this.isBlankValue(proofingNo) ? '' : String(proofingNo).trim() + this.oneKeyForm.proofingNo = selectedNo if (this.oneKeyDialogMode !== 'create') { // 修改和详情以库里的预计完成日期、baseline 为准。库里为空就保持空,不用试验单预计完成日期回填。 if (!selectedNo) { @@ -268,12 +278,7 @@ export default { applyQuantity: '' }) } - if (!hasCurrent && !keepCurrentIfMissing) { - this.oneKeyForm.proofingNo = '' - this.oneKeyForm.requiredDeliveryDate = '' - this.oneKeyForm.baseline = '' - this.oneKeyForm.planStartDate = '' - } + // 手工单号不要求出现在试验单列表中;异步查询不能清空当前输入和日期。 this.oneKeyProofingApplyOptions = nextOptions if (!this.isBlankValue(this.oneKeyForm.proofingNo)) { this.handleOneKeyProofingNoChange(latestProofingNo) @@ -642,6 +647,10 @@ export default { this.setOneKeyRoleFieldsFromSource(selectedProject) this.snapshotOneKeyProjectRoles(selectedProject) if (projectChanged) { + this.oneKeyForm.proofingNo = '' + this.oneKeyForm.requiredDeliveryDate = '' + this.oneKeyForm.baseline = '' + this.oneKeyForm.planStartDate = '' // 项目切换时清理料号相关字段,防止旧料号角色残留到新项目。 this.oneKeyForm.testPartNo = '' this.oneKeyForm.partDesc = '' diff --git a/src/views/modules/sampleTracking/projectProofTracking/mixins/proofDialog.js b/src/views/modules/sampleTracking/projectProofTracking/mixins/proofDialog.js index 139099e..0981253 100644 --- a/src/views/modules/sampleTracking/projectProofTracking/mixins/proofDialog.js +++ b/src/views/modules/sampleTracking/projectProofTracking/mixins/proofDialog.js @@ -37,8 +37,13 @@ export default { updateBy: this.$store.state.user.name } }, + queryProofDialogProofingNoSuggestions (queryString, callback) { + const keyword = String(queryString || '').trim().toUpperCase() + callback(this.proofDialogApplyOptions.filter(item => item && String(item.applyNo || '').toUpperCase().indexOf(keyword) > -1)) + }, handleProofDialogProofingNoChange (proofingNo) { const selectedNo = this.isBlankValue(proofingNo) ? '' : String(proofingNo).trim() + this.proofDialogData.proofingNo = selectedNo if (!selectedNo) { this.proofDialogData.requiredDeliveryDate = '' this.proofDialogData.baseline = ''