tplus-components-touch 3.21.2 → 3.22.4

package/dist/components/addLog/AddLogProcessor.js

@@ -28,11 +28,7 @@ var AddLogProcessor = function () {
         key: 'execute',
         value: function execute(title, docno, description, isShow) {
             try {
-                if (isShow == undefined || isShow == null) {
-                    _OperationLogApi2.default.addPosLog(title, docno, description);
-                } else {
-                    _OperationLogApi2.default.addPosLogWithShow(title, docno, description, isShow);
-                }
+                _OperationLogApi2.default.addPosLogWithShow(title, docno, description, !!isShow);
             } catch (e) {
                 console.error('操作日志接口调用异常');
             }

package/dist/components/addLog/AddLogProcessor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["tplus-components-touch/components/addLog/AddLogProcessor.js"],"names":["AddLogProcessor","title","docno","description","isShow","undefined","OperationLogApi","addPosLog","addPosLogWithShow","e","console","error"],"mappings":";;;;;;;;;;;;;;;AAQA;;;;;;IACqBA,e;;;;;;;gCACFC,K,EAAOC,K,EAAOC,W,EAAaC,M,EAAQ;AAC9C,gBAAG;AACC,oBAAGA,UAAQC,SAAR,IAAmBD,UAAQ,IAA9B,EACA;AACIE,8CAAgBC,SAAhB,CAA0BN,KAA1B,EAAiCC,KAAjC,EAAwCC,WAAxC;AACH,iBAHD,MAKA;AACIG,8CAAgBE,iBAAhB,CAAkCP,KAAlC,EAAyCC,KAAzC,EAAgDC,WAAhD,EAA4DC,MAA5D;AACH;AACJ,aATD,CAUA,OAAOK,CAAP,EAAU;AACNC,wBAAQC,KAAR,CAAc,YAAd;AACH;AACJ;;;;AAvBL;;;;;;;;;kBAQqBX,e","file":"AddLogProcessor.js","sourcesContent":["\r\n/**\r\n *POS 操作日志\r\n *\r\n * @export\r\n * @class AddLogProcessor\r\n * @auther tuzha\r\n */\r\nimport OperationLogApi from './OperationLogApi'\r\nexport default class AddLogProcessor {\r\n    static execute(title, docno, description, isShow) {\r\n        try{\r\n            if(isShow==undefined||isShow==null)\r\n            {\r\n                OperationLogApi.addPosLog(title, docno, description);\r\n            }\r\n            else\r\n            {\r\n                OperationLogApi.addPosLogWithShow(title, docno, description,isShow);\r\n            }\r\n        }\r\n        catch (e) {\r\n            console.error('操作日志接口调用异常');\r\n        }  \r\n    }\r\n}"]}
+{"version":3,"sources":["tplus-components-touch/components/addLog/AddLogProcessor.js"],"names":["AddLogProcessor","title","docno","description","isShow","OperationLogApi","addPosLogWithShow","e","console","error"],"mappings":";;;;;;;;;;;;;;;AAQA;;;;;;IACqBA,e;;;;;;;gCACFC,K,EAAOC,K,EAAOC,W,EAAaC,M,EAAQ;AAC9C,gBAAG;AACCC,0CAAgBC,iBAAhB,CAAkCL,KAAlC,EAAyCC,KAAzC,EAAgDC,WAAhD,EAA4D,CAAC,CAACC,MAA9D;AACH,aAFD,CAGA,OAAOG,CAAP,EAAU;AACNC,wBAAQC,KAAR,CAAc,YAAd;AACH;AACJ;;;;AAhBL;;;;;;;;;kBAQqBT,e","file":"AddLogProcessor.js","sourcesContent":["\r\n/**\r\n *POS 操作日志\r\n *\r\n * @export\r\n * @class AddLogProcessor\r\n * @auther tuzha\r\n */\r\nimport OperationLogApi from './OperationLogApi'\r\nexport default class AddLogProcessor {\r\n    static execute(title, docno, description, isShow) {\r\n        try{\r\n            OperationLogApi.addPosLogWithShow(title, docno, description,!!isShow);\r\n        }\r\n        catch (e) {\r\n            console.error('操作日志接口调用异常');\r\n        }  \r\n    }\r\n}"]}

package/dist/components/addLog/OperationLogApi.js

@@ -79,13 +79,12 @@ var OperationLogApi = function () {
 
             return log;
         }()
-
         //添加POS操作日志
 
     }, {
-        key: 'addPosLog',
+        key: 'addPosLogWithShow',
         value: function () {
-            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(title, docno, description) {
+            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(title, docno, description, isShow) {
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
                         switch (_context2.prev = _context2.next) {
@@ -94,12 +93,12 @@ var OperationLogApi = function () {
                                     docno = " ";
                                 }
                                 _context2.next = 3;
-                                return (0, _tplusApi.tApi)({
+                                return (0, _tplusApi.addOperatorLog)({
                                     title: title,
                                     code: docno,
                                     description: description,
-                                    isShow: false
-                                }, 'chanjet.RE.NewPos.AddPosLog', false, false, { timeout_skip: true });
+                                    isShow: isShow
+                                });
 
                             case 3:
                                 return _context2.abrupt('return', _context2.sent);
@@ -112,48 +111,10 @@ var OperationLogApi = function () {
                 }, _callee2, this);
             }));
 
-            function addPosLog(_x2, _x3, _x4) {
+            function addPosLogWithShow(_x2, _x3, _x4, _x5) {
                 return _ref2.apply(this, arguments);
             }
 
-            return addPosLog;
-        }()
-        //添加POS操作日志
-
-    }, {
-        key: 'addPosLogWithShow',
-        value: function () {
-            var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(title, docno, description, isShow) {
-                return _regenerator2.default.wrap(function _callee3$(_context3) {
-                    while (1) {
-                        switch (_context3.prev = _context3.next) {
-                            case 0:
-                                if (!docno) {
-                                    docno = " ";
-                                }
-                                _context3.next = 3;
-                                return (0, _tplusApi.tApi)({
-                                    title: title,
-                                    code: docno,
-                                    description: description,
-                                    isShow: isShow
-                                }, 'chanjet.RE.NewPos.AddPosLog', false, false, { timeout_skip: true });
-
-                            case 3:
-                                return _context3.abrupt('return', _context3.sent);
-
-                            case 4:
-                            case 'end':
-                                return _context3.stop();
-                        }
-                    }
-                }, _callee3, this);
-            }));
-
-            function addPosLogWithShow(_x5, _x6, _x7, _x8) {
-                return _ref3.apply(this, arguments);
-            }
-
             return addPosLogWithShow;
         }()
     }]);

package/dist/components/addLog/OperationLogApi.js.map

@@ -1 +1 @@
-{"version":3,"sources":["tplus-components-touch/components/addLog/OperationLogApi.js"],"names":["OperationLogApi","params","operationName","description","bringType","strModuleCode","strFunctionCode","strOperationName","status","strDocNo","strDescription","dtFunctionDate","tools","getCurDateTime","title","docno","code","isShow","timeout_skip"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;;;;;AACA;;;;IAIqBA,e;;;;;;;;AACjB;;iHACiBC,M;;;;;;AACNC,6C,GAA6BD,M,CAA7BC,a,EAAcC,W,GAAeF,M,CAAfE,W;;uCACR,oBAAK;AACdC,+CAAW,GADG;AAEdC,mDAAe,IAFD;AAGdC,qDAAiB,QAHH;AAIdC,sDAAkBL,aAJJ;AAKdM,4CAAQ,CALM;AAMdC,8CAAU,SANI;AAOdC,oDAAgBP,WAPF;AAQdQ,oDAAgBC,gBAAMC,cAAN;AARF,iCAAL,EASV,wDATU,EASgD,KAThD,EASuD,KATvD,C;;;;;;;;;;;;;;;;;;;;AAYjB;;;;;mHACuBC,K,EAAMC,K,EAAMZ,W;;;;;AAE/B,oCAAG,CAACY,KAAJ,EACA;AACIA,4CAAM,GAAN;AACH;;uCACY,oBAAK;AACdD,2CAAOA,KADO;AAEdE,0CAAMD,KAFQ;AAGdZ,iDAAaA,WAHC;AAIdc,4CAAO;AAJO,iCAAL,EAKV,6BALU,EAKqB,KALrB,EAK4B,KAL5B,EAKmC,EAACC,cAAa,IAAd,EALnC,C;;;;;;;;;;;;;;;;;;;AAOhB;;;;;mHAC8BJ,K,EAAMC,K,EAAMZ,W,EAAYc,M;;;;;AAEnD,oCAAG,CAACF,KAAJ,EACA;AACIA,4CAAM,GAAN;AACH;;uCACY,oBAAK;AACdD,2CAAOA,KADO;AAEdE,0CAAMD,KAFQ;AAGdZ,iDAAaA,WAHC;AAIdc,4CAAOA;AAJO,iCAAL,EAKV,6BALU,EAKqB,KALrB,EAK4B,KAL5B,EAKmC,EAACC,cAAa,IAAd,EALnC,C;;;;;;;;;;;;;;;;;;;;;;;kBArCAlB,e","file":"OperationLogApi.js","sourcesContent":["import { tApi } from 'tplus-api';\r\nimport tools from '../../util/tools';\r\n/**\r\n * 记操作日志API\r\n * POS端每个操作都需要在T+的表EAP_OPERATION\r\n */\r\nexport default class OperationLogApi {\r\n    //获取存货明细信息\r\n    static async log(params) {\r\n        const {operationName,description} = params;\r\n        return await tApi({\r\n            bringType: '1',\r\n            strModuleCode: 'RE',\r\n            strFunctionCode: 'RE3002',\r\n            strOperationName: operationName,\r\n            status: 1,\r\n            strDocNo: '1234567',\r\n            strDescription: description,\r\n            dtFunctionDate: tools.getCurDateTime(),\r\n        }, 'chanjet.SM.CommonInterface.IOperationLogService.AddLog', false, false);\r\n    }\r\n\r\n    //添加POS操作日志\r\n    static async addPosLog(title,docno,description)\r\n    {\r\n        if(!docno)\r\n        {\r\n            docno=\" \";\r\n        }\r\n        return await tApi({\r\n            title: title,\r\n            code: docno,\r\n            description: description,\r\n            isShow:false\r\n        }, 'chanjet.RE.NewPos.AddPosLog', false, false, {timeout_skip:true});\r\n    }\r\n     //添加POS操作日志\r\n    static async addPosLogWithShow(title,docno,description,isShow)\r\n    {\r\n        if(!docno)\r\n        {\r\n            docno=\" \";\r\n        }\r\n        return await tApi({\r\n            title: title,\r\n            code: docno,\r\n            description: description,\r\n            isShow:isShow\r\n        }, 'chanjet.RE.NewPos.AddPosLog', false, false, {timeout_skip:true});\r\n    }\r\n}\r\n\r\n"]}
+{"version":3,"sources":["tplus-components-touch/components/addLog/OperationLogApi.js"],"names":["OperationLogApi","params","operationName","description","bringType","strModuleCode","strFunctionCode","strOperationName","status","strDocNo","strDescription","dtFunctionDate","tools","getCurDateTime","title","docno","isShow","code"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;;;;;AACA;;;;IAIqBA,e;;;;;;;;AACjB;;iHACiBC,M;;;;;;AACNC,6C,GAA6BD,M,CAA7BC,a,EAAcC,W,GAAeF,M,CAAfE,W;;uCACR,oBAAK;AACdC,+CAAW,GADG;AAEdC,mDAAe,IAFD;AAGdC,qDAAiB,QAHH;AAIdC,sDAAkBL,aAJJ;AAKdM,4CAAQ,CALM;AAMdC,8CAAU,SANI;AAOdC,oDAAgBP,WAPF;AAQdQ,oDAAgBC,gBAAMC,cAAN;AARF,iCAAL,EASV,wDATU,EASgD,KAThD,EASuD,KATvD,C;;;;;;;;;;;;;;;;;;;AAWhB;;;;;mHAC8BC,K,EAAMC,K,EAAMZ,W,EAAYa,M;;;;;AAEnD,oCAAG,CAACD,KAAJ,EACA;AACIA,4CAAM,GAAN;AACH;;uCACY,8BAAe;AACxBD,2CAAOA,KADiB;AAExBG,0CAAMF,KAFkB;AAGxBZ,iDAAaA,WAHW;AAIxBa,4CAAOA;AAJiB,iCAAf,C;;;;;;;;;;;;;;;;;;;;;;;kBAtBAhB,e","file":"OperationLogApi.js","sourcesContent":["import { tApi,addOperatorLog } from 'tplus-api';\r\nimport tools from '../../util/tools';\r\n/**\r\n * 记操作日志API\r\n * POS端每个操作都需要在T+的表EAP_OPERATION\r\n */\r\nexport default class OperationLogApi {\r\n    //获取存货明细信息\r\n    static async log(params) {\r\n        const {operationName,description} = params;\r\n        return await tApi({\r\n            bringType: '1',\r\n            strModuleCode: 'RE',\r\n            strFunctionCode: 'RE3002',\r\n            strOperationName: operationName,\r\n            status: 1,\r\n            strDocNo: '1234567',\r\n            strDescription: description,\r\n            dtFunctionDate: tools.getCurDateTime(),\r\n        }, 'chanjet.SM.CommonInterface.IOperationLogService.AddLog', false, false);\r\n    }\r\n     //添加POS操作日志\r\n    static async addPosLogWithShow(title,docno,description,isShow)\r\n    {\r\n        if(!docno)\r\n        {\r\n            docno=\" \";\r\n        }\r\n        return await addOperatorLog({\r\n            title: title,\r\n            code: docno,\r\n            description: description,\r\n            isShow:isShow\r\n        });\r\n    }\r\n}\r\n\r\n"]}

package/dist/components/billSearch/index.js

@@ -357,6 +357,7 @@ var BillSearch = function (_React$Component) {
           value3 = _this$state2.value3,
           value4 = _this$state2.value4,
           value5 = _this$state2.value5,
+          value6 = _this$state2.value6,
           option = _this$state2.option;
 
       return (0, _extends5.default)({
@@ -368,6 +369,7 @@ var BillSearch = function (_React$Component) {
         KeyType: type === 2 ? '1' : '0', //区分原单退货与单据查询
         Inventory: value4, //string  商品名称（条形码、助记码、商品编码、商品名称）
         Member: value5, //string 会员（会员卡号、手机号、会员名称）
+        SerialNumber: value6,
         VoucherType: '', // int  单据业务类型，下拉单选，返回对应业务类型Id
         VoucherState: '', // int  单据状态，下拉单选，返回枚举Id
         Navigator: '', // string  导购，多选，返回导购Id，多个用英文逗号隔开，如：1,2,3,4
@@ -613,6 +615,18 @@ var BillSearch = function (_React$Component) {
         _index.Message.warn('至少选择一个退货信息');
         return;
       }
+      var noSerialNumberList = selectedList.filter(function (item) {
+        var obj = item.RetailDetailDTO;
+        //商品是序列号但原单未录
+        if (obj.Inventory && obj.Inventory.IsSerialNumber && !obj.SerialNumber) {
+          return true;
+        }
+        return false;
+      });
+      if (noSerialNumberList && noSerialNumberList.length > 0) {
+        _index.Message.warn('原单中的序列号商品缺少序列号，请使用非原单退货！');
+        return;
+      }
       var infoList = selectedList.filter(function (item) {
         var obj = item.RetailDetailDTO;
         if (obj.PromotionTypeStr || obj.PromotionIdStr || obj.PromotionCode) {
@@ -869,6 +883,10 @@ var BillSearch = function (_React$Component) {
         _this.setState({
           value5: ''
         });
+      } else if (type === 'value6') {
+        _this.setState({
+          value6: ''
+        });
       } else {
         // 剩下的一些单选
         _this.setState({
@@ -892,6 +910,7 @@ var BillSearch = function (_React$Component) {
       value3: '',
       value4: '',
       value5: '',
+      value6: '',
       tableDataList: [],
       show: false,
       isLook: true, //区别查看、退货
@@ -1224,6 +1243,7 @@ var BillSearch = function (_React$Component) {
           value3 = _state.value3,
           value4 = _state.value4,
           value5 = _state.value5,
+          value6 = _state.value6,
           tableDataList = _state.tableDataList,
           show = _state.show,
           isLook = _state.isLook,
@@ -1283,7 +1303,8 @@ var BillSearch = function (_React$Component) {
         line = isSpecialQuery ? 10 : isEnableMinMall ? 9 : 7;
       }
 
-      var billTitleHeight = (30 + 16) * line + 30 - 8;
+      // let billTitleHeight = (30 + 16) * line + 30 - 8;
+      var billTitleHeight = 240;
 
       if (!searchFilterItemShow) {
         billTitleHeight = 0;
@@ -1298,7 +1319,8 @@ var BillSearch = function (_React$Component) {
       var billContentHeight = "calc(100% - " + otherHeight + "px)";
 
       var isEnableMember = (0, _tplusPoslogin.PosInitData)('isEnableMember');
-
+      //启用序列号
+      var isEnableSerialNumber = (0, _tplusPoslogin.PosInitData)("IsEnableSerialNumber");
       return _react2.default.createElement(
         'div',
         { className: 'bill' },
@@ -1388,13 +1410,51 @@ var BillSearch = function (_React$Component) {
             _react2.default.createElement(_input2.default, { type: 'text',
               placeholder: '\u6761\u5F62\u7801/\u52A9\u8BB0\u7801/\u5546\u54C1\u7F16\u7801/\u5546\u54C1\u540D\u79F0',
               value: value4,
-              className: 'bill-title-txt-input',
+              className: 'bill-title-txt-input android_focus_keyboard',
               onChange: this.onChange.bind(this, 4),
               onClick: this.onFocus.bind(this, 4),
               ref: function ref(input) {
                 return _this4.input4 = input;
               } })
           ),
+          isEnableSerialNumber === 'true' && _react2.default.createElement(
+            'div',
+            { className: 'bill-title-item' },
+            _react2.default.createElement(
+              'label',
+              null,
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u5E8F'
+              ),
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u5217'
+              ),
+              _react2.default.createElement(
+                'span',
+                null,
+                '\u53F7'
+              )
+            ),
+            ':',
+            _react2.default.createElement(
+              'div',
+              { className: 'bill-title-item-all ' + (value6 ? '' : 'text-default'), onClick: this.onClickAll.bind(this, 'value6') },
+              '\u5168\u90E8'
+            ),
+            _react2.default.createElement(_input2.default, { type: 'text',
+              placeholder: '\u8BF7\u8F93\u5165\u5E8F\u5217\u53F7',
+              value: value6,
+              className: 'bill-title-txt-input',
+              onChange: this.onChange.bind(this, 6),
+              onClick: this.onFocus.bind(this, 6),
+              ref: function ref(input) {
+                return _this4.input6 = input;
+              } })
+          ),
           isEnableMember && _react2.default.createElement(
             'div',
             { className: 'bill-title-item' },
@@ -1423,7 +1483,7 @@ var BillSearch = function (_React$Component) {
             _react2.default.createElement(_input2.default, { type: 'text',
               placeholder: '\u4F1A\u5458\u5361\u53F7/\u624B\u673A\u53F7/\u4F1A\u5458\u540D\u79F0',
               value: value5,
-              className: 'bill-title-txt-input',
+              className: 'bill-title-txt-input android_focus_keyboard',
               onChange: this.onChange.bind(this, 5),
               onClick: this.onFocus.bind(this, 5),
               ref: function ref(input) {