tplus-components-touch 3.27.29 → 3.27.33

package/dist/components/billSearch/index.js

@@ -358,6 +358,7 @@ var BillSearch = function (_React$Component) {
           value4 = _this$state2.value4,
           value5 = _this$state2.value5,
           value6 = _this$state2.value6,
+          value7 = _this$state2.value7,
           option = _this$state2.option;
 
       return (0, _extends5.default)({
@@ -365,11 +366,14 @@ var BillSearch = function (_React$Component) {
         PageSize: 15, // int   页大小，默认10
         StartVoucherDate: '', // datetime 单据开始日期
         EndVoucherDate: '', // datetime 单据结束日期
+        StartCreatedTime: '', // datatime 交易开始时间
+        EndCreatedTime: '', // datetime 交易结束时间
         Key: value3, // 单据编号，支持模糊查询
         KeyType: type === 2 ? '1' : '0', //区分原单退货与单据查询
         Inventory: value4, //string  商品名称（条形码、助记码、商品编码、商品名称）
         Member: value5, //string 会员（会员卡号、手机号、会员名称）
         SerialNumber: value6,
+        TradeNo: value7, //string 支付流水号
         VoucherType: '', // int  单据业务类型，下拉单选，返回对应业务类型Id
         VoucherState: '', // int  单据状态，下拉单选，返回枚举Id
         Navigator: '', // string  导购，多选，返回导购Id，多个用英文逗号隔开，如：1,2,3,4
@@ -472,6 +476,22 @@ var BillSearch = function (_React$Component) {
       });
     };
 
+    _this.onTimeChange = function (dateArray) {
+      console.log('dateArray => ', dateArray);
+      var date1 = void 0,
+          date2 = void 0;
+      if (!dateArray || dateArray.length == 0) {
+        console.log('没有传入dateArray');
+        date1 = date2 = '';
+      } else {
+        date1 = _tools2.default.dateFormat(new Date(dateArray[0]), 'yyyy-MM-dd HH:mm:ss');
+        date2 = _tools2.default.dateFormat(new Date(dateArray[1]), 'yyyy-MM-dd HH:mm:ss');
+      }
+      _this.setState({
+        option: (0, _extends5.default)({}, _this.state.option, { StartCreatedTime: date1, EndCreatedTime: date2 })
+      });
+    };
+
     _this.handleChange = function (type, value) {
       _this.setState({
         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) {
             EndVoucherDate: ''
           })
         });
+      } else if (type == 'time') {
+        // 清空时间
+        _this.setState({
+          option: (0, _extends5.default)({}, _this.state.option, {
+            StartCreatedTime: '',
+            EndCreatedTime: ''
+          })
+        });
       } else if (type == 'money') {
         // 清空金额
         _this.setState({
@@ -887,6 +915,10 @@ var BillSearch = function (_React$Component) {
         _this.setState({
           value6: ''
         });
+      } else if (type === 'value7') {
+        _this.setState({
+          value7: ''
+        });
       } else {
         // 剩下的一些单选
         _this.setState({
@@ -905,7 +937,7 @@ var BillSearch = function (_React$Component) {
 
     _this.loadingIcon = function () {
       var theme = _mutantsUtil.localStore.get('theme');
-      var img = 'https://newretail.static.chanjet.com/bc_pos/loading' + (theme == 'blue' || theme == 'dark' ? '2' : '') + '.gif';
+      var img = 'https://newretail.static.chanjet.com/bc_pos/loading' + (theme == 'blue' || theme == 'dark' ? '4' : '3') + '.gif';
       return _react2.default.createElement('img', { src: img, style: { width: '90px', height: '90px' } });
     };
 
@@ -917,6 +949,7 @@ var BillSearch = function (_React$Component) {
       value4: '',
       value5: '',
       value6: '',
+      value7: '', //支付流水号
       tableDataList: [],
       show: false,
       isLook: true, //区别查看、退货
@@ -937,6 +970,8 @@ var BillSearch = function (_React$Component) {
       option: {
         StartVoucherDate: '', // 单据开始日期
         EndVoucherDate: '', // 单据结束日期
+        StartCreatedTime: '', //交易开始时间
+        EndCreatedTime: '', //交易结束时间
         VoucherCode: '', //
         VoucherType: '', // 据业务类型，下拉选项，返回对应业务类型Id
         VoucherState: '', // 单据状态，下拉选项，返回枚举Id
@@ -990,23 +1025,24 @@ var BillSearch = function (_React$Component) {
       var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
         var _this3 = this;
 
-        var that, _props, idStore, type, storeData, listColumn, selectListData, selectList, _ref14, HeadFieldDesign, detailColumn, value3, IdmarketingOrgan, POSCode, VoucherDate, result, Code, DetailColumn, ListColumn, detailColumnMeta, endTime, startTime;
+        var that, columsArr, _props, idStore, type, storeData, listColumn, selectListData, selectList, _ref14, HeadFieldDesign, detailColumn, value3, IdmarketingOrgan, POSCode, VoucherDate, result, Code, DetailColumn, ListColumn, detailColumnMeta, endTime, startTime;
 
         return _regenerator2.default.wrap(function _callee9$(_context9) {
           while (1) {
             switch (_context9.prev = _context9.next) {
               case 0:
                 that = this;
+                columsArr = [];
                 _props = this.props, idStore = _props.idStore, type = _props.type, storeData = _props.storeData;
-                _context9.next = 4;
+                _context9.next = 5;
                 return _api2.default.getPOSSearchRetailListDesigns();
 
-              case 4:
+              case 5:
                 listColumn = _context9.sent;
-                _context9.next = 7;
+                _context9.next = 8;
                 return _api2.default.getRetailSearchItemList(idStore);
 
-              case 7:
+              case 8:
                 selectListData = _context9.sent;
                 selectList = SELECT_LIST;
 
@@ -1014,26 +1050,26 @@ var BillSearch = function (_React$Component) {
                   selectList[item.ItemType] = item.Items;
                 });
                 console.log(listColumn, selectList, 'select-----');
-                _context9.next = 13;
+                _context9.next = 14;
                 return _api2.default.getPOSSearchDesigns();
 
-              case 13:
+              case 14:
                 _ref14 = _context9.sent;
                 HeadFieldDesign = _ref14.HeadFieldDesign;
                 detailColumn = _ref14.list;
                 value3 = '';
 
                 if (!(type === 2)) {
-                  _context9.next = 27;
+                  _context9.next = 28;
                   break;
                 }
 
                 //退货
                 IdmarketingOrgan = storeData.IdmarketingOrgan, POSCode = storeData.POSCode, VoucherDate = storeData.VoucherDate;
-                _context9.next = 21;
+                _context9.next = 22;
                 return _api2.default.getPOSOrigReturnListInitData({ IdmarketingOrgan: IdmarketingOrgan, POSCode: POSCode, VoucherDate: VoucherDate });
 
-              case 21:
+              case 22:
                 result = _context9.sent;
                 Code = result.Code, DetailColumn = result.DetailColumn, ListColumn = result.ListColumn;
 
@@ -1042,11 +1078,11 @@ var BillSearch = function (_React$Component) {
                 HeadFieldDesign = DetailColumn.HeadFieldDesign;
                 detailColumn = DetailColumn.list;
 
-              case 27:
+              case 28:
                 detailColumnMeta = detailColumn;
 
                 detailColumn = this.initDetailColumn(detailColumn, false);
-                listColumn = listColumn.map(function (v) {
+                listColumn.map(function (v) {
                   var obj = {
                     title: v.OriginalTitle,
                     dataIndex: v.FieldName,
@@ -1097,9 +1133,9 @@ var BillSearch = function (_React$Component) {
                       );
                     };
                   }
-                  return obj;
+                  columsArr.push(obj);
                 });
-                listColumn.push({
+                columsArr.push({
                   title: "操作",
                   dataIndex: "i",
                   key: "i",
@@ -1132,6 +1168,8 @@ var BillSearch = function (_React$Component) {
                 });
                 endTime = (0, _moment2.default)().format('l');
                 startTime = (0, _moment2.default)().format('l');
+                // let endTime1 = moment().endOf('day');
+                // let startTime1 = moment().format('l');
 
                 if (type === 2) startTime = (0, _moment2.default)().subtract(7, 'days').format('YYYY/MM/DD');
                 this.setState({
@@ -1140,8 +1178,8 @@ var BillSearch = function (_React$Component) {
                   detailColumn: detailColumn,
                   detailColumnMeta: detailColumnMeta,
                   selectList: selectList,
-                  listColumn: listColumn,
-                  option: (0, _extends5.default)({}, this.state.option, { StartVoucherDate: startTime, EndVoucherDate: endTime })
+                  listColumn: columsArr,
+                  option: (0, _extends5.default)({}, this.state.option, { StartVoucherDate: startTime, EndVoucherDate: endTime, StartCreatedTime: '', EndCreatedTime: '' })
                 }, (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
                   return _regenerator2.default.wrap(function _callee8$(_context8) {
                     while (1) {
@@ -1166,7 +1204,7 @@ var BillSearch = function (_React$Component) {
                   }, _callee8, _this3);
                 })));
 
-              case 35:
+              case 36:
               case 'end':
                 return _context9.stop();
             }
@@ -1226,8 +1264,13 @@ var BillSearch = function (_React$Component) {
       var _loop = function _loop(index) {
         var detail = detailData[index];
         var detailId = detail.detailId;
+        var deliveryDetailId = detail.DeliveryDetailId;
         detailData[index].RetailDetailDTO = retailDTO.RetailDetails.find(function (detail) {
-          return detail.ID == detailId;
+          if (deliveryDetailId) {
+            return detail.ID == detailId && detail.DeliveryDetailId == deliveryDetailId;
+          } else {
+            return detail.ID == detailId;
+          }
         });
       };
 
@@ -1251,6 +1294,7 @@ var BillSearch = function (_React$Component) {
           value4 = _state.value4,
           value5 = _state.value5,
           value6 = _state.value6,
+          value7 = _state.value7,
           tableDataList = _state.tableDataList,
           show = _state.show,
           isLook = _state.isLook,
@@ -1267,7 +1311,6 @@ var BillSearch = function (_React$Component) {
           HeadFieldDesign = _state.HeadFieldDesign,
           isPickupCard = _state.isPickupCard;
 
-
       tableDataList = [].concat((0, _toConsumableArray3.default)(tableDataList));
       tableDataList.push({
         VoucherType: "",
@@ -1532,12 +1575,63 @@ var BillSearch = function (_React$Component) {
             ),
             _react2.default.createElement(RangePicker, {
               placeholder: ['开始', '结束'],
+              dateInputPlaceholder: ['开始', '结束'],
+              showClear: true,
+              showOk: false,
+              showToday: false,
               format: 'YYYY-MM-DD',
               onChange: this.onDateChange,
               defaultValue: [(0, _moment2.default)(), (0, _moment2.default)()],
               value: [this.dateFormat(option.StartVoucherDate), this.dateFormat(option.EndVoucherDate)]
             })
           ),
+          _react2.default.createElement(
+            'div',
+            { className: 'bill-title-item' },
+            _react2.default.createElement(
+              'label',
+              null,
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u4EA4'
+              ),
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u6613'
+              ),
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u65F6'
+              ),
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u95F4'
+              )
+            ),
+            ':',
+            _react2.default.createElement(
+              'div',
+              { className: 'bill-title-item-all ' + (option.StartCreatedTime ? '' : 'text-default'), onClick: this.onClickAll.bind(this, 'time') },
+              '\u5168\u90E8'
+            ),
+            _react2.default.createElement(RangePicker, {
+              className: 'searchPicker',
+              showTime: true,
+              placeholder: ['开始', '结束'],
+              dateInputPlaceholder: ['开始', '结束'],
+              showClear: true,
+              showOk: false,
+              showToday: false,
+              format: 'YYYY-MM-DD HH:mm:ss',
+              onChange: this.onTimeChange,
+              defaultValue: [(0, _moment2.default)(), (0, _moment2.default)()],
+              value: [this.dateFormat(option.StartCreatedTime), this.dateFormat(option.EndCreatedTime)]
+            })
+          ),
           isRefund === false && (isSpecialQuery || isEnableMinMall) ? _react2.default.createElement(
             'div',
             { className: 'bill-title-item' },
@@ -1959,6 +2053,55 @@ var BillSearch = function (_React$Component) {
                 );
               })
             )
+          ),
+          _react2.default.createElement(
+            'div',
+            { className: 'bill-title-item' },
+            _react2.default.createElement(
+              'label',
+              null,
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u652F'
+              ),
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u4ED8'
+              ),
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u6D41'
+              ),
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u6C34'
+              ),
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u53F7'
+              )
+            ),
+            ':',
+            _react2.default.createElement(
+              'div',
+              { className: 'bill-title-item-all ' + (value7 ? '' : 'text-default'), onClick: this.onClickAll.bind(this, 'value7') },
+              '\u5168\u90E8'
+            ),
+            _react2.default.createElement(_input2.default, { type: 'text',
+              placeholder: '\u626B\u63CF/\u8F93\u5165\u652F\u4ED8\u6D41\u6C34\u53F7',
+              value: value7,
+              className: 'bill-title-txt-input android_focus_keyboard',
+              onChange: this.onChange.bind(this, 7),
+              onClick: this.onFocus.bind(this, 7),
+              ref: function ref(input) {
+                return _this4.input7 = input;
+              }
+            })
           )
         ),
         _react2.default.createElement(