tplus-components-touch 3.28.12 → 3.28.16

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';\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"]}
+{"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"]}

package/dist/components/billSearch/index.js

@@ -121,8 +121,8 @@ var _cloneDeep2 = _interopRequireDefault(_cloneDeep);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * 单据查询
+/**
+ * 单据查询
  */
 
 var SELECT_LIST = {
@@ -374,7 +374,7 @@ var BillSearch = function (_React$Component) {
         Inventory: value4, //string  商品名称（条形码、助记码、商品编码、商品名称）
         Member: value5, //string 会员（会员卡号、手机号、会员名称）
         SerialNumber: value6,
-        TradeNo: value7, //string 交易流水号
+        TradeNo: value7, //string 支付流水号
         VoucherType: '', // int  单据业务类型，下拉单选，返回对应业务类型Id
         VoucherState: '', // int  单据状态，下拉单选，返回枚举Id
         Navigator: '', // string  导购，多选，返回导购Id，多个用英文逗号隔开，如：1,2,3,4
@@ -967,7 +967,7 @@ var BillSearch = function (_React$Component) {
       value4: '',
       value5: '',
       value6: '',
-      value7: '', //交易流水号
+      value7: '', //支付流水号
       tableDataList: [],
       show: false,
       isLook: true, //区别查看、退货
@@ -1043,23 +1043,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, endTime1, startTime1;
+        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;
 
@@ -1067,26 +1068,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;
 
@@ -1095,11 +1096,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,
@@ -1147,9 +1148,11 @@ var BillSearch = function (_React$Component) {
                       );
                     };
                   }
-                  return obj;
+                  if (!(v.key == 'TradeNo')) {
+                    columsArr.push(obj);
+                  }
                 });
-                listColumn.push({
+                columsArr.push({
                   title: "操作",
                   dataIndex: "i",
                   key: "i",
@@ -1182,8 +1185,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');
+                // 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({
@@ -1192,8 +1195,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, StartCreatedTime: startTime1, EndCreatedTime: endTime1 })
+                  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) {
@@ -1218,7 +1221,7 @@ var BillSearch = function (_React$Component) {
                   }, _callee8, _this3);
                 })));
 
-              case 37:
+              case 36:
               case 'end':
                 return _context9.stop();
             }
@@ -1262,10 +1265,10 @@ var BillSearch = function (_React$Component) {
   }, {
     key: 'initDetailData',
 
-    /**
-     * 初始化数据
-     * @param {*} retailDTO
-     * @param {*} detailData
+    /**
+     * 初始化数据
+     * @param {*} retailDTO
+     * @param {*} detailData
      */
     value: function initDetailData(retailDTO, detailData) {
       if (!retailDTO) {
@@ -1319,15 +1322,6 @@ 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({
@@ -2081,12 +2075,12 @@ var BillSearch = function (_React$Component) {
               _react2.default.createElement(
                 'span',
                 null,
-                '\u4EA4'
+                '\u652F'
               ),
               _react2.default.createElement(
                 'span',
                 null,
-                '\u6613'
+                '\u4ED8'
               ),
               _react2.default.createElement(
                 'span',