yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

♻️ refactor(mes): 重命名通知单编码和名称字段

pull/871/MERGE
YunaiV 2026-04-11 09:25:52 +08:00
parent 36666cfdc6
commit 9fb0659615
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/mes/wm/salesnotice/index.ts
View File

@ -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

22
src/views/mes/wm/salesnotice/SalesNoticeForm.vue
View File

@ -10,9 +10,9 @@
>
<el-row>
<el-col :span="8">
<el-form-item label="通知单编号" prop="noticeCode">
<el-form-item label="通知单编号" prop="code">
<el-input
v-model="formData.noticeCode"
v-model="formData.code"
placeholder="请输入通知单编号"
:disabled="isHeaderReadonly"
>
@ -23,9 +23,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="通知单名称" prop="noticeName">
<el-form-item label="通知单名称" prop="name">
<el-input
v-model="formData.noticeName"
v-model="formData.name"
placeholder="请输入通知单名称"
:disabled="isHeaderReadonly"
/>
@ -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<string>('') // 原始表单数据快照，用于脏
/** 生成通知单编号 */
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,

6
src/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue
View File

@ -24,8 +24,8 @@
<el-tooltip :disabled="!selectedItem" placement="top" :show-after="500">
<template #content>
<div v-if="selectedItem" class="leading-6">
<div>编号：{{ selectedItem.noticeCode }}</div>
<div>名称：{{ selectedItem.noticeName || '-' }}</div>
<div>编号：{{ selectedItem.code }}</div>
<div>名称：{{ selectedItem.name || '-' }}</div>
<div>客户：{{ selectedItem.clientName || '-' }}</div>
<div>销售订单：{{ selectedItem.salesOrderCode || '-' }}</div>
</div>
@ -88,7 +88,7 @@ const selectedItem = ref<WmSalesNoticeVO | undefined>() // 当前选中的发货
/** 输入框显示文本：展示通知单名称，保持简洁 */
const displayLabel = computed(() => {
return selectedItem.value?.noticeName ?? ''
return selectedItem.value?.name ?? ''
})
/** 是否显示清除图标 */

20
src/views/mes/wm/salesnotice/components/WmSalesNoticeSelectDialog.vue
View File

@ -23,7 +23,7 @@
<el-form :inline="true" :model="queryParams" label-width="100px">
<el-form-item label="通知单编号">
<el-input
v-model="queryParams.noticeCode"
v-model="queryParams.code"
placeholder="请输入通知单编号"
clearable
@keyup.enter="handleQuery"
@ -32,7 +32,7 @@
</el-form-item>
<el-form-item label="通知单名称">
<el-input
v-model="queryParams.noticeName"
v-model="queryParams.name"
placeholder="请输入通知单名称"
clearable
@keyup.enter="handleQuery"
@ -109,8 +109,8 @@
/>
</template>
</el-table-column>
<el-table-column label="通知单编号" align="center" prop="noticeCode" width="180" />
<el-table-column label="通知单名称" align="left" prop="noticeName" min-width="150" />
<el-table-column label="通知单编号" align="center" prop="code" width="180" />
<el-table-column label="通知单名称" align="left" prop="name" min-width="150" />
<el-table-column label="销售订单编号" align="center" prop="salesOrderCode" width="160" />
<el-table-column label="客户名称" align="center" prop="clientName" width="120" />
<el-table-column label="发货日期" align="center" prop="salesDate" width="120">
@ -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

18
src/views/mes/wm/salesnotice/index.vue
View File

@ -7,18 +7,18 @@
:inline="true"
label-width="100px"
>
<el-form-item label="通知单编号" prop="noticeCode">
<el-form-item label="通知单编号" prop="code">
<el-input
v-model="queryParams.noticeCode"
v-model="queryParams.code"
placeholder="请输入通知单编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="通知单名称" prop="noticeName">
<el-form-item label="通知单名称" prop="name">
<el-input
v-model="queryParams.noticeName"
v-model="queryParams.name"
placeholder="请输入通知单名称"
clearable
@keyup.enter="handleQuery"
@ -63,14 +63,14 @@
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="通知单编号" align="center" prop="noticeCode" min-width="160">
<el-table-column label="通知单编号" align="center" prop="code" min-width="160">
<template #default="scope">
<el-button link type="primary" @click="openForm('detail', scope.row.id)">
{{ scope.row.noticeCode }}
{{ scope.row.code }}
</el-button>
</template>
</el-table-column>
<el-table-column label="通知单名称" align="center" prop="noticeName" min-width="150" />
<el-table-column label="通知单名称" align="center" prop="name" min-width="150" />
<el-table-column label="销售订单编号" align="center" prop="salesOrderCode" min-width="140" />
<el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />
<el-table-column
@ -154,8 +154,8 @@ const exportLoading = ref(false) // 导出的加载中
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
noticeCode: undefined,
noticeName: undefined,
code: undefined,
name: undefined,
salesOrderCode: undefined,
clientId: undefined
})