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/lexInventory/lexInventory.js | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/lwc/lexInventory/lexInventory.js b/force-app/main/default/lwc/lexInventory/lexInventory.js
index ac48985..bdcd664 100644
--- a/force-app/main/default/lwc/lexInventory/lexInventory.js
+++ b/force-app/main/default/lwc/lexInventory/lexInventory.js
@@ -213,6 +213,7 @@
@track consumableorderdetailsRecords = [];
@track showcount = true;
+<<<<<<< HEAD
@track iSinventory = false;
@track numberDetail;
@track hidecheckbox = true;
@@ -233,6 +234,28 @@
@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