diff --git a/src/api/infra/outerApiHis/index.ts b/src/api/infra/outerApiHis/index.ts index b786bdcd7..7c6885ad0 100644 --- a/src/api/infra/outerApiHis/index.ts +++ b/src/api/infra/outerApiHis/index.ts @@ -56,3 +56,17 @@ export const retry = (id: number) => { url: '/wms/outer/retry?id=' + id }) } + +//禁用 +export const disable = (id: number) => { + return request.get({ + url: '/wms/outer/disable?id=' + id + }) +} + +//启用 +export const enable = (id: number) => { + return request.get({ + url: '/wms/outer/enable?id=' + id + }) +} diff --git a/src/views/infra/outerApiHis/index.vue b/src/views/infra/outerApiHis/index.vue index f2588ba64..89f188e38 100644 --- a/src/views/infra/outerApiHis/index.vue +++ b/src/views/infra/outerApiHis/index.vue @@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { waitForDebugger } from 'inspector' defineOptions({ name: 'OuterApiHis' }) @@ -101,7 +102,7 @@ const { getList, setSearchParams } = tableMethods const HeadButttondata = [ // defaultButtons.defaultAddBtn({hasPermi:'wms:outerApiHis:create'}), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'wms:outerApiHis:import'}), // 导入 - // defaultButtons.defaultExportBtn({hasPermi:'wms:outerApiHis:export'}), // 导出 + defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -126,9 +127,12 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row) =>{ return [ - // defaultButtons.mainListEditBtn({hasPermi:'wms:outerApiHis:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:outerApiHis:delete'}), // 删除 - defaultButtons.retryBtn({hide: row.success}), // 重试 + //defaultButtons.mainListEditBtn({hasPermi:'wms:outerApiHis:update'}), // 启用 + defaultButtons.retryBtn({hide:!( !row.success && row.available == 'TRUE')}), // 重试 + defaultButtons.mainListEnableBtn({hide: !(row.available=='FALSE' && !row.success)}), // 启用 + defaultButtons.mainListDisableBtn({hide: !(row.available=='TRUE' && !row.success)}), // 禁用 + + ] } @@ -140,6 +144,10 @@ const buttonTableClick = async (val, row) => { handleDelete(row.id) } else if (val == 'retry') { // 重试 handleRetry(row) + }else if (val == 'enable') { // 启用 + handleEnable(row) + }else if (val == 'disable') { // 禁用 + handleDisable(row) } } @@ -249,6 +257,42 @@ const handleRetry = (row) => { }) } + +//点击禁用 +const handleDisable = (row) => { + tableObject.loading = true; + OuterApiHisApi.disable(row.id).then(res => { + if(res){ + message.success('修改成功'); + }else{ + message.success('修改失败'); + } + tableObject.loading = false; + getList() + }).catch((e) => { + tableObject.loading = false; + getList() + }) + + +} + +//点击启用 +const handleEnable = (row) => { + tableObject.loading = true; + OuterApiHisApi.enable(row.id).then(res => { + if(res){ + message.success('修改成功'); + }else{ + message.success('修改失败'); + } + tableObject.loading = false; + getList() + }).catch((e) => { + tableObject.loading = false; + getList() + }) +} /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/infra/outerApiHis/outerApiHis.data.ts b/src/views/infra/outerApiHis/outerApiHis.data.ts index 6008750a7..040e7ec45 100644 --- a/src/views/infra/outerApiHis/outerApiHis.data.ts +++ b/src/views/infra/outerApiHis/outerApiHis.data.ts @@ -48,6 +48,21 @@ export const OuterApiHis = useCrudSchemas(reactive([ label: '内容', field: 'content', sort: 'custom', + isSearch: true, + }, + { + label: '品番号', + field: 'itemCode', + sort: 'custom', + isTable:false, + isSearch: true, + }, + { + label: '生产线', + field: 'productionLine', + sort: 'custom', + isTable:false, + isSearch: true, }, { label: '结果', @@ -63,6 +78,22 @@ export const OuterApiHis = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE_LOWER_CASE, dictClass: 'string', }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + } + }, { label: '创建时间', field: 'createTime', @@ -75,7 +106,7 @@ export const OuterApiHis = useCrudSchemas(reactive([ field: 'action', isForm: false, table: { - width: 150, + width: 200, fixed: 'right' } }