@kmkf-fe-packages/basic-components 2.2.44-beta.76 → 2.2.44-beta.79

package/dist/index.esm.js

@@ -24130,6 +24130,7 @@ var systemOrderNoMap = {
   JKY_REISSUE_GOODS: 'tradeNo',
   KM_REISSUE_GOODS: 'sid',
   KM_RETURN_GOODS: 'sid',
+  KM_EXCHANGE_GOODS: 'sid',
   JST_REISSUE_GOODS: 'oId',
   GY_REISSUE_GOODS: 'code',
   BS_E3_REISSUE_GOODS: 'orderSn',
@@ -24155,7 +24156,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     type = _ref$type === void 0 ? '' : _ref$type,
     width = _ref.width,
     _ref$isReissueType = _ref.isReissueType,
-    isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType;
+    isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType,
+    _ref$isReloadSelectTa = _ref.isReloadSelectTable,
+    isReloadSelectTable = _ref$isReloadSelectTa === void 0 ? false : _ref$isReloadSelectTa,
+    validSystemOrderFn = _ref.validSystemOrderFn;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     selectSystemNo = _useState2[0],
@@ -24200,36 +24204,52 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
   }();
   var openModal = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var flag;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            if (!validSystemOrderFn) {
+              _context2.next = 7;
+              break;
+            }
+            _context2.next = 3;
+            return validSystemOrderFn();
+          case 3:
+            flag = _context2.sent;
+            if (!(flag === false)) {
+              _context2.next = 7;
+              break;
+            }
+            console.log('validSystemOrderFn校验不通过');
+            return _context2.abrupt("return");
+          case 7:
             if (!validSystemOrder) {
-              _context2.next = 3;
+              _context2.next = 10;
               break;
             }
             message.warning('请选择补发系统单');
             return _context2.abrupt("return");
-          case 3:
-            if (!(getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length))) {
-              _context2.next = 6;
+          case 10:
+            if (!(getDataSourceAsync && (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || isReloadSelectTable))) {
+              _context2.next = 13;
               break;
             }
-            _context2.next = 6;
+            _context2.next = 13;
             return getDataSourceAsync();
-          case 6:
+          case 13:
             if (!['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
-              _context2.next = 9;
+              _context2.next = 16;
               break;
             }
-            _context2.next = 9;
+            _context2.next = 16;
             return getKmSupplier(dataSource);
-          case 9:
+          case 16:
             setTradeGoodsVisible(true);
             // 补发直接传入的是systemNo
             if (isShowSelect && isReissueType) {
               setSelectSystemNo(selectedSystemOrders || []);
             }
-          case 11:
+          case 18:
           case "end":
             return _context2.stop();
         }
@@ -24344,7 +24364,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
 SelectTradeGoods.displayName = 'SelectTradeGoods';
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
+  if (['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_EXCHANGE_GOODS'].includes(type)) {
     return '选择快麦ERP商品';
   }
   if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
@@ -24415,7 +24435,9 @@ var GoodItem$1 = function GoodItem(props) {
     _props$templateDetail = props.templateDetail,
     templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail,
     _props$hasSelectedSys = props.hasSelectedSystemOrder,
-    hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys;
+    hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys,
+    isReloadSelectTable = props.isReloadSelectTable,
+    validSystemOrderFn = props.validSystemOrderFn;
   var canDelete = ['JST_AFTERSALE_GOODS'].includes(type);
   var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
   // 监听聚水潭退货商品
@@ -24716,6 +24738,8 @@ var GoodItem$1 = function GoodItem(props) {
     checked: isStrict,
     onChange: handleCheckboxChange
   }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !isEmpty(tradeGoods) && isShowSelectTradeGoods && /*#__PURE__*/React.createElement(SelectTradeGoods, {
+    isReloadSelectTable: isReloadSelectTable,
+    validSystemOrderFn: validSystemOrderFn,
     validSystemOrder: validSystemOrder,
     isShowSelect: isShowSelect,
     uniqueKey: uniqueKey,
@@ -28018,6 +28042,34 @@ var componentMap$4 = {
     outerOiIdKey: '',
     name: '快麦',
     updateGoodsHandle: updateKmGoodsHandle,
+    isReloadSelectTable: true,
+    validSystemOrderFn: function () {
+      var _validSystemOrderFn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(form) {
+        var returnGoodsValue;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return form.getFieldValue('KM3F7B91C2');
+            case 2:
+              returnGoodsValue = _context.sent;
+              if (returnGoodsValue.kmSystemOrderNo) {
+                _context.next = 6;
+                break;
+              }
+              message.error('请选择退货系统单');
+              return _context.abrupt("return", false);
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function validSystemOrderFn(_x) {
+        return _validSystemOrderFn.apply(this, arguments);
+      }
+      return validSystemOrderFn;
+    }(),
     eventNameMap: {
       // pubsub 事件
       exchangeCopyGood: 'kmExchangeCopyGood',
@@ -28032,7 +28084,8 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
-    compType = props.type;
+    compType = props.type,
+    form = props.form;
   var uniqueKey = (componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp = componentMap$4[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.skuIdKey) || 'uuid';
   var valueRef = useRef({});
   // PS: 目前选择订单商品，只有聚水潭换出商品，而且聚水潭不用考虑合并单，所以这个值一直是 false
@@ -28141,6 +28194,10 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
     key: componentMap$4[compType].type
   }, props), {}, {
+    validSystemOrderFn: function validSystemOrderFn() {
+      return componentMap$4[compType].validSystemOrderFn(form);
+    },
+    isReloadSelectTable: componentMap$4[compType].isReloadSelectTable,
     disabled: disabled,
     canUpdateNumber: true,
     showChangeBtn: true,

package/dist/index.js

@@ -24145,6 +24145,7 @@ var systemOrderNoMap = {
   JKY_REISSUE_GOODS: 'tradeNo',
   KM_REISSUE_GOODS: 'sid',
   KM_RETURN_GOODS: 'sid',
+  KM_EXCHANGE_GOODS: 'sid',
   JST_REISSUE_GOODS: 'oId',
   GY_REISSUE_GOODS: 'code',
   BS_E3_REISSUE_GOODS: 'orderSn',
@@ -24170,7 +24171,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     type = _ref$type === void 0 ? '' : _ref$type,
     width = _ref.width,
     _ref$isReissueType = _ref.isReissueType,
-    isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType;
+    isReissueType = _ref$isReissueType === void 0 ? false : _ref$isReissueType,
+    _ref$isReloadSelectTa = _ref.isReloadSelectTable,
+    isReloadSelectTable = _ref$isReloadSelectTa === void 0 ? false : _ref$isReloadSelectTa,
+    validSystemOrderFn = _ref.validSystemOrderFn;
   var _useState = React.useState(),
     _useState2 = _slicedToArray(_useState, 2),
     selectSystemNo = _useState2[0],
@@ -24215,36 +24219,52 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
   }();
   var openModal = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var flag;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            if (!validSystemOrderFn) {
+              _context2.next = 7;
+              break;
+            }
+            _context2.next = 3;
+            return validSystemOrderFn();
+          case 3:
+            flag = _context2.sent;
+            if (!(flag === false)) {
+              _context2.next = 7;
+              break;
+            }
+            console.log('validSystemOrderFn校验不通过');
+            return _context2.abrupt("return");
+          case 7:
             if (!validSystemOrder) {
-              _context2.next = 3;
+              _context2.next = 10;
               break;
             }
             antd.message.warning('请选择补发系统单');
             return _context2.abrupt("return");
-          case 3:
-            if (!(getDataSourceAsync && !(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length))) {
-              _context2.next = 6;
+          case 10:
+            if (!(getDataSourceAsync && (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || isReloadSelectTable))) {
+              _context2.next = 13;
               break;
             }
-            _context2.next = 6;
+            _context2.next = 13;
             return getDataSourceAsync();
-          case 6:
+          case 13:
             if (!['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
-              _context2.next = 9;
+              _context2.next = 16;
               break;
             }
-            _context2.next = 9;
+            _context2.next = 16;
             return getKmSupplier(dataSource);
-          case 9:
+          case 16:
             setTradeGoodsVisible(true);
             // 补发直接传入的是systemNo
             if (isShowSelect && isReissueType) {
               setSelectSystemNo(selectedSystemOrders || []);
             }
-          case 11:
+          case 18:
           case "end":
             return _context2.stop();
         }
@@ -24359,7 +24379,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
 SelectTradeGoods.displayName = 'SelectTradeGoods';
 var getButtonText = function getButtonText() {
   var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  if (['KM_GOODS', 'KM_REISSUE_GOODS'].includes(type)) {
+  if (['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_EXCHANGE_GOODS'].includes(type)) {
     return '选择快麦ERP商品';
   }
   if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
@@ -24430,7 +24450,9 @@ var GoodItem$1 = function GoodItem(props) {
     _props$templateDetail = props.templateDetail,
     templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail,
     _props$hasSelectedSys = props.hasSelectedSystemOrder,
-    hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys;
+    hasSelectedSystemOrder = _props$hasSelectedSys === void 0 ? false : _props$hasSelectedSys,
+    isReloadSelectTable = props.isReloadSelectTable,
+    validSystemOrderFn = props.validSystemOrderFn;
   var canDelete = ['JST_AFTERSALE_GOODS'].includes(type);
   var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
   // 监听聚水潭退货商品
@@ -24731,6 +24753,8 @@ var GoodItem$1 = function GoodItem(props) {
     checked: isStrict,
     onChange: handleCheckboxChange
   }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !lodash.isEmpty(tradeGoods) && isShowSelectTradeGoods && /*#__PURE__*/React__default['default'].createElement(SelectTradeGoods, {
+    isReloadSelectTable: isReloadSelectTable,
+    validSystemOrderFn: validSystemOrderFn,
     validSystemOrder: validSystemOrder,
     isShowSelect: isShowSelect,
     uniqueKey: uniqueKey,
@@ -28033,6 +28057,34 @@ var componentMap$4 = {
     outerOiIdKey: '',
     name: '快麦',
     updateGoodsHandle: kmkfUtils.updateKmGoodsHandle,
+    isReloadSelectTable: true,
+    validSystemOrderFn: function () {
+      var _validSystemOrderFn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(form) {
+        var returnGoodsValue;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return form.getFieldValue('KM3F7B91C2');
+            case 2:
+              returnGoodsValue = _context.sent;
+              if (returnGoodsValue.kmSystemOrderNo) {
+                _context.next = 6;
+                break;
+              }
+              antd.message.error('请选择退货系统单');
+              return _context.abrupt("return", false);
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function validSystemOrderFn(_x) {
+        return _validSystemOrderFn.apply(this, arguments);
+      }
+      return validSystemOrderFn;
+    }(),
     eventNameMap: {
       // pubsub 事件
       exchangeCopyGood: 'kmExchangeCopyGood',
@@ -28047,7 +28099,8 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
-    compType = props.type;
+    compType = props.type,
+    form = props.form;
   var uniqueKey = (componentMap$4 === null || componentMap$4 === void 0 ? void 0 : (_componentMap$compTyp = componentMap$4[compType]) === null || _componentMap$compTyp === void 0 ? void 0 : _componentMap$compTyp.skuIdKey) || 'uuid';
   var valueRef = React.useRef({});
   // PS: 目前选择订单商品，只有聚水潭换出商品，而且聚水潭不用考虑合并单，所以这个值一直是 false
@@ -28156,6 +28209,10 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(GoodItem$1, _objectSpread2(_objectSpread2({
     key: componentMap$4[compType].type
   }, props), {}, {
+    validSystemOrderFn: function validSystemOrderFn() {
+      return componentMap$4[compType].validSystemOrderFn(form);
+    },
+    isReloadSelectTable: componentMap$4[compType].isReloadSelectTable,
     disabled: disabled,
     canUpdateNumber: true,
     showChangeBtn: true,

package/dist/src/bs/component/GoodItem/index.d.ts

@@ -44,6 +44,8 @@ interface BsGoodsProps {
     };
     systemOrders?: any[];
     selectedSystemOrders?: any[];
+    isReloadSelectTable?: boolean;
+    validSystemOrderFn?: () => boolean | undefined;
 }
 type MakeRequired<T, K extends keyof T> = {
     [P in K]-?: T[P];
@@ -64,9 +66,11 @@ type SelectTradeGoodsProps = {
     width?: number;
     validSystemOrder?: boolean;
     isReissueType?: boolean;
+    isReloadSelectTable?: boolean;
+    validSystemOrderFn?: () => boolean | undefined;
 };
 export declare const SelectTradeGoods: {
-    ({ columns, dataSource, getDataSourceAsync, selectedRowKeys, onChangeSelectedKeys, uniqueKey, isShowSelect, systemOrders, selectedSystemOrders, validSystemOrder, type, width, isReissueType, }: SelectTradeGoodsProps): React.JSX.Element;
+    ({ columns, dataSource, getDataSourceAsync, selectedRowKeys, onChangeSelectedKeys, uniqueKey, isShowSelect, systemOrders, selectedSystemOrders, validSystemOrder, type, width, isReissueType, isReloadSelectTable, validSystemOrderFn, }: SelectTradeGoodsProps): React.JSX.Element;
     displayName: string;
 };
 declare const GoodItem: (props: MakeRequired<Partial<BsGoodsProps>, 'useGoodsSourceFormat'>) => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.44-beta.76",
+  "version": "2.2.44-beta.79",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.76",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.77",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1771dc8261d9b6ee2666a0ed2bbc65f023d4a939"
+  "gitHead": "707e028127f76ab9ddc2c5bda30bc15ac8ed55d3"
 }