Merge remote-tracking branch 'origin/dev_浪潮' into dev_浪潮

liyong

2026-05-14 bfc02d9cd38ccdeb09b3a1f2545e1c75cdf39b29

 src/views/basicData/product/materialIndex.vue

@@ -440,7 +440,7 @@
          form.value.parentId = "";
        } else {
          form.value.id = currentId.value;
          form.value.parentId = "";
          form.value.parentId = currentParentId.value;
        }
        addOrEditProduct(form.value).then(res => {
          proxy.$modal.msgSuccess("提交成功");