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

liu

2026-09-07 a7dc7b230fcc6abc6ee5a7bfadb90789b03d2ca8

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

@@ -7,8 +7,8 @@

import { computed, reactive, ref } from 'vue';

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

import { message } from 'ant-design-vue';

@@ -29,6 +29,7 @@
const props = defineProps<{
  formType: FormType;
  issueId: number;
  workOrderId?: number;
}>();

const isEditable = computed(() =>
@@ -61,12 +62,12 @@

/** 添加物料 */
function handleCreate() {
  lineFormModalApi.setData({ issueId: props.issueId }).open();
  lineFormModalApi.setData({ issueId: props.issueId, workOrderId: props.workOrderId }).open();
}

/** 编辑物料 */
function handleEdit(row: MesWmReturnIssueLineApi.ReturnIssueLine) {
  lineFormModalApi.setData({ id: row.id, issueId: props.issueId }).open();
  lineFormModalApi.setData({ id: row.id, issueId: props.issueId, workOrderId: props.workOrderId }).open();
}

/** 删除物料 */