diff --git a/src/App.vue b/src/App.vue index 93b181a..97added 100644 --- a/src/App.vue +++ b/src/App.vue @@ -236,7 +236,7 @@ .el-dialog__footer { background: transparent !important; position: relative; - z-index: 1; + z-index: inherit; } .el-dialog__header { display: flex; diff --git a/src/api/adminApi.ts b/src/api/adminApi.ts index 897a2c8..f961317 100644 --- a/src/api/adminApi.ts +++ b/src/api/adminApi.ts @@ -298,6 +298,13 @@ export class manageService { params }) } + //备货单删除 + static delectStock(params: any) { + return request.get({ + url: '/admin/stock/order/destroy', + params + }) + } //打印 static printStock(params: any) { return request.get({ diff --git a/src/components/custom/files_previews.vue b/src/components/custom/files_previews.vue index 0e1bbb5..f749b61 100644 --- a/src/components/custom/files_previews.vue +++ b/src/components/custom/files_previews.vue @@ -37,7 +37,7 @@ - 下载 + 关闭 @@ -131,6 +131,7 @@ // --- Props --- interface FileItem { + file_name: any name?: string url: string mime?: string // 可选,优先使用 @@ -253,8 +254,12 @@ const fileType = computed(() => { const f = currentFile.value if (!f) return 'unknown' - const mime = (f.mime || mimeFromName(f.name) || '').toLowerCase() - const ext = getExtension(f.name) + let names = f.name + if (names == '') { + names = f.file_name + } + const mime = (f.mime || mimeFromName(names) || '').toLowerCase() + const ext = getExtension(names) if (mime.startsWith('image/') || ['png', 'jpg', 'jpeg', 'gif', 'bmp', 'webp'].includes(ext)) return 'image' diff --git a/src/views/admin/stock/final_list_admin.vue b/src/views/admin/stock/final_list_admin.vue index 194567a..6bb192a 100644 --- a/src/views/admin/stock/final_list_admin.vue +++ b/src/views/admin/stock/final_list_admin.vue @@ -85,6 +85,14 @@ > 查看审批 + + 删除 +