From f52c5b4a8ecf1279cc7a580f2bffcbd0b75fe5fa Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 09 十一月 2025 18:57:24 +0800
Subject: [PATCH] *
---
src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html | 65 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
index da59c76..00ce1ce 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>
@@ -259,9 +270,9 @@
// 鎼滅储琛ㄥ崟
searchForm: {
uuid: '',
- cstmrName: '',
+ cstmr_name: '',
settle: '',
- orderNo: ''
+ order_no: ''
},
// 鎺掑簭鐩稿叧
orderByField: '',
@@ -319,7 +330,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];
+ }
}
});
@@ -496,9 +515,9 @@
handleReset() {
this.searchForm = {
uuid: '',
- cstmrName: '',
+ cstmr_name: '',
settle: '',
- orderNo: ''
+ order_no: ''
};
this.orderByField = '';
this.orderByType = 'asc';
@@ -558,6 +577,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