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

gaoluyang

7 天以前 ced6b504a82f27839b4392ec7fdd76592516456e

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

@@ -85,8 +85,13 @@
      modalApi.lock();
      try {
        formData.value = await getReturnIssueDetail(data.detailId);
        // 设置到 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();
      }