系统性修复 MES migration review(INDEX.md,MES-R001~R042)发现的迁移问题, 覆盖 web-antd 与 web-ele 两端,按严重级别从 P0 到 P3。 P0 - B001: DICT_TYPE/BarcodeBizTypeEnum 等常量从 'vue' 误导入致 TS2305/运行时崩溃, 改从 @vben/constants 导入(20 个文件)。 P1 - B002 itemreceipt 入库单名称误必填;B003 条码工单选择补 CONFIRMED 过滤; B004 库存台账冻结开关补更新权限禁用;B005 returnsales 上架明细批次号误必填; B006 checkrecord/maintenrecord 计划/执行人误必填;B007 returnsales 退货行 rqcCheckFlag 默认改回 false;B019 OQC 预填 checkQuantity 缺省取 outQuantity; B024 repair 完成维修态放开 finishDate 录入;B025 tool 编码管理类型库存数量锁定为 1; B027 详情态自动编码按钮隐藏/禁用(md/cal/dv/tm 13 模块)。 P2 - B008 IPQC 废品数量补 0 默认值;B009 共享选择器去掉 catch+console.error 吞错; B011 route 自定义 SFC 改 markRaw;B012 ele 自动编码按钮去 type:'default'; B014 md 编辑态编码字段误禁用;B015 dv/subject 选择器仅展示启用项(保留历史回显); B016 盘点结果回填 batchId;B017 源 vue3 miscissue 业务类型字典误用 getStrDictOptions; B018 stocktaking/plan 盘点条件表单 schema 化;B020 清理 TODO @AI; B026 repair 验收信息字段按状态门控只读。 P3 - B010 QcIndicatorSelect 去吞错;B013/B019/B030/B031 componentProps、列对象多行化等 code style;B021 自动编码循环方式列条件展示;B022 盘点结果选中清单行后字段禁用; B023 质检指标 resultSpecification 抽 ResultSpecificationInput 消除重复 fieldName; B032 barcode/batch/sn API 字段补注释。 风格统一 - getTitle 统一为「特殊态 if 提前 return + create/update 三元」(pro/card、 stocktaking/task、repair);headerReadonly 抽 isHeaderReadonly 辅助函数对齐 pro/workorder/transfer 写法;computed 解释注释移入 computed 内部。 验证: - 两端 pnpm exec eslint 改动文件通过 - 两端 pnpm -F @vben/web-antd / @vben/web-ele exec vue-tsc 过滤 src/views/mes、 api/mes 无报错 - git diff --check 通过 备注:R037(defectrecord 命名漂移)经复核为原 finding 前提有误(两端本就一致), 已 rejected,未占 MES-B 编号。R008/R009 为 disputed 待裁决。 本提交仅含 src/views/mes 与 src/api/mes 下文件,排除 .env.development、vite.config.ts、 infra/codegen、docs changelog 等无关旁支改动。
478 lines
11 KiB
TypeScript
478 lines
11 KiB
TypeScript
import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
|
|
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
|
|
import type { MesMdClientApi } from '#/api/mes/md/client';
|
|
|
|
import { h } from 'vue';
|
|
|
|
import { CommonStatusEnum, DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants';
|
|
import { getDictOptions } from '@vben/hooks';
|
|
|
|
import { ElButton } from 'element-plus';
|
|
|
|
import { z } from '#/adapter/form';
|
|
import { generateAutoCode } from '#/api/mes/md/autocode/record';
|
|
|
|
/** 表单类型 */
|
|
export type FormType = 'create' | 'detail' | 'update';
|
|
|
|
/** 新增/修改客户的表单 */
|
|
export function useFormSchema(
|
|
formType: FormType,
|
|
formApi?: VbenFormApi,
|
|
): VbenFormSchema[] {
|
|
return [
|
|
{
|
|
fieldName: 'id',
|
|
component: 'Input',
|
|
dependencies: {
|
|
triggerFields: [''],
|
|
show: () => false,
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'code',
|
|
label: '客户编码',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入客户编码',
|
|
},
|
|
rules: 'required',
|
|
suffix:
|
|
formType === 'detail'
|
|
? undefined
|
|
: () =>
|
|
h(
|
|
ElButton,
|
|
{
|
|
onClick: async () => {
|
|
const code = await generateAutoCode(
|
|
MesAutoCodeRuleCode.MD_CLIENT_CODE,
|
|
);
|
|
await formApi?.setFieldValue('code', code);
|
|
},
|
|
},
|
|
{ default: () => '自动生成' },
|
|
),
|
|
},
|
|
{
|
|
fieldName: 'name',
|
|
label: '客户名称',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入客户名称',
|
|
},
|
|
rules: z.string().min(1, '客户名称不能为空').max(100),
|
|
},
|
|
{
|
|
fieldName: 'nickname',
|
|
label: '客户简称',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入客户简称',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'englishName',
|
|
label: '客户英文名称',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入客户英文名称',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'type',
|
|
label: '客户类型',
|
|
component: 'Select',
|
|
componentProps: {
|
|
clearable: true,
|
|
options: getDictOptions(DICT_TYPE.MES_CLIENT_TYPE, 'number'),
|
|
placeholder: '请选择客户类型',
|
|
},
|
|
rules: 'selectRequired',
|
|
},
|
|
{
|
|
fieldName: 'description',
|
|
label: '客户简介',
|
|
component: 'Textarea',
|
|
formItemClass: 'col-span-3',
|
|
componentProps: {
|
|
placeholder: '请输入客户简介',
|
|
rows: 2,
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'address',
|
|
label: '客户地址',
|
|
component: 'Textarea',
|
|
formItemClass: 'col-span-3',
|
|
componentProps: {
|
|
placeholder: '请输入客户地址',
|
|
rows: 2,
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'website',
|
|
label: '客户官网地址',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入客户官网地址',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'email',
|
|
label: '客户邮箱地址',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入客户邮箱地址',
|
|
},
|
|
rules: z.string().email('邮箱格式不正确').or(z.literal('')).optional(),
|
|
},
|
|
{
|
|
fieldName: 'telephone',
|
|
label: '客户电话',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入客户电话',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'logo',
|
|
label: '客户 LOGO',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入客户 LOGO 地址',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'contact1Name',
|
|
label: '联系人1',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入联系人1',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'contact1Telephone',
|
|
label: '联系人1电话',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入联系人1电话',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'contact1Email',
|
|
label: '联系人1邮箱',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入联系人1邮箱',
|
|
},
|
|
rules: z.string().email('邮箱格式不正确').or(z.literal('')).optional(),
|
|
},
|
|
{
|
|
fieldName: 'contact2Name',
|
|
label: '联系人2',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入联系人2',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'contact2Telephone',
|
|
label: '联系人2电话',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入联系人2电话',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'contact2Email',
|
|
label: '联系人2邮箱',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入联系人2邮箱',
|
|
},
|
|
rules: z.string().email('邮箱格式不正确').or(z.literal('')).optional(),
|
|
},
|
|
{
|
|
fieldName: 'creditCode',
|
|
label: '社会信用代码',
|
|
component: 'Input',
|
|
componentProps: {
|
|
placeholder: '请输入统一社会信用代码',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'status',
|
|
label: '状态',
|
|
component: 'RadioGroup',
|
|
componentProps: {
|
|
options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
|
|
},
|
|
rules: z.number().default(CommonStatusEnum.ENABLE),
|
|
},
|
|
{
|
|
fieldName: 'remark',
|
|
label: '备注',
|
|
component: 'Textarea',
|
|
formItemClass: 'col-span-3',
|
|
componentProps: {
|
|
placeholder: '请输入备注',
|
|
rows: 3,
|
|
},
|
|
},
|
|
];
|
|
}
|
|
|
|
/** 导入客户的表单 */
|
|
export function useImportFormSchema(): VbenFormSchema[] {
|
|
return [
|
|
{
|
|
fieldName: 'file',
|
|
label: '客户数据',
|
|
component: 'Upload',
|
|
rules: 'required',
|
|
help: '仅允许导入 xls、xlsx 格式文件',
|
|
},
|
|
{
|
|
fieldName: 'updateSupport',
|
|
label: '是否覆盖',
|
|
component: 'Switch',
|
|
componentProps: {
|
|
activeText: '是',
|
|
inactiveText: '否',
|
|
inlinePrompt: true,
|
|
},
|
|
rules: z.boolean().default(false),
|
|
help: '是否更新已经存在的客户数据',
|
|
},
|
|
];
|
|
}
|
|
|
|
/** 列表的搜索表单 */
|
|
export function useGridFormSchema(): VbenFormSchema[] {
|
|
return [
|
|
{
|
|
fieldName: 'code',
|
|
label: '客户编码',
|
|
component: 'Input',
|
|
componentProps: {
|
|
clearable: true,
|
|
placeholder: '请输入客户编码',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'name',
|
|
label: '客户名称',
|
|
component: 'Input',
|
|
componentProps: {
|
|
clearable: true,
|
|
placeholder: '请输入客户名称',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'nickname',
|
|
label: '客户简称',
|
|
component: 'Input',
|
|
componentProps: {
|
|
clearable: true,
|
|
placeholder: '请输入客户简称',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'englishName',
|
|
label: '英文名称',
|
|
component: 'Input',
|
|
componentProps: {
|
|
clearable: true,
|
|
placeholder: '请输入客户英文名称',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'type',
|
|
label: '客户类型',
|
|
component: 'Select',
|
|
componentProps: {
|
|
clearable: true,
|
|
options: getDictOptions(DICT_TYPE.MES_CLIENT_TYPE, 'number'),
|
|
placeholder: '请选择客户类型',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'status',
|
|
label: '状态',
|
|
component: 'Select',
|
|
componentProps: {
|
|
clearable: true,
|
|
options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
|
|
placeholder: '请选择状态',
|
|
},
|
|
},
|
|
];
|
|
}
|
|
|
|
/** 列表的字段 */
|
|
export function useGridColumns(): VxeTableGridOptions<MesMdClientApi.Client>['columns'] {
|
|
return [
|
|
{
|
|
field: 'code',
|
|
title: '客户编码',
|
|
minWidth: 150,
|
|
slots: { default: 'code' },
|
|
},
|
|
{
|
|
field: 'name',
|
|
title: '客户名称',
|
|
minWidth: 160,
|
|
},
|
|
{
|
|
field: 'nickname',
|
|
title: '客户简称',
|
|
minWidth: 130,
|
|
},
|
|
{
|
|
field: 'type',
|
|
title: '客户类型',
|
|
width: 120,
|
|
cellRender: {
|
|
name: 'CellDict',
|
|
props: { type: DICT_TYPE.MES_CLIENT_TYPE },
|
|
},
|
|
},
|
|
{
|
|
field: 'telephone',
|
|
title: '客户电话',
|
|
minWidth: 140,
|
|
},
|
|
{
|
|
field: 'contact1Name',
|
|
title: '联系人1',
|
|
width: 120,
|
|
},
|
|
{
|
|
field: 'contact1Telephone',
|
|
title: '联系人1电话',
|
|
minWidth: 140,
|
|
},
|
|
{
|
|
field: 'status',
|
|
title: '状态',
|
|
width: 120,
|
|
cellRender: {
|
|
name: 'CellDict',
|
|
props: { type: DICT_TYPE.COMMON_STATUS },
|
|
},
|
|
},
|
|
{
|
|
field: 'createTime',
|
|
title: '创建时间',
|
|
width: 180,
|
|
formatter: 'formatDateTime',
|
|
},
|
|
{
|
|
title: '操作',
|
|
width: 160,
|
|
fixed: 'right',
|
|
slots: { default: 'actions' },
|
|
},
|
|
];
|
|
}
|
|
|
|
/** 客户选择弹窗的搜索表单 */
|
|
export function useClientSelectGridFormSchema(): VbenFormSchema[] {
|
|
return [
|
|
{
|
|
fieldName: 'code',
|
|
label: '客户编码',
|
|
component: 'Input',
|
|
componentProps: {
|
|
clearable: true,
|
|
placeholder: '请输入客户编码',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'name',
|
|
label: '客户名称',
|
|
component: 'Input',
|
|
componentProps: {
|
|
clearable: true,
|
|
placeholder: '请输入客户名称',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'nickname',
|
|
label: '客户简称',
|
|
component: 'Input',
|
|
componentProps: {
|
|
clearable: true,
|
|
placeholder: '请输入客户简称',
|
|
},
|
|
},
|
|
{
|
|
fieldName: 'englishName',
|
|
label: '英文名称',
|
|
component: 'Input',
|
|
componentProps: {
|
|
clearable: true,
|
|
placeholder: '请输入客户英文名称',
|
|
},
|
|
},
|
|
];
|
|
}
|
|
|
|
/** 客户选择弹窗的字段 */
|
|
export function useClientSelectGridColumns(
|
|
multiple = true,
|
|
): VxeTableGridOptions<MesMdClientApi.Client>['columns'] {
|
|
return [
|
|
{ type: multiple ? 'checkbox' : 'radio', width: 50 },
|
|
{
|
|
field: 'code',
|
|
title: '客户编码',
|
|
minWidth: 160,
|
|
},
|
|
{
|
|
field: 'name',
|
|
title: '客户名称',
|
|
minWidth: 160,
|
|
},
|
|
{
|
|
field: 'nickname',
|
|
title: '客户简称',
|
|
width: 120,
|
|
},
|
|
{
|
|
field: 'type',
|
|
title: '客户类型',
|
|
width: 110,
|
|
cellRender: {
|
|
name: 'CellDict',
|
|
props: { type: DICT_TYPE.MES_CLIENT_TYPE },
|
|
},
|
|
},
|
|
{
|
|
field: 'contact1Name',
|
|
title: '联系人',
|
|
width: 120,
|
|
},
|
|
{
|
|
field: 'telephone',
|
|
title: '联系电话',
|
|
width: 140,
|
|
},
|
|
{
|
|
field: 'contact1Telephone',
|
|
title: '联系人电话',
|
|
width: 140,
|
|
},
|
|
{
|
|
field: 'status',
|
|
title: '状态',
|
|
width: 100,
|
|
cellRender: {
|
|
name: 'CellDict',
|
|
props: { type: DICT_TYPE.COMMON_STATUS },
|
|
},
|
|
},
|
|
];
|
|
}
|