diff --git a/klp-ui/src/views/wms/purchasePlan/panels/merger.vue b/klp-ui/src/views/wms/purchasePlan/panels/merger.vue index b266c702..9a8ed2d8 100644 --- a/klp-ui/src/views/wms/purchasePlan/panels/merger.vue +++ b/klp-ui/src/views/wms/purchasePlan/panels/merger.vue @@ -44,6 +44,10 @@ export default { newResult: { type: Array, required: true + }, + info: { + type: Object, + required: true } }, data() { @@ -80,7 +84,8 @@ export default { if (this.uploadQualityCertificateForm.qualityCertificateType === 1) { // 什么都不需要做,直接完成就可以 console.log('使用旧的质保单'); - } else if (this.uploadQualityCertificateForm.qualityCertificateType === 2) { + } + else if (this.uploadQualityCertificateForm.qualityCertificateType === 2) { // 创建一个新的BOM const bom = await addBom({ bomName: 'N' + new Date().getTime(), @@ -99,7 +104,7 @@ export default { attrValue: this.newResult[i].attrValue, }) } - console.log('使用新的质保单'); + } else if (this.uploadQualityCertificateForm.qualityCertificateType === 3) { console.log('创建新物料'); // 创建一个新的BOM diff --git a/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue b/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue index b5b1c6ff..7ad62657 100644 --- a/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue +++ b/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue @@ -23,9 +23,8 @@ --> -
- 大模型识别 - model +
+ model
@@ -33,7 +32,7 @@
- +
@@ -131,7 +130,8 @@ const atoms = { export default { name: 'QualityCerticate', components: { - FileUpload + FileUpload, + Merger }, props: { info: {