From 4b8acfd882baf3a4ee09a65ecfe2bbafc900967c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 09 十一月 2025 19:31:43 +0800
Subject: [PATCH] *
---
src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html | 114 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 76 insertions(+), 38 deletions(-)
diff --git a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
index da59c76..211afd7 100644
--- a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
+++ b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
@@ -121,6 +121,16 @@
@keyup.enter.native="handleSearch"
></el-input>
</div>
+<!-- <div class="search-item">-->
+<!-- <span class="search-label">璁㈠崟缂栧彿:</span>-->
+<!-- <el-input-->
+<!-- v-model="searchForm.orderNo"-->
+<!-- placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"-->
+<!-- clearable-->
+<!-- style="width: 150px;"-->
+<!-- @keyup.enter.native="handleSearch"-->
+<!-- ></el-input>-->
+<!-- </div>-->
<div class="search-item">
<span class="search-label">鐘舵��:</span>
<el-select
@@ -130,19 +140,20 @@
style="width: 150px;"
>
<el-option label="鍏ㄩ儴" value=""></el-option>
- <el-option label="姝ｅ父" value="1"></el-option>
- <el-option label="绂佺敤" value="0"></el-option>
+ <el-option label="寰呭鐞�" value="1"></el-option>
+ <el-option label="浣滀笟涓�" value="2"></el-option>
+ <el-option label="宸插彇娑�" value="3"></el-option>
+ <el-option label="宸插畬鎴�" value="4"></el-option>
+ <el-option label="鍑嗗鍙栨秷" value="5"></el-option>
+ <el-option label="宸插畬鎴�" value="6"></el-option>
+ <el-option label="涓婃姤瀹屾垚" value="7"></el-option>
+ <el-option label="寰呭垽鏌ヨ涓�" value="9"></el-option>
+ <el-option label="灏辩华" value="10"></el-option>
+ <el-option label="鐢熸垚瀹為檯缁勮揣鍗曚腑銆傝绛夊緟..." value="11"></el-option>
+ <el-option label="鐢熸垚瀹為檯缁勮揣鍗曟垚鍔�" value="12"></el-option>
+ <el-option label="鐢熸垚瀹為檯缁勮揣鍗曞け璐�" value="13"></el-option>
+ <el-option label="寮傚父" value="99"></el-option>
</el-select>
- </div>
- <div class="search-item">
- <span class="search-label">璁㈠崟缂栧彿:</span>
- <el-input
- v-model="searchForm.orderNo"
- placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
- clearable
- style="width: 150px;"
- @keyup.enter.native="handleSearch"
- ></el-input>
</div>
<div class="search-actions">
<el-button type="primary" icon="el-icon-search" @click="handleSearch">鎼滅储</el-button>
@@ -165,8 +176,8 @@
<el-table-column prop="orderNo" label="璁㈠崟缂栧彿" min-width="140" align="center"></el-table-column>
<el-table-column prop="cstmrName" label="瀹㈡埛鍚嶇О" min-width="120" align="center"></el-table-column>
<el-table-column prop="settle" label="鐘舵��" min-width="100" align="center" :formatter="formatStatus"></el-table-column>
- <el-table-column prop="totalFee" label="鍚堣閲戦" min-width="100" align="center" :formatter="formatCurrency"></el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="140" align="center" sortable="custom"></el-table-column>
+<!-- <el-table-column prop="totalFee" label="鍚堣閲戦" min-width="100" align="center" :formatter="formatCurrency"></el-table-column>-->
+<!-- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="140" align="center" sortable="custom"></el-table-column>-->
<el-table-column label="鎿嶄綔" width="150" align="center" fixed="right">
<template slot-scope="scope">
<div class="operation-cell">
@@ -207,7 +218,7 @@
<el-descriptions :column="2" border>
<el-descriptions-item label="璁㈠崟缂栧彿">{{ currentRow.orderNo }}</el-descriptions-item>
<el-descriptions-item label="瀹㈡埛鍚嶇О">{{ currentRow.cstmrName }}</el-descriptions-item>
- <el-descriptions-item label="鐘舵��">{{ formatStatus(currentRow) }}</el-descriptions-item>
+ <el-descriptions-item label="鐘舵��">{{ currentRow.settle$ }}</el-descriptions-item>
<el-descriptions-item label="鍚堣閲戦">{{ formatCurrency(currentRow) }}</el-descriptions-item>
<el-descriptions-item label="鍒涘缓鏃堕棿">{{ formatDate(currentRow.createTime) }}</el-descriptions-item>
<el-descriptions-item label="澶囨敞">{{ currentRow.memo || '鏃�' }}</el-descriptions-item>
@@ -219,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>
@@ -259,9 +273,9 @@
// 鎼滅储琛ㄥ崟
searchForm: {
uuid: '',
- cstmrName: '',
+ cstmr_name: '',
settle: '',
- orderNo: ''
+ order_no: ''
},
// 鎺掑簭鐩稿叧
orderByField: '',
@@ -296,7 +310,7 @@
// 姣�5绉掕嚜鍔ㄥ埛鏂版暟鎹�
setInterval(() => {
this.getTableDataA();
- }, 5000);
+ }, 10000);
},
// 鑾峰彇涓昏〃A鏁版嵁 - 浣跨敤鏂扮殑API
@@ -319,7 +333,15 @@
// 娣诲姞鎼滅储鍙傛暟
Object.keys(that.searchForm).forEach(key => {
if (that.searchForm[key] !== '') {
- params[key] = that.searchForm[key];
+ if (key === 'orderNo'){
+ params['order_no'] = that.searchForm[key];
+ } else if (key === 'cstmrName'){
+ params['cstmr_name'] = that.searchForm[key];
+ } else if (key === 'settle$'){
+ params['settle'] = that.searchForm[key];
+ } else {
+ params[key] = that.searchForm[key];
+ }
}
});
@@ -354,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.data.total || 0;
+ } else {
+ that.$message.error(res.message || '鑾峰彇鏁版嵁澶辫触');
+ that.tableDataB = [];
+ that.detailTotal = 0;
+ }
that.detailLoading = false;
},
error: function() {
@@ -496,9 +528,9 @@
handleReset() {
this.searchForm = {
uuid: '',
- cstmrName: '',
+ cstmr_name: '',
settle: '',
- orderNo: ''
+ order_no: ''
};
this.orderByField = '';
this.orderByType = 'asc';
@@ -511,7 +543,7 @@
this.currentRow = row;
this.detailDialogVisible = true;
this.detailCurrentPage = 1;
- this.getTableDataB(row.uuid);
+ this.getTableDataB(row.orderNo);
},
// 鍏抽棴璇︽儏寮圭獥
@@ -540,7 +572,7 @@
this.detailPageSize = val;
this.detailCurrentPage = 1;
if (this.currentRow) {
- this.getTableDataB(this.currentRow.uuid);
+ this.getTableDataB(this.currentRow.orderNo);
}
},
@@ -548,7 +580,7 @@
handleDetailCurrentChange(val) {
this.detailCurrentPage = val;
if (this.currentRow) {
- this.getTableDataB(this.currentRow.uuid);
+ this.getTableDataB(this.currentRow.orderNo);
}
},
@@ -558,6 +590,12 @@
return '姝ｅ父';
} else if (row.settle === 0) {
return '绂佺敤';
+ } else if (row.settle === 0) {
+ return '绂佺敤';
+ } else if (row.settle === 0) {
+ return '绂佺敤';
+ } else if (row.settle === 0) {
+ return '绂佺敤';
} else {
return row.settle || '鏈煡';
}
--
Gitblit v1.9.1