@kmkf-fe-packages/basic-components 2.10.24 → 2.10.25

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, normalizeYouzanStar, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, warehouseTypeMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, TTX_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, TTX_INTERNAL_ORDER_TYPE_MAP, TTX_STATUS_MAP, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateTtxGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, normalizeYouzanStar, servers, columnsGoodsList, LogisticsAddressData, isJdLogisticsCompany, getJdCustomerCodeOptions, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, warehouseTypeMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, TTX_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, TTX_INTERNAL_ORDER_TYPE_MAP, TTX_STATUS_MAP, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateTtxGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import every from 'lodash/every';
 import maxBy from 'lodash/maxBy';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
@@ -8635,7 +8635,7 @@ var processLogisticsInterception = function processLogisticsInterception(getValu
     address = every(address, function (item) {
       return !item;
     }) ? [] : address;
-    var subFields = ['interceptCompany', 'interceptCode', 'interceptType', 'interceptSenderMobile', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsUserKCode', 'interceptLogisticsUserSecretKey'];
+    var subFields = ['interceptCompany', 'interceptCode', 'interceptType', 'interceptSenderMobile', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsUserKCode', 'interceptLogisticsUserSecretKey', 'interceptLogisticsCustomerCode'];
     var map = subFields.reduce(function (cur, nxt) {
       return _objectSpread2(_objectSpread2({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
     }, {});
@@ -13536,7 +13536,6 @@ var Item = Form.Item;
 var LogisticsInterception = function LogisticsInterception(props) {
   var _value$interceptLogis3, _value$interceptLogis4, _value$interceptLogis5;
   var LogisticsAddress = LogisticsAddressData.getInstance();
-  var LogisticsAddressOptions = (LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getAddressData()) || [];
   var address = AddressData.getInstance();
   var _props$value = props.value,
     value = _props$value === void 0 ? {} : _props$value,
@@ -13574,6 +13573,12 @@ var LogisticsInterception = function LogisticsInterception(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     isInterface = _useState8[0],
     setIsInterface = _useState8[1];
+  var _useState9 = useState(function () {
+      return (LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getAddressData()) || [];
+    }),
+    _useState10 = _slicedToArray(_useState9, 2),
+    logisticsAddressData = _useState10[0],
+    setLogisticsAddressData = _useState10[1];
   useEffect(function () {
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) {
       setTypeOptions([]);
@@ -13588,6 +13593,13 @@ var LogisticsInterception = function LogisticsInterception(props) {
     setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.logisticsStatusList) || []);
     setIsInterface(interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.isInterface);
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  useEffect(function () {
+    if (!isJdLogisticsCompany(value === null || value === void 0 ? void 0 : value.interceptCompany) && (value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode) !== undefined) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        interceptLogisticsCustomerCode: undefined
+      }));
+    }
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode]);
   //拦截类型切换 需要清空派送地址
   useEffect(function () {
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) return;
@@ -13650,6 +13662,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
     return isShow;
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  var showCustomerCode = useMemo(function () {
+    return isJdLogisticsCompany(value === null || value === void 0 ? void 0 : value.interceptCompany);
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //判断是否能修改物流信息
   var isEdit = useMemo(function () {
     var company = expressInterceptData.find(function (item) {
@@ -13661,13 +13676,13 @@ var LogisticsInterception = function LogisticsInterception(props) {
   var baseFieldDisabled = disabled || isEdit && !canEditPreCreateBaseFields;
   //退回地址列表
   var logisticsAddressOptions = useMemo(function () {
-    return LogisticsAddressOptions === null || LogisticsAddressOptions === void 0 ? void 0 : LogisticsAddressOptions.filter(function (item) {
+    return logisticsAddressData === null || logisticsAddressData === void 0 ? void 0 : logisticsAddressData.filter(function (item) {
       return item.cpCode === (value === null || value === void 0 ? void 0 : value.interceptCompany);
     });
-  }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  }, [logisticsAddressData, value === null || value === void 0 ? void 0 : value.interceptCompany]);
   // K码列表
   var kCodeList = useMemo(function () {
-    return LogisticsAddressOptions === null || LogisticsAddressOptions === void 0 ? void 0 : LogisticsAddressOptions.filter(function (item) {
+    return logisticsAddressData === null || logisticsAddressData === void 0 ? void 0 : logisticsAddressData.filter(function (item) {
       return item.cpCode === (value === null || value === void 0 ? void 0 : value.interceptCompany) && item.userKCode;
     }).map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -13675,7 +13690,44 @@ var LogisticsInterception = function LogisticsInterception(props) {
         label: item === null || item === void 0 ? void 0 : item.userKCode
       });
     });
-  }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  }, [logisticsAddressData, value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  var customerCodeOptions = useMemo(function () {
+    return getJdCustomerCodeOptions(logisticsAddressData);
+  }, [logisticsAddressData]);
+  var refreshLogisticsAddressOptions = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _yield$request, data, latestData;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return request$1({
+              url: '/qy/userConfig/listLogisticsAddress',
+              method: 'get',
+              data: {}
+            });
+          case 3:
+            _yield$request = _context.sent;
+            data = _yield$request.data;
+            latestData = data || [];
+            LogisticsAddress.setaddressData(latestData);
+            setLogisticsAddressData(latestData);
+            _context.next = 12;
+            break;
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](0);
+          case 12:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 10]]);
+    }));
+    return function refreshLogisticsAddressOptions() {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var returnValue = useMemo(function () {
     var _value$interceptAddre, _value$interceptAddre2, _value$interceptAddre3;
     var uk = LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getUkByInfo({
@@ -13731,9 +13783,6 @@ var LogisticsInterception = function LogisticsInterception(props) {
       //     userSecretKey: '12345678',
       //   },
       // ];
-      var matchKCodeList = LogisticsAddressOptions === null || LogisticsAddressOptions === void 0 ? void 0 : LogisticsAddressOptions.filter(function (item) {
-        return item.cpCode === val && item.userKCode;
-      });
       newValue = _objectSpread2(_objectSpread2({}, newValue), {}, {
         interceptCompany: val,
         interceptType: (_defaultInterceptType = defaultInterceptType) === null || _defaultInterceptType === void 0 ? void 0 : _defaultInterceptType.value,
@@ -13752,7 +13801,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         },
         interceptLogisticsApiStatusReason: undefined,
         interceptLogisticsUserKCode: undefined,
-        interceptLogisticsUserSecretKey: undefined
+        interceptLogisticsUserSecretKey: undefined,
+        interceptLogisticsCustomerCode: undefined
       });
     }
     if (type === 'interceptLogisticsApiStatus') {
@@ -13832,7 +13882,41 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur((_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.trim(), 'interceptCode');
     },
     value: value === null || value === void 0 ? void 0 : value.interceptCode
-  }))), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Item, {
+  }))), /*#__PURE__*/React.createElement(Item, {
+    label: /*#__PURE__*/React.createElement("span", null, "\u5BA2\u6237\u7F16\u7801", platform === 'pc' ? /*#__PURE__*/React.createElement(React.Fragment, null, "\uFF1A", /*#__PURE__*/React.createElement(Typography.Link, {
+      style: {
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        return onJumpPage && (onJumpPage === null || onJumpPage === void 0 ? void 0 : onJumpPage({
+          type: 'interceptConfig',
+          state: {
+            tab: 'JDLCodeRelation'
+          }
+        }));
+      }
+    }, 'K码/EBU码配置>>')) : null),
+    required: showCustomerCode,
+    key: 'interceptLogisticsCustomerCode',
+    hidden: !showCustomerCode
+  }, /*#__PURE__*/React.createElement(Select, {
+    disabled: disabled,
+    placeholder: "\u9009\u62E9\u5BA2\u6237\u7F16\u7801",
+    notFoundContent: "\u6682\u65E0\u5BA2\u6237\u7F16\u7801\u914D\u7F6E\uFF0C\u8BF7\u5148\u524D\u5F80K\u7801/EBU\u7801\u914D\u7F6E>>",
+    showSearch: true,
+    style: {
+      width: '200px'
+    },
+    onChange: function onChange(val) {
+      return changeHandle(val, 'interceptLogisticsCustomerCode');
+    },
+    onFocus: refreshLogisticsAddressOptions,
+    options: customerCodeOptions,
+    value: value === null || value === void 0 ? void 0 : value.interceptLogisticsCustomerCode,
+    filterOption: function filterOption(input, option) {
+      return option.label.includes(input);
+    }
+  })), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Item, {
     label: /*#__PURE__*/React.createElement("span", null, "\u5BA2\u6237\u7F16\u7801\uFF08K\u7801\uFF09\uFF1A", platform === 'pc' ? /*#__PURE__*/React.createElement(Typography.Link, {
       style: {
         cursor: 'pointer'
@@ -13877,7 +13961,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     value: value === null || value === void 0 ? void 0 : value.interceptLogisticsUserSecretKey
   }))), /*#__PURE__*/React.createElement(Item, {
     label: '拦截类型',
-    required: required,
+    required: required && !showCustomerCode,
     key: 'interceptType'
   }, /*#__PURE__*/React.createElement(Select, {
     disabled: baseFieldDisabled,

package/dist/src/business/LogisticsInterception/index.d.ts

@@ -19,6 +19,7 @@ interface LogisticsInterceptionValueType {
     interceptLogisticsApiStatusReason: string;
     interceptLogisticsUserKCode: string;
     interceptLogisticsUserSecretKey: string;
+    interceptLogisticsCustomerCode: string;
 }
 interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.10.24",
+  "version": "2.10.25",
   "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.10.24",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.25",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "44324b6b5ad4fdab5f2b2c8f9636860f687e1b4f"
+  "gitHead": "aa3cb81f3a8cd8e70b2c6d602e12fdff2b5887f4"
 }