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/lexSaleAndDelivery/lexSaleAndDelivery.js | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js
index e57180a..f33bb52 100644
--- a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js
+++ b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js
@@ -17,6 +17,7 @@
type: 'date',
hideDefaultActions: true,
sortable: true,
+ initialWidth: 180,
wrapText: true
},
{
@@ -44,12 +45,14 @@
label: '绉戝',
fieldName: 'Order_ForCustomerText__c',
hideDefaultActions: true,
+ initialWidth: 100,
wrapText: true
},
{
label: '鍑哄簱鍗曠姸鎬�',
fieldName: 'SummonsStatus_c__c',
hideDefaultActions: true,
+ initialWidth: 100,
sortable: true,
wrapText: true
},
@@ -57,6 +60,7 @@
label: '寮�绁ㄧ姸鎬�',
fieldName: 'Billed_Status__c',
hideDefaultActions: true,
+ initialWidth: 100,
sortable: true,
wrapText: true
},
@@ -64,6 +68,7 @@
label: '鏈彂绁ㄩ噾棰�(鍏�)',
fieldName: 'InvoiceNotPro_money__c',
hideDefaultActions: true,
+ initialWidth: 125,
type: 'number',
typeAttributes: {
minimumFractionDigits: 2
@@ -76,6 +81,7 @@
hideDefaultActions: true,
sortable: true,
wrapText: true,
+ initialWidth: 180,
type: 'date',
typeAttributes: {
timeZone: 'Asia/Shanghai',
@@ -432,4 +438,8 @@
openModal() {
this.isModalOpen = true;
}
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1