From 5627248e473253b3f10615d6be8b27bb7cc7c4f7 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期五, 10 四月 2026 14:49:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 ui/admin-ui3/src/views/tms/tmsArBill/index.vue |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ui/admin-ui3/src/views/tms/tmsArBill/index.vue b/ui/admin-ui3/src/views/tms/tmsArBill/index.vue
index a5d0642..b18dc16 100644
--- a/ui/admin-ui3/src/views/tms/tmsArBill/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsArBill/index.vue
@@ -47,6 +47,10 @@
         <el-link size="small" type="primary" @click="handleEdit(row)" class="link-btn" underline="never"
           icon="el-icon-edit">淇敼
         </el-link>
+           <el-link size="small" type="primary" v-if="[0, 2].includes(row.status)" @click="handleClose(row)"
+            class="link-btn" v-hasPermi="['tms:tmsArBill:closeOrder']" underline="never" icon="el-icon-close">
+            浣滃簾
+          </el-link>
         <el-link size="small" type="primary" @click="handleLog(row)" class="link-btn" underline="never"
           icon="el-icon-tickets">鏃ュ織
         </el-link>
@@ -144,7 +148,7 @@
   getTmsArBill,
   listTmsArBill,
   updateTmsArBill, cancelArBill,
-  exportArBillFormat,manualPushTmsArBill,listReceivableAuditLog
+  exportArBillFormat,manualPushTmsArBill,listReceivableAuditLog,tmsArBillCancelPush
 } from "@/api/tms/tmsArBill";
 import useCurrentInstance from "@/utils/useCurrentInstance";
 import { computed, reactive, ref, toRefs } from "vue";
@@ -535,5 +539,19 @@
 
   })
 }
-
+const handleClose = (row: any) => {
+  ElMessageBox.confirm("鏄惁瀵瑰簲鏀惰处鍗�" + row.systemNo + "杩涜浣滃簾锛�", '绯荤粺鎻愮ず', {
+    confirmButtonText: '纭畾',
+    cancelButtonText: '鍙栨秷',
+    type: 'warning'
+  }).then(() => {
+    return tmsArBillCancelPush(row.id);
+  }).then(() => {
+    onLoad(page.value);
+    ElMessage({
+      message: "鎿嶄綔鎴愬姛锛�",
+      type: 'success'
+    })
+  });
+}
 </script>

--
Gitblit v1.8.0