From 34efdf4ec14fdda8da858b057db49c00a79536ed Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 13 Oct 2024 14:30:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9D=83=E9=99=90=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E5=92=8C=E9=80=9A=E7=9F=A5=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新编辑和删除操作的权限检查，使用正确的权限路径
- 在订单列表中添加通知列，显示相关消息
- 修改删除操作的 API 调用，使用正确的订单删除接口
---
 src/views/order/beforehand_order/details.vue | 8 ++++++--
 src/views/order/beforehand_order/index.vue   | 9 ++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/order/beforehand_order/details.vue b/src/views/order/beforehand_order/details.vue
index a883bef8b..25ab45db3 100644
--- a/src/views/order/beforehand_order/details.vue
+++ b/src/views/order/beforehand_order/details.vue
@@ -95,7 +95,9 @@
                             <el-table-column label="操作" width="120" fixed="right">
                                 <template #default="{ row }">
                                     <el-button
-                                        v-perms="['beforehand_order.beforehand_order/edit']"
+                                        v-perms="[
+                                            'beforehand_order_cart_info.beforehand_order_cart_info/edit'
+                                        ]"
                                         type="primary"
                                         link
                                         @click="handleEdit(row)"
@@ -103,7 +105,9 @@
                                         编辑
                                     </el-button>
                                     <el-button
-                                        v-perms="['beforehand_order.beforehand_order/delete']"
+                                        v-perms="[
+                                            'beforehand_order_cart_info.beforehand_order_cart_info/delete'
+                                        ]"
                                         type="danger"
                                         link
                                         @click="handleDeletes(row.id)"
diff --git a/src/views/order/beforehand_order/index.vue b/src/views/order/beforehand_order/index.vue
index 05ad5748b..dc517f3c5 100644
--- a/src/views/order/beforehand_order/index.vue
+++ b/src/views/order/beforehand_order/index.vue
@@ -57,14 +57,14 @@
                     <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="mark" show-overflow-tooltip />
-
+                    <el-table-column label="通知" prop="msg" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button type="primary" link @click="handleDetai(row)"
                                 >详情</el-button
                             >
                             <el-button
-                                v-perms="['warehouse_order.warehouse_order/delete']"
+                                v-perms="['beforehand_order.beforehand_order/delete']"
                                 type="danger"
                                 link
                                 @click="handleDelete(row.id)"
@@ -99,14 +99,13 @@
 <script lang="ts" setup name="warehouseOrderLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiWarehouseOrderLists, apiWarehouseOrderDelete } from '@/api/warehouse_order'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 // import EditPopup from './edit.vue'
 import DetailsPopup from './details.vue'
 import { apiSystemStoreLists } from '@/api/system_store'
 import moment from 'moment'
-import { apiBeforehandOrderLists } from '@/api/beforehand_order'
+import { apiBeforehandOrderLists, apiBeforehandOrderDelete } from '@/api/beforehand_order'
 // const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const detailsRef = shallowRef<InstanceType<typeof DetailsPopup>>()
 
@@ -160,7 +159,7 @@ const handleEdit = async (data: any) => {
 // 删除
 const handleDelete = async (id: number | any[]) => {
     await feedback.confirm('确定要删除？')
-    await apiWarehouseOrderDelete({ id })
+    await apiBeforehandOrderDelete({ id })
     getLists()
 }
 // 详情