tplus-components-touch 3.17.10 → 3.17.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/addLog/AddLogProcessor.js +1 -5
- package/dist/components/addLog/AddLogProcessor.js.map +1 -1
- package/dist/components/addLog/OperationLogApi.js +6 -45
- package/dist/components/addLog/OperationLogApi.js.map +1 -1
- package/dist/components/settlement/settlement.js +6 -8
- package/dist/components/settlement/settlement.js.map +1 -1
- package/package.json +1 -1
|
@@ -28,11 +28,7 @@ var AddLogProcessor = function () {
|
|
|
28
28
|
key: 'execute',
|
|
29
29
|
value: function execute(title, docno, description, isShow) {
|
|
30
30
|
try {
|
|
31
|
-
|
|
32
|
-
_OperationLogApi2.default.addPosLog(title, docno, description);
|
|
33
|
-
} else {
|
|
34
|
-
_OperationLogApi2.default.addPosLogWithShow(title, docno, description, isShow);
|
|
35
|
-
}
|
|
31
|
+
_OperationLogApi2.default.addPosLogWithShow(title, docno, description, !!isShow);
|
|
36
32
|
} catch (e) {
|
|
37
33
|
console.error('操作日志接口调用异常');
|
|
38
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["tplus-components-touch/components/addLog/AddLogProcessor.js"],"names":["AddLogProcessor","title","docno","description","isShow","
|
|
1
|
+
{"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}"]}
|
|
@@ -79,13 +79,12 @@ var OperationLogApi = function () {
|
|
|
79
79
|
|
|
80
80
|
return log;
|
|
81
81
|
}()
|
|
82
|
-
|
|
83
82
|
//添加POS操作日志
|
|
84
83
|
|
|
85
84
|
}, {
|
|
86
|
-
key: '
|
|
85
|
+
key: 'addPosLogWithShow',
|
|
87
86
|
value: function () {
|
|
88
|
-
var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(title, docno, description) {
|
|
87
|
+
var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(title, docno, description, isShow) {
|
|
89
88
|
return _regenerator2.default.wrap(function _callee2$(_context2) {
|
|
90
89
|
while (1) {
|
|
91
90
|
switch (_context2.prev = _context2.next) {
|
|
@@ -94,12 +93,12 @@ var OperationLogApi = function () {
|
|
|
94
93
|
docno = " ";
|
|
95
94
|
}
|
|
96
95
|
_context2.next = 3;
|
|
97
|
-
return (0, _tplusApi.
|
|
96
|
+
return (0, _tplusApi.addOperatorLog)({
|
|
98
97
|
title: title,
|
|
99
98
|
code: docno,
|
|
100
99
|
description: description,
|
|
101
|
-
isShow:
|
|
102
|
-
}
|
|
100
|
+
isShow: isShow
|
|
101
|
+
});
|
|
103
102
|
|
|
104
103
|
case 3:
|
|
105
104
|
return _context2.abrupt('return', _context2.sent);
|
|
@@ -112,48 +111,10 @@ var OperationLogApi = function () {
|
|
|
112
111
|
}, _callee2, this);
|
|
113
112
|
}));
|
|
114
113
|
|
|
115
|
-
function
|
|
114
|
+
function addPosLogWithShow(_x2, _x3, _x4, _x5) {
|
|
116
115
|
return _ref2.apply(this, arguments);
|
|
117
116
|
}
|
|
118
117
|
|
|
119
|
-
return addPosLog;
|
|
120
|
-
}()
|
|
121
|
-
//添加POS操作日志
|
|
122
|
-
|
|
123
|
-
}, {
|
|
124
|
-
key: 'addPosLogWithShow',
|
|
125
|
-
value: function () {
|
|
126
|
-
var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(title, docno, description, isShow) {
|
|
127
|
-
return _regenerator2.default.wrap(function _callee3$(_context3) {
|
|
128
|
-
while (1) {
|
|
129
|
-
switch (_context3.prev = _context3.next) {
|
|
130
|
-
case 0:
|
|
131
|
-
if (!docno) {
|
|
132
|
-
docno = " ";
|
|
133
|
-
}
|
|
134
|
-
_context3.next = 3;
|
|
135
|
-
return (0, _tplusApi.tApi)({
|
|
136
|
-
title: title,
|
|
137
|
-
code: docno,
|
|
138
|
-
description: description,
|
|
139
|
-
isShow: isShow
|
|
140
|
-
}, 'chanjet.RE.NewPos.AddPosLog', false, false, { timeout_skip: true });
|
|
141
|
-
|
|
142
|
-
case 3:
|
|
143
|
-
return _context3.abrupt('return', _context3.sent);
|
|
144
|
-
|
|
145
|
-
case 4:
|
|
146
|
-
case 'end':
|
|
147
|
-
return _context3.stop();
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
}, _callee3, this);
|
|
151
|
-
}));
|
|
152
|
-
|
|
153
|
-
function addPosLogWithShow(_x5, _x6, _x7, _x8) {
|
|
154
|
-
return _ref3.apply(this, arguments);
|
|
155
|
-
}
|
|
156
|
-
|
|
157
118
|
return addPosLogWithShow;
|
|
158
119
|
}()
|
|
159
120
|
}]);
|
|
@@ -1 +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","
|
|
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","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"]}
|
|
@@ -276,7 +276,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
276
276
|
});
|
|
277
277
|
}
|
|
278
278
|
if (b.lastChild) {
|
|
279
|
-
|
|
279
|
+
// 原来bWidth < cWidth，过渡过程中右边按钮会隐藏，+20之后解决
|
|
280
|
+
if (bWidth < cWidth + 20) {
|
|
280
281
|
b.lastChild.className = 'btns voucherMode';
|
|
281
282
|
} else {
|
|
282
283
|
b.lastChild.className = 'btns';
|
|
@@ -934,11 +935,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
934
935
|
var _ref8 = paymode || {},
|
|
935
936
|
paymodes = _ref8.paymodes;
|
|
936
937
|
|
|
937
|
-
var
|
|
938
|
-
offlineStatus = _stores$offlineSys.offlineStatus,
|
|
939
|
-
OFFLINE_STATUS = _stores$offlineSys.OFFLINE_STATUS;
|
|
938
|
+
var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
|
|
940
939
|
|
|
941
|
-
if (
|
|
940
|
+
if (isOffline) {
|
|
942
941
|
if (paymodes) {
|
|
943
942
|
var currentPayMode = paymodes.find(function (item) {
|
|
944
943
|
return item.paymentType === key;
|
|
@@ -963,7 +962,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
963
962
|
Differentiate = _enumController$getEn7.Differentiate;
|
|
964
963
|
|
|
965
964
|
paymode.currentMode = null;
|
|
966
|
-
if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(key)) return false;
|
|
967
965
|
switch (key) {
|
|
968
966
|
case PayStyle.hyczk:
|
|
969
967
|
_this2.showCzkModal(-1);
|
|
@@ -1283,6 +1281,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
1283
1281
|
};
|
|
1284
1282
|
|
|
1285
1283
|
_this2.onHotKeyClick1 = function (mode, index, boriginReturn) {
|
|
1284
|
+
if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType)) return false;
|
|
1286
1285
|
if (_this2.hotkeydebouncedPayMode == mode) {
|
|
1287
1286
|
return;
|
|
1288
1287
|
}
|
|
@@ -1376,7 +1375,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
1376
1375
|
thePaymodes.forEach(function (paymodes, index) {
|
|
1377
1376
|
if (paymodes.paymethodId == _this2.state.currentIndex) payIndex = index;
|
|
1378
1377
|
});
|
|
1379
|
-
|
|
1380
1378
|
_this2.setFocusAndSelectionMode(thePaymodes, payIndex);
|
|
1381
1379
|
}
|
|
1382
1380
|
}, 500, {
|
|
@@ -1422,7 +1420,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
1422
1420
|
var findIndex = currenIndex;
|
|
1423
1421
|
var endCurrentMode = thePaymodes.find(function (mode, index) {
|
|
1424
1422
|
findIndex++;
|
|
1425
|
-
return (symbol ? index > currenIndex : index < currenIndex) && mode.paymentType != PayStyle.hyczk && mode.paymentType != PayStyle.djq && mode.paymentType != PayStyle.jfdx;
|
|
1423
|
+
return (symbol ? index > currenIndex : index < currenIndex) && mode.paymentType != PayStyle.hyczk && mode.paymentType != PayStyle.djq && mode.paymentType != PayStyle.jfdx && _mutantsMicrofx.stores.offlineSys.shouldSettlement(mode.paymentType, true);
|
|
1426
1424
|
});
|
|
1427
1425
|
if (endCurrentMode) return { mode: endCurrentMode, index: findIndex };
|
|
1428
1426
|
return null;
|