Browse Source

创建时间

master
hongxi.lian 10 months ago
parent
commit
2d4dc1139e
  1. 5
      src/api/wms/inventoryinitRecordMain/index.ts
  2. 7
      src/api/wms/inventoryinitRequestMain/index.ts
  3. 2
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
  4. 28
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
  5. 2
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

5
src/api/wms/inventoryinitRecordMain/index.ts

@ -53,7 +53,12 @@ export const deleteInventoryinitRecordMain = async (id: number) => {
// 导出库存初始化记录主 Excel // 导出库存初始化记录主 Excel
export const exportInventoryinitRecordMain = async (params) => { export const exportInventoryinitRecordMain = async (params) => {
if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/wms/inventoryinit-record-main/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/inventoryinit-record-main/export-excel`, params }) return await request.download({ url: `/wms/inventoryinit-record-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板

7
src/api/wms/inventoryinitRequestMain/index.ts

@ -5,7 +5,7 @@ export interface InventoryinitRequestMainVO {
number: string number: string
businessType: string businessType: string
remark: string remark: string
creationTime: Date createTime: Date
creator: string creator: string
requestTime: Date requestTime: Date
dueTime: Date dueTime: Date
@ -75,7 +75,12 @@ export const deleteInventoryinitRequestMain = async (id: number) => {
// 导出库存初始化申请主 Excel // 导出库存初始化申请主 Excel
export const exportInventoryinitRequestMain = async (params) => { export const exportInventoryinitRequestMain = async (params) => {
if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/wms/inventoryinit-request-main/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/inventoryinit-request-main/export-excel`, params }) return await request.download({ url: `/wms/inventoryinit-request-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板

2
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue

@ -141,7 +141,7 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const data = await InventoryinitRecordMainApi.exportInventoryinitRecordMain(setSearchParams) const data = await InventoryinitRecordMainApi.exportInventoryinitRecordMain(tableObject.params)
download.excel(data, '库存初始化记录主.xlsx') download.excel(data, '库存初始化记录主.xlsx')
} catch { } catch {
} finally { } finally {

28
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@ -187,7 +187,7 @@ const butttondata = (row) => {
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventoryinit-request-main:agree'}), // defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventoryinit-request-main:agree'}), //
defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventoryinit-request-main:handle'}), // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventoryinit-request-main:handle'}), //
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventoryinit-request-main:update'}), // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventoryinit-request-main:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventoryinit-request-main:delete'}), //
] ]
} }
@ -207,8 +207,6 @@ const buttonTableClick = async (val, row) => {
handleHandle(row.id) handleHandle(row.id)
} else if (val == 'edit') { // } else if (val == 'edit') { //
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
} }
} }
@ -293,17 +291,17 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (id: number) => { // const handleDelete = async (id: number) => {
try { // try {
// // //
await message.delConfirm() // await message.delConfirm()
// // //
await InventoryinitRequestMainApi.deleteInventoryinitRequestMain(id) // await InventoryinitRequestMainApi.deleteInventoryinitRequestMain(id)
message.success(t('common.delSuccess')) // message.success(t('common.delSuccess'))
// // //
await getList() // await getList()
} catch {} // } catch {}
} // }
/** 导出按钮操作 */ /** 导出按钮操作 */
const exportLoading = ref(false) // const exportLoading = ref(false) //
@ -313,7 +311,7 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const data = await InventoryinitRequestMainApi.exportInventoryinitRequestMain(setSearchParams) const data = await InventoryinitRequestMainApi.exportInventoryinitRequestMain(tableObject.params)
download.excel(data, '库存初始化申请主.xlsx') download.excel(data, '库存初始化申请主.xlsx')
} catch { } catch {
} finally { } finally {

2
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@ -96,7 +96,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '创建时间', label: '创建时间',
field: 'creationTime', field: 'createTime',
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'

Loading…
Cancel
Save