tplus-components-touch 3.54.12 → 3.54.15

package/dist/components/settlement/settlement.js

@@ -287,7 +287,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.getIsReturn = function () {
       var dataModal = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data;
-      return dataModal.IdbusiType === 35 || dataModal.IdbusiType === 40; //40预售退货类型。
+      return dataModal.IdbusiType === 35 || dataModal.IdbusiType === 40 || dataModal.IdbusiType === 42; //40预售退货类型。 42赊销退货类型
     };
 
     _this2.getBoriginReturn = function () {
@@ -2707,12 +2707,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   break;
                 }
 
-                if (!(Number(amount) < 0)) {
+                if (!(Number(amount) <= 0)) {
                   _context18.next = 5;
                   break;
                 }
 
-                return _context18.abrupt('return', _message2.default.warn('所勾选零售单的欠款合计须大于等于0！'));
+                return _context18.abrupt('return', _message2.default.warn('所勾选零售单的欠款合计不可小于等于0！'));
 
               case 5:
                 notSelectableVoucherList = creditSalesVoucher.filter(function (o) {