|
|
@ -225,6 +225,9 @@ export default { |
|
|
return list |
|
|
return list |
|
|
.map(item => String(item || '').trim()) |
|
|
.map(item => String(item || '').trim()) |
|
|
.filter(item => { |
|
|
.filter(item => { |
|
|
|
|
|
if (!item) { |
|
|
|
|
|
return false |
|
|
|
|
|
} |
|
|
if (cache.has(item)) { |
|
|
if (cache.has(item)) { |
|
|
return false |
|
|
return false |
|
|
} |
|
|
} |
|
|
@ -318,11 +321,16 @@ export default { |
|
|
const queryList = this.resolveFilterQueryOrderRef3(selectedType) |
|
|
const queryList = this.resolveFilterQueryOrderRef3(selectedType) |
|
|
return queryList.length > 0 ? queryList[0] : selectedType |
|
|
return queryList.length > 0 ? queryList[0] : selectedType |
|
|
} |
|
|
} |
|
|
|
|
|
const directOrderRef3 = String(this.orderRef3 || '').trim() |
|
|
|
|
|
if (directOrderRef3) { |
|
|
|
|
|
return directOrderRef3 |
|
|
|
|
|
} |
|
|
const queryList = this.buildQueryOrderRef3List() |
|
|
const queryList = this.buildQueryOrderRef3List() |
|
|
if ((!this.orderRef3 || !String(this.orderRef3).trim()) && queryList.length > 0) { |
|
|
|
|
|
|
|
|
if (queryList.length > 0) { |
|
|
return queryList[0] |
|
|
return queryList[0] |
|
|
} |
|
|
} |
|
|
return this.orderRef3 |
|
|
|
|
|
|
|
|
// 保持向后兼容:旧模块未传 orderRef3 时允许按空字符串上传 |
|
|
|
|
|
return '' |
|
|
}, |
|
|
}, |
|
|
handleUpload(){ |
|
|
handleUpload(){ |
|
|
this.$nextTick(()=>{ |
|
|
this.$nextTick(()=>{ |
|
|
@ -387,10 +395,10 @@ export default { |
|
|
formData.append('orderRef1', this.orderRef1); |
|
|
formData.append('orderRef1', this.orderRef1); |
|
|
formData.append('orderRef2', this.ossForm.orderRef2); |
|
|
formData.append('orderRef2', this.ossForm.orderRef2); |
|
|
const uploadOrderRef3 = this.resolveUploadOrderRef3() |
|
|
const uploadOrderRef3 = this.resolveUploadOrderRef3() |
|
|
if (!uploadOrderRef3) { |
|
|
|
|
|
|
|
|
if (this.showOrderRef3Filter && !uploadOrderRef3) { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
formData.append('orderRef3', uploadOrderRef3); |
|
|
|
|
|
|
|
|
formData.append('orderRef3', uploadOrderRef3 || ''); |
|
|
formData.append('fileRemark', this.ossForm.remark); |
|
|
formData.append('fileRemark', this.ossForm.remark); |
|
|
if (this.requireFileNoRev){ |
|
|
if (this.requireFileNoRev){ |
|
|
formData.append('fileNo', this.ossForm.fileNo); |
|
|
formData.append('fileNo', this.ossForm.fileNo); |
|
|
|