From 89fd2cf7202c321512c2ea699a3a220a7138ed44 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
ui/admin-ui3/src/views/tms/collectionTmsQuoteDetail/index.vue | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 159 insertions(+), 1 deletions(-)
diff --git a/ui/admin-ui3/src/views/tms/collectionTmsQuoteDetail/index.vue b/ui/admin-ui3/src/views/tms/collectionTmsQuoteDetail/index.vue
index f71be12..4d8da87 100644
--- a/ui/admin-ui3/src/views/tms/collectionTmsQuoteDetail/index.vue
+++ b/ui/admin-ui3/src/views/tms/collectionTmsQuoteDetail/index.vue
@@ -174,7 +174,7 @@
const option = ref({
pageKey: 'TmsQuoteDetail',
rowKey: 'id',
- labelWidth: 120,
+ labelWidth: 150,
dialogWidth:'80%',
group:[
{
@@ -377,6 +377,44 @@
itemsTableOption.value.column.segment2Currency.hide = true;
itemsTableOption.value.column.segment2TaxRate.hide = true;
itemsTableOption.value.column.totalFreight.hide = true;
+
+
+ option.value.group.forEach((item:any) =>{
+ if (item.prop == 'jcxx'){
+ item.column.freightPrice.editDisplay = true;
+ item.column.freightPrice.viewDisplay = true;
+ item.column.currency.editDisplay = true;
+ item.column.currency.viewDisplay = true;
+ item.column.taxRate.editDisplay = true;
+ item.column.taxRate.viewDisplay = true;
+
+ item.column.segment1FreightQuote.editDisplay = false;
+ item.column.segment1FreightQuote.viewDisplay = false;
+
+ item.column.segment1Currency.editDisplay = false;
+ item.column.segment1Currency.viewDisplay = false;
+
+ item.column.segment1TaxRate.editDisplay = false;
+ item.column.segment1TaxRate.viewDisplay = false;
+
+ item.column.segment2FreightQuote.editDisplay = false;
+ item.column.segment2FreightQuote.viewDisplay = false;
+
+ item.column.segment2Currency.editDisplay = false;
+ item.column.segment2Currency.viewDisplay = false;
+
+ item.column.segment2TaxRate.editDisplay = false;
+ item.column.segment2TaxRate.viewDisplay = false;
+
+ item.column.totalFreightCny.editDisplay = false;
+ item.column.totalFreightCny.viewDisplay = false;
+
+ item.column.totalFreightHkd.editDisplay = false;
+ item.column.totalFreightHkd.viewDisplay = false;
+
+ }
+ })
+
}else{
itemsTableOption.value.column.freightPrice.hide = true;
itemsTableOption.value.column.currency.hide = true;
@@ -388,6 +426,48 @@
itemsTableOption.value.column.segment2Currency.hide = false;
itemsTableOption.value.column.segment2TaxRate.hide = false;
itemsTableOption.value.column.totalFreight.hide = false;
+
+ option.value.group.forEach((item:any) =>{
+ if (item.prop == 'jcxx'){
+ item.column.freightPrice.editDisplay = false;
+ item.column.freightPrice.viewDisplay = false;
+ item.column.currency.editDisplay = false;
+ item.column.currency.viewDisplay = false;
+ item.column.taxRate.editDisplay = false;
+ item.column.taxRate.viewDisplay = false;
+
+ item.column.segment1FreightQuote.editDisplay = true;
+ item.column.segment1FreightQuote.viewDisplay = true;
+
+ item.column.segment1Currency.editDisplay = true;
+ item.column.segment1Currency.viewDisplay = true;
+
+ item.column.segment1TaxRate.editDisplay = true;
+ item.column.segment1TaxRate.viewDisplay = true;
+
+ item.column.segment2FreightQuote.editDisplay = true;
+ item.column.segment2FreightQuote.viewDisplay = true;
+
+ item.column.segment2Currency.editDisplay = true;
+ item.column.segment2Currency.viewDisplay = true;
+
+ item.column.segment2TaxRate.editDisplay = true;
+ item.column.segment2TaxRate.viewDisplay = true;
+
+ item.column.totalFreightCny.editDisplay = true;
+ item.column.totalFreightCny.viewDisplay = true;
+
+ item.column.totalFreightHkd.editDisplay = true;
+ item.column.totalFreightHkd.viewDisplay = true;
+
+ }
+ })
+
+
+
+
+
+
}
}
},
@@ -454,6 +534,84 @@
}
],
},
+
+ segment1FreightQuote:{
+ label: '涓�娈佃繍璐规姤浠�', addDisplay: false,
+ editDisplay: true,
+ viewDisplay: true,type: 'number',
+ rules: [
+ {
+ required: true,
+ message: "涓�娈佃繍璐规姤浠蜂笉鑳戒负绌�", trigger: "blur"
+ }
+ ],
+ },
+ segment1Currency:{
+ label: '涓�娈佃繍璐瑰竵鍒�',addDisplay: false,
+ type: 'radio', dataType: 'string', dicUrl: '/system/dict/data/type/sys_currency',
+ rules: [
+ {
+ required: true,
+ message: "涓�娈佃繍璐瑰竵鍒朵笉鑳戒负绌�", trigger: "blur"
+ }
+ ],
+ },
+ segment1TaxRate:{
+ label: '涓�娈佃繍璐圭◣鐐�%', addDisplay: false,
+ editDisplay: true,
+ viewDisplay: true,type: 'number',
+ rules: [
+ {
+ required: true,
+ message: "涓�娈佃繍璐圭◣鐐逛笉鑳戒负绌�", trigger: "blur"
+ }
+ ],
+ },
+ segment2FreightQuote:{
+ label: '浜屾杩愯垂鎶ヤ环', addDisplay: false,
+ editDisplay: true,
+ viewDisplay: true,type: 'number',
+ rules: [
+ {
+ required: true,
+ message: "浜屾杩愯垂鎶ヤ环涓嶈兘涓虹┖", trigger: "blur"
+ }
+ ],
+ },
+ segment2Currency:{
+ label: '浜屾杩愯垂甯佸埗',addDisplay: false,
+ type: 'radio', dataType: 'string', dicUrl: '/system/dict/data/type/sys_currency',
+ rules: [
+ {
+ required: true,
+ message: "浜屾杩愯垂甯佸埗涓嶈兘涓虹┖", trigger: "blur"
+ }
+ ],
+ },
+ segment2TaxRate:{
+ label: '浜屾杩愯垂绋庣偣%',addDisplay: false,
+ editDisplay: true,
+ viewDisplay: true,type: 'number',
+ rules: [
+ {
+ required: true,
+ message: "浜屾杩愯垂绋庣偣涓嶈兘涓虹┖", trigger: "blur"
+ }
+ ],
+ },
+ totalFreightCny:{
+ label: '鎬昏繍璐逛汉姘戝竵鎶ヤ环', disabled: true, addDisplay: false,
+ editDisplay: true,
+ viewDisplay: true,
+ },
+ totalFreightHkd:{
+ label: '鎬昏繍璐规腐甯佹姤浠�',disabled: true ,addDisplay: false,
+ editDisplay: true,
+ viewDisplay: true
+ }
+
+
+
}
},
{
--
Gitblit v1.8.0