diff --git a/plugin.zip b/plugin.zip deleted file mode 100644 index f7eb408..0000000 Binary files a/plugin.zip and /dev/null differ diff --git a/src/common/router/index.ts b/src/common/router/index.ts index 693c694..44b38a0 100644 --- a/src/common/router/index.ts +++ b/src/common/router/index.ts @@ -122,8 +122,8 @@ Evt.on('logout', (_) => { .filter((it) => it.name !== SpecialPage.Main && it.name !== SpecialPage.Login && it.name !== SpecialPage.NotFound && it.name !== SpecialPage.Home) .map((it) => it.name as string) removeRoutes(routes) - router.push({replace: true, name: SpecialPage.Login}).then((r) => { - console.log(r) + router.push({replace: true, name: SpecialPage.Login}).then(() => { + // console.log(r) }) }) diff --git a/src/components/a-drop-table/ADropTable.vue b/src/components/a-drop-table/ADropTable.vue new file mode 100644 index 0000000..eebc0a1 --- /dev/null +++ b/src/components/a-drop-table/ADropTable.vue @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/dts/components.d.ts b/src/dts/components.d.ts index 742337c..00d0d32 100644 --- a/src/dts/components.d.ts +++ b/src/dts/components.d.ts @@ -32,6 +32,7 @@ declare module 'vue' { ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] + ElIconCircleClose: typeof import('@element-plus/icons-vue')['CircleClose'] ElIconPicture: typeof import('@element-plus/icons-vue')['Picture'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] @@ -84,6 +85,7 @@ declare global { const ElFormItem: typeof import('element-plus/es')['ElFormItem'] const ElHeader: typeof import('element-plus/es')['ElHeader'] const ElIcon: typeof import('element-plus/es')['ElIcon'] + const ElIconCircleClose: typeof import('@element-plus/icons-vue')['CircleClose'] const ElIconPicture: typeof import('@element-plus/icons-vue')['Picture'] const ElImage: typeof import('element-plus/es')['ElImage'] const ElInput: typeof import('element-plus/es')['ElInput'] diff --git a/src/pages/gds/goods/Goods.vue b/src/pages/gds/goods/Goods.vue index d672825..282858f 100644 --- a/src/pages/gds/goods/Goods.vue +++ b/src/pages/gds/goods/Goods.vue @@ -71,7 +71,7 @@ - + {{ row.canuse ? "是" : "否" }} @@ -114,12 +114,12 @@ + + diff --git a/src/pages/mfg/craft/CraftForm.vue b/src/pages/mfg/craft/CraftForm.vue new file mode 100644 index 0000000..6997e3f --- /dev/null +++ b/src/pages/mfg/craft/CraftForm.vue @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ status === 'view' ? '关闭' : '取消' }} + 提交 + + + + + + + diff --git a/src/pages/mfg/craft/craft-api.ts b/src/pages/mfg/craft/craft-api.ts new file mode 100644 index 0000000..bfd094c --- /dev/null +++ b/src/pages/mfg/craft/craft-api.ts @@ -0,0 +1,25 @@ +import { + get, + post, +} from '@/common/utils/http-util.ts' + +export default { + paging(data: CraftTypes.SearchCraftParam) { + return get>('/craft/paging', data) + }, + detail(id: string) { + return get('/craft/detail', {id}) + }, + add(data: CraftTypes.AddCraftParam) { + return post('/craft/add', data) + }, + modify(data: CraftTypes.ModifyCraftParam) { + return post('/craft/modify', data) + }, + del(ids: string[]) { + return post('/craft/del', ids) + }, + disable(id: string, disable: boolean) { + return get('/craft/disable', {id, disable}) + }, +} diff --git a/src/pages/mfg/craft/craft.d.ts b/src/pages/mfg/craft/craft.d.ts new file mode 100644 index 0000000..3fe1b73 --- /dev/null +++ b/src/pages/mfg/craft/craft.d.ts @@ -0,0 +1,116 @@ +export {} + +declare global { + namespace CraftTypes { + interface SearchCraftParam extends G.PageParam { + // Id + id?: string + // 编码 + sn?: string + // 终产品 Id + goodsId?: string + // 工艺名称 + craftName?: string + // 工艺版本号 + craftVer?: string + // 工艺类型;字典编码:craft_category,ZiDongHua-->自动化、RenGong-->人工 + craftCategory?: string + // 是否可用;0-->否、1-->是 + canuse?: boolean + // 备注 + memo?: string + // 创建人 Id; sys_user.id + creatorId?: string + // 修改人 Id; sys_user.id + modifierId?: string + // 创建时间 + createTime?: string + // 修改时间 + modifyTime?: string + // 是否删除; 0-->未删除、1-->已删除 + deleted?: boolean + } + + interface SearchCraftResult { + // Id + id?: string + // 编码 + sn?: string + // 终产品 Id + goodsId?: string + goodsName?: string + goodsSn?: string + // 工艺名称 + craftName?: string + // 工艺版本号 + craftVer?: string + // 工艺类型;字典编码:craft_category,ZiDongHua-->自动化、RenGong-->人工 + craftCategory?: string + craftCategoryTxt?: string + // 是否可用;0-->否、1-->是 + canuse?: boolean + // 备注 + memo?: string + // 创建时间 + createTime?: string + } + + interface AddCraftParam { + // Id + id?: string + // 编码 + sn?: string + // 终产品 Id + goodsId?: string + // 工艺名称 + craftName?: string + // 工艺版本号 + craftVer?: string + // 工艺类型;字典编码:craft_category,ZiDongHua-->自动化、RenGong-->人工 + craftCategory?: string + // 是否可用;0-->否、1-->是 + canuse?: boolean + // 备注 + memo?: string + // 创建人 Id; sys_user.id + creatorId?: string + // 修改人 Id; sys_user.id + modifierId?: string + // 创建时间 + createTime?: string + // 修改时间 + modifyTime?: string + // 是否删除; 0-->未删除、1-->已删除 + deleted?: boolean + } + + interface ModifyCraftParam { + // Id + id?: string + // 编码 + sn?: string + // 终产品 Id + goodsId?: string + // 工艺名称 + craftName?: string + // 工艺版本号 + craftVer?: string + // 工艺类型;字典编码:craft_category,ZiDongHua-->自动化、RenGong-->人工 + craftCategory?: string + // 是否可用;0-->否、1-->是 + canuse?: boolean + // 备注 + memo?: string + // 创建人 Id; sys_user.id + creatorId?: string + // 修改人 Id; sys_user.id + modifierId?: string + // 创建时间 + createTime?: string + // 修改时间 + modifyTime?: string + // 是否删除; 0-->未删除、1-->已删除 + deleted?: boolean + } + } +} diff --git a/src/pages/mfg/craft/page.ts b/src/pages/mfg/craft/page.ts new file mode 100644 index 0000000..eee69b8 --- /dev/null +++ b/src/pages/mfg/craft/page.ts @@ -0,0 +1,3 @@ +export default { + component: () => import('@/pages/mfg/craft/Craft.vue'), +} as RouterTypes.RouteConfig \ No newline at end of file diff --git a/tsconfig.node.zip b/tsconfig.node.zip deleted file mode 100644 index dcdc155..0000000 Binary files a/tsconfig.node.zip and /dev/null differ