Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

昨天 b64a0deae5b5d33f9e20671a68936b27f0b9b00b

 src/views/wls/returnissue/modules/line-form.vue

@@ -79,8 +79,13 @@
    modalApi.lock();
    try {
      formData.value = await getReturnIssueLine(data.id);
      // 设置到 values
      await formApi.setValues(formData.value);
      // 设置到 values，并构建物料展示名
      await formApi.setValues({
        ...formData.value,
        materialDisplayName: [formData.value.itemName, formData.value.specification]
          .filter(Boolean)
          .join(' | '),
      });
    } finally {
      modalApi.unlock();
    }