diff --git a/pages.json b/pages.json index 7e5fcf9..91ba9f8 100644 --- a/pages.json +++ b/pages.json @@ -222,6 +222,13 @@ { "titleNView": false } + }, + { + "path" : "pages/replenishment/replenishShorts", + "style" : + { + "titleNView": false + } } ], diff --git a/pages/replenishment/replenishShorts.vue b/pages/replenishment/replenishShorts.vue new file mode 100644 index 0000000..45b5e97 --- /dev/null +++ b/pages/replenishment/replenishShorts.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/pages/work/order/order-review-comps/ReviewDetail.vue b/pages/work/order/order-review-comps/ReviewDetail.vue index 61030af..ee3249c 100644 --- a/pages/work/order/order-review-comps/ReviewDetail.vue +++ b/pages/work/order/order-review-comps/ReviewDetail.vue @@ -145,7 +145,7 @@ - + 库内有相同商品 @@ -174,7 +174,7 @@ - 关闭 + 关闭 @@ -521,6 +521,10 @@ import voice from '@/core/utils/voice'; /** * 多商品匹配时,选择第一个商品进行处理 */ + handleMultiMatchClose() { + this.showMultiMatchPopup = false; + this.pendingScanCode = ''; + }, handleMultiMatchSelect(index) { this.showMultiMatchPopup = false; const code = this.pendingScanCode; diff --git a/pages/work/order/order-review.vue b/pages/work/order/order-review.vue index d874237..fe69748 100644 --- a/pages/work/order/order-review.vue +++ b/pages/work/order/order-review.vue @@ -2107,7 +2107,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; try { const res = await this.$http('setting.packageMaterial.search', { keyword: this.packageInputCode }); const list = Array.isArray(res?.data) ? res.data : []; - const matched = list.find(item => String(item.material_code || '') === this.packageInputCode) || list[0]; + const matched = list.find(item => String(item.material_code || '') === this.packageInputCode); if (matched) { finalPackageCode = String(matched.id || ''); } @@ -2123,7 +2123,7 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; try { const res = await this.$http('setting.packageMaterial.search', { keyword: this.suggestedPkg.code }); const list = Array.isArray(res?.data) ? res.data : []; - const matched = list.find(item => String(item.material_code || '') === this.suggestedPkg.code) || list[0]; + const matched = list.find(item => String(item.material_code || '') === this.suggestedPkg.code); if (matched) { finalPackageCode = String(matched.id || ''); }