修正权限检查和通知显示问题

- 更新编辑和删除操作的权限检查,使用正确的权限路径
- 在订单列表中添加通知列,显示相关消息
- 修改删除操作的 API 调用,使用正确的订单删除接口
This commit is contained in:
mkm 2024-10-13 14:30:14 +08:00
parent 2f0cf1f6d5
commit 34efdf4ec1
2 changed files with 10 additions and 7 deletions

View File

@ -95,7 +95,9 @@
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
v-perms="['beforehand_order.beforehand_order/edit']" v-perms="[
'beforehand_order_cart_info.beforehand_order_cart_info/edit'
]"
type="primary" type="primary"
link link
@click="handleEdit(row)" @click="handleEdit(row)"
@ -103,7 +105,9 @@
编辑 编辑
</el-button> </el-button>
<el-button <el-button
v-perms="['beforehand_order.beforehand_order/delete']" v-perms="[
'beforehand_order_cart_info.beforehand_order_cart_info/delete'
]"
type="danger" type="danger"
link link
@click="handleDeletes(row.id)" @click="handleDeletes(row.id)"

View File

@ -57,14 +57,14 @@
<el-table-column label="填写人员" prop="admin_name" show-overflow-tooltip /> <el-table-column label="填写人员" prop="admin_name" show-overflow-tooltip />
<el-table-column label="总价格" prop="total_price" show-overflow-tooltip /> <el-table-column label="总价格" prop="total_price" show-overflow-tooltip />
<el-table-column label="备注" prop="mark" show-overflow-tooltip /> <el-table-column label="备注" prop="mark" show-overflow-tooltip />
<el-table-column label="通知" prop="msg" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button type="primary" link @click="handleDetai(row)" <el-button type="primary" link @click="handleDetai(row)"
>详情</el-button >详情</el-button
> >
<el-button <el-button
v-perms="['warehouse_order.warehouse_order/delete']" v-perms="['beforehand_order.beforehand_order/delete']"
type="danger" type="danger"
link link
@click="handleDelete(row.id)" @click="handleDelete(row.id)"
@ -99,14 +99,13 @@
<script lang="ts" setup name="warehouseOrderLists"> <script lang="ts" setup name="warehouseOrderLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { apiWarehouseOrderLists, apiWarehouseOrderDelete } from '@/api/warehouse_order'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
// import EditPopup from './edit.vue' // import EditPopup from './edit.vue'
import DetailsPopup from './details.vue' import DetailsPopup from './details.vue'
import { apiSystemStoreLists } from '@/api/system_store' import { apiSystemStoreLists } from '@/api/system_store'
import moment from 'moment' import moment from 'moment'
import { apiBeforehandOrderLists } from '@/api/beforehand_order' import { apiBeforehandOrderLists, apiBeforehandOrderDelete } from '@/api/beforehand_order'
// const editRef = shallowRef<InstanceType<typeof EditPopup>>() // const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>() const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
@ -160,7 +159,7 @@ const handleEdit = async (data: any) => {
// //
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?') await feedback.confirm('确定要删除?')
await apiWarehouseOrderDelete({ id }) await apiBeforehandOrderDelete({ id })
getLists() getLists()
} }
// //