From 65d55c079329cc02f3e5b8c4b177db346052f0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Tue, 3 Nov 2026 16:49:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=99=E5=8F=B7=E5=85=81=E8=AE=B8-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../srmPart/PartAdvancedCopyDialog.vue | 5 +--- src/views/modules/srmPart/partInfoList.vue | 24 ++++++++++--------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/views/modules/srmPart/PartAdvancedCopyDialog.vue b/src/views/modules/srmPart/PartAdvancedCopyDialog.vue index 5eb6456..bb3b240 100644 --- a/src/views/modules/srmPart/PartAdvancedCopyDialog.vue +++ b/src/views/modules/srmPart/PartAdvancedCopyDialog.vue @@ -166,10 +166,7 @@ export default { this.$refs.targetForm.validate(valid => { if (!valid) return const suffix = (this.form.partSuffix || '').trim().toUpperCase() - if (suffix.includes('-')) { - this.$message.warning('物料后缀不能包含 "-"') - return - } + // 后缀允许包含 '-',保留完整编码长度及源目标编码不同的校验 - rqrq。 if (this.targetPartNo.length > 30) { this.$message.warning('目标物料编码不能超过30个字符') return diff --git a/src/views/modules/srmPart/partInfoList.vue b/src/views/modules/srmPart/partInfoList.vue index 3f9c17d..b8ef184 100644 --- a/src/views/modules/srmPart/partInfoList.vue +++ b/src/views/modules/srmPart/partInfoList.vue @@ -1182,7 +1182,7 @@ export default { } return row[columnProp] }, - // 新增和原有复制共用规则:后缀为空时直接使用基准料号,不生成尾部 '-' - rqrq + // 新增和原有复制共用规则:后缀允许包含 '-',为空时直接使用基准料号 - rqrq generatePartNo (basePartNo, partSuffix) { const base = (basePartNo || '').trim().toUpperCase() const suffix = (partSuffix || '').trim().toUpperCase() @@ -1236,11 +1236,11 @@ export default { const index = value.indexOf('-') return index > 0 ? value.substring(0, index) : value }, - extractPartSuffix (partNo) { + // 以已存基准料号为边界提取完整后缀;基准为空或与编码不匹配时留空,避免按首个 '-' 误拆 - rqrq。 + extractPartSuffix (partNo, basePartNo) { const value = (partNo || '').trim().toUpperCase() - if (!value) return '' - const index = value.indexOf('-') - return index > 0 && index < value.length - 1 ? value.substring(index + 1) : '' + const base = (basePartNo || '').trim().toUpperCase() + return base && value.indexOf(`${base}-`) === 0 ? value.substring(base.length + 1) : '' }, openCopyDialog () { const selectedBasePartNo = (this.currentRow && this.currentRow.basePartNo) ? this.currentRow.basePartNo : '' @@ -1261,8 +1261,9 @@ export default { if (!valid) return const basePartNo = (this.copyForm.basePartNo || '').trim().toUpperCase() const partSuffix = (this.copyForm.partSuffix || '').trim().toUpperCase() - if (partSuffix.includes('-')) { - this.$message.warning('物料后缀不能包含 "-"') + // 后缀内的 '-' 属于编码内容,只校验拼接后的完整编码长度 - rqrq。 + if (this.generatePartNo(basePartNo, partSuffix).length > 30) { + this.$message.warning('产品编码不能超过30个字符') return } copyPartByBase({ @@ -1844,8 +1845,8 @@ export default { this.isAdd = false this.skuOptions = [] this.currentpart = {...row} - // 编辑时基准料号以原值为准,空值保持为空 - rqrq - this.currentpart.partSuffix = this.extractPartSuffix(this.currentpart.partNo) + // 编辑时按已存基准料号回显完整后缀,基准料号空值保持为空 - rqrq。 + this.currentpart.partSuffix = this.extractPartSuffix(this.currentpart.partNo, this.currentpart.basePartNo) this.initPartCategoryOptions(true).then(() => { this.partDialogVisible = true }) @@ -1886,8 +1887,9 @@ export default { this.$message.warning('请填写基准料号') return } - if (partSuffix.includes('-')) { - this.$message.warning('物料后缀不能包含 "-"') + // 与普通复制、高级复制一致,允许多段后缀并限制完整产品编码为30位 - rqrq。 + if (this.generatePartNo(basePartNo, partSuffix).length > 30) { + this.$message.warning('产品编码不能超过30个字符') return } if (!(this.currentpart.defaultSupplierNo || '').trim()) {