diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..1ed2224 Binary files /dev/null and b/dist.zip differ diff --git a/src/views/stock/component/apply-modal.vue b/src/views/stock/component/apply-modal.vue index 4bcd3db..8730a94 100644 --- a/src/views/stock/component/apply-modal.vue +++ b/src/views/stock/component/apply-modal.vue @@ -12,7 +12,7 @@
- +
@@ -56,7 +56,7 @@ const loading = ref(false) // 提交按钮的loading状态 const items = [{ title: '录入申请' }, { title: '扫码点货' }, { title: '人工确认' }] - + const myType = ref('') // 申请类型 /** * 点击下一步 */ @@ -71,6 +71,8 @@ totalValue.value += item.quantity } }) + const applyForm = applyFormRef.value.getApplyForm() // 申请表单数据 + myType.value = applyForm.type // 申请类型 } if (scanFormRef.value && current.value === 1) { // 再step2中点击下一步的时候,就去获取step2中的表单数据 diff --git a/src/views/stock/component/scan-form.vue b/src/views/stock/component/scan-form.vue index 4b3d414..c03acea 100644 --- a/src/views/stock/component/scan-form.vue +++ b/src/views/stock/component/scan-form.vue @@ -65,6 +65,11 @@ required: false, default: 0, }, + applyType: { + type: String, + required: false, + default: '', + }, }) //获取扫码的集合 @@ -177,9 +182,9 @@ return } // 找到条形码对应的物料编码 - const code = sn.slice(0, 6) + const code = sn.slice(0, 4) const materialInfo = materialMapCache.value.get(code) - if (!materialInfo) { + if (!materialInfo && props.applyType != 'PURCHASE_RECEIPT') { value.value = '' message.warning('【' + sn + '】条形码不合法,请重新扫码', 5) return