From a33764aa5b7c3e9b3bf55d1edc112e0ac79ece19 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 11 十一月 2025 17:11:12 +0800
Subject: [PATCH] *
---
src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
index cc09ec8..a9cabba 100644
--- a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
+++ b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
@@ -261,7 +261,8 @@
class="confirm-report-btn"
@click="showConfirmDialog"
:loading="reportLoading">
- 纭涓婃姤
+ <!-- 鐩存帴鍦ㄦā鏉夸腑鍒ゆ柇 -->
+ {{ settleA === 17 ? '鍐嶆涓婃姤' : '纭涓婃姤' }}
</el-button>
<el-button @click="closeDetailDialog">鍏抽棴</el-button>
</div>
@@ -295,6 +296,7 @@
currentRow: null,
// 瀛愯〃鍒嗛〉
detailCurrentPage: 1,
+ settleA: 1,
detailPageSize: 5,
detailTotal: 0,
// 鍔犺浇鐘舵��
@@ -575,16 +577,12 @@
// 璋冪敤鍚庡彴API涓婃姤鏁版嵁
$.ajax({
- url: baseUrl + "/api/report/confirm",
- headers: {
- 'token': localStorage.getItem('token')
+ url: baseUrl + "/order/pakout/actual/shipment/order/report/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ itemName: groupOrderNo // 浼犻�掔粍璐у崟鍙�
},
- data: JSON.stringify({
- item_name: groupOrderNo // 浼犻�掔粍璐у崟鍙�
- }),
- dataType: 'json',
- contentType: 'application/json;charset=UTF-8',
- method: 'post',
+ method: 'POST',
success: (res) => {
this.reportLoading = false;
if (typeof done === 'function') {
@@ -644,6 +642,7 @@
this.currentRow = row;
this.detailDialogVisible = true;
this.detailCurrentPage = 1;
+ this.settleA = row.settle;
this.getTableDataB(row.itemName);
},
--
Gitblit v1.9.1