tplus-components-touch 3.40.1 → 3.40.4

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,6 +412,67 @@ 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;
+    }()
+
     /**
      * 获取服务器时间
      */
@@ -419,23 +480,23 @@ var billSearchApi = function () {
   }, {
     key: 'getTime',
     value: function () {
-      var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11() {
-        return _regenerator2.default.wrap(function _callee11$(_context11) {
+      var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13() {
+        return _regenerator2.default.wrap(function _callee13$(_context13) {
           while (1) {
-            switch (_context11.prev = _context11.next) {
+            switch (_context13.prev = _context13.next) {
               case 0:
-                return _context11.abrupt('return', '2019-05-15');
+                return _context13.abrupt('return', '2019-05-15');
 
               case 1:
               case 'end':
-                return _context11.stop();
+                return _context13.stop();
             }
           }
-        }, _callee11, this);
+        }, _callee13, this);
       }));
 
       function getTime() {
-        return _ref11.apply(this, arguments);
+        return _ref13.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","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   * 获取服务器时间\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"]}
+{"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"]}

package/dist/components/billSearch/index.js

@@ -264,27 +264,31 @@ var BillSearch = function (_React$Component) {
       return columns;
     };
 
-    _this.handleSettleColumn = function (modalData) {
-      var column = [{ title: "结算方式", dataIndex: "Amount", key: "Amount", textAlign: 'center' }];
+    _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
+          );
+        } }];
       // let columnWidth = modalData.length < 4? 570/modalData.length : 142.5
-      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);
-      });
+      // 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)
+      // })
       return column;
     };
 
@@ -766,8 +770,8 @@ var BillSearch = function (_React$Component) {
                 detailColumn = _this.initDetailColumn(detailColumnMeta, false);
 
                 PaymentData = typeof PaymentData === 'string' ? JSON.parse(PaymentData) : PaymentData;
-                detailSettleColumn = _this.handleSettleColumn(PaymentData);
-                settleResult = _this.handleSettleResult(PaymentData);
+                detailSettleColumn = _this.handleSettleColumn();
+                settleResult = PaymentData;
 
                 _this.setState({
                   showModalData: result,
@@ -818,8 +822,8 @@ var BillSearch = function (_React$Component) {
                 PaymentData = result1.PaymentData;
 
                 PaymentData = typeof PaymentData === 'string' ? JSON.parse(PaymentData) : PaymentData;
-                detailSettleColumn = _this.handleSettleColumn(PaymentData);
-                settleResult = _this.handleSettleResult(PaymentData);
+                detailSettleColumn = _this.handleSettleColumn();
+                settleResult = PaymentData;
                 RetailDTO = result.RetailDTO, DetailData = result.DetailData;
 
                 RetailDTO = typeof RetailDTO === 'string' ? JSON.parse(RetailDTO) : RetailDTO;
@@ -940,7 +944,7 @@ var BillSearch = function (_React$Component) {
     _this.loadingIcon = function () {
       var theme = _mutantsUtil.localStore.get('theme');
       var img = theme == 'blue' || theme == 'dark' ? _this.sys_parms.blueloading : _this.sys_parms.orangeloading;
-      return _react2.default.createElement('img', { src: img, style: { width: '90px', height: '90px' } });
+      return _react2.default.createElement('img', { src: img, className: 'loading-img-symbol', style: { width: '90px', height: '90px' } });
     };
 
     _this.state = {
@@ -1093,6 +1097,9 @@ 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';
@@ -1258,8 +1265,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;
+          }
         });
       };
 
@@ -2176,7 +2188,7 @@ var BillSearch = function (_React$Component) {
                 columns: detailSettleColumn,
                 dataSource: showSettleModalData,
                 parentNodeId: 'parent',
-                scroll: { y: 257 },
+                scroll: { y: 200 },
                 pagination: false })
             )
           )