From 9fb0659615442409734248df32cf6f8548f8067c Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 11 Apr 2026 09:25:52 +0800 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(mes):=20=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E9=80=9A=E7=9F=A5=E5=8D=95=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=92=8C=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/wm/salesnotice/index.ts | 4 ++-- .../mes/wm/salesnotice/SalesNoticeForm.vue | 22 +++++++++---------- .../components/WmSalesNoticeSelect.vue | 6 ++--- .../components/WmSalesNoticeSelectDialog.vue | 20 ++++++++--------- src/views/mes/wm/salesnotice/index.vue | 18 +++++++-------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/api/mes/wm/salesnotice/index.ts b/src/api/mes/wm/salesnotice/index.ts index 042ebec09..d4ee52751 100644 --- a/src/api/mes/wm/salesnotice/index.ts +++ b/src/api/mes/wm/salesnotice/index.ts @@ -3,8 +3,8 @@ import request from '@/config/axios' // MES 发货通知单 VO export interface WmSalesNoticeVO { id: number - noticeCode: string - noticeName: string + code: string + name: string salesOrderCode: string clientId: number clientCode: string diff --git a/src/views/mes/wm/salesnotice/SalesNoticeForm.vue b/src/views/mes/wm/salesnotice/SalesNoticeForm.vue index 0346b2228..b498191d4 100644 --- a/src/views/mes/wm/salesnotice/SalesNoticeForm.vue +++ b/src/views/mes/wm/salesnotice/SalesNoticeForm.vue @@ -10,9 +10,9 @@ > - + @@ -23,9 +23,9 @@ - + @@ -156,8 +156,8 @@ const dialogTitle = computed(() => { }) const formData = ref({ id: undefined as number | undefined, - noticeCode: undefined, - noticeName: undefined, + code: undefined, + name: undefined, salesOrderCode: undefined, clientId: undefined, salesDate: undefined, @@ -168,8 +168,8 @@ const formData = ref({ remark: undefined }) const formRules = reactive({ - noticeCode: [{ required: true, message: '通知单编号不能为空', trigger: 'blur' }], - noticeName: [{ required: true, message: '通知单名称不能为空', trigger: 'blur' }], + code: [{ required: true, message: '通知单编号不能为空', trigger: 'blur' }], + name: [{ required: true, message: '通知单名称不能为空', trigger: 'blur' }], clientId: [{ required: true, message: '请选择客户', trigger: 'change' }], salesDate: [{ required: true, message: '请选择发货日期', trigger: 'change' }] }) @@ -178,7 +178,7 @@ const originalFormData = ref('') // 原始表单数据快照，用于脏 /** 生成通知单编号 */ const generateCode = async () => { - formData.value.noticeCode = await AutoCodeRecordApi.generateAutoCode( + formData.value.code = await AutoCodeRecordApi.generateAutoCode( MesAutoCodeRuleCode.WM_SALES_NOTICE_CODE ) } @@ -261,8 +261,8 @@ const handleFinish = () => { const resetForm = () => { formData.value = { id: undefined, - noticeCode: undefined, - noticeName: undefined, + code: undefined, + name: undefined, salesOrderCode: undefined, clientId: undefined, salesDate: undefined, diff --git a/src/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue b/src/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue index 057b241df..71b038c0b 100644 --- a/src/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue +++ b/src/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue @@ -24,8 +24,8 @@ - - + + @@ -212,8 +212,8 @@ const handleRowDblClick = (row: WmSalesNoticeVO) => { const queryParams = reactive({ pageNo: 1, pageSize: 10, - noticeCode: undefined as string | undefined, - noticeName: undefined as string | undefined, + code: undefined as string | undefined, + name: undefined as string | undefined, salesOrderCode: undefined as string | undefined, clientId: undefined as number | undefined, status: undefined as number | undefined @@ -265,8 +265,8 @@ const handleQuery = () => { /** 重置查询条件 */ const resetQuery = () => { - queryParams.noticeCode = undefined - queryParams.noticeName = undefined + queryParams.code = undefined + queryParams.name = undefined queryParams.salesOrderCode = undefined queryParams.clientId = undefined queryParams.status = props.status @@ -297,8 +297,8 @@ const confirmSelect = () => { const open = async (selectedIds?: number[]) => { dialogVisible.value = true // 重置查询条件 + 页码，避免二次打开继承上次过滤上下文 - queryParams.noticeCode = undefined - queryParams.noticeName = undefined + queryParams.code = undefined + queryParams.name = undefined queryParams.salesOrderCode = undefined queryParams.clientId = undefined queryParams.status = props.status != null ? props.status : undefined diff --git a/src/views/mes/wm/salesnotice/index.vue b/src/views/mes/wm/salesnotice/index.vue index f7c627337..1de164738 100644 --- a/src/views/mes/wm/salesnotice/index.vue +++ b/src/views/mes/wm/salesnotice/index.vue @@ -7,18 +7,18 @@ :inline="true" label-width="100px" > - + - + - + - +