|
|
|
@ -521,7 +521,7 @@ export default { |
|
|
|
columnProp: "customerName", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "客户编号", |
|
|
|
columnLabel: "客户名称", |
|
|
|
columnWidth: '240', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
@ -530,6 +530,24 @@ export default { |
|
|
|
status: true, |
|
|
|
fixed: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: this.functionId, |
|
|
|
serialNumber: '750001Table1CustomerAbb', |
|
|
|
tableId: "750001Table1", |
|
|
|
tableName: "销售发货清单", |
|
|
|
columnProp: "customerAbb", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "客户简称", |
|
|
|
columnWidth: '120', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: this.functionId, |
|
|
|
@ -971,25 +989,25 @@ export default { |
|
|
|
// 检查卷标签是否重复(根据 site 和 rollNo) |
|
|
|
const duplicateRolls = [] |
|
|
|
const newRolls = [] |
|
|
|
|
|
|
|
|
|
|
|
rollList.forEach(rollInfo => { |
|
|
|
// 检查当前列表中是否已存在相同 site 和 rollNo 的记录 |
|
|
|
const isDuplicate = this.caseRollList.some(item => |
|
|
|
const isDuplicate = this.caseRollList.some(item => |
|
|
|
item.site === this.caseForm.site && item.rollNo === rollInfo.rollNo |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
if (isDuplicate) { |
|
|
|
duplicateRolls.push(rollInfo.rollNo) |
|
|
|
} else { |
|
|
|
newRolls.push(rollInfo) |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
// 如果有重复的卷标签,提示用户 |
|
|
|
if (duplicateRolls.length > 0) { |
|
|
|
this.$message.warning(`以下卷标签已存在,不能重复添加:${duplicateRolls.join(', ')}`) |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 只添加不重复的卷到列表最前面(后扫描的在上面) |
|
|
|
newRolls.forEach(rollInfo => { |
|
|
|
this.caseRollList.unshift({ |
|
|
|
|