From 268b3f852b6fc558fd57f274005f961a9d985e08 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 22 Oct 2025 17:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=8C=E6=88=90=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/foodManage/purchaseManage.js            | 11 ++++++++++-
 .../purchaseManage/purchaseOrder/index.vue      | 17 ++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/api/foodManage/purchaseManage.js b/src/api/foodManage/purchaseManage.js
index 17f31be3..307ca375 100644
--- a/src/api/foodManage/purchaseManage.js
+++ b/src/api/foodManage/purchaseManage.js
@@ -445,7 +445,16 @@ export function delPurchaseOrderApi(data) {
     })
 }
 
-
+export function finishPurchaseOrderApi(data) {
+    return request({
+        url: '/smart-canteen/ims_order_goods/finishOrder',
+        method: 'post',
+        headers: {
+            //"merchant-id":"378915229716713472",
+        },
+        data: data
+    })
+}
 
 
 // -------------采购验货---------------
diff --git a/src/views/foodManage/purchaseManage/purchaseOrder/index.vue b/src/views/foodManage/purchaseManage/purchaseOrder/index.vue
index 6be49ec3..ac849ad5 100644
--- a/src/views/foodManage/purchaseManage/purchaseOrder/index.vue
+++ b/src/views/foodManage/purchaseManage/purchaseOrder/index.vue
@@ -162,6 +162,12 @@
                 icon="el-icon-edit" v-if="scope.row.orderStatus==1||scope.row.orderStatus==2"
                 @click="handleUpdate(scope.row)" 
             >编辑</el-button>
+            <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit" v-if="scope.row.orderStatus==3"
+                @click="handleFinish(scope.row)" 
+            >订单完成</el-button>
             <el-button
                 size="mini"
                 type="text"
@@ -212,7 +218,7 @@
 <script>
 import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall";  
 import { supplierPageApi } from "@/api/foodManage/purchaseManage"; 
-import { purchaseOrderPageApi,getPurchaseOrderInfoApi,delPurchaseOrderApi,addPurchaseInspectApi } from "@/api/foodManage/purchaseManage";
+import { purchaseOrderPageApi,getPurchaseOrderInfoApi,delPurchaseOrderApi,finishPurchaseOrderApi,addPurchaseInspectApi } from "@/api/foodManage/purchaseManage";
 
 export default {
     name: "",
@@ -381,6 +387,15 @@ export default {
         handleUpdate(row) { 
             this.$router.push({ path: "/foodManage/purchaseManage/orderEdit",query: {purchaseOrderRowData:JSON.stringify(row)} });
         },
+        //订单完成按钮
+        handleFinish(row) { 
+            this.$modal.confirm('是否确认该订单已完成？').then(function() {
+                return finishPurchaseOrderApi({orderGoodsId:row.orderGoodsId});
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("操作成功");
+            }).catch(() => {});
+        },
         // 取消按钮
         cancel() {
             this.open = false;