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

feat(mes): 完善计量单位、物料导入与客户管理前端 

1. 计量单位管理：新增 API + 列表页 + 表单（UnitMeasureForm）
2. 物料单位选择器：MdItemForm 单位字段从 el-input 改为 el-select 下拉
3. 物料导入：新增 MdItemImportForm 组件（上传 Excel、下载模板、更新已有数据）
4. 物料导入权限：v-hasPermi 改为 mes:md-item:import
5. API VO 字段调整：unitOfMeasure → unitMeasureId + unitMeasureName
6. 客户管理：新增 API + 列表页 + 表单（MdClientForm）
pull/871/MERGE
YunaiV 2026-02-15 22:18:46 +08:00
parent 27f5fcb66e
commit 5153adf1cf
7 changed files with 480 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/mes/md/item/index.ts
View File

@ -6,7 +6,8 @@ export interface MdItemVO {
code: string // 物料编码
name: string // 物料名称
specification: string // 规格型号
unitOfMeasure: string // 单位编码
unitMeasureId: number // 计量单位编号
unitMeasureName?: string // 计量单位名称
itemTypeId: number // 物料分类编号
itemTypeName?: string // 物料分类名称
itemOrProduct?: string // 物料/产品标识
@ -54,5 +55,10 @@ export const MdItemApi = {
// 导出物料产品 Excel
exportItem: async (params: any) => {
return await request.download({ url: `/mes/md/item/export-excel`, params })
},
// 下载物料导入模板
importTemplate: async () => {
return await request.download({ url: `/mes/md/item/get-import-template` })
}
}

51
src/api/mes/md/unitmeasure/index.ts Normal file
View File

@ -0,0 +1,51 @@
import request from '@/config/axios'
// MES 计量单位 VO
export interface MdUnitMeasureVO {
id: number // 单位编号
code: string // 单位编码
name: string // 单位名称
primaryFlag: boolean // 是否主单位
primaryId: number // 主单位编号
changeRate: number // 与主单位换算比例
status: number // 状态
remark: string // 备注
}
// MES 计量单位 API
export const MdUnitMeasureApi = {
// 查询计量单位分页
getUnitMeasurePage: async (params: any) => {
return await request.get({ url: `/mes/md/unit-measure/page`, params })
},
// 查询计量单位精简列表
getUnitMeasureSimpleList: async () => {
return await request.get({ url: `/mes/md/unit-measure/simple-list` })
},
// 查询计量单位详情
getUnitMeasure: async (id: number) => {
return await request.get({ url: `/mes/md/unit-measure/get?id=` + id })
},
// 新增计量单位
createUnitMeasure: async (data: MdUnitMeasureVO) => {
return await request.post({ url: `/mes/md/unit-measure/create`, data })
},
// 修改计量单位
updateUnitMeasure: async (data: MdUnitMeasureVO) => {
return await request.put({ url: `/mes/md/unit-measure/update`, data })
},
// 删除计量单位
deleteUnitMeasure: async (id: number) => {
return await request.delete({ url: `/mes/md/unit-measure/delete?id=` + id })
},
// 导出计量单位 Excel
exportUnitMeasure: async (params: any) => {
return await request.download({ url: `/mes/md/unit-measure/export-excel`, params })
}
}

5
src/utils/dict.ts
View File

@ -250,5 +250,8 @@ export enum DICT_TYPE {
IOT_OTA_TASK_STATUS = 'iot_ota_task_status', // IoT OTA 任务状态
IOT_OTA_TASK_RECORD_STATUS = 'iot_ota_task_record_status', // IoT OTA 记录状态
IOT_MODBUS_MODE = 'iot_modbus_mode', // IoT Modbus 工作模式
IOT_MODBUS_FRAME_FORMAT = 'iot_modbus_frame_format' // IoT Modbus 帧格式
IOT_MODBUS_FRAME_FORMAT = 'iot_modbus_frame_format', // IoT Modbus 帧格式
// ========== MES - 制造执行系统模块 ==========
MES_CLIENT_TYPE = 'mes_client_type' // MES 客户类型
}

21
src/views/mes/md/item/MdItemForm.vue
View File

@ -31,8 +31,15 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位" prop="unitOfMeasure">
<el-input v-model="formData.unitOfMeasure" placeholder="请输入单位编码" />
<el-form-item label="单位" prop="unitMeasureId">
<el-select v-model="formData.unitMeasureId" placeholder="请选择计量单位" class="w-1/1">
<el-option
v-for="item in unitMeasureList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
@ -138,6 +145,7 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { generateRandomStr } from '@/utils'
import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
import { MdItemTypeApi, MdItemTypeVO } from '@/api/mes/md/item/type'
import { MdUnitMeasureApi, MdUnitMeasureVO } from '@/api/mes/md/unitmeasure'
import { CommonStatusEnum } from '@/utils/constants'
import { defaultProps, handleTree } from '@/utils/tree'
@ -157,7 +165,7 @@ const formData = ref({
code: undefined,
name: undefined,
specification: undefined,
unitOfMeasure: undefined,
unitMeasureId: undefined,
itemTypeId: undefined,
status: CommonStatusEnum.ENABLE,
safeStockFlag: false,
@ -170,12 +178,13 @@ const formData = ref({
const formRules = reactive({
code: [{ required: true, message: '物料编码不能为空', trigger: 'blur' }],
name: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
unitOfMeasure: [{ required: true, message: '单位编码不能为空', trigger: 'blur' }],
unitMeasureId: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
itemTypeId: [{ required: true, message: '物料分类不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
const itemTypeList = ref<MdItemTypeVO[]>([]) // 物料分类列表
const unitMeasureList = ref<MdUnitMeasureVO[]>([]) // 计量单位列表
/** 生成物料编码 */
const generateCode = () => {
@ -202,6 +211,8 @@ const open = async (type: string, id?: number) => {
// 物料分类
const categoryData = await MdItemTypeApi.getItemTypeSimpleList()
itemTypeList.value = handleTree(categoryData, 'id', 'parentId')
// 计量单位
unitMeasureList.value = await MdUnitMeasureApi.getUnitMeasureSimpleList()
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@ -236,7 +247,7 @@ const resetForm = () => {
code: undefined,
name: undefined,
specification: undefined,
unitOfMeasure: undefined,
unitMeasureId: undefined,
itemTypeId: undefined,
status: CommonStatusEnum.ENABLE,
safeStockFlag: false,

19
src/views/mes/md/item/index.vue
View File

@ -65,6 +65,14 @@
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="warning"
plain
@click="handleImport"
v-hasPermi="['mes:md-item:import']"
>
<Icon icon="ep:upload" class="mr-5px" /> 导入
</el-button>
<el-button
type="success"
plain
@ -84,7 +92,7 @@
<el-table-column label="物料编码" align="center" prop="code" />
<el-table-column label="物料名称" align="center" prop="name" />
<el-table-column label="规格型号" align="center" prop="specification" />
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="单位" align="center" prop="unitMeasureName" />
<el-table-column label="物料分类" align="center" prop="itemTypeName" />
<el-table-column label="物料/产品" align="center" prop="itemOrProduct">
<template #default="scope">
@ -142,6 +150,8 @@
<!-- 表单弹窗：添加/修改 -->
<MdItemForm ref="formRef" @success="getList" />
<!-- 物料导入对话框 -->
<MdItemImportForm ref="importFormRef" @success="getList" />
</template>
<script setup lang="ts">
@ -150,6 +160,7 @@ import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
import MdItemForm from './MdItemForm.vue'
import MdItemImportForm from './MdItemImportForm.vue'
import ItemTypeTree from './ItemTypeTree.vue'
import { getItemOrProductLabel } from '@/views/mes/utils/constants'
@ -222,6 +233,12 @@ const handleDelete = async (id: number) => {
} catch {}
}
/** 物料导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
/** 导出按钮操作 */
const handleExport = async () => {
try {

175
src/views/mes/md/unitmeasure/UnitMeasureForm.vue Normal file
View File

@ -0,0 +1,175 @@
<!-- MES 计量单位表单 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="120px"
v-loading="formLoading"
>
<el-form-item label="单位编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入单位编码" />
</el-form-item>
<el-form-item label="单位名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入单位名称" />
</el-form-item>
<el-form-item label="是否主单位" prop="primaryFlag">
<el-radio-group v-model="formData.primaryFlag">
<el-radio
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value"
:value="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="主单位" prop="primaryId" v-if="formData.primaryFlag === false">
<el-select v-model="formData.primaryId" placeholder="请选择主单位" class="w-1/1">
<el-option
v-for="item in primaryUnitList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item
label="与主单位换算比例"
prop="changeRate"
v-if="formData.primaryFlag === false"
>
<el-input-number
v-model="formData.changeRate"
:step="1"
:precision="4"
:min="0"
class="!w-1/1"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:value="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { getBoolDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { MdUnitMeasureApi, MdUnitMeasureVO } from '@/api/mes/md/unitmeasure'
import { CommonStatusEnum } from '@/utils/constants'
defineOptions({ name: 'UnitMeasureForm' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({
id: undefined as unknown as number,
code: undefined as unknown as string,
name: undefined as unknown as string,
primaryFlag: true as boolean,
primaryId: undefined as unknown as number,
changeRate: undefined as unknown as number,
status: CommonStatusEnum.ENABLE,
remark: undefined as unknown as string
})
const formRules = reactive({
code: [{ required: true, message: '单位编码不能为空', trigger: 'blur' }],
name: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
primaryFlag: [{ required: true, message: '是否主单位不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
const primaryUnitList = ref<MdUnitMeasureVO[]>([]) // 主单位列表
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
// 加载主单位列表（用于辅单位选择主单位）
await getPrimaryUnitList()
// 修改时，设置数据
if (id) {
formLoading.value = true
try {
formData.value = await MdUnitMeasureApi.getUnitMeasure(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
/** 获取主单位列表 */
const getPrimaryUnitList = async () => {
const list = await MdUnitMeasureApi.getUnitMeasureSimpleList()
// 过滤出主单位
primaryUnitList.value = list.filter((item: MdUnitMeasureVO) => item.primaryFlag === true)
}
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
// 如果是主单位，清空主单位和换算比例
if (formData.value.primaryFlag) {
formData.value.primaryId = undefined as unknown as number
formData.value.changeRate = undefined as unknown as number
}
// 提交请求
formLoading.value = true
try {
const data = formData.value as unknown as MdUnitMeasureVO
if (formType.value === 'create') {
await MdUnitMeasureApi.createUnitMeasure(data)
message.success(t('common.createSuccess'))
} else {
await MdUnitMeasureApi.updateUnitMeasure(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
// 发送操作成功的事件
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
code: undefined,
name: undefined,
primaryFlag: true,
primaryId: undefined,
changeRate: undefined,
status: CommonStatusEnum.ENABLE,
remark: undefined
}
formRef.value?.resetFields()
}
</script>

209
src/views/mes/md/unitmeasure/index.vue Normal file
View File

@ -0,0 +1,209 @@
<!-- MES 计量单位列表 -->
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="单位编码" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入单位编码"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="单位名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入单位名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['mes:md-unit-measure:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:md-unit-measure:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="单位编码" align="center" prop="code" />
<el-table-column label="单位名称" align="center" prop="name" />
<el-table-column label="是否主单位" align="center" prop="primaryFlag">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.primaryFlag" />
</template>
</el-table-column>
<el-table-column label="与主单位换算比例" align="center" prop="changeRate" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" width="130">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:md-unit-measure:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:md-unit-measure:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<UnitMeasureForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { MdUnitMeasureApi, MdUnitMeasureVO } from '@/api/mes/md/unitmeasure'
import UnitMeasureForm from './UnitMeasureForm.vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
defineOptions({ name: 'MesMdUnitMeasure' })
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const list = ref<MdUnitMeasureVO[]>([]) // 列表的数据
const total = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
name: undefined,
status: undefined
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await MdUnitMeasureApi.getUnitMeasurePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await MdUnitMeasureApi.deleteUnitMeasure(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
// 导出的二次确认
await message.exportConfirm()
// 发起导出
exportLoading.value = true
const data = await MdUnitMeasureApi.exportUnitMeasure(queryParams)
download.excel(data, '计量单位.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>