diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index d6b9648cc..446f89cfa 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -32,7 +32,6 @@ export interface ItembasicVO { // 查询物品基本信息列表 export const getItembasicPage = async (params) => { if (params.isSearch) { - delete params.isSearch const data = {...params} return request.post({ url: '/wms/itembasic/senior', data }) } else { diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 6c0fadcef..1bf3b167b 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -249,7 +249,7 @@ const submitForm = async () => { return item.field === 'activeTime' || item.field === 'expireTime'; }); if(isHave){ - if(data.activeTime >=data.expireTime){ + if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ message.error('失效时间要大于生效时间') return; } diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index eef62c159..cebc50ed3 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -101,15 +101,22 @@ const setVisible = () => { visible.value = !unref(visible) } const Search = ref() -onMounted(() => { -}) +onMounted(() => {}) diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue index 16ec0bd8c..f9788935e 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue @@ -65,7 +65,6 @@ defineOptions({ name: 'Itembasic' }) const { tableObject, tableMethods } = useTable({ getListApi: ItembasicApi.getItembasicPage // 分页接口 }) -console.log(tableObject) const importFormRef = ref() // 列表头部按钮 const HeadButttondata = [ @@ -165,6 +164,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { const handleDelete = async (id: number) => { try { // 删除的二次确认 + console.log(tableObject.params) await message.delConfirm() // 发起删除 await ItembasicApi.deleteItembasic(id)