diff --git a/src/api/mes/partternType/index.ts b/src/api/mes/partternType/index.ts deleted file mode 100644 index 29002581a..000000000 --- a/src/api/mes/partternType/index.ts +++ /dev/null @@ -1,54 +0,0 @@ -import request from '@/config/axios' - -export interface PartternTypeVO { - deleteTime: Date - id: number - status: string - concurrencyStamp: number - remark: string - deleter: string - siteId: number - code: string - name: string -} - -// 查询模具类型列表 -export const getPartternTypePage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = {...params} - return await request.post({ url: '/mes/parttern-type/senior', data }) - } else { - return await request.get({ url: `/mes/parttern-type/page`, params }) - } -} - -// 查询模具类型详情 -export const getPartternType = async (id: number) => { - return await request.get({ url: `/mes/parttern-type/get?id=` + id }) -} - -// 新增模具类型 -export const createPartternType = async (data: PartternTypeVO) => { - return await request.post({ url: `/mes/parttern-type/create`, data }) -} - -// 修改模具类型 -export const updatePartternType = async (data: PartternTypeVO) => { - return await request.put({ url: `/mes/parttern-type/update`, data }) -} - -// 删除模具类型 -export const deletePartternType = async (id: number) => { - return await request.delete({ url: `/mes/parttern-type/delete?id=` + id }) -} - -// 导出模具类型 Excel -export const exportPartternType = async (params) => { - return await request.download({ url: `/mes/parttern-type/export-excel`, params }) -} - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/mes/parttern-type/get-import-template' }) -} \ No newline at end of file diff --git a/src/api/mes/pattern/index.ts b/src/api/mes/pattern/index.ts new file mode 100644 index 000000000..2ee80689b --- /dev/null +++ b/src/api/mes/pattern/index.ts @@ -0,0 +1,66 @@ +import request from '@/config/axios' + +export interface PatternVO { + deleteTime: Date + id: number + status: string + concurrencyStamp: number + remark: string + deleter: string + siteId: number + code: string + name: string + partternName: string + productCode: string + dateUseStart: Date + dateUseStop: Date + partternFrom: string + partternGo: string + initCout: number + effectStart: Date + effectEnd: Date + factoryCode: string + factoryName: string + factoryType: string +} + +// 查询模具基本信息列表 +export const getPatternPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/mes/pattern/senior', data }) + } else { + return await request.get({ url: `/mes/pattern/page`, params }) + } +} + +// 查询模具基本信息详情 +export const getPattern = async (id: number) => { + return await request.get({ url: `/mes/pattern/get?id=` + id }) +} + +// 新增模具基本信息 +export const createPattern = async (data: PatternVO) => { + return await request.post({ url: `/mes/pattern/create`, data }) +} + +// 修改模具基本信息 +export const updatePattern = async (data: PatternVO) => { + return await request.put({ url: `/mes/pattern/update`, data }) +} + +// 删除模具基本信息 +export const deletePattern = async (id: number) => { + return await request.delete({ url: `/mes/pattern/delete?id=` + id }) +} + +// 导出模具基本信息 Excel +export const exportPattern = async (params) => { + return await request.download({ url: `/mes/pattern/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/mes/pattern/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/mes/patternType/index.ts b/src/api/mes/patternType/index.ts new file mode 100644 index 000000000..f4bf226df --- /dev/null +++ b/src/api/mes/patternType/index.ts @@ -0,0 +1,54 @@ +import request from '@/config/axios' + +export interface PatternTypeVO { + deleteTime: Date + id: number + status: string + concurrencyStamp: number + remark: string + deleter: string + siteId: number + code: string + name: string +} + +// 查询模具类型列表 +export const getPatternTypePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/mes/pattern-type/senior', data }) + } else { + return await request.get({ url: `/mes/pattern-type/page`, params }) + } +} + +// 查询模具类型详情 +export const getPatternType = async (id: number) => { + return await request.get({ url: `/mes/pattern-type/get?id=` + id }) +} + +// 新增模具类型 +export const createPatternType = async (data: PatternTypeVO) => { + return await request.post({ url: `/mes/pattern-type/create`, data }) +} + +// 修改模具类型 +export const updatePatternType = async (data: PatternTypeVO) => { + return await request.put({ url: `/mes/pattern-type/update`, data }) +} + +// 删除模具类型 +export const deletePatternType = async (id: number) => { + return await request.delete({ url: `/mes/pattern-type/delete?id=` + id }) +} + +// 导出模具类型 Excel +export const exportPatternType = async (params) => { + return await request.download({ url: `/mes/pattern-type/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/mes/pattern-type/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/mes/pattern/index.vue b/src/views/mes/pattern/index.vue new file mode 100644 index 000000000..7d201886a --- /dev/null +++ b/src/views/mes/pattern/index.vue @@ -0,0 +1,244 @@ + + + diff --git a/src/views/mes/pattern/pattern.data.ts b/src/views/mes/pattern/pattern.data.ts new file mode 100644 index 000000000..35d2afb1d --- /dev/null +++ b/src/views/mes/pattern/pattern.data.ts @@ -0,0 +1,217 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const PatternRules = reactive({ + concurrencyStamp: [required], +}) + +export const Pattern = useCrudSchemas(reactive([ + { + label: '删除时间', + field: 'deleteTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '主键', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '删除用户名', + field: 'deleter', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '位置ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '模具编码', + field: 'code', + sort: 'custom', + isSearch: true, + }, + { + label: '模具名称', + field: 'name', + sort: 'custom', + isSearch: true, + }, + { + label: '模具类型', + field: 'partternName', + sort: 'custom', + isSearch: true, + }, + { + label: '产品编码', + field: 'productCode', + sort: 'custom', + isSearch: true, + }, + { + label: '启用时间', + field: 'dateUseStart', + sort: 'custom', + isSearch: true, + }, + { + label: '停用时间', + field: 'dateUseStop', + sort: 'custom', + isSearch: true, + }, + { + label: '模具来源', + field: 'partternFrom', + sort: 'custom', + isSearch: true, + }, + { + label: '模具去向', + field: 'partternGo', + sort: 'custom', + isSearch: true, + }, + { + label: '模具初始数量', + field: 'initCout', + sort: 'custom', + isSearch: true, + }, + { + label: '有效期开始时间', + field: 'effectStart', + sort: 'custom', + isSearch: true, + }, + { + label: '有效期结束时间', + field: 'effectEnd', + sort: 'custom', + isSearch: true, + }, + { + label: '所属单位编码', + field: 'factoryCode', + sort: 'custom', + isSearch: true, + }, + { + label: '所属单位名称', + field: 'factoryName', + sort: 'custom', + isSearch: true, + }, + { + label: '所属单位类别', + field: 'factoryType', + sort: 'custom', + isSearch: true, + }, + { + label: '状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.QUALIFY_STATUS, + dictClass: 'string', + isForm: true, + isSearch: true, + isTable: true, + form: { + component: 'Switch', + value: '2', + componentProps: { + inactiveValue: '2', + activeValue: '1' + } + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + isDetail:false, + table: { + width: 150, + fixed: 'right' + } + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false, + isTable: false + } +])) diff --git a/src/views/mes/partternType/index.vue b/src/views/mes/patternType/index.vue similarity index 76% rename from src/views/mes/partternType/index.vue rename to src/views/mes/patternType/index.vue index 77a6cefb8..acedd71fe 100644 --- a/src/views/mes/partternType/index.vue +++ b/src/views/mes/patternType/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/mes/partternType/partternType.data.ts b/src/views/mes/patternType/patternType.data.ts similarity index 95% rename from src/views/mes/partternType/partternType.data.ts rename to src/views/mes/patternType/patternType.data.ts index 2cf9df99c..3ec104df8 100644 --- a/src/views/mes/partternType/partternType.data.ts +++ b/src/views/mes/patternType/patternType.data.ts @@ -2,11 +2,12 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' // 表单校验 -export const PartternTypeRules = reactive({ +export const PatternTypeRules = reactive({ code: [required], + name: [required] }) -export const PartternType = useCrudSchemas(reactive([ +export const PatternType = useCrudSchemas(reactive([ { label: '删除时间', field: 'deleteTime',