tplus-components-touch 3.27.1 → 3.28.1
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.
- package/dist/components/billSearch/api.js +13 -74
- package/dist/components/billSearch/api.js.map +1 -1
- package/dist/components/billSearch/index.js +141 -3
- package/dist/components/billSearch/index.js.map +1 -1
- package/dist/components/billSearch/index.less +6 -3
- package/dist/components/cloudPrint/api.js +85 -43
- package/dist/components/cloudPrint/api.js.map +1 -1
- package/dist/components/cloudPrint/printDispatch.js +209 -108
- package/dist/components/cloudPrint/printDispatch.js.map +1 -1
- package/dist/components/hotKey/localConfig.js +0 -52
- package/dist/components/hotKey/localConfig.js.map +1 -1
- package/dist/components/inventorySearch/tab.js +80 -63
- package/dist/components/inventorySearch/tab.js.map +1 -1
- package/dist/components/settlement/settlement.js +69 -208
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlementStore.js +154 -193
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/ticon/iconfont/demo.css +539 -539
- package/dist/components/ticon/iconfont/demo_index.html +3 -26
- package/dist/components/ticon/iconfont/iconfont.css +3 -7
- package/dist/components/ticon/iconfont/iconfont.js +1 -1
- package/dist/components/ticon/iconfont/iconfont.js.map +1 -1
- package/dist/components/ticon/iconfont/iconfont.json +0 -7
- package/dist/components/ticon/iconfont/iconfont.ttf +0 -0
- package/dist/components/ticon/iconfont/iconfont.woff +0 -0
- package/dist/components/ticon/iconfont/iconfont.woff2 +0 -0
- package/dist/components/touchTable/index.js +0 -4
- package/dist/components/touchTable/index.js.map +1 -1
- package/dist/index.js +16 -9
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
- package/dist/components/presale/pickup.js +0 -419
- package/dist/components/presale/pickup.js.map +0 -1
- package/dist/components/presale/style.less +0 -48
|
@@ -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;
|
|
@@ -92,7 +92,7 @@ var billSearchApi = function () {
|
|
|
92
92
|
|
|
93
93
|
/**
|
|
94
94
|
* 获取单据详细信息
|
|
95
|
-
* @param {string} code
|
|
95
|
+
* @param {string} code
|
|
96
96
|
*/
|
|
97
97
|
|
|
98
98
|
}, {
|
|
@@ -128,7 +128,7 @@ var billSearchApi = function () {
|
|
|
128
128
|
|
|
129
129
|
/**
|
|
130
130
|
* 获取单据详细信息
|
|
131
|
-
* @param {string} code
|
|
131
|
+
* @param {string} code
|
|
132
132
|
*/
|
|
133
133
|
|
|
134
134
|
}, {
|
|
@@ -164,7 +164,7 @@ var billSearchApi = function () {
|
|
|
164
164
|
|
|
165
165
|
/**
|
|
166
166
|
* 获取单据详细信息-原单退货
|
|
167
|
-
* @param {string} ID
|
|
167
|
+
* @param {string} ID
|
|
168
168
|
*/
|
|
169
169
|
|
|
170
170
|
}, {
|
|
@@ -200,7 +200,7 @@ var billSearchApi = function () {
|
|
|
200
200
|
|
|
201
201
|
/**
|
|
202
202
|
* 提货卡退货
|
|
203
|
-
* @param {string} ID
|
|
203
|
+
* @param {string} ID
|
|
204
204
|
*/
|
|
205
205
|
|
|
206
206
|
}, {
|
|
@@ -412,67 +412,6 @@ var billSearchApi = function () {
|
|
|
412
412
|
return getRetailSearchItemList;
|
|
413
413
|
}()
|
|
414
414
|
|
|
415
|
-
//预售取货列表
|
|
416
|
-
|
|
417
|
-
}, {
|
|
418
|
-
key: 'searchWaitPickUpListPaging',
|
|
419
|
-
value: function () {
|
|
420
|
-
var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(data) {
|
|
421
|
-
return _regenerator2.default.wrap(function _callee11$(_context11) {
|
|
422
|
-
while (1) {
|
|
423
|
-
switch (_context11.prev = _context11.next) {
|
|
424
|
-
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);
|
|
430
|
-
|
|
431
|
-
case 3:
|
|
432
|
-
case 'end':
|
|
433
|
-
return _context11.stop();
|
|
434
|
-
}
|
|
435
|
-
}
|
|
436
|
-
}, _callee11, this);
|
|
437
|
-
}));
|
|
438
|
-
|
|
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
415
|
/**
|
|
477
416
|
* 获取服务器时间
|
|
478
417
|
*/
|
|
@@ -480,23 +419,23 @@ var billSearchApi = function () {
|
|
|
480
419
|
}, {
|
|
481
420
|
key: 'getTime',
|
|
482
421
|
value: function () {
|
|
483
|
-
var
|
|
484
|
-
return _regenerator2.default.wrap(function
|
|
422
|
+
var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11() {
|
|
423
|
+
return _regenerator2.default.wrap(function _callee11$(_context11) {
|
|
485
424
|
while (1) {
|
|
486
|
-
switch (
|
|
425
|
+
switch (_context11.prev = _context11.next) {
|
|
487
426
|
case 0:
|
|
488
|
-
return
|
|
427
|
+
return _context11.abrupt('return', '2019-05-15');
|
|
489
428
|
|
|
490
429
|
case 1:
|
|
491
430
|
case 'end':
|
|
492
|
-
return
|
|
431
|
+
return _context11.stop();
|
|
493
432
|
}
|
|
494
433
|
}
|
|
495
|
-
},
|
|
434
|
+
}, _callee11, this);
|
|
496
435
|
}));
|
|
497
436
|
|
|
498
437
|
function getTime() {
|
|
499
|
-
return
|
|
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","
|
|
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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;AACA;;;;;;IAMqBA,a;;;;;;;;2GACWC,G;;;;;;AACxBC,4B,GAAe;AACjBC,+BAAa,CADI,EACK;AACtBC,4BAAU,EAFO,EAEK;AACtBC,oCAAkB,EAHD,EAGK;AACtBC,kCAAgB,EAJC,EAIK;AACtBC,+BAAa,EALI,EAKI;AACrBC,+BAAa,EANI,EAMI;AACrBC,gCAAc,EAPG,EAOK;AACtBC,0BAAQ,EARS,EAQK;AACtBC,6BAAW,EATM,EASI;AACrBC,2BAAS,EAVQ,EAUI;AACrBC,gCAAc,EAXG,EAWK;AACtBC,8BAAY,EAZK,EAYK;AACtBC,2BAAS;AAbQ,iB;;uBAgBE,oBAAK,EAAEC,OAAO,oDAAoBd,YAApB,EAAqCD,GAArC,EAAT,EAAL,EAA6D,0CAA7D,EAAyG,KAAzG,EAAgH,KAAhH,C;;;AAAfgB,sB;iDACCA,M;;;;;;;;;;;;;;;;;AAGT;;;;;;;;6GAI6BC,I,EAAMC,I;;;;;;;uBACZ,oBAAK,EAAEC,YAAYF,IAAd,EAAoBG,SAASF,IAA7B,EAAL,EAA0C,sCAA1C,EAAkF,KAAlF,EAAyF,KAAzF,C;;;AAAfF,sB;kDACCA,M;;;;;;;;;;;;;;;;;AAIT;;;;;;;;6GAIiCC,I;;;;;;;uBACV,oBAAK,EAAEE,YAAYF,IAAd,EAAL,EAA2B,0CAA3B,EAAuE,KAAvE,EAA8E,KAA9E,C;;;AAAfD,sB;kDACCA,M;;;;;;;;;;;;;;;;;AAGT;;;;;;;;6GAI+BK,E,EAAIC,Y;;;;;;;uBACZ,oBAAK,EAAEC,UAAUF,EAAZ,EAAgBG,WAAWF,YAA3B,EAAL,EAAgD,wCAAhD,EAA0F,KAA1F,EAAiG,KAAjG,C;;;AAAfN,sB;kDACCA,M;;;;;;;;;;;;;;;;;AAGT;;;;;;;;6GAI+BK,E,EAAII,M;;;;;;;uBACZ,qBAAM,EAAEC,cAAcL,EAAhB,EAAoBM,KAAKF,MAAzB,EAAN,EACnB,kCADmB,EAEnB,KAFmB,EAGnB,KAHmB,C;;;AAAfT,sB;kDAKCA,M;;;;;;;;;;;;;;;;;AAGT;;;;;;;;;;;;;;uBAIuB,oBAAK,EAAL,EAAS,oDAAT,EAA+D,KAA/D,EAAsE,KAAtE,C;;;AAAfA,sB;kDACCA,M;;;;;;;;;;;;;;;;;AAGT;;;;;;;6GAG0CY,M;;;;;;;uBACnB,oBAAK,EAAEA,cAAF,EAAL,EAAiB,mDAAjB,EAAsE,KAAtE,EAA6E,KAA7E,C;;;AAAfZ,sB;kDACCA,M;;;;;;;;;;;;;;;;;AAGT;;;;;;;;;;;;;;uBAIuB,oBAAK,EAACa,UAAU,QAAX,EAAL,EAA2B,0CAA3B,EAAuE,KAAvE,EAA8E,KAA9E,C;;;AAAfb,sB;kDACCA,M;;;;;;;;;;;;;;;;;AAGT;;;;;;;;;;;;;;uBAIuB,oBAAK,EAACc,cAAa,EAACC,KAAK,EAAN,EAASC,cAAc,KAAvB,EAA8B9B,aAAa,CAA3C,EAA8CC,UAAU,IAAxD,EAAd,EAAL,EAAoF,iDAApF,EAAuI,KAAvI,EAA8I,KAA9I,C;;;AAAfa,sB;kDACCA,M;;;;;;;;;;;;;;;;;AAGT;;;;;;;;YAGqCF,O,uEAAQ,E;;;;;;;uBAEtB,oBAAK,EAAEA,SAASA,OAAX,EAAL,EAA0B,yDAA1B,EAAqF,KAArF,EAA4F,KAA5F,C;;;AAAfE,sB;;AACNiB,wBAAQC,GAAR,CAAY,YAAZ,EAA0BlB,MAA1B;mDACOA,M;;;;;;;;;;;;;;;;;AAUT;;;;;;;;;;;;mDAIS,Y;;;;;;;;;;;;;;;;;;iCAGWmB,M,EAAQC,M,EAAQ;AAClC,UAAID,WAAW,EAAX,IAAiBA,WAAWE,SAAhC,EAA2C;AACzC,eAAOF,MAAP;AACD;AACDA,gBAAU,EAAV;AACA,UAAIC,UAAU,CAAd,EAAiB;AACf,eAAOE,SAASH,MAAT,CAAP;AACD;AACD,UAAIA,OAAOI,OAAP,CAAe,GAAf,IAAsB,CAA1B,EAA6B;AAC3BJ,kBAAU,YAAV;AACD,OAFD,MAEO;AACLA,kBAAU,aAAV;AACD;AACD,aAAOA,OAAOK,SAAP,CAAiB,CAAjB,EAAmBL,OAAOI,OAAP,CAAe,GAAf,IAAsB,CAACH,MAAvB,GAAgC,CAAnD,CAAP;AACD;;;;;kBArIkBrC,a","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 * 获取服务器时间\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"]}
|
|
@@ -358,6 +358,7 @@ var BillSearch = function (_React$Component) {
|
|
|
358
358
|
value4 = _this$state2.value4,
|
|
359
359
|
value5 = _this$state2.value5,
|
|
360
360
|
value6 = _this$state2.value6,
|
|
361
|
+
value7 = _this$state2.value7,
|
|
361
362
|
option = _this$state2.option;
|
|
362
363
|
|
|
363
364
|
return (0, _extends5.default)({
|
|
@@ -365,11 +366,14 @@ var BillSearch = function (_React$Component) {
|
|
|
365
366
|
PageSize: 15, // int 页大小,默认10
|
|
366
367
|
StartVoucherDate: '', // datetime 单据开始日期
|
|
367
368
|
EndVoucherDate: '', // datetime 单据结束日期
|
|
369
|
+
StartCreatedTime: '', // datatime 交易开始时间
|
|
370
|
+
EndCreatedTime: '', // datetime 交易结束时间
|
|
368
371
|
Key: value3, // 单据编号,支持模糊查询
|
|
369
372
|
KeyType: type === 2 ? '1' : '0', //区分原单退货与单据查询
|
|
370
373
|
Inventory: value4, //string 商品名称(条形码、助记码、商品编码、商品名称)
|
|
371
374
|
Member: value5, //string 会员(会员卡号、手机号、会员名称)
|
|
372
375
|
SerialNumber: value6,
|
|
376
|
+
TradeNo: value7, //string 交易流水号
|
|
373
377
|
VoucherType: '', // int 单据业务类型,下拉单选,返回对应业务类型Id
|
|
374
378
|
VoucherState: '', // int 单据状态,下拉单选,返回枚举Id
|
|
375
379
|
Navigator: '', // string 导购,多选,返回导购Id,多个用英文逗号隔开,如:1,2,3,4
|
|
@@ -472,6 +476,22 @@ var BillSearch = function (_React$Component) {
|
|
|
472
476
|
});
|
|
473
477
|
};
|
|
474
478
|
|
|
479
|
+
_this.onTimeChange = function (dateArray) {
|
|
480
|
+
console.log('dateArray => ', dateArray);
|
|
481
|
+
var date1 = void 0,
|
|
482
|
+
date2 = void 0;
|
|
483
|
+
if (!dateArray || dateArray.length == 0) {
|
|
484
|
+
console.log('没有传入dateArray');
|
|
485
|
+
date1 = date2 = '';
|
|
486
|
+
} else {
|
|
487
|
+
date1 = _tools2.default.dateFormat(new Date(dateArray[0]), 'yyyy-MM-dd HH:mm:ss');
|
|
488
|
+
date2 = _tools2.default.dateFormat(new Date(dateArray[1]), 'yyyy-MM-dd HH:mm:ss');
|
|
489
|
+
}
|
|
490
|
+
_this.setState({
|
|
491
|
+
option: (0, _extends5.default)({}, _this.state.option, { StartCreatedTime: date1, EndCreatedTime: date2 })
|
|
492
|
+
});
|
|
493
|
+
};
|
|
494
|
+
|
|
475
495
|
_this.handleChange = function (type, value) {
|
|
476
496
|
_this.setState({
|
|
477
497
|
option: (0, _extends5.default)({}, _this.state.option, (0, _defineProperty3.default)({}, type, Array.isArray(value) ? value.join(',') : value))
|
|
@@ -869,6 +889,14 @@ var BillSearch = function (_React$Component) {
|
|
|
869
889
|
EndVoucherDate: ''
|
|
870
890
|
})
|
|
871
891
|
});
|
|
892
|
+
} else if (type == 'time') {
|
|
893
|
+
// 清空时间
|
|
894
|
+
_this.setState({
|
|
895
|
+
option: (0, _extends5.default)({}, _this.state.option, {
|
|
896
|
+
StartCreatedTime: '',
|
|
897
|
+
EndCreatedTime: ''
|
|
898
|
+
})
|
|
899
|
+
});
|
|
872
900
|
} else if (type == 'money') {
|
|
873
901
|
// 清空金额
|
|
874
902
|
_this.setState({
|
|
@@ -887,6 +915,10 @@ var BillSearch = function (_React$Component) {
|
|
|
887
915
|
_this.setState({
|
|
888
916
|
value6: ''
|
|
889
917
|
});
|
|
918
|
+
} else if (type === 'value7') {
|
|
919
|
+
_this.setState({
|
|
920
|
+
value7: ''
|
|
921
|
+
});
|
|
890
922
|
} else {
|
|
891
923
|
// 剩下的一些单选
|
|
892
924
|
_this.setState({
|
|
@@ -911,6 +943,7 @@ var BillSearch = function (_React$Component) {
|
|
|
911
943
|
value4: '',
|
|
912
944
|
value5: '',
|
|
913
945
|
value6: '',
|
|
946
|
+
value7: '', //交易流水号
|
|
914
947
|
tableDataList: [],
|
|
915
948
|
show: false,
|
|
916
949
|
isLook: true, //区别查看、退货
|
|
@@ -931,6 +964,8 @@ var BillSearch = function (_React$Component) {
|
|
|
931
964
|
option: {
|
|
932
965
|
StartVoucherDate: '', // 单据开始日期
|
|
933
966
|
EndVoucherDate: '', // 单据结束日期
|
|
967
|
+
StartCreatedTime: '', //交易开始时间
|
|
968
|
+
EndCreatedTime: '', //交易结束时间
|
|
934
969
|
VoucherCode: '', //
|
|
935
970
|
VoucherType: '', // 据业务类型,下拉选项,返回对应业务类型Id
|
|
936
971
|
VoucherState: '', // 单据状态,下拉选项,返回枚举Id
|
|
@@ -984,7 +1019,7 @@ var BillSearch = function (_React$Component) {
|
|
|
984
1019
|
var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
|
|
985
1020
|
var _this3 = this;
|
|
986
1021
|
|
|
987
|
-
var that, _props, idStore, type, storeData, listColumn, selectListData, selectList, _ref14, HeadFieldDesign, detailColumn, value3, IdmarketingOrgan, POSCode, VoucherDate, result, Code, DetailColumn, ListColumn, detailColumnMeta, endTime, startTime;
|
|
1022
|
+
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
1023
|
|
|
989
1024
|
return _regenerator2.default.wrap(function _callee9$(_context9) {
|
|
990
1025
|
while (1) {
|
|
@@ -1123,6 +1158,8 @@ var BillSearch = function (_React$Component) {
|
|
|
1123
1158
|
});
|
|
1124
1159
|
endTime = (0, _moment2.default)().format('l');
|
|
1125
1160
|
startTime = (0, _moment2.default)().format('l');
|
|
1161
|
+
endTime1 = (0, _moment2.default)().endOf('day');
|
|
1162
|
+
startTime1 = (0, _moment2.default)().format('l');
|
|
1126
1163
|
|
|
1127
1164
|
if (type === 2) startTime = (0, _moment2.default)().subtract(7, 'days').format('YYYY/MM/DD');
|
|
1128
1165
|
this.setState({
|
|
@@ -1132,7 +1169,7 @@ var BillSearch = function (_React$Component) {
|
|
|
1132
1169
|
detailColumnMeta: detailColumnMeta,
|
|
1133
1170
|
selectList: selectList,
|
|
1134
1171
|
listColumn: listColumn,
|
|
1135
|
-
option: (0, _extends5.default)({}, this.state.option, { StartVoucherDate: startTime, EndVoucherDate: endTime })
|
|
1172
|
+
option: (0, _extends5.default)({}, this.state.option, { StartVoucherDate: startTime, EndVoucherDate: endTime, StartCreatedTime: startTime1, EndCreatedTime: endTime1 })
|
|
1136
1173
|
}, (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
|
|
1137
1174
|
return _regenerator2.default.wrap(function _callee8$(_context8) {
|
|
1138
1175
|
while (1) {
|
|
@@ -1157,7 +1194,7 @@ var BillSearch = function (_React$Component) {
|
|
|
1157
1194
|
}, _callee8, _this3);
|
|
1158
1195
|
})));
|
|
1159
1196
|
|
|
1160
|
-
case
|
|
1197
|
+
case 37:
|
|
1161
1198
|
case 'end':
|
|
1162
1199
|
return _context9.stop();
|
|
1163
1200
|
}
|
|
@@ -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(
|