tplus-components-touch 3.28.7 → 3.28.11

package/dist/components/billSearch/api.js

@@ -55,7 +55,7 @@ var billSearchApi = function () {
               case 0:
                 defaultValue = {
                   CurrentPage: 1, // int	 当前页，默认1
-                  PageSize: 15, // int 	 页大小，默认10
+                  PageSize: 15, // int 	 页大小，默认10 
                   StartVoucherDate: '', // datetime	单据开始日期
                   EndVoucherDate: '', // datetime	单据结束日期
                   VoucherCode: '', // string	单据编号，支持模糊查询
@@ -65,7 +65,7 @@ var billSearchApi = function () {
                   Navigator: '', // string	 导购，多选，返回导购Id，多个用英文逗号隔开，如：1,2,3,4
                   Cashier: '', // string	 收银员，多选，返回收银员Id，多个用英文逗号隔开，如：1,2,3,4
                   StartAdmount: '', // decimal 	 起始金额
-                  EndAdmount: '', // decimal	结束金额
+                  EndAdmount: '', // decimal	结束金额 
                   IdStore: ''
                 };
                 _context.next = 3;
@@ -92,7 +92,7 @@ var billSearchApi = function () {
 
     /**
      * 获取单据详细信息
-     * @param {string} code
+     * @param {string} code 
      */
 
   }, {
@@ -128,7 +128,7 @@ var billSearchApi = function () {
 
     /**
      * 获取单据详细信息
-     * @param {string} code
+     * @param {string} code 
      */
 
   }, {
@@ -164,7 +164,7 @@ var billSearchApi = function () {
 
     /**
      * 获取单据详细信息-原单退货
-     * @param {string} ID
+     * @param {string} ID 
      */
 
   }, {
@@ -200,7 +200,7 @@ var billSearchApi = function () {
 
     /**
      * 提货卡退货
-     * @param {string} ID
+     * @param {string} ID 
      */
 
   }, {
@@ -412,67 +412,6 @@ var billSearchApi = function () {
       return getRetailSearchItemList;
     }()
 
-    //预售取货列表
-
-  }, {
-    key: 'searchWaitPickUpListPaging',
-    value: function () {
-      var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(data) {
-        return _regenerator2.default.wrap(function _callee11$(_context11) {
-          while (1) {
-            switch (_context11.prev = _context11.next) {
-              case 0:
-                _context11.next = 2;
-                return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/searchWaitPickUpListPaging', false, false);
-
-              case 2:
-                return _context11.abrupt('return', _context11.sent);
-
-              case 3:
-              case 'end':
-                return _context11.stop();
-            }
-          }
-        }, _callee11, this);
-      }));
-
-      function searchWaitPickUpListPaging(_x11) {
-        return _ref11.apply(this, arguments);
-      }
-
-      return searchWaitPickUpListPaging;
-    }()
-    //判断是否需要补款
-
-  }, {
-    key: 'GetPickUpSettleAmount',
-    value: function () {
-      var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(data) {
-        return _regenerator2.default.wrap(function _callee12$(_context12) {
-          while (1) {
-            switch (_context12.prev = _context12.next) {
-              case 0:
-                _context12.next = 2;
-                return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPickUpSettleAmount', false, false);
-
-              case 2:
-                return _context12.abrupt('return', _context12.sent);
-
-              case 3:
-              case 'end':
-                return _context12.stop();
-            }
-          }
-        }, _callee12, this);
-      }));
-
-      function GetPickUpSettleAmount(_x12) {
-        return _ref12.apply(this, arguments);
-      }
-
-      return GetPickUpSettleAmount;
-    }()
-
     /**
      * 获取服务器时间
      */
@@ -480,23 +419,23 @@ var billSearchApi = function () {
   }, {
     key: 'getTime',
     value: function () {
-      var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13() {
-        return _regenerator2.default.wrap(function _callee13$(_context13) {
+      var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11() {
+        return _regenerator2.default.wrap(function _callee11$(_context11) {
           while (1) {
-            switch (_context13.prev = _context13.next) {
+            switch (_context11.prev = _context11.next) {
               case 0:
-                return _context13.abrupt('return', '2019-05-15');
+                return _context11.abrupt('return', '2019-05-15');
 
               case 1:
               case 'end':
-                return _context13.stop();
+                return _context11.stop();
             }
           }
-        }, _callee13, this);
+        }, _callee11, this);
       }));
 
       function getTime() {
-        return _ref13.apply(this, arguments);
+        return _ref11.apply(this, arguments);
       }
 
       return getTime;

package/dist/components/billSearch/api.js.map

@@ -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';\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  static async searchWaitPickUpListPaging(data) {\n    return await ccApi(data, '/retail/RetailPos/searchWaitPickUpListPaging', false, false);\n  }\n  //判断是否需要补款\n  static async GetPickUpSettleAmount(data) {\n    return await ccApi(data, '/retail/RetailPos/getPickUpSettleAmount', false, false);\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"]}
+{"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"]}

package/dist/components/billSearch/index.js

@@ -115,8 +115,16 @@ var _find2 = require('lodash/find');
 
 var _find3 = _interopRequireDefault(_find2);
 
+var _cloneDeep = require('lodash/cloneDeep');
+
+var _cloneDeep2 = _interopRequireDefault(_cloneDeep);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+/**
+ * 单据查询
+ */
+
 var SELECT_LIST = {
   VoucherState: [],
   Navigator: [],
@@ -126,10 +134,7 @@ var SELECT_LIST = {
   RetailType: [],
   VoucherType: [],
   Cashier: []
-}; /**
-    * 单据查询
-    */
-
+};
 var RangePicker = _datePicker2.default.RangePicker;
 
 var Option = _select2.default.Option;
@@ -259,31 +264,27 @@ var BillSearch = function (_React$Component) {
       return columns;
     };
 
-    _this.handleSettleColumn = function () {
-      var column = [{ title: "收款时间", dataIndex: "CreatedStamp", key: "CreatedStamp" }, { title: "结算方式", dataIndex: "SettleName", key: "SettleName", ellipsis: true }, { title: "金额", dataIndex: "Amount", key: 'Amount', align: 'center',
-        render: function render(text) {
-          var renderText = _api2.default.formatNumber(text, 2);
-          return _react2.default.createElement(
-            'span',
-            null,
-            renderText
-          );
-        } }];
+    _this.handleSettleColumn = function (modalData) {
+      var column = [{ title: "结算方式", dataIndex: "Amount", key: "Amount", textAlign: 'center' }];
       // let columnWidth = modalData.length < 4? 570/modalData.length : 142.5
-      // modalData.forEach((v, index) => {
-      //   let obj = {
-      //     title: v.SettleName,
-      //     dataIndex: 'Amount' + index,
-      //     key: 'Amount' + index,
-      //     textAlign: 'center',
-      //     ellipsis: true,
-      //     render: (text, record, index) => {
-      //       let renderText = billSearchApi.formatNumber(text, 2);
-      //       return <span>{renderText}</span>
-      //     }
-      //   }
-      //   column.push(obj)
-      // })
+      modalData.forEach(function (v, index) {
+        var obj = {
+          title: v.SettleName,
+          dataIndex: 'Amount' + index,
+          key: 'Amount' + index,
+          textAlign: 'center',
+          ellipsis: true,
+          render: function render(text, record, index) {
+            var renderText = _api2.default.formatNumber(text, 2);
+            return _react2.default.createElement(
+              'span',
+              null,
+              renderText
+            );
+          }
+        };
+        column.push(obj);
+      });
       return column;
     };
 
@@ -358,6 +359,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 +367,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 +477,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))
@@ -718,7 +739,7 @@ var BillSearch = function (_React$Component) {
 
     _this.rowSearchDetail = function () {
       var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(record) {
-        var result, result1, PaymentData, detailColumnMeta, themode, detailColumn, detailSettleColumn, settleResult;
+        var result, result1, PaymentData, detailColumnMeta, tradeNos, themode, detailColumn, detailSettleColumn, settleResult;
         return _regenerator2.default.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
@@ -736,6 +757,15 @@ var BillSearch = function (_React$Component) {
                 result1 = _context5.sent;
                 PaymentData = result1.PaymentData;
                 detailColumnMeta = _this.state.detailColumnMeta;
+
+                if (PaymentData) {
+                  tradeNos = [];
+
+                  PaymentData.forEach(function (item) {
+                    if (item.TradeNo) tradeNos.push(item.TradeNo);
+                  });
+                  record.TradeNo = tradeNos.join(',');
+                }
                 themode = (0, _find3.default)(PaymentData, { 'SettleCode': "PICKUPCARD" });
 
                 _this.setState({
@@ -744,8 +774,8 @@ var BillSearch = function (_React$Component) {
                 detailColumn = _this.initDetailColumn(detailColumnMeta, false);
 
                 PaymentData = typeof PaymentData === 'string' ? JSON.parse(PaymentData) : PaymentData;
-                detailSettleColumn = _this.handleSettleColumn();
-                settleResult = PaymentData;
+                detailSettleColumn = _this.handleSettleColumn(PaymentData);
+                settleResult = _this.handleSettleResult(PaymentData);
 
                 _this.setState({
                   showModalData: result,
@@ -757,7 +787,7 @@ var BillSearch = function (_React$Component) {
                   detailColumn: detailColumn
                 });
 
-              case 16:
+              case 17:
               case 'end':
                 return _context5.stop();
             }
@@ -772,7 +802,7 @@ var BillSearch = function (_React$Component) {
 
     _this.rowRefundDetail = function () {
       var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(record, isLook) {
-        var _this$state6, HeadFieldDesign, detailColumnMeta, result, result1, PaymentData, detailSettleColumn, settleResult, RetailDTO, DetailData, themode, detailColumn;
+        var _this$state6, HeadFieldDesign, detailColumnMeta, result, result1, PaymentData, tradeNos, detailSettleColumn, settleResult, RetailDTO, DetailData, themode, detailColumn;
 
         return _regenerator2.default.wrap(function _callee6$(_context6) {
           while (1) {
@@ -796,8 +826,16 @@ var BillSearch = function (_React$Component) {
                 PaymentData = result1.PaymentData;
 
                 PaymentData = typeof PaymentData === 'string' ? JSON.parse(PaymentData) : PaymentData;
-                detailSettleColumn = _this.handleSettleColumn();
-                settleResult = PaymentData;
+                if (PaymentData) {
+                  tradeNos = [];
+
+                  PaymentData.forEach(function (item) {
+                    if (item.TradeNo) tradeNos.push(item.TradeNo);
+                  });
+                  record.TradeNo = tradeNos.join(',');
+                }
+                detailSettleColumn = _this.handleSettleColumn(PaymentData);
+                settleResult = _this.handleSettleResult(PaymentData);
                 RetailDTO = result.RetailDTO, DetailData = result.DetailData;
 
                 RetailDTO = typeof RetailDTO === 'string' ? JSON.parse(RetailDTO) : RetailDTO;
@@ -821,21 +859,21 @@ var BillSearch = function (_React$Component) {
                   detailColumn: detailColumn,
                   loading: false
                 });
-                _context6.next = 27;
+                _context6.next = 28;
                 break;
 
-              case 24:
-                _context6.prev = 24;
+              case 25:
+                _context6.prev = 25;
                 _context6.t0 = _context6['catch'](0);
 
                 _this.setState({ loading: false });
 
-              case 27:
+              case 28:
               case 'end':
                 return _context6.stop();
             }
           }
-        }, _callee6, _this2, [[0, 24]]);
+        }, _callee6, _this2, [[0, 25]]);
       }));
 
       return function (_x5, _x6) {
@@ -869,6 +907,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 +933,10 @@ var BillSearch = function (_React$Component) {
         _this.setState({
           value6: ''
         });
+      } else if (type === 'value7') {
+        _this.setState({
+          value7: ''
+        });
       } else {
         // 剩下的一些单选
         _this.setState({
@@ -906,7 +956,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';
-      return _react2.default.createElement('img', { src: img, style: { width: '150px', height: '150px' } });
+      return _react2.default.createElement('img', { src: img, style: { width: '90px', height: '90px' } });
     };
 
     _this.state = {
@@ -917,6 +967,7 @@ var BillSearch = function (_React$Component) {
       value4: '',
       value5: '',
       value6: '',
+      value7: '', //交易流水号
       tableDataList: [],
       show: false,
       isLook: true, //区别查看、退货
@@ -937,6 +988,8 @@ var BillSearch = function (_React$Component) {
       option: {
         StartVoucherDate: '', // 单据开始日期
         EndVoucherDate: '', // 单据结束日期
+        StartCreatedTime: '', //交易开始时间
+        EndCreatedTime: '', //交易结束时间
         VoucherCode: '', //
         VoucherType: '', // 据业务类型，下拉选项，返回对应业务类型Id
         VoucherState: '', // 单据状态，下拉选项，返回枚举Id
@@ -990,7 +1043,7 @@ 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, _props, idStore, type, storeData, listColumn, selectListData, selectList, _ref14, HeadFieldDesign, detailColumn, value3, IdmarketingOrgan, POSCode, VoucherDate, result, Code, DetailColumn, ListColumn, detailColumnMeta, endTime, startTime, endTime1, startTime1;
 
         return _regenerator2.default.wrap(function _callee9$(_context9) {
           while (1) {
@@ -1060,9 +1113,6 @@ var BillSearch = function (_React$Component) {
                   if (v.FieldName == 'VoucherDate' || v.FieldName == 'BusiTypeName') {
                     obj.width = 110;
                   }
-                  if (v.FieldName == 'VoucherTime') {
-                    obj.width = 180;
-                  }
                   if (v.FieldName == 'Code') {
                     obj.width = 210;
                     obj.className = 'rowClassName rtl';
@@ -1132,6 +1182,8 @@ var BillSearch = function (_React$Component) {
                 });
                 endTime = (0, _moment2.default)().format('l');
                 startTime = (0, _moment2.default)().format('l');
+                endTime1 = (0, _moment2.default)().endOf('day');
+                startTime1 = (0, _moment2.default)().format('l');
 
                 if (type === 2) startTime = (0, _moment2.default)().subtract(7, 'days').format('YYYY/MM/DD');
                 this.setState({
@@ -1141,7 +1193,7 @@ var BillSearch = function (_React$Component) {
                   detailColumnMeta: detailColumnMeta,
                   selectList: selectList,
                   listColumn: listColumn,
-                  option: (0, _extends5.default)({}, this.state.option, { StartVoucherDate: startTime, EndVoucherDate: endTime })
+                  option: (0, _extends5.default)({}, this.state.option, { StartVoucherDate: startTime, EndVoucherDate: endTime, StartCreatedTime: startTime1, EndCreatedTime: endTime1 })
                 }, (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
                   return _regenerator2.default.wrap(function _callee8$(_context8) {
                     while (1) {
@@ -1166,7 +1218,7 @@ var BillSearch = function (_React$Component) {
                   }, _callee8, _this3);
                 })));
 
-              case 35:
+              case 37:
               case 'end':
                 return _context9.stop();
             }
@@ -1251,6 +1303,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,
@@ -1266,7 +1319,15 @@ var BillSearch = function (_React$Component) {
           selectedIndexList = _state.selectedIndexList,
           HeadFieldDesign = _state.HeadFieldDesign,
           isPickupCard = _state.isPickupCard;
+      // 支付流水号不要在这里显示，手动去掉
 
+      listColumn = (0, _cloneDeep2.default)(listColumn);
+      if (listColumn) {
+        var TradNoIndex = listColumn.findIndex(function (val) {
+          return val.dataIndex === "TradeNo";
+        });
+        TradNoIndex > 0 && listColumn.splice(TradNoIndex, 1);
+      }
 
       tableDataList = [].concat((0, _toConsumableArray3.default)(tableDataList));
       tableDataList.push({
@@ -1532,12 +1593,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 +2071,55 @@ var BillSearch = function (_React$Component) {
                 );
               })
             )
+          ),
+          _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,
+                '\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(
@@ -2055,7 +2216,7 @@ var BillSearch = function (_React$Component) {
                 columns: detailSettleColumn,
                 dataSource: showSettleModalData,
                 parentNodeId: 'parent',
-                scroll: { y: 200 },
+                scroll: { y: 257 },
                 pagination: false })
             )
           )