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/lexInventory/lexInventory.js | 27 ++-------------------------
1 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/force-app/main/default/lwc/lexInventory/lexInventory.js b/force-app/main/default/lwc/lexInventory/lexInventory.js
index bdcd664..5e89561 100644
--- a/force-app/main/default/lwc/lexInventory/lexInventory.js
+++ b/force-app/main/default/lwc/lexInventory/lexInventory.js
@@ -213,14 +213,13 @@
@track consumableorderdetailsRecords = [];
@track showcount = true;
-<<<<<<< HEAD
@track iSinventory = false;
@track numberDetail;
@track hidecheckbox = true;
//鍒嗛〉start
@track sortBy = '';
@track sortDirection = 'asc';
- @track pageSize = 10;
+ @track pageSize = 200;
error;
records;
currentPageToken = 0;
@@ -230,32 +229,10 @@
@track pageNumber = 1;
@track paginationVisibility = false;
@track totalPages = 1;
- pageSizeOptions = [10, 25, 50, 100];
+ pageSizeOptions = [100, 200, 300];
@track recordStart = 0;
@track recordEnd = 0;
//end
-=======
- @track iSinventory = false
- @track numberDetail;
- @track hidecheckbox = true;
- //鍒嗛〉start
- @track sortBy = "";
- @track sortDirection = "asc";
- @track pageSize = 200;
- error;
- records;
- currentPageToken = 0;
- nextPageToken = this.pageSize;
- @track totalRecords = 0;
- @track loader = false;
- @track pageNumber = 1;
- @track paginationVisibility = false;
- @track totalPages = 1;
- pageSizeOptions = [100, 200, 300];
- @track recordStart = 0;
- @track recordEnd = 0;
- //end
->>>>>>> LEXCommunityLiJun
//鍔犺浇妗�
// @track casesSpinner = true;
--
Gitblit v1.9.1