diff --git a/src/views/weightManage/index.vue b/src/views/weightManage/index.vue
index 829cef7..45d6298 100644
--- a/src/views/weightManage/index.vue
+++ b/src/views/weightManage/index.vue
@@ -56,7 +56,7 @@
@@ -279,7 +286,8 @@ const activeStep = ref(1)
// 表单数据
const formData = reactive({
- inputMaterialCode: '', // 输入的物料编码
+ inputMaterialCode: '', // 输入的物料编码(扫码)
+ inputMaterialCode2: '', // 输入的手动物料编码
id: '', // 物料ID
encoding: '', // 物料编码
materialName: '', // 物料名称
@@ -591,10 +599,13 @@ const originalHandleMaterialCodeChange = async () => {
const materialCode = formData.inputMaterialCode?.trim()
// 无论是否有输入,先重置所有物料相关字段,确保新数据能完全覆盖旧数据
+ formData.id = ''
formData.encoding = ''
formData.materialName = ''
formData.materialSpec = ''
formData.unitWeight = 0
+ formData.batch = ''
+ formData.mark = ''
formData.photoUrl = ''
formData.weightRange = ''
compareMatchResult.value = '';
@@ -666,6 +677,41 @@ const fetchMaterialData = async (code: string) => {
}
}
+
+const handleMaterialCodeChange2 = async (code: string) => {
+ if (!code || code === '') {
+ formData.id = '';
+ formData.encoding = '';
+ formData.materialName = '';
+ formData.materialSpec = '';
+ formData.batch = '';
+ formData.mark = '';
+ formData.materialProcess = '';
+ formData.unitWeight = 0;
+ formData.photoUrl = '';
+ formData.weightRange = '';
+ }
+ const res = await getMaterialDetail(code);
+ if (res.code === '0') {
+ // 更新表单数据
+ formData.id = res.data?.id || ''
+ formData.encoding = res.data?.encoding || ''
+ formData.materialName = res.data?.materialName || ''
+ formData.materialSpec = res.data?.materialSpec || ''
+ formData.materialProcess = res.data?.materialProcess || ''
+ formData.unitWeight = res.data?.unitWeight || 0
+ formData.photoUrl = res.data?.photoUrl || ''
+ formData.batch = res.data?.batch || ''
+ formData.mark = res.data?.mark || ''
+ formData.weightRange = (res.data?.downFloatRatio ?? '-') + '% ~ ' + (res.data?.upFloatRatio ?? '-') + '%'
+ }
+ if (res.data && res.data.id) {
+ await brightness(res.data.id);
+ }
+};
+
+
+
// 处理下一步
const handleNext = async () => {
// 步骤2:直接完成称重登记
@@ -699,12 +745,6 @@ const handleNext = async () => {
if (activeStep.value === 1) {
try {
- const materialCode = formData.inputMaterialCode?.trim()
- if (!materialCode) {
- Message.error('请先扫描物料编码')
- return;
- }
-
if (!formData.encoding) {
Message.error('未识别到物料!')
}