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

liu

8 天以前 a7dc7b230fcc6abc6ee5a7bfadb90789b03d2ca8

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

@@ -5,8 +5,8 @@

import { computed, ref } from 'vue';

import { useVbenModal } from '../../../../packages/effects/common-ui/src';
import { MesWmReturnIssueStatusEnum } from '../../../../packages/constants/src';
import { useVbenModal } from '@vben/common-ui';
import { MesWmReturnIssueStatusEnum } from '@vben/constants';

import { Button, Divider, message, Popconfirm } from 'ant-design-vue';

@@ -142,17 +142,21 @@
      if (formData.value?.id) {
        await updateReturnIssue({ ...formData.value, ...data });
        formData.value = { ...formData.value, ...data };
      } else {
        const id = await createReturnIssue(data);
        formData.value = {
          ...data,
          id,
          status: MesWmReturnIssueStatusEnum.PREPARE,
        };
        await formApi.setFieldValue('id', id);
        await formApi.setFieldValue('status', formData.value.status);
        formType.value = 'update';
        emit('success');
        message.success($t('ui.actionMessage.operationSuccess'));
        await modalApi.close();
        return;
      }
      // 新增：保持弹窗打开，切换到编辑模式
      const id = await createReturnIssue(data);
      formData.value = {
        ...data,
        id,
        status: MesWmReturnIssueStatusEnum.PREPARE,
      };
      await formApi.setFieldValue('id', id);
      await formApi.setFieldValue('status', formData.value.status);
      formType.value = 'update';
      originalSnapshot.value = JSON.stringify(await formApi.getValues());
      emit('success');
      message.success($t('ui.actionMessage.operationSuccess'));
@@ -194,7 +198,7 @@
    <template v-if="formData?.id">
      <Divider>物料信息</Divider>
      <div class="mx-4">
        <LineList :form-type="formType" :issue-id="formData.id" />
        <LineList :form-type="formType" :issue-id="formData.id" :work-order-id="formData.workOrderId" />
      </div>
    </template>
    <template #prepend-footer>