tplus-components-touch 3.27.3 → 3.28.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (203) hide show
  1. package/README.md +16 -16
  2. package/dist/components/acCitySelect/CitySelect.js +18 -18
  3. package/dist/components/acCitySelect/CitySelect.js.map +1 -1
  4. package/dist/components/acCitySelect/CitySelect.less +9 -9
  5. package/dist/components/acCitySelect/citys.js.map +1 -1
  6. package/dist/components/acCitySelect/index.js.map +1 -1
  7. package/dist/components/acCitySelect/provinceData.js +7 -7
  8. package/dist/components/acCitySelect/provinceData.js.map +1 -1
  9. package/dist/components/addLog/AddLogProcessor.js +6 -6
  10. package/dist/components/addLog/AddLogProcessor.js.map +1 -1
  11. package/dist/components/addLog/OperationLogApi.js +3 -3
  12. package/dist/components/addLog/OperationLogApi.js.map +1 -1
  13. package/dist/components/autoComplete/index.js +14 -14
  14. package/dist/components/autoComplete/index.js.map +1 -1
  15. package/dist/components/autoComplete/index.less +89 -89
  16. package/dist/components/autoComplete/option.js.map +1 -1
  17. package/dist/components/autoCompleteWithKeyboard/index.js +14 -14
  18. package/dist/components/autoCompleteWithKeyboard/index.js.map +1 -1
  19. package/dist/components/autoCompleteWithKeyboard/index.less +7 -7
  20. package/dist/components/billSearch/api.js +37 -98
  21. package/dist/components/billSearch/api.js.map +1 -1
  22. package/dist/components/billSearch/index.js +159 -21
  23. package/dist/components/billSearch/index.js.map +1 -1
  24. package/dist/components/billSearch/index.less +376 -373
  25. package/dist/components/cloudPrint/BTPrintFormatUtil.js +17 -17
  26. package/dist/components/cloudPrint/BTPrintFormatUtil.js.map +1 -1
  27. package/dist/components/cloudPrint/api.js +85 -43
  28. package/dist/components/cloudPrint/api.js.map +1 -1
  29. package/dist/components/cloudPrint/index.js +57 -4
  30. package/dist/components/cloudPrint/index.js.map +1 -1
  31. package/dist/components/cloudPrint/printDispatch.js +209 -108
  32. package/dist/components/cloudPrint/printDispatch.js.map +1 -1
  33. package/dist/components/commonForm/addressPicker/index.js +14 -23
  34. package/dist/components/commonForm/addressPicker/index.js.map +1 -1
  35. package/dist/components/commonForm/addressPicker/style.less +10 -10
  36. package/dist/components/commonForm/autoComplete/index.js.map +1 -1
  37. package/dist/components/commonForm/autoComplete/style.less +2 -2
  38. package/dist/components/commonForm/datePicker/index.js.map +1 -1
  39. package/dist/components/commonForm/datePicker/style.less +4 -4
  40. package/dist/components/commonForm/formControl/index.js.map +1 -1
  41. package/dist/components/commonForm/index.js +7 -13
  42. package/dist/components/commonForm/index.js.map +1 -1
  43. package/dist/components/commonForm/inputNumber/index.js.map +1 -1
  44. package/dist/components/commonForm/inputNumber/style.less +10 -10
  45. package/dist/components/commonForm/radio/index.js.map +1 -1
  46. package/dist/components/commonForm/style.less +1 -1
  47. package/dist/components/deliverySearch/api.js +21 -21
  48. package/dist/components/deliverySearch/api.js.map +1 -1
  49. package/dist/components/deliverySearch/index.js +16 -12
  50. package/dist/components/deliverySearch/index.js.map +1 -1
  51. package/dist/components/deliverySearch/index.less +553 -553
  52. package/dist/components/form/index.js.map +1 -1
  53. package/dist/components/hardwareAPI/index.js.map +1 -1
  54. package/dist/components/hotKey/config.js +23 -23
  55. package/dist/components/hotKey/config.js.map +1 -1
  56. package/dist/components/hotKey/hotKeyModal.js.map +1 -1
  57. package/dist/components/hotKey/index.js +26 -26
  58. package/dist/components/hotKey/index.js.map +1 -1
  59. package/dist/components/hotKey/localConfig.js +0 -52
  60. package/dist/components/hotKey/localConfig.js.map +1 -1
  61. package/dist/components/hotKey/style.less +96 -96
  62. package/dist/components/hotKey/utils.js.map +1 -1
  63. package/dist/components/input/index.js +6 -6
  64. package/dist/components/input/index.js.map +1 -1
  65. package/dist/components/input/scanInput.js +98 -0
  66. package/dist/components/input/scanInput.js.map +1 -0
  67. package/dist/components/input/scanInput.less +28 -0
  68. package/dist/components/input/style.less +99 -99
  69. package/dist/components/input/tplusInput/index.js +30 -30
  70. package/dist/components/input/tplusInput/index.js.map +1 -1
  71. package/dist/components/input/tplusInput/inputContent.js.map +1 -1
  72. package/dist/components/input/tplusInput/inputs.js.map +1 -1
  73. package/dist/components/input/tplusInput/style.less +132 -132
  74. package/dist/components/input/utils/index.js.map +1 -1
  75. package/dist/components/inventorySearch/api.js +58 -58
  76. package/dist/components/inventorySearch/api.js.map +1 -1
  77. package/dist/components/inventorySearch/index.js +3 -3
  78. package/dist/components/inventorySearch/index.js.map +1 -1
  79. package/dist/components/inventorySearch/index.less +119 -119
  80. package/dist/components/inventorySearch/store.js +31 -12
  81. package/dist/components/inventorySearch/store.js.map +1 -1
  82. package/dist/components/inventorySearch/tab.js +78 -63
  83. package/dist/components/inventorySearch/tab.js.map +1 -1
  84. package/dist/components/keyboard/index.js.map +1 -1
  85. package/dist/components/keyboard/index.less +469 -469
  86. package/dist/components/keyboard/letterKeyboard.js +2 -2
  87. package/dist/components/keyboard/letterKeyboard.js.map +1 -1
  88. package/dist/components/keyboard/numKeyboard.js +4 -4
  89. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  90. package/dist/components/keyboard/numKeyboardScan.js.map +1 -1
  91. package/dist/components/keyboard/numberButton_input.js +5 -5
  92. package/dist/components/keyboard/numberButton_input.js.map +1 -1
  93. package/dist/components/keyboard/numkeyboardPassword.js +4 -4
  94. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  95. package/dist/components/keyboard/onlyKeyboard.js +7 -7
  96. package/dist/components/keyboard/onlyKeyboard.js.map +1 -1
  97. package/dist/components/keyboard/onlyLetterButton.js +2 -2
  98. package/dist/components/keyboard/onlyLetterButton.js.map +1 -1
  99. package/dist/components/keyboard/onlyLetterButton2.js +2 -2
  100. package/dist/components/keyboard/onlyLetterButton2.js.map +1 -1
  101. package/dist/components/keyboard/onlyLetterButton2.less +161 -161
  102. package/dist/components/keyboard/onlyNumberButton.js +2 -2
  103. package/dist/components/keyboard/onlyNumberButton.js.map +1 -1
  104. package/dist/components/keyboard/onlyNumberButton2.js +3 -3
  105. package/dist/components/keyboard/onlyNumberButton2.js.map +1 -1
  106. package/dist/components/keyboard/textKeyboard.js.map +1 -1
  107. package/dist/components/layout/hamburger.js.map +1 -1
  108. package/dist/components/layout/index.js +10 -10
  109. package/dist/components/layout/index.js.map +1 -1
  110. package/dist/components/layout/layout.js.map +1 -1
  111. package/dist/components/layout/sider.js +12 -12
  112. package/dist/components/layout/sider.js.map +1 -1
  113. package/dist/components/layout/style.less +82 -82
  114. package/dist/components/loading/index.js +15 -15
  115. package/dist/components/loading/index.js.map +1 -1
  116. package/dist/components/loading/loadingContent.js +13 -4
  117. package/dist/components/loading/loadingContent.js.map +1 -1
  118. package/dist/components/loading/style.less +70 -61
  119. package/dist/components/loading/utils.js.map +1 -1
  120. package/dist/components/message/index.js +16 -13
  121. package/dist/components/message/index.js.map +1 -1
  122. package/dist/components/message/index.less +101 -101
  123. package/dist/components/modal/index.js.map +1 -1
  124. package/dist/components/modal/index.less +19 -19
  125. package/dist/components/modalVertical/index.js +7 -7
  126. package/dist/components/modalVertical/index.js.map +1 -1
  127. package/dist/components/modalVertical/style.less +60 -60
  128. package/dist/components/modalWraper/index.js +15 -15
  129. package/dist/components/modalWraper/index.js.map +1 -1
  130. package/dist/components/modalWraper/style.less +257 -257
  131. package/dist/components/modalWraper/utils.js.map +1 -1
  132. package/dist/components/notification/index.js +4 -4
  133. package/dist/components/notification/index.js.map +1 -1
  134. package/dist/components/notification/index.less +51 -51
  135. package/dist/components/overflowTip/index.js +15 -15
  136. package/dist/components/overflowTip/index.js.map +1 -1
  137. package/dist/components/overflowTip/style.less +66 -66
  138. package/dist/components/page/index.js.map +1 -1
  139. package/dist/components/page/index.less +21 -21
  140. package/dist/components/product/detail.js +7 -7
  141. package/dist/components/product/detail.js.map +1 -1
  142. package/dist/components/product/getCard.js +5 -5
  143. package/dist/components/product/getCard.js.map +1 -1
  144. package/dist/components/product/index.less +128 -128
  145. package/dist/components/progressState/EmptyAndErrorView.js.map +1 -1
  146. package/dist/components/progressState/ProgressState.js +10 -10
  147. package/dist/components/progressState/ProgressState.js.map +1 -1
  148. package/dist/components/progressState/index.js.map +1 -1
  149. package/dist/components/progressState/style.less +65 -65
  150. package/dist/components/scan/index.js.map +1 -1
  151. package/dist/components/scan/index.less +33 -33
  152. package/dist/components/select/index.js.map +1 -1
  153. package/dist/components/select/index.less +11 -11
  154. package/dist/components/settlement/asyncModal.js.map +1 -1
  155. package/dist/components/settlement/index.js.map +1 -1
  156. package/dist/components/settlement/prototypeTable/index.js.map +1 -1
  157. package/dist/components/settlement/prototypeTable/style.less +58 -58
  158. package/dist/components/settlement/prototypeTable/utils.js.map +1 -1
  159. package/dist/components/settlement/settlement.js +73 -237
  160. package/dist/components/settlement/settlement.js.map +1 -1
  161. package/dist/components/settlement/settlement.less +1594 -1600
  162. package/dist/components/settlement/settlementStore.js +108 -142
  163. package/dist/components/settlement/settlementStore.js.map +1 -1
  164. package/dist/components/settlement/utils.js.map +1 -1
  165. package/dist/components/socket/index.js +17 -16
  166. package/dist/components/socket/index.js.map +1 -1
  167. package/dist/components/spin/index.js +6 -6
  168. package/dist/components/spin/index.js.map +1 -1
  169. package/dist/components/spin/spin-style.less +436 -436
  170. package/dist/components/test/index.js +3 -3
  171. package/dist/components/test/index.js.map +1 -1
  172. package/dist/components/ticon/iconfont/demo.css +539 -539
  173. package/dist/components/ticon/iconfont/demo_index.html +5202 -5225
  174. package/dist/components/ticon/iconfont/iconfont.css +887 -891
  175. package/dist/components/ticon/iconfont/iconfont.js +1 -1
  176. package/dist/components/ticon/iconfont/iconfont.js.map +1 -1
  177. package/dist/components/ticon/iconfont/iconfont.json +1535 -1542
  178. package/dist/components/ticon/iconfont/iconfont.svg +593 -593
  179. package/dist/components/ticon/iconfont/iconfont.ttf +0 -0
  180. package/dist/components/ticon/iconfont/iconfont.woff +0 -0
  181. package/dist/components/ticon/iconfont/iconfont.woff2 +0 -0
  182. package/dist/components/ticon/index.js.map +1 -1
  183. package/dist/components/touchScroll/index.js +9 -9
  184. package/dist/components/touchScroll/index.js.map +1 -1
  185. package/dist/components/touchTable/AuthProcess.js.map +1 -1
  186. package/dist/components/touchTable/generateWater.js.map +1 -1
  187. package/dist/components/touchTable/index.js +9 -18
  188. package/dist/components/touchTable/index.js.map +1 -1
  189. package/dist/components/touchTable/index.less +369 -369
  190. package/dist/components/touchTable/utils.js.map +1 -1
  191. package/dist/demo/PopOverDemo.js.map +1 -1
  192. package/dist/index.js +25 -13
  193. package/dist/index.js.map +1 -1
  194. package/dist/util/tools.js +5 -7
  195. package/dist/util/tools.js.map +1 -1
  196. package/locales/zh/tplus-components-touch.json +1 -1
  197. package/locales/zh-CN/tplus-components-touch.json +1 -1
  198. package/mocks/memberInfo.json +79 -79
  199. package/package.json +2 -2
  200. package/tsconfig.json +26 -26
  201. package/dist/components/presale/pickup.js +0 -419
  202. package/dist/components/presale/pickup.js.map +0 -1
  203. package/dist/components/presale/style.less +0 -48
@@ -33,11 +33,11 @@ var _tplusApi = require('tplus-api');
33
33
 
34
34
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
35
35
 
36
- /**
37
- *
38
- *
39
- * @export
40
- * @class billSearchApi
36
+ /**
37
+ *
38
+ *
39
+ * @export
40
+ * @class billSearchApi
41
41
  */
42
42
  var billSearchApi = function () {
43
43
  function billSearchApi() {
@@ -55,7 +55,7 @@ var billSearchApi = function () {
55
55
  case 0:
56
56
  defaultValue = {
57
57
  CurrentPage: 1, // int 当前页,默认1
58
- PageSize: 15, // int 页大小,默认10
58
+ PageSize: 15, // int 页大小,默认10
59
59
  StartVoucherDate: '', // datetime 单据开始日期
60
60
  EndVoucherDate: '', // datetime 单据结束日期
61
61
  VoucherCode: '', // string 单据编号,支持模糊查询
@@ -65,7 +65,7 @@ var billSearchApi = function () {
65
65
  Navigator: '', // string 导购,多选,返回导购Id,多个用英文逗号隔开,如:1,2,3,4
66
66
  Cashier: '', // string 收银员,多选,返回收银员Id,多个用英文逗号隔开,如:1,2,3,4
67
67
  StartAdmount: '', // decimal 起始金额
68
- EndAdmount: '', // decimal 结束金额
68
+ EndAdmount: '', // decimal 结束金额
69
69
  IdStore: ''
70
70
  };
71
71
  _context.next = 3;
@@ -90,9 +90,9 @@ var billSearchApi = function () {
90
90
  return searchRetailList;
91
91
  }()
92
92
 
93
- /**
94
- * 获取单据详细信息
95
- * @param {string} code
93
+ /**
94
+ * 获取单据详细信息
95
+ * @param {string} code
96
96
  */
97
97
 
98
98
  }, {
@@ -126,9 +126,9 @@ var billSearchApi = function () {
126
126
  return getRetailDetail;
127
127
  }()
128
128
 
129
- /**
130
- * 获取单据详细信息
131
- * @param {string} code
129
+ /**
130
+ * 获取单据详细信息
131
+ * @param {string} code
132
132
  */
133
133
 
134
134
  }, {
@@ -162,9 +162,9 @@ var billSearchApi = function () {
162
162
  return getRetailDetailInfo;
163
163
  }()
164
164
 
165
- /**
166
- * 获取单据详细信息-原单退货
167
- * @param {string} ID
165
+ /**
166
+ * 获取单据详细信息-原单退货
167
+ * @param {string} ID
168
168
  */
169
169
 
170
170
  }, {
@@ -198,9 +198,9 @@ var billSearchApi = function () {
198
198
  return getOrigRetailData;
199
199
  }()
200
200
 
201
- /**
202
- * 提货卡退货
203
- * @param {string} ID
201
+ /**
202
+ * 提货卡退货
203
+ * @param {string} ID
204
204
  */
205
205
 
206
206
  }, {
@@ -234,8 +234,8 @@ var billSearchApi = function () {
234
234
  return getRefundConsumer;
235
235
  }()
236
236
 
237
- /**
238
- * 获取单据 栏目信息 (目前用不上,先前端写死)
237
+ /**
238
+ * 获取单据 栏目信息 (目前用不上,先前端写死)
239
239
  */
240
240
 
241
241
  }, {
@@ -269,8 +269,8 @@ var billSearchApi = function () {
269
269
  return getPOSSearchRetailListDesigns;
270
270
  }()
271
271
 
272
- /**
273
- * 获取单据编码信息、单据栏目、明细栏目。
272
+ /**
273
+ * 获取单据编码信息、单据栏目、明细栏目。
274
274
  */
275
275
 
276
276
  }, {
@@ -304,8 +304,8 @@ var billSearchApi = function () {
304
304
  return getPOSOrigReturnListInitData;
305
305
  }()
306
306
 
307
- /**
308
- * 获取单据 详细 的栏目信息
307
+ /**
308
+ * 获取单据 详细 的栏目信息
309
309
  */
310
310
 
311
311
  }, {
@@ -339,8 +339,8 @@ var billSearchApi = function () {
339
339
  return getPOSSearchDesigns;
340
340
  }()
341
341
 
342
- /**
343
- * 获取 导购下拉
342
+ /**
343
+ * 获取 导购下拉
344
344
  */
345
345
 
346
346
  }, {
@@ -374,8 +374,8 @@ var billSearchApi = function () {
374
374
  return searchNavigator;
375
375
  }()
376
376
 
377
- /**
378
- * 获取 其他三个 下拉
377
+ /**
378
+ * 获取 其他三个 下拉
379
379
  */
380
380
 
381
381
  }, {
@@ -412,23 +412,21 @@ var billSearchApi = function () {
412
412
  return getRetailSearchItemList;
413
413
  }()
414
414
 
415
- //预售取货列表
415
+ /**
416
+ * 获取服务器时间
417
+ */
416
418
 
417
419
  }, {
418
- key: 'searchWaitPickUpListPaging',
420
+ key: 'getTime',
419
421
  value: function () {
420
- var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(data) {
422
+ var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11() {
421
423
  return _regenerator2.default.wrap(function _callee11$(_context11) {
422
424
  while (1) {
423
425
  switch (_context11.prev = _context11.next) {
424
426
  case 0:
425
- _context11.next = 2;
426
- return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/searchWaitPickUpListPaging', false, false);
427
-
428
- case 2:
429
- return _context11.abrupt('return', _context11.sent);
427
+ return _context11.abrupt('return', '2019-05-15');
430
428
 
431
- case 3:
429
+ case 1:
432
430
  case 'end':
433
431
  return _context11.stop();
434
432
  }
@@ -436,67 +434,8 @@ var billSearchApi = function () {
436
434
  }, _callee11, this);
437
435
  }));
438
436
 
439
- function searchWaitPickUpListPaging(_x11) {
440
- return _ref11.apply(this, arguments);
441
- }
442
-
443
- return searchWaitPickUpListPaging;
444
- }()
445
- //判断是否需要补款
446
-
447
- }, {
448
- key: 'GetPickUpSettleAmount',
449
- value: function () {
450
- var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(data) {
451
- return _regenerator2.default.wrap(function _callee12$(_context12) {
452
- while (1) {
453
- switch (_context12.prev = _context12.next) {
454
- case 0:
455
- _context12.next = 2;
456
- return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPickUpSettleAmount', false, false);
457
-
458
- case 2:
459
- return _context12.abrupt('return', _context12.sent);
460
-
461
- case 3:
462
- case 'end':
463
- return _context12.stop();
464
- }
465
- }
466
- }, _callee12, this);
467
- }));
468
-
469
- function GetPickUpSettleAmount(_x12) {
470
- return _ref12.apply(this, arguments);
471
- }
472
-
473
- return GetPickUpSettleAmount;
474
- }()
475
-
476
- /**
477
- * 获取服务器时间
478
- */
479
-
480
- }, {
481
- key: 'getTime',
482
- value: function () {
483
- var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13() {
484
- return _regenerator2.default.wrap(function _callee13$(_context13) {
485
- while (1) {
486
- switch (_context13.prev = _context13.next) {
487
- case 0:
488
- return _context13.abrupt('return', '2019-05-15');
489
-
490
- case 1:
491
- case 'end':
492
- return _context13.stop();
493
- }
494
- }
495
- }, _callee13, this);
496
- }));
497
-
498
437
  function getTime() {
499
- return _ref13.apply(this, arguments);
438
+ return _ref11.apply(this, arguments);
500
439
  }
501
440
 
502
441
  return getTime;
@@ -1 +1 @@
1
- {"version":3,"sources":["tplus-components-touch/components/billSearch/api.js"],"names":["billSearchApi","obj","defaultValue","CurrentPage","PageSize","StartVoucherDate","EndVoucherDate","VoucherCode","VoucherType","VoucherState","Member","Navigator","Cashier","StartAdmount","EndAdmount","IdStore","param","result","code","type","RetailCode","KeyType","ID","DetailColumn","RetailId","PosDesign","retail","origRetailId","dto","Retail","ViewName","SearchParams","Key","IsOtherStore","console","log","data","number","length","undefined","parseInt","indexOf","substring"],"mappings":"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","file":"api.js","sourcesContent":["import { tApi, ccApi } from 'tplus-api';\r\n/**\r\n *\r\n *\r\n * @export\r\n * @class billSearchApi\r\n */\r\nexport default class billSearchApi {\r\n static async searchRetailList(obj) {\r\n let defaultValue = {\r\n CurrentPage: 1,\t // int\t 当前页,默认1\r\n PageSize: 15, \t // int \t 页大小,默认10\r\n StartVoucherDate: '',\t// datetime\t单据开始日期\r\n EndVoucherDate: '',\t // datetime\t单据结束日期\r\n VoucherCode: '',\t // string\t单据编号,支持模糊查询\r\n VoucherType: '',\t // int\t单据业务类型,下拉单选,返回对应业务类型Id\r\n VoucherState: '',\t // int\t单据状态,下拉单选,返回枚举Id\r\n Member: '',\t // string\t会员,多选,返回会员Id,多个用英文逗号隔开,如:1,2,3,4\r\n Navigator: '', \t // string\t 导购,多选,返回导购Id,多个用英文逗号隔开,如:1,2,3,4\r\n Cashier: '',\t // string\t 收银员,多选,返回收银员Id,多个用英文逗号隔开,如:1,2,3,4\r\n StartAdmount: '',\t // decimal \t 起始金额\r\n EndAdmount: '',\t // decimal\t结束金额\r\n IdStore: ''\r\n }\r\n\r\n const result = await tApi({ param: JSON.stringify({ ...defaultValue, ...obj }) }, 'chanjet.RE.newRetail.SearchNewRetailList', false, false);\r\n return result;\r\n }\r\n\r\n /**\r\n * 获取单据详细信息\r\n * @param {string} code\r\n */\r\n static async getRetailDetail(code, type) {\r\n const result = await tApi({ RetailCode: code, KeyType: type }, 'chanjet.RE.newRetail.GetRetailDetail', false, false);\r\n return result;\r\n }\r\n\r\n\r\n /**\r\n * 获取单据详细信息\r\n * @param {string} code\r\n */\r\n static async getRetailDetailInfo(code) {\r\n const result = await tApi({ RetailCode: code }, 'chanjet.RE.newRetail.GetRetailDetailInfo', false, false);\r\n return result;\r\n }\r\n\r\n /**\r\n * 获取单据详细信息-原单退货\r\n * @param {string} ID\r\n */\r\n static async getOrigRetailData(ID, DetailColumn) {\r\n const result = await tApi({ RetailId: ID, PosDesign: DetailColumn }, 'chanjet.RE.newRetail.GetOrigRetailData', false, false);\r\n return result;\r\n }\r\n\r\n /**\r\n * 提货卡退货\r\n * @param {string} ID\r\n */\r\n static async getRefundConsumer(ID, retail) {\r\n const result = await ccApi({ origRetailId: ID, dto: retail },\r\n \"/retail/RetailPos/refundConsumer\",\r\n false,\r\n false,\r\n );\r\n return result;\r\n }\r\n\r\n /**\r\n * 获取单据 栏目信息 (目前用不上,先前端写死)\r\n */\r\n static async getPOSSearchRetailListDesigns() {\r\n const result = await tApi({}, 'chanjet.RE.newRetail.GetPOSSearchRetailListDesigns', false, false);\r\n return result;\r\n }\r\n\r\n /**\r\n * 获取单据编码信息、单据栏目、明细栏目。\r\n */\r\n static async getPOSOrigReturnListInitData(Retail) {\r\n const result = await tApi({ Retail }, 'chanjet.RE.newRetail.GetPOSOrigReturnListInitData', false, false);\r\n return result;\r\n }\r\n\r\n /**\r\n * 获取单据 详细 的栏目信息\r\n */\r\n static async getPOSSearchDesigns() {\r\n const result = await tApi({ViewName: 'Retail'}, 'chanjet.RE.newRetail.GetPOSSearchDesigns', false, false);\r\n return result;\r\n }\r\n\r\n /**\r\n * 获取 导购下拉\r\n */\r\n static async searchNavigator() {\r\n const result = await tApi({SearchParams:{Key: '',IsOtherStore: false, CurrentPage: 1, PageSize: 1000 }}, 'chanjet.AA.DR.NewRetailBaseInfo.SearchNavigator', false, false);\r\n return result;\r\n }\r\n\r\n /**\r\n * 获取 其他三个 下拉\r\n */\r\n static async getRetailSearchItemList(IdStore='') {\r\n // 业务类型\r\n const result = await tApi({ IdStore: IdStore}, 'chanjet.AA.DR.NewRetailBaseInfo.GetRetailSearchItemList', false, false);\r\n console.log('result => ', result);\r\n return result;\r\n // 单据状态\r\n // const result2 = await tApi({ ItemName: 'VoucherState' }, 'chanjet.AA.DR.NewRetailBaseInfo.GetRetailSearchItemList', false, false);\r\n // 收银员\r\n // const result3 = await tApi({ ItemName: 'Cashier' }, 'chanjet.AA.DR.NewRetailBaseInfo.GetRetailSearchItemList', false, false);\r\n\r\n\r\n return [result1, result2, result3];\r\n }\r\n\r\n //预售取货列表\r\n static async searchWaitPickUpListPaging(data) {\r\n return await ccApi(data, '/retail/RetailPos/searchWaitPickUpListPaging', false, false);\r\n }\r\n //判断是否需要补款\r\n static async GetPickUpSettleAmount(data) {\r\n return await ccApi(data, '/retail/RetailPos/getPickUpSettleAmount', false, false);\r\n }\r\n\r\n /**\r\n * 获取服务器时间\r\n */\r\n static async getTime() {\r\n return '2019-05-15';\r\n }\r\n\r\n static formatNumber(number, length) {\r\n if (number === '' || number === undefined) {\r\n return number;\r\n }\r\n number += '';\r\n if (length == 0) {\r\n return parseInt(number);\r\n }\r\n if (number.indexOf('.') > 0) {\r\n number += '0000000000';\r\n } else {\r\n number += '.0000000000'\r\n }\r\n return number.substring(0,number.indexOf(\".\") + +length + 1)\r\n }\r\n}\r\n\r\n"]}
1
+ {"version":3,"sources":["tplus-components-touch/components/billSearch/api.js"],"names":["billSearchApi","obj","defaultValue","CurrentPage","PageSize","StartVoucherDate","EndVoucherDate","VoucherCode","VoucherType","VoucherState","Member","Navigator","Cashier","StartAdmount","EndAdmount","IdStore","param","result","code","type","RetailCode","KeyType","ID","DetailColumn","RetailId","PosDesign","retail","origRetailId","dto","Retail","ViewName","SearchParams","Key","IsOtherStore","console","log","number","length","undefined","parseInt","indexOf","substring"],"mappings":"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","file":"api.js","sourcesContent":["import { tApi, ccApi } from 'tplus-api';\n/**\n *\n *\n * @export\n * @class billSearchApi\n */\nexport default class billSearchApi {\n static async searchRetailList(obj) {\n let defaultValue = {\n CurrentPage: 1,\t // int\t 当前页,默认1\n PageSize: 15, \t // int \t 页大小,默认10 \n StartVoucherDate: '',\t// datetime\t单据开始日期\n EndVoucherDate: '',\t // datetime\t单据结束日期\n VoucherCode: '',\t // string\t单据编号,支持模糊查询\n VoucherType: '',\t // int\t单据业务类型,下拉单选,返回对应业务类型Id\n VoucherState: '',\t // int\t单据状态,下拉单选,返回枚举Id\n Member: '',\t // string\t会员,多选,返回会员Id,多个用英文逗号隔开,如:1,2,3,4\n Navigator: '', \t // string\t 导购,多选,返回导购Id,多个用英文逗号隔开,如:1,2,3,4\n Cashier: '',\t // string\t 收银员,多选,返回收银员Id,多个用英文逗号隔开,如:1,2,3,4\n StartAdmount: '',\t // decimal \t 起始金额\n EndAdmount: '',\t // decimal\t结束金额 \n IdStore: ''\n }\n\n const result = await tApi({ param: JSON.stringify({ ...defaultValue, ...obj }) }, 'chanjet.RE.newRetail.SearchNewRetailList', false, false);\n return result;\n }\n\n /**\n * 获取单据详细信息\n * @param {string} code \n */\n static async getRetailDetail(code, type) {\n const result = await tApi({ RetailCode: code, KeyType: type }, 'chanjet.RE.newRetail.GetRetailDetail', false, false);\n return result;\n }\n\n\n /**\n * 获取单据详细信息\n * @param {string} code \n */\n static async getRetailDetailInfo(code) {\n const result = await tApi({ RetailCode: code }, 'chanjet.RE.newRetail.GetRetailDetailInfo', false, false);\n return result;\n }\n\n /**\n * 获取单据详细信息-原单退货\n * @param {string} ID \n */\n static async getOrigRetailData(ID, DetailColumn) {\n const result = await tApi({ RetailId: ID, PosDesign: DetailColumn }, 'chanjet.RE.newRetail.GetOrigRetailData', false, false);\n return result;\n }\n\n /**\n * 提货卡退货\n * @param {string} ID \n */\n static async getRefundConsumer(ID, retail) {\n const result = await ccApi({ origRetailId: ID, dto: retail },\n \"/retail/RetailPos/refundConsumer\",\n false,\n false,\n );\n return result;\n }\n\n /**\n * 获取单据 栏目信息 (目前用不上,先前端写死)\n */\n static async getPOSSearchRetailListDesigns() {\n const result = await tApi({}, 'chanjet.RE.newRetail.GetPOSSearchRetailListDesigns', false, false);\n return result;\n }\n\n /**\n * 获取单据编码信息、单据栏目、明细栏目。\n */\n static async getPOSOrigReturnListInitData(Retail) {\n const result = await tApi({ Retail }, 'chanjet.RE.newRetail.GetPOSOrigReturnListInitData', false, false);\n return result;\n }\n\n /**\n * 获取单据 详细 的栏目信息\n */\n static async getPOSSearchDesigns() {\n const result = await tApi({ViewName: 'Retail'}, 'chanjet.RE.newRetail.GetPOSSearchDesigns', false, false);\n return result;\n }\n\n /**\n * 获取 导购下拉\n */\n static async searchNavigator() {\n const result = await tApi({SearchParams:{Key: '',IsOtherStore: false, CurrentPage: 1, PageSize: 1000 }}, 'chanjet.AA.DR.NewRetailBaseInfo.SearchNavigator', false, false);\n return result;\n }\n\n /**\n * 获取 其他三个 下拉\n */\n static async getRetailSearchItemList(IdStore='') {\n // 业务类型\n const result = await tApi({ IdStore: IdStore}, 'chanjet.AA.DR.NewRetailBaseInfo.GetRetailSearchItemList', false, false);\n console.log('result => ', result);\n return result;\n // 单据状态\n // const result2 = await tApi({ ItemName: 'VoucherState' }, 'chanjet.AA.DR.NewRetailBaseInfo.GetRetailSearchItemList', false, false); \n // 收银员\n // const result3 = await tApi({ ItemName: 'Cashier' }, 'chanjet.AA.DR.NewRetailBaseInfo.GetRetailSearchItemList', false, false);\n \n \n return [result1, result2, result3];\n }\n\n /**\n * 获取服务器时间\n */\n static async getTime() {\n return '2019-05-15';\n }\n\n static formatNumber(number, length) {\n if (number === '' || number === undefined) {\n return number;\n }\n number += '';\n if (length == 0) {\n return parseInt(number);\n }\n if (number.indexOf('.') > 0) {\n number += '0000000000';\n } else {\n number += '.0000000000'\n }\n return number.substring(0,number.indexOf(\".\") + +length + 1)\n }\n}\n\n"]}
@@ -91,11 +91,11 @@ var _react = require('react');
91
91
 
92
92
  var _react2 = _interopRequireDefault(_react);
93
93
 
94
- var _index = require('../../index');
95
-
96
94
  var _tplusPoslogin = require('tplus-poslogin');
97
95
 
98
- var _mutantsAppfx = require('mutants-appfx');
96
+ var _mutantsUtil = require('mutants-util');
97
+
98
+ var _index = require('../../index');
99
99
 
100
100
  var _moment = require('moment');
101
101
 
@@ -111,18 +111,12 @@ var _api2 = _interopRequireDefault(_api);
111
111
 
112
112
  require('./index.less');
113
113
 
114
- var _mutantsUtil = require('mutants-util');
115
-
116
114
  var _find2 = require('lodash/find');
117
115
 
118
116
  var _find3 = _interopRequireDefault(_find2);
119
117
 
120
118
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
121
119
 
122
- /**
123
- * 单据查询
124
- */
125
-
126
120
  var SELECT_LIST = {
127
121
  VoucherState: [],
128
122
  Navigator: [],
@@ -132,9 +126,11 @@ var SELECT_LIST = {
132
126
  RetailType: [],
133
127
  VoucherType: [],
134
128
  Cashier: []
135
- };
136
- var RangePicker = _datePicker2.default.RangePicker;
129
+ }; /**
130
+ * 单据查询
131
+ */
137
132
 
133
+ var RangePicker = _datePicker2.default.RangePicker;
138
134
 
139
135
  var Option = _select2.default.Option;
140
136
 
@@ -358,6 +354,7 @@ var BillSearch = function (_React$Component) {
358
354
  value4 = _this$state2.value4,
359
355
  value5 = _this$state2.value5,
360
356
  value6 = _this$state2.value6,
357
+ value7 = _this$state2.value7,
361
358
  option = _this$state2.option;
362
359
 
363
360
  return (0, _extends5.default)({
@@ -365,11 +362,14 @@ var BillSearch = function (_React$Component) {
365
362
  PageSize: 15, // int 页大小,默认10
366
363
  StartVoucherDate: '', // datetime 单据开始日期
367
364
  EndVoucherDate: '', // datetime 单据结束日期
365
+ StartCreatedTime: '', // datatime 交易开始时间
366
+ EndCreatedTime: '', // datetime 交易结束时间
368
367
  Key: value3, // 单据编号,支持模糊查询
369
368
  KeyType: type === 2 ? '1' : '0', //区分原单退货与单据查询
370
369
  Inventory: value4, //string 商品名称(条形码、助记码、商品编码、商品名称)
371
370
  Member: value5, //string 会员(会员卡号、手机号、会员名称)
372
371
  SerialNumber: value6,
372
+ TradeNo: value7, //string 交易流水号
373
373
  VoucherType: '', // int 单据业务类型,下拉单选,返回对应业务类型Id
374
374
  VoucherState: '', // int 单据状态,下拉单选,返回枚举Id
375
375
  Navigator: '', // string 导购,多选,返回导购Id,多个用英文逗号隔开,如:1,2,3,4
@@ -472,6 +472,22 @@ var BillSearch = function (_React$Component) {
472
472
  });
473
473
  };
474
474
 
475
+ _this.onTimeChange = function (dateArray) {
476
+ console.log('dateArray => ', dateArray);
477
+ var date1 = void 0,
478
+ date2 = void 0;
479
+ if (!dateArray || dateArray.length == 0) {
480
+ console.log('没有传入dateArray');
481
+ date1 = date2 = '';
482
+ } else {
483
+ date1 = _tools2.default.dateFormat(new Date(dateArray[0]), 'yyyy-MM-dd HH:mm:ss');
484
+ date2 = _tools2.default.dateFormat(new Date(dateArray[1]), 'yyyy-MM-dd HH:mm:ss');
485
+ }
486
+ _this.setState({
487
+ option: (0, _extends5.default)({}, _this.state.option, { StartCreatedTime: date1, EndCreatedTime: date2 })
488
+ });
489
+ };
490
+
475
491
  _this.handleChange = function (type, value) {
476
492
  _this.setState({
477
493
  option: (0, _extends5.default)({}, _this.state.option, (0, _defineProperty3.default)({}, type, Array.isArray(value) ? value.join(',') : value))
@@ -869,6 +885,14 @@ var BillSearch = function (_React$Component) {
869
885
  EndVoucherDate: ''
870
886
  })
871
887
  });
888
+ } else if (type == 'time') {
889
+ // 清空时间
890
+ _this.setState({
891
+ option: (0, _extends5.default)({}, _this.state.option, {
892
+ StartCreatedTime: '',
893
+ EndCreatedTime: ''
894
+ })
895
+ });
872
896
  } else if (type == 'money') {
873
897
  // 清空金额
874
898
  _this.setState({
@@ -887,6 +911,10 @@ var BillSearch = function (_React$Component) {
887
911
  _this.setState({
888
912
  value6: ''
889
913
  });
914
+ } else if (type === 'value7') {
915
+ _this.setState({
916
+ value7: ''
917
+ });
890
918
  } else {
891
919
  // 剩下的一些单选
892
920
  _this.setState({
@@ -903,6 +931,12 @@ var BillSearch = function (_React$Component) {
903
931
  return '';
904
932
  };
905
933
 
934
+ _this.loadingIcon = function () {
935
+ var theme = _mutantsUtil.localStore.get('theme');
936
+ var img = 'https://newretail.static.chanjet.com/bc_pos/loading' + (theme == 'blue' || theme == 'dark' ? '2' : '') + '.gif';
937
+ return _react2.default.createElement('img', { src: img, style: { width: '150px', height: '150px' } });
938
+ };
939
+
906
940
  _this.state = {
907
941
  currentIndex: 1,
908
942
  value1: '',
@@ -911,6 +945,7 @@ var BillSearch = function (_React$Component) {
911
945
  value4: '',
912
946
  value5: '',
913
947
  value6: '',
948
+ value7: '', //交易流水号
914
949
  tableDataList: [],
915
950
  show: false,
916
951
  isLook: true, //区别查看、退货
@@ -931,6 +966,8 @@ var BillSearch = function (_React$Component) {
931
966
  option: {
932
967
  StartVoucherDate: '', // 单据开始日期
933
968
  EndVoucherDate: '', // 单据结束日期
969
+ StartCreatedTime: '', //交易开始时间
970
+ EndCreatedTime: '', //交易结束时间
934
971
  VoucherCode: '', //
935
972
  VoucherType: '', // 据业务类型,下拉选项,返回对应业务类型Id
936
973
  VoucherState: '', // 单据状态,下拉选项,返回枚举Id
@@ -984,7 +1021,7 @@ var BillSearch = function (_React$Component) {
984
1021
  var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
985
1022
  var _this3 = this;
986
1023
 
987
- var that, _props, idStore, type, storeData, listColumn, selectListData, selectList, _ref14, HeadFieldDesign, detailColumn, value3, IdmarketingOrgan, POSCode, VoucherDate, result, Code, DetailColumn, ListColumn, detailColumnMeta, endTime, startTime;
1024
+ var that, _props, idStore, type, storeData, listColumn, selectListData, selectList, _ref14, HeadFieldDesign, detailColumn, value3, IdmarketingOrgan, POSCode, VoucherDate, result, Code, DetailColumn, ListColumn, detailColumnMeta, endTime, startTime, endTime1, startTime1;
988
1025
 
989
1026
  return _regenerator2.default.wrap(function _callee9$(_context9) {
990
1027
  while (1) {
@@ -1123,6 +1160,8 @@ var BillSearch = function (_React$Component) {
1123
1160
  });
1124
1161
  endTime = (0, _moment2.default)().format('l');
1125
1162
  startTime = (0, _moment2.default)().format('l');
1163
+ endTime1 = (0, _moment2.default)().endOf('day');
1164
+ startTime1 = (0, _moment2.default)().format('l');
1126
1165
 
1127
1166
  if (type === 2) startTime = (0, _moment2.default)().subtract(7, 'days').format('YYYY/MM/DD');
1128
1167
  this.setState({
@@ -1132,7 +1171,7 @@ var BillSearch = function (_React$Component) {
1132
1171
  detailColumnMeta: detailColumnMeta,
1133
1172
  selectList: selectList,
1134
1173
  listColumn: listColumn,
1135
- option: (0, _extends5.default)({}, this.state.option, { StartVoucherDate: startTime, EndVoucherDate: endTime })
1174
+ option: (0, _extends5.default)({}, this.state.option, { StartVoucherDate: startTime, EndVoucherDate: endTime, StartCreatedTime: startTime1, EndCreatedTime: endTime1 })
1136
1175
  }, (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
1137
1176
  return _regenerator2.default.wrap(function _callee8$(_context8) {
1138
1177
  while (1) {
@@ -1157,7 +1196,7 @@ var BillSearch = function (_React$Component) {
1157
1196
  }, _callee8, _this3);
1158
1197
  })));
1159
1198
 
1160
- case 35:
1199
+ case 37:
1161
1200
  case 'end':
1162
1201
  return _context9.stop();
1163
1202
  }
@@ -1201,10 +1240,10 @@ var BillSearch = function (_React$Component) {
1201
1240
  }, {
1202
1241
  key: 'initDetailData',
1203
1242
 
1204
- /**
1205
- * 初始化数据
1206
- * @param {*} retailDTO
1207
- * @param {*} detailData
1243
+ /**
1244
+ * 初始化数据
1245
+ * @param {*} retailDTO
1246
+ * @param {*} detailData
1208
1247
  */
1209
1248
  value: function initDetailData(retailDTO, detailData) {
1210
1249
  if (!retailDTO) {
@@ -1231,8 +1270,6 @@ var BillSearch = function (_React$Component) {
1231
1270
  value: function render() {
1232
1271
  var _this4 = this;
1233
1272
 
1234
- var that = this;
1235
- var loadingIcon = _react2.default.createElement('img', { src: 'https://newretail.static.chanjet.com/loading.gif', style: { width: '200px', height: '189px' } });
1236
1273
  var _props2 = this.props,
1237
1274
  isUUser = _props2.isUUser,
1238
1275
  type = _props2.type;
@@ -1244,6 +1281,7 @@ var BillSearch = function (_React$Component) {
1244
1281
  value4 = _state.value4,
1245
1282
  value5 = _state.value5,
1246
1283
  value6 = _state.value6,
1284
+ value7 = _state.value7,
1247
1285
  tableDataList = _state.tableDataList,
1248
1286
  show = _state.show,
1249
1287
  isLook = _state.isLook,
@@ -1525,12 +1563,63 @@ var BillSearch = function (_React$Component) {
1525
1563
  ),
1526
1564
  _react2.default.createElement(RangePicker, {
1527
1565
  placeholder: ['开始', '结束'],
1566
+ dateInputPlaceholder: ['开始', '结束'],
1567
+ showClear: true,
1568
+ showOk: false,
1569
+ showToday: false,
1528
1570
  format: 'YYYY-MM-DD',
1529
1571
  onChange: this.onDateChange,
1530
1572
  defaultValue: [(0, _moment2.default)(), (0, _moment2.default)()],
1531
1573
  value: [this.dateFormat(option.StartVoucherDate), this.dateFormat(option.EndVoucherDate)]
1532
1574
  })
1533
1575
  ),
1576
+ _react2.default.createElement(
1577
+ 'div',
1578
+ { className: 'bill-title-item' },
1579
+ _react2.default.createElement(
1580
+ 'label',
1581
+ null,
1582
+ _react2.default.createElement(
1583
+ 'span',
1584
+ null,
1585
+ '\u4EA4'
1586
+ ),
1587
+ _react2.default.createElement(
1588
+ 'span',
1589
+ null,
1590
+ '\u6613'
1591
+ ),
1592
+ _react2.default.createElement(
1593
+ 'span',
1594
+ null,
1595
+ '\u65F6'
1596
+ ),
1597
+ _react2.default.createElement(
1598
+ 'span',
1599
+ null,
1600
+ '\u95F4'
1601
+ )
1602
+ ),
1603
+ ':',
1604
+ _react2.default.createElement(
1605
+ 'div',
1606
+ { className: 'bill-title-item-all ' + (option.StartCreatedTime ? '' : 'text-default'), onClick: this.onClickAll.bind(this, 'time') },
1607
+ '\u5168\u90E8'
1608
+ ),
1609
+ _react2.default.createElement(RangePicker, {
1610
+ className: 'searchPicker',
1611
+ showTime: true,
1612
+ placeholder: ['开始', '结束'],
1613
+ dateInputPlaceholder: ['开始', '结束'],
1614
+ showClear: true,
1615
+ showOk: false,
1616
+ showToday: false,
1617
+ format: 'YYYY-MM-DD HH:mm:ss',
1618
+ onChange: this.onTimeChange,
1619
+ defaultValue: [(0, _moment2.default)(), (0, _moment2.default)()],
1620
+ value: [this.dateFormat(option.StartCreatedTime), this.dateFormat(option.EndCreatedTime)]
1621
+ })
1622
+ ),
1534
1623
  isRefund === false && (isSpecialQuery || isEnableMinMall) ? _react2.default.createElement(
1535
1624
  'div',
1536
1625
  { className: 'bill-title-item' },
@@ -1952,6 +2041,55 @@ var BillSearch = function (_React$Component) {
1952
2041
  );
1953
2042
  })
1954
2043
  )
2044
+ ),
2045
+ _react2.default.createElement(
2046
+ 'div',
2047
+ { className: 'bill-title-item' },
2048
+ _react2.default.createElement(
2049
+ 'label',
2050
+ null,
2051
+ _react2.default.createElement(
2052
+ 'span',
2053
+ null,
2054
+ '\u4EA4'
2055
+ ),
2056
+ _react2.default.createElement(
2057
+ 'span',
2058
+ null,
2059
+ '\u6613'
2060
+ ),
2061
+ _react2.default.createElement(
2062
+ 'span',
2063
+ null,
2064
+ '\u6D41'
2065
+ ),
2066
+ _react2.default.createElement(
2067
+ 'span',
2068
+ null,
2069
+ '\u6C34'
2070
+ ),
2071
+ _react2.default.createElement(
2072
+ 'span',
2073
+ null,
2074
+ '\u53F7'
2075
+ )
2076
+ ),
2077
+ ':',
2078
+ _react2.default.createElement(
2079
+ 'div',
2080
+ { className: 'bill-title-item-all ' + (value7 ? '' : 'text-default'), onClick: this.onClickAll.bind(this, 'value7') },
2081
+ '\u5168\u90E8'
2082
+ ),
2083
+ _react2.default.createElement(_input2.default, { type: 'text',
2084
+ placeholder: '\u626B\u63CF/\u8F93\u5165\u652F\u4ED8\u6D41\u6C34\u53F7',
2085
+ value: value7,
2086
+ className: 'bill-title-txt-input android_focus_keyboard',
2087
+ onChange: this.onChange.bind(this, 7),
2088
+ onClick: this.onFocus.bind(this, 7),
2089
+ ref: function ref(input) {
2090
+ return _this4.input7 = input;
2091
+ }
2092
+ })
1955
2093
  )
1956
2094
  ),
1957
2095
  _react2.default.createElement(
@@ -1963,7 +2101,7 @@ var BillSearch = function (_React$Component) {
1963
2101
  parentNodeId: 'parent',
1964
2102
  loading: {
1965
2103
  spinning: this.state.loading,
1966
- indicator: loadingIcon
2104
+ indicator: this.loadingIcon()
1967
2105
  },
1968
2106
  sticky: true,
1969
2107
  pagination: false,