From c7a31680a32a45c7d47af5162eb8edcb9824d16a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 24 十二月 2025 15:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
index 681bcf9..e1162dc 100644
--- a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
+++ b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
@@ -216,7 +216,7 @@
class="detail-dialog"
@close="closeDetailDialog">
<div v-if="currentRow">
- <h3>缁勮揣鍗曚富琛� (璁㈠崟鍙�: {{ currentRow.orderNo }})</h3>
+ <h3>璁㈠崟涓昏〃 (璁㈠崟鍙�: {{ currentRow.orderNo }})</h3>
<el-descriptions :column="2" border>
<el-descriptions-item label="瀹㈡埛鍚嶇О">{{ currentRow.cstmrName }}</el-descriptions-item>
<el-descriptions-item label="鐘舵��">{{ formatStatus(currentRow)}}</el-descriptions-item>
@@ -224,7 +224,7 @@
<el-descriptions-item label="澶囨敞">{{ currentRow.memo || '鏃�' }}</el-descriptions-item>
</el-descriptions>
- <h3 style="margin-top: 20px;">缁勮揣鍗曟槑缁�</h3>
+ <h3 style="margin-top: 20px;">璁㈠崟鏄庣粏</h3>
<el-table
border
:data="tableDataB"
@@ -634,7 +634,7 @@
headers: {'token': localStorage.getItem('token')},
data: top.reObject({
orderNo: orderNo, // 缁勮揣鍗曞彿
- id: id, // 绠卞彿
+ id: id, // id
anfme: anfme, // 绠卞彿
inspect: inspect // 绠卞彿
}),
@@ -644,7 +644,7 @@
if (res.code === 200 || res.success) {
this.$message({
- message: `淇敼鎴愬姛锛佺粍璐у崟鍙�: ${groupOrderNo}, 绠卞彿: ${batch}`,
+ message: `淇敼鎴愬姛锛佽鍗曞彿: ${orderNo}, id: ${id}`,
type: 'success',
duration: 3000
});
--
Gitblit v1.9.1