From 8ca7e4aff6670faa03633b91848b26639c92279a Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期四, 18 十二月 2025 09:40:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue | 163 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 116 insertions(+), 47 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..ff759c8 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"
@@ -128,7 +128,7 @@
<template #shipperId-form="{disabled}">
<div style="display:flex; align-items: center;justify-content: space-between">
- <avue-input-table :props="consignorProps"
+ <avue-input-table :props="consignorProps" dataType="string"
:children="consignorOption" :disabled="disabled"
:on-load="onShipperLoad" suffixIcon="search"
v-model="form.shipperId" style="width: 80%"
@@ -140,7 +140,7 @@
<template #receiverId-form="{disabled}">
<div style="display:flex; align-items: center;justify-content: space-between">
<avue-input-table :props="consignorProps"
- :children="consignorOption"
+ :children="consignorOption" dataType="string"
:on-load="onConsignorLoad" suffixIcon="search"
v-model="form.receiverId" :disabled="disabled"
@change="changeReceiver" style="width: 80%"
@@ -395,6 +395,7 @@
searchSpan: 6,
searchLabelWidth: 150,
menuWidth: 300,
+ height: 530,
group: [
{
label: '鍩烘湰淇℃伅',
@@ -412,13 +413,11 @@
],
type: 'table', suffixIcon: 'search',dataType: 'string',
change: (val: any) => {
- console.log(val)
const table = crudRef.value?.getPropRef?.('quoteDetailId')?.$refs?.temp;
if (!table) return;
let active = table.active;
if (Array.isArray(active)) active = active[0];
if (active) {
- console.log(active)
Object.assign(form.value, {
quoteDetailId: active.quoteDetailId,
transportLine: active.transportRoute,
@@ -434,6 +433,14 @@
requiredVehicleTypes: active.vehicleType,
quotePlanId: active.quotePlanId,
});
+ form.value.shipperId = undefined;
+ form.value.shipperRegionLabel = undefined;
+ form.value.shipperAddress = undefined;
+ form.value.shipperMobile = undefined;
+ form.value.receiverId = undefined;
+ form.value.receiverRegionLabel = undefined;
+ form.value.receiverAddress = undefined;
+ form.value.receiverMobile = undefined;
}
},
children: {
@@ -738,6 +745,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 +1437,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,29 +1510,29 @@
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,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/tms_dispatch_order_status',
display: false,
hide: false, fixed: 'right',
- search: true,
+ search: false,
rules: [
{
required: true,
@@ -1526,14 +1540,54 @@
}
],
},
+ inStatusList: {
+ label: '鐘舵��', minWidth: 150,
+ type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/tms_dispatch_order_status',
+ display: false,multiple:true,
+ hide: true,
+ search: true,
+ },
+ confirmTime: {
+ label: '纭鏃堕棿', minWidth: 180,
+ display: false,
+ hide: false,
+ search: false,
+ },
+ orderTime: {
+ label: '涓嬪崟鏃堕棿', minWidth: 180,
+ display: false,
+ hide: false,
+ search: false,
+ },
+ createBy: {
+ label: '鍒涘缓浜�', minWidth: 150,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: false,
+ search: true,
+ },
+ createTime: {
+ label: '鍒涘缓鏃堕棿', minWidth: 180,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: false,
+ search: false,
+ },
+ createTimeRange: {
+ label: '鍒涘缓鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
+ format: 'YYYY-MM-DD', hide: true, searchSpan: 5,
+ valueFormat: 'YYYY-MM-DD',
+ },
updateBy: {
label: '鏇存柊浜�', minWidth: 150,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: false,
- search: false,
+ search: true,
},
updateTime: {
label: '鏇存柊鏃堕棿', minWidth: 180,
@@ -1555,6 +1609,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',
},
@@ -1678,8 +1737,7 @@
label: '琛岀▼鍑瘉',
display: true,
span: 24, dataType: 'string',
- type: 'upload',
- action: '/common/upload2',
+ type: 'img',
},
@@ -2459,6 +2517,11 @@
queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.confirmTimeRange, 'confirmTime') || {};
queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.okTimeRange, 'okTime') || {};
},
+ handleBeforeOpenFunc:(type:string)=>{
+ if(type == 'add'){
+ form.value = {};
+ }
+ }
})
const handleConfirm = (row: any) => {
@@ -2686,7 +2749,10 @@
pageF.isUploading = false;
})
}else if (optionType.value === 'customs') {
- customsOrder({id:form.value.id}).then(res => {
+ customsOrder({id:form.value.id,
+ customsServiceProviderId: form.value.customsServiceProviderId,
+ customsServiceProviderName: form.value.customsServiceProviderName,
+ }).then(res => {
ElMessage({
message: "鎻愪氦鎴愬姛锛�",
type: 'success'
@@ -2697,7 +2763,10 @@
pageF.isUploading = false;
})
}else if (optionType.value === 'loading') {
- loadingOrder({id:form.value.id}).then(res => {
+ loadingOrder({id:form.value.id,
+ loadingServiceProviderId: form.value.loadingServiceProviderId,
+ loadingServiceProviderName: form.value.loadingServiceProviderName,
+ }).then(res => {
ElMessage({
message: "鎻愪氦鎴愬姛锛�",
type: 'success'
@@ -2824,7 +2893,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 +2920,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