From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte

---
 force-app/main/default/lwc/lexConsumable/lexConsumable.js |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.js b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
index 4cb51c5..f944034 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.js
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
@@ -85,9 +85,9 @@
     @track sortedBy;
     //鍒嗛〉
     @track currentPage = 1;
-    @track pageSize = 10;
+    @track pageSize = 200;
     // @track totalPage = 0;
-    @track pageSizeOptions = [10, 25, 50, 100];
+    @track pageSizeOptions = [100, 200, 300];
     @track recordStart = 0;
     @track recordEnd = 0;
     //鎶ラ敊鎻愰啋
@@ -206,8 +206,8 @@
             fieldName: 'prodName',
             wrapText: true,
             hideDefaultActions: true,
-            sortable: true,
-            initialWidth: 150
+            sortable: true
+            // initialWidth: 136
         });
         cols.push({
             label: '瑙勬牸',
@@ -222,28 +222,28 @@
             fieldName: 'prodSFDAStatus',
             wrapText: true,
             hideDefaultActions: true,
-            initialWidth: 97
+            initialWidth: 84
         });
         cols.push({
             label: '娉ㄥ唽璇佺紪鐮佸彿',
             fieldName: 'approbation_No',
             wrapText: true,
             hideDefaultActions: true,
-            initialWidth: 120
+            initialWidth: 104
         });
         cols.push({
             label: '娉ㄥ唽璇佹晥鏈�',
             fieldName: 'expiration_Date',
             wrapText: true,
             hideDefaultActions: true,
-            initialWidth: 105
+            initialWidth: 95
         });
         cols.push({
             label: '绗�3鍒嗙被',
             fieldName: 'prodCategory3',
             wrapText: true,
             hideDefaultActions: true,
-            initialWidth: 78,
+            initialWidth: 84,
             sortable: true
         });
         cols.push({
@@ -251,7 +251,7 @@
             fieldName: 'prodCategory4',
             wrapText: true,
             hideDefaultActions: true,
-            initialWidth: 107,
+            initialWidth: 84,
             sortable: true
         });
         cols.push({
@@ -259,7 +259,7 @@
             fieldName: 'prodCategory5',
             wrapText: true,
             hideDefaultActions: true,
-            initialWidth: 80,
+            initialWidth: 84,
             sortable: true
         });
         if (this.cansee) {
@@ -269,7 +269,7 @@
                 typeAttributes: { minimumFractionDigits: 2 },
                 fieldName: 'prodIntraTradeList',
                 hideDefaultActions: true,
-                initialWidth: 80
+                initialWidth: 78
             });
         }
         if (this.editAble) {
@@ -285,14 +285,14 @@
                     valueType: 'Number'
                 },
                 hideDefaultActions: true,
-                initialWidth: 80
+                initialWidth: 78
             });
         } else {
             cols.push({
                 label: '閲囪喘鏁伴噺',
                 fieldName: 'consumableCount',
                 hideDefaultActions: true,
-                initialWidth: 80,
+                initialWidth: 78,
                 cellAttributes: { alignment: 'right' }
             });
         }
@@ -300,20 +300,21 @@
             label: '鍦ㄥ簱鏁颁笅闄�',
             fieldName: 'lowerlimit',
             hideDefaultActions: true,
-            initialWidth: 100,
+            initialWidth: 86,
             cellAttributes: { alignment: 'right' }
         });
         cols.push({
             label: '鍦ㄥ簱鏁颁笂闄�',
             fieldName: 'upperlimit',
             hideDefaultActions: true,
-            initialWidth: 100,
+            initialWidth: 86,
             cellAttributes: { alignment: 'right' }
         });
         // cols.push({label:'鏈夋晥鏈熷簱瀛�(鐩�)',fieldName:'allnumber',hideDefaultActions: true,initialWidth:105,sortable: true});
         cols.push({
             label: '鏈夋晥鏈熷簱瀛�(鐩�)',
             type: 'customInventoryColor',
+            fieldName: 'allnumber',
             typeAttributes: {
                 value: { fieldName: 'allnumber' },
                 upperlimit: { fieldName: 'upperlimit' },
@@ -321,13 +322,14 @@
                 boxPrice: '鐩�'
             },
             hideDefaultActions: true,
-            initialWidth: 126
+            initialWidth: 122,
+            sortable: true
         });
         cols.push({
             label: '鏈夋晥鏈熷簱瀛�(涓�)',
             fieldName: 'allnumber_piece',
             hideDefaultActions: true,
-            initialWidth: 126,
+            initialWidth: 112,
             cellAttributes: { alignment: 'right' }
         });
         return cols;
@@ -1773,4 +1775,4 @@
     get nextButtonDisabled() {
         return this.currentPage == this.totalPage;
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1