From 3e3cd7ad6d3787dac450deef5d5173de11abab94 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 26 一月 2026 11:03:44 +0800
Subject: [PATCH] 修改为下单类型
---
ui/admin-ui3/src/views/tms/generationCost/index.vue | 59 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/ui/admin-ui3/src/views/tms/generationCost/index.vue b/ui/admin-ui3/src/views/tms/generationCost/index.vue
index deddddf..c3aed09 100644
--- a/ui/admin-ui3/src/views/tms/generationCost/index.vue
+++ b/ui/admin-ui3/src/views/tms/generationCost/index.vue
@@ -202,23 +202,34 @@
:data="boxTableData"
>
<template #expand="{row}">
- <avue-crud
+ <avue-crud v-if="optionType === 'ysGenerate'"
:option="boxItemTableOption" ref="itemsTableRef2"
:data="row.tmsReceivableFeeItems"
>
</avue-crud>
+ <avue-crud v-else
+ :option="boxItemTableOption" ref="itemsTableRef2"
+ :data="row.payableFeeItems"
+ >
+ </avue-crud>
+
</template>
<template #receivableAmount="{row}">
<div v-if="row.receivableAmountRMB > 0">{{row.receivableAmountRMB}}浜烘皯甯�</div>
<div v-if="row.receivableAmountHKD > 0">{{row.receivableAmountHKD}}娓竵</div>
</template>
+
+ <template #payableAmount="{row}">
+ <div v-if="row.payableRmbAmount > 0">{{row.payableRmbAmount}}浜烘皯甯�</div>
+ <div v-if="row.payableHkbAmount > 0">{{row.payableHkbAmount}}娓竵</div>
+ </template>
</avue-crud>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary"
+ <el-button type="primary" v-if="optionType != 'view'"
:loading="pageF.isUploading" @click="submitGenerate">
{{ pageF.isUploading ? '鎻愪氦涓�' : '纭� 瀹�' }}
</el-button>
@@ -1113,18 +1124,24 @@
dispatchNo:{
label: '璋冨害鍗曞彿',
},
-
- transportLine:{
- label: '杩愯緭璺嚎',
+ serviceProviderType:{
+ label: '鏈嶅姟鍟嗙被鍨�',
+ type: 'radio', dicUrl: '/system/dict/data/type/provider_type', dataType: 'string',
},
- actualVehicleType:{
- label: '杞﹀瀷',
- display: true, type: 'select', dicUrl: '/system/dict/data/type/vehicle_type', dataType: 'string',
-
- },licensePlate:{
- label: '杞︾墝',
+ serviceProviderName:{
+ label: '鏈嶅姟鍟嗗悕绋�',
},
- receivableAmount:{
+ // transportLine:{
+ // label: '杩愯緭璺嚎',
+ // },
+ // actualVehicleType:{
+ // label: '杞﹀瀷',
+ // display: true, type: 'select', dicUrl: '/system/dict/data/type/vehicle_type', dataType: 'string',
+ //
+ // },licensePlate:{
+ // label: '杞︾墝',
+ // },
+ payableAmount:{
label: '搴斾粯璐圭敤',
}
}
@@ -1233,12 +1250,13 @@
isLoad.value = isLoad.value == 0 && !pageF.single ? 0 : -1;
console.log(pageF.single)
},
- getBeginListFunc: () => {
+ getBeginListFunc: (params = {}) => {
queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.createTimeRange, 'createTime') || {};
queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.updateTimeRange, 'updateTime') || {};
queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.confirmTimeRange, 'confirmTime') || {};
queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.okTimeRange, 'okTime') || {};
- },
+ return params;
+ },
})
@@ -1563,19 +1581,6 @@
let ids = selectionList.value.map((item: any) => item.id);
initYFGenerate(ids).then(res => {
boxTableData.value = res.data || [];
- boxTableData.value.forEach((item:any) => {
- let items = item.tmsReceivableFeeItems || [];
- let receivableAmountRMB = items.filter( (cItem:any) => cItem.currency == 'RMB').reduce( (pre:any,cur:any) => {
- return pre + Number(cur.registerAmount)
- },0);
- let receivableAmountHKD = items.filter( (cItem:any) => cItem.currency == 'HKD').reduce( (pre:any,cur:any) => {
- return pre + Number(cur.registerAmount)
- },0);
- console.log(receivableAmountRMB,receivableAmountHKD)
- item.receivableAmountRMB = receivableAmountRMB;
- item.receivableAmountHKD = receivableAmountHKD;
-
- })
optionType.value = 'yfGenerate';
open.value = true;
pageF.title = '鐢熸垚搴斾粯璐圭敤';
--
Gitblit v1.8.0