From 867eb1ce9fafa55fc2a21d294d253ef89d05b067 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 15 十二月 2025 10:05:27 +0800
Subject: [PATCH] 提交
---
ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue | 100 +++++++++++++++++++++++++++++++-------------------
1 files changed, 62 insertions(+), 38 deletions(-)
diff --git a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
index afdb80f..14ca8c9 100644
--- a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
@@ -44,14 +44,14 @@
v-hasPermi="['tms:tmsDispatchOrder:export']"
>瀵煎嚭
</el-button>
- <el-button
- type="success"
- icon="Promotion"
- :disabled="pageF.multiple"
- @click="handleGenerate"
- v-hasPermi="['tms:tmsDispatchOrder:generate']"
- >鐢熸垚搴旀敹搴斾粯璐圭敤
- </el-button>
+<!-- <el-button-->
+<!-- type="success"-->
+<!-- icon="Promotion"-->
+<!-- :disabled="pageF.multiple"-->
+<!-- @click="handleGenerate"-->
+<!-- v-hasPermi="['tms:tmsDispatchOrder:generate']"-->
+<!-- >鐢熸垚搴旀敹搴斾粯璐圭敤-->
+<!-- </el-button>-->
<el-button
type="warning"
icon="Female"
@@ -115,10 +115,10 @@
v-hasPermi="['tms:tmsDispatchOrder:okOrder']"
:underline="false" icon="el-icon-circle-check">瀹屾垚琛岀▼
</el-link>
- <el-link size="small" type="primary" v-if="[2,3].includes(row.status)" @click="handleAddFinance(row)"
- class="link-btn" v-hasPermi="['tms:tmsFinanceDetail:add']"
- :underline="false" icon="el-icon-edit-pen">璐圭敤鐧昏
- </el-link>
+<!-- <el-link size="small" type="primary" v-if="[2,3].includes(row.status)" @click="handleAddFinance(row)"-->
+<!-- class="link-btn" v-hasPermi="['tms:tmsFinanceDetail:add']"-->
+<!-- :underline="false" icon="el-icon-edit-pen">璐圭敤鐧昏-->
+<!-- </el-link>-->
</template>
<template #menu="{row}">
<el-link size="small" type="primary" @click="handleLog(row)" class="link-btn" :underline="false"
@@ -395,6 +395,7 @@
searchSpan: 6,
searchLabelWidth: 150,
menuWidth: 300,
+ height: 530,
group: [
{
label: '鍩烘湰淇℃伅',
@@ -738,6 +739,13 @@
// label: '閰嶈浇鏂瑰紡',
// display: true, type: 'select', dicUrl: '/system/dict/data/type/load_method', dataType: 'string',
// },
+ orderTime: {
+ label: '涓嬪崟鏃堕棿',
+ type: 'datetime', // 鏀逛负 datetime 绫诲瀷
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ display: true,
+ },
latestDeparture: {
label: '瑕佹眰鏈�鏅氬嚭鍙戞椂闂�',
type: 'datetime', // 鏀逛负 datetime 绫诲瀷
@@ -1423,13 +1431,13 @@
type: 'select', dataType: 'string',
dicUrl: '/system/dict/data/type/order_type',
},
- signType: {
- label: '璁㈠崟绫诲瀷',
- display: false,
- search: true, minWidth: 120,
- type: 'select', dataType: 'string',
- dicUrl: '/system/dict/data/type/order_type',
- },
+ // signType: {
+ // label: '璁㈠崟绫诲瀷',
+ // display: false,
+ // search: true, minWidth: 120,
+ // type: 'select', dataType: 'string',
+ // dicUrl: '/system/dict/data/type/order_type',
+ // },
transportLine: {
label: '杩愯緭绾胯矾',
@@ -1496,22 +1504,22 @@
display: false,
search: true,
},
- accountsReceivableStatus: {
- label: '搴旀敹璐圭敤鐢熸垚鐘舵��', minWidth: 160,
- display: false,
- hide: false,
- search: true,
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/accounts_status',
-
- },
- accountsPayableStatus: {
- label: '搴斾粯璐圭敤鐢熸垚鐘舵��', minWidth: 160,
- display: false,
- hide: false,
- search: true,
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/accounts_status',
-
- },
+ // accountsReceivableStatus: {
+ // label: '搴旀敹璐圭敤鐢熸垚鐘舵��', minWidth: 160,
+ // display: false,
+ // hide: false,
+ // search: true,
+ // type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/accounts_status',
+ //
+ // },
+ // accountsPayableStatus: {
+ // label: '搴斾粯璐圭敤鐢熸垚鐘舵��', minWidth: 160,
+ // display: false,
+ // hide: false,
+ // search: true,
+ // type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/accounts_status',
+ //
+ // },
status: {
label: '鐘舵��', minWidth: 150,
@@ -1526,7 +1534,18 @@
}
],
},
-
+ confirmTime: {
+ label: '纭鏃堕棿', minWidth: 180,
+ display: false,
+ hide: false,
+ search: false,
+ },
+ orderTime: {
+ label: '涓嬪崟鏃堕棿', minWidth: 180,
+ display: false,
+ hide: false,
+ search: false,
+ },
updateBy: {
label: '鏇存柊浜�', minWidth: 150,
addDisplay: false,
@@ -1555,6 +1574,11 @@
},
okTimeRange: {
label: '瀹屾垚鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
+ format: 'YYYY-MM-DD', hide: true, searchSpan: 5,
+ valueFormat: 'YYYY-MM-DD',
+ },
+ orderTimeRange: {
+ label: '涓嬪崟鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
format: 'YYYY-MM-DD', hide: true, searchSpan: 5,
valueFormat: 'YYYY-MM-DD',
},
@@ -2824,7 +2848,7 @@
if (districtId) data.districtId = districtId;
if (streetId) data.streetId = streetId;
}
- listTmsConsignor({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ listTmsConsignor({pageSize: page.pageSize, pageNum: page.currentPage, ...data,customerId: form.value.customerId}).then(res => {
return callback({
total: res.total,
data: res.rows || [],
@@ -2851,7 +2875,7 @@
if (districtId) data.districtId = districtId;
if (streetId) data.streetId = streetId;
}
- listTmsConsignor({pageSize: page.pageSize, pageNum: page.currentPage, ...data}).then(res => {
+ listTmsConsignor({pageSize: page.pageSize, pageNum: page.currentPage, ...data,customerId: form.value.customerId}).then(res => {
return callback({
total: res.total,
data: res.rows || [],
--
Gitblit v1.8.0