From 054b36d1437864e90d69d99c698a6fa7e9421165 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 09 十一月 2025 19:11:30 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java | 21 +++++++---
src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html | 47 +++++++++++++++--------
2 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
index 8a4ea71..2e9ea58 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
@@ -135,14 +135,23 @@
return R.ok();
}
- @RequestMapping(value = "/cargo/grouping/auth")
+ @RequestMapping(value = "/orderDetl/cargo/grouping/auth")
@ManagerAuth
- public R orderDetlCargoGrouping(@RequestBody JSONObject param) {
- Wrapper<OrderDetlPakout> wrapper = new EntityWrapper<OrderDetlPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderDetlService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakout.class, String.valueOf(param.get("key"))));
+ public R orderDetlCargoGrouping(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
}
- return R.ok();
+ wrapper.eq("status", 1);
+ Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderDetlPage);
}
+
}
diff --git a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
index 00ce1ce..49447db 100644
--- a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
+++ b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
@@ -230,10 +230,13 @@
:data="tableDataB"
style="width: 100%"
v-loading="detailLoading">
- <el-table-column prop="productName" label="浜у搧鍚嶇О" min-width="120" align="center"></el-table-column>
- <el-table-column prop="quantity" label="鏁伴噺" min-width="80" align="center"></el-table-column>
- <el-table-column prop="price" label="鍗曚环" min-width="100" align="center" :formatter="formatCurrency"></el-table-column>
- <el-table-column prop="totalPrice" label="閲戦" min-width="100" align="center" :formatter="formatCurrency"></el-table-column>
+ <el-table-column prop="matnr" label="瑙勬牸" min-width="120" align="center"></el-table-column>
+ <el-table-column prop="batch" label="绠卞彿" min-width="80" align="center"></el-table-column>
+ <el-table-column prop="model" label="鍗峰彿" min-width="100" align="center" ></el-table-column>
+<!-- <el-table-column prop="totalPrice" label="閲戦" min-width="100" align="center" :formatter="formatCurrency"></el-table-column>-->
+ <el-table-column prop="origin" label="浣嶇疆" min-width="100" align="center"></el-table-column>
+ <el-table-column prop="danger" label="寰呭垽" min-width="100" align="center"></el-table-column>
+ <el-table-column prop="memo" label="澶囨敞" min-width="100" align="center"></el-table-column>
<!-- 鍙牴鎹疄闄呴渶姹傛坊鍔犳洿澶氬瓙琛ㄥ垪 -->
</el-table>
@@ -373,27 +376,37 @@
},
// 鑾峰彇瀛愯〃B鏁版嵁锛堟牴鎹疄闄呬笟鍔¤皟鏁达級
- getTableDataB(uuid) {
+ getTableDataB(orderNo) {
let that = this;
that.detailLoading = true;
+ // 鏋勫缓璇锋眰鍙傛暟
+ let params = {
+ order_no: orderNo,
+ curr: that.detailCurrentPage,
+ limit: that.detailPageSize
+ };
+
// 妯℃嫙API璋冪敤 - 鏍规嵁瀹為檯涓氬姟璋冩暣API鍦板潃
$.ajax({
- url: baseUrl + "/api/order/detail/list",
+ // url: baseUrl + "/order/pakout/orderDetl/cargo/grouping/auth",
+ url: baseUrl + "/orderDetl/list/auth",
headers: {
'token': localStorage.getItem('token')
},
- data: {
- uuid: uuid,
- page: that.detailCurrentPage,
- size: that.detailPageSize
- },
+ data: params,
dataType: 'json',
contentType: 'application/json;charset=UTF-8',
- method: 'post',
+ method: 'get',
success: function (res) {
- that.tableDataB = res.data || [];
- that.detailTotal = res.total || 0;
+ if (res.code === 200 || res.success) {
+ that.tableDataB = res.data.records || [];
+ that.detailTotal = res.total || 0;
+ } else {
+ that.$message.error(res.message || '鑾峰彇鏁版嵁澶辫触');
+ that.tableDataB = [];
+ that.detailTotal = 0;
+ }
that.detailLoading = false;
},
error: function() {
@@ -530,7 +543,7 @@
this.currentRow = row;
this.detailDialogVisible = true;
this.detailCurrentPage = 1;
- this.getTableDataB(row.uuid);
+ this.getTableDataB(row.orderNo);
},
// 鍏抽棴璇︽儏寮圭獥
@@ -559,7 +572,7 @@
this.detailPageSize = val;
this.detailCurrentPage = 1;
if (this.currentRow) {
- this.getTableDataB(this.currentRow.uuid);
+ this.getTableDataB(this.currentRow.orderNo);
}
},
@@ -567,7 +580,7 @@
handleDetailCurrentChange(val) {
this.detailCurrentPage = val;
if (this.currentRow) {
- this.getTableDataB(this.currentRow.uuid);
+ this.getTableDataB(this.currentRow.orderNo);
}
},
--
Gitblit v1.9.1