♻️ refactor(mes): 重命名通知单编码和名称字段
parent
36666cfdc6
commit
9fb0659615
|
|
@ -3,8 +3,8 @@ import request from '@/config/axios'
|
||||||
// MES 发货通知单 VO
|
// MES 发货通知单 VO
|
||||||
export interface WmSalesNoticeVO {
|
export interface WmSalesNoticeVO {
|
||||||
id: number
|
id: number
|
||||||
noticeCode: string
|
code: string
|
||||||
noticeName: string
|
name: string
|
||||||
salesOrderCode: string
|
salesOrderCode: string
|
||||||
clientId: number
|
clientId: number
|
||||||
clientCode: string
|
clientCode: string
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,9 @@
|
||||||
>
|
>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="通知单编号" prop="noticeCode">
|
<el-form-item label="通知单编号" prop="code">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="formData.noticeCode"
|
v-model="formData.code"
|
||||||
placeholder="请输入通知单编号"
|
placeholder="请输入通知单编号"
|
||||||
:disabled="isHeaderReadonly"
|
:disabled="isHeaderReadonly"
|
||||||
>
|
>
|
||||||
|
|
@ -23,9 +23,9 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="通知单名称" prop="noticeName">
|
<el-form-item label="通知单名称" prop="name">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="formData.noticeName"
|
v-model="formData.name"
|
||||||
placeholder="请输入通知单名称"
|
placeholder="请输入通知单名称"
|
||||||
:disabled="isHeaderReadonly"
|
:disabled="isHeaderReadonly"
|
||||||
/>
|
/>
|
||||||
|
|
@ -156,8 +156,8 @@ const dialogTitle = computed(() => {
|
||||||
})
|
})
|
||||||
const formData = ref({
|
const formData = ref({
|
||||||
id: undefined as number | undefined,
|
id: undefined as number | undefined,
|
||||||
noticeCode: undefined,
|
code: undefined,
|
||||||
noticeName: undefined,
|
name: undefined,
|
||||||
salesOrderCode: undefined,
|
salesOrderCode: undefined,
|
||||||
clientId: undefined,
|
clientId: undefined,
|
||||||
salesDate: undefined,
|
salesDate: undefined,
|
||||||
|
|
@ -168,8 +168,8 @@ const formData = ref({
|
||||||
remark: undefined
|
remark: undefined
|
||||||
})
|
})
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
noticeCode: [{ required: true, message: '通知单编号不能为空', trigger: 'blur' }],
|
code: [{ required: true, message: '通知单编号不能为空', trigger: 'blur' }],
|
||||||
noticeName: [{ required: true, message: '通知单名称不能为空', trigger: 'blur' }],
|
name: [{ required: true, message: '通知单名称不能为空', trigger: 'blur' }],
|
||||||
clientId: [{ required: true, message: '请选择客户', trigger: 'change' }],
|
clientId: [{ required: true, message: '请选择客户', trigger: 'change' }],
|
||||||
salesDate: [{ required: true, message: '请选择发货日期', trigger: 'change' }]
|
salesDate: [{ required: true, message: '请选择发货日期', trigger: 'change' }]
|
||||||
})
|
})
|
||||||
|
|
@ -178,7 +178,7 @@ const originalFormData = ref<string>('') // 原始表单数据快照,用于脏
|
||||||
|
|
||||||
/** 生成通知单编号 */
|
/** 生成通知单编号 */
|
||||||
const generateCode = async () => {
|
const generateCode = async () => {
|
||||||
formData.value.noticeCode = await AutoCodeRecordApi.generateAutoCode(
|
formData.value.code = await AutoCodeRecordApi.generateAutoCode(
|
||||||
MesAutoCodeRuleCode.WM_SALES_NOTICE_CODE
|
MesAutoCodeRuleCode.WM_SALES_NOTICE_CODE
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
@ -261,8 +261,8 @@ const handleFinish = () => {
|
||||||
const resetForm = () => {
|
const resetForm = () => {
|
||||||
formData.value = {
|
formData.value = {
|
||||||
id: undefined,
|
id: undefined,
|
||||||
noticeCode: undefined,
|
code: undefined,
|
||||||
noticeName: undefined,
|
name: undefined,
|
||||||
salesOrderCode: undefined,
|
salesOrderCode: undefined,
|
||||||
clientId: undefined,
|
clientId: undefined,
|
||||||
salesDate: undefined,
|
salesDate: undefined,
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,8 @@
|
||||||
<el-tooltip :disabled="!selectedItem" placement="top" :show-after="500">
|
<el-tooltip :disabled="!selectedItem" placement="top" :show-after="500">
|
||||||
<template #content>
|
<template #content>
|
||||||
<div v-if="selectedItem" class="leading-6">
|
<div v-if="selectedItem" class="leading-6">
|
||||||
<div>编号:{{ selectedItem.noticeCode }}</div>
|
<div>编号:{{ selectedItem.code }}</div>
|
||||||
<div>名称:{{ selectedItem.noticeName || '-' }}</div>
|
<div>名称:{{ selectedItem.name || '-' }}</div>
|
||||||
<div>客户:{{ selectedItem.clientName || '-' }}</div>
|
<div>客户:{{ selectedItem.clientName || '-' }}</div>
|
||||||
<div>销售订单:{{ selectedItem.salesOrderCode || '-' }}</div>
|
<div>销售订单:{{ selectedItem.salesOrderCode || '-' }}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -88,7 +88,7 @@ const selectedItem = ref<WmSalesNoticeVO | undefined>() // 当前选中的发货
|
||||||
|
|
||||||
/** 输入框显示文本:展示通知单名称,保持简洁 */
|
/** 输入框显示文本:展示通知单名称,保持简洁 */
|
||||||
const displayLabel = computed(() => {
|
const displayLabel = computed(() => {
|
||||||
return selectedItem.value?.noticeName ?? ''
|
return selectedItem.value?.name ?? ''
|
||||||
})
|
})
|
||||||
|
|
||||||
/** 是否显示清除图标 */
|
/** 是否显示清除图标 */
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
<el-form :inline="true" :model="queryParams" label-width="100px">
|
<el-form :inline="true" :model="queryParams" label-width="100px">
|
||||||
<el-form-item label="通知单编号">
|
<el-form-item label="通知单编号">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.noticeCode"
|
v-model="queryParams.code"
|
||||||
placeholder="请输入通知单编号"
|
placeholder="请输入通知单编号"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter="handleQuery"
|
@keyup.enter="handleQuery"
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="通知单名称">
|
<el-form-item label="通知单名称">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.noticeName"
|
v-model="queryParams.name"
|
||||||
placeholder="请输入通知单名称"
|
placeholder="请输入通知单名称"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter="handleQuery"
|
@keyup.enter="handleQuery"
|
||||||
|
|
@ -109,8 +109,8 @@
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="通知单编号" align="center" prop="noticeCode" width="180" />
|
<el-table-column label="通知单编号" align="center" prop="code" width="180" />
|
||||||
<el-table-column label="通知单名称" align="left" prop="noticeName" min-width="150" />
|
<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="salesOrderCode" width="160" />
|
||||||
<el-table-column label="客户名称" align="center" prop="clientName" width="120" />
|
<el-table-column label="客户名称" align="center" prop="clientName" width="120" />
|
||||||
<el-table-column label="发货日期" align="center" prop="salesDate" width="120">
|
<el-table-column label="发货日期" align="center" prop="salesDate" width="120">
|
||||||
|
|
@ -212,8 +212,8 @@ const handleRowDblClick = (row: WmSalesNoticeVO) => {
|
||||||
const queryParams = reactive({
|
const queryParams = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
noticeCode: undefined as string | undefined,
|
code: undefined as string | undefined,
|
||||||
noticeName: undefined as string | undefined,
|
name: undefined as string | undefined,
|
||||||
salesOrderCode: undefined as string | undefined,
|
salesOrderCode: undefined as string | undefined,
|
||||||
clientId: undefined as number | undefined,
|
clientId: undefined as number | undefined,
|
||||||
status: undefined as number | undefined
|
status: undefined as number | undefined
|
||||||
|
|
@ -265,8 +265,8 @@ const handleQuery = () => {
|
||||||
|
|
||||||
/** 重置查询条件 */
|
/** 重置查询条件 */
|
||||||
const resetQuery = () => {
|
const resetQuery = () => {
|
||||||
queryParams.noticeCode = undefined
|
queryParams.code = undefined
|
||||||
queryParams.noticeName = undefined
|
queryParams.name = undefined
|
||||||
queryParams.salesOrderCode = undefined
|
queryParams.salesOrderCode = undefined
|
||||||
queryParams.clientId = undefined
|
queryParams.clientId = undefined
|
||||||
queryParams.status = props.status
|
queryParams.status = props.status
|
||||||
|
|
@ -297,8 +297,8 @@ const confirmSelect = () => {
|
||||||
const open = async (selectedIds?: number[]) => {
|
const open = async (selectedIds?: number[]) => {
|
||||||
dialogVisible.value = true
|
dialogVisible.value = true
|
||||||
// 重置查询条件 + 页码,避免二次打开继承上次过滤上下文
|
// 重置查询条件 + 页码,避免二次打开继承上次过滤上下文
|
||||||
queryParams.noticeCode = undefined
|
queryParams.code = undefined
|
||||||
queryParams.noticeName = undefined
|
queryParams.name = undefined
|
||||||
queryParams.salesOrderCode = undefined
|
queryParams.salesOrderCode = undefined
|
||||||
queryParams.clientId = undefined
|
queryParams.clientId = undefined
|
||||||
queryParams.status = props.status != null ? props.status : undefined
|
queryParams.status = props.status != null ? props.status : undefined
|
||||||
|
|
|
||||||
|
|
@ -7,18 +7,18 @@
|
||||||
:inline="true"
|
:inline="true"
|
||||||
label-width="100px"
|
label-width="100px"
|
||||||
>
|
>
|
||||||
<el-form-item label="通知单编号" prop="noticeCode">
|
<el-form-item label="通知单编号" prop="code">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.noticeCode"
|
v-model="queryParams.code"
|
||||||
placeholder="请输入通知单编号"
|
placeholder="请输入通知单编号"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter="handleQuery"
|
@keyup.enter="handleQuery"
|
||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="通知单名称" prop="noticeName">
|
<el-form-item label="通知单名称" prop="name">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.noticeName"
|
v-model="queryParams.name"
|
||||||
placeholder="请输入通知单名称"
|
placeholder="请输入通知单名称"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter="handleQuery"
|
@keyup.enter="handleQuery"
|
||||||
|
|
@ -63,14 +63,14 @@
|
||||||
|
|
||||||
<ContentWrap>
|
<ContentWrap>
|
||||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
<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">
|
<template #default="scope">
|
||||||
<el-button link type="primary" @click="openForm('detail', scope.row.id)">
|
<el-button link type="primary" @click="openForm('detail', scope.row.id)">
|
||||||
{{ scope.row.noticeCode }}
|
{{ scope.row.code }}
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</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="salesOrderCode" min-width="140" />
|
||||||
<el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />
|
<el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
|
@ -154,8 +154,8 @@ const exportLoading = ref(false) // 导出的加载中
|
||||||
const queryParams = reactive({
|
const queryParams = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
noticeCode: undefined,
|
code: undefined,
|
||||||
noticeName: undefined,
|
name: undefined,
|
||||||
salesOrderCode: undefined,
|
salesOrderCode: undefined,
|
||||||
clientId: undefined
|
clientId: undefined
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue