From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/lexInventory/lexInventory.js | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/lwc/lexInventory/lexInventory.js b/force-app/main/default/lwc/lexInventory/lexInventory.js
index 07ed955..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;
@@ -615,15 +638,11 @@
doc += '</table>';
console.log('doc' + doc);
var bom = '\uFEFF';
- // link.href = 'data:text/csv;charset=utf-8,' + encodeURIComponent(bom + csv);
var element =
'data:application/vnd.ms-excel,' + encodeURIComponent(bom + doc);
let downloadElement = document.createElement('a');
downloadElement.href = element;
downloadElement.target = '_self';
- // 璁剧疆鍝嶅簲澶寸鐢ㄧ紦瀛�
- // downloadElement.setAttribute('data-turbolinks-cache-control', 'no-cache');
- // downloadElement.setAttribute('data-turbolinks-track', 'reload');
// use .csv as extension on below line if you want to export data as csv
downloadElement.download = '鍦ㄥ簱璋冩暣涓�瑙�.xls';
document.body.appendChild(downloadElement);
@@ -854,4 +873,4 @@
.querySelector('c-common-toast')
.showToast(variant, content, iconName, 10000);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1