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/lexArriveGoodsMain/lexArriveGoodsMain.js | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
index 47b005d..47a5f09 100644
--- a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
+++ b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
@@ -59,7 +59,7 @@
recordId: { fieldName: 'Id' }
},
hideDefaultActions: true,
- initialWidth: 200,
+ // initialWidth: 200,
wrapText: true
},
{
@@ -90,7 +90,7 @@
recordId: { fieldName: 'Id' }
},
hideDefaultActions: true,
- initialWidth: 110,
+ initialWidth: 100,
cellAttributes: { alignment: 'right' }
},
{
@@ -102,7 +102,7 @@
recordId: { fieldName: 'Id' }
},
hideDefaultActions: true,
- initialWidth: 180,
+ initialWidth: 150,
cellAttributes: { alignment: 'right' }
},
{
@@ -126,20 +126,20 @@
recordId: { fieldName: 'Id' }
},
hideDefaultActions: true,
- initialWidth: 180,
+ initialWidth: 150,
cellAttributes: { alignment: 'right' }
},
{
label: '鏈�鏂板彂璐ф棩鏈�',
fieldName: 'Shipment_date__c',
hideDefaultActions: true,
- initialWidth: 140
+ initialWidth: 105
},
{
label: '棣栨鍙戣揣鏃ユ湡',
fieldName: 'First_Delivery__c',
hideDefaultActions: true,
- initialWidth: 140
+ initialWidth: 105
}
];
@@ -526,4 +526,8 @@
// });
// this.dispatchEvent(evt);
}
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1