From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.js | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.js b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.js
index 495eb73..299d046 100644
--- a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.js
+++ b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.js
@@ -161,19 +161,20 @@
label: '浜у搧鍨嬪彿',
fieldName: 'esdAssetModelNo',
hideDefaultActions: true,
- initialWidth: 200,
+ initialWidth: 150,
wrapText: true
},
{
label: '瑙勬牸',
fieldName: 'packingListManual',
hideDefaultActions: true,
- initialWidth: 30
+ initialWidth: 50
},
{
label: '鍑鸿揣鍗曚环(鍏�)',
fieldName: 'esdDeliveryListRMB',
hideDefaultActions: true,
+ initialWidth: 100,
type: 'number',
typeAttributes: {
minimumFractionDigits: 2
@@ -207,6 +208,7 @@
label: '杩樻病鍙戠エ鏁伴噺',
fieldName: 'esdInvoiceProNotCount',
hideDefaultActions: true,
+ initialWidth: 100,
type: 'number',
typeAttributes: {
minimumFractionDigits: 2
@@ -2172,4 +2174,8 @@
this.showMyToast('閿欒', error.message, 'Error');
});
}
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1