@kmkf-fe-packages/basic-components 2.10.9-beta.13 → 2.10.9-beta.15

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, 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, 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, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, 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, 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, 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, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, 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';
@@ -8632,7 +8632,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))));
     }, {});
@@ -13471,6 +13471,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;
@@ -13533,6 +13540,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) {
@@ -13559,6 +13569,9 @@ var LogisticsInterception = function LogisticsInterception(props) {
       });
     });
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
+  var customerCodeOptions = useMemo(function () {
+    return getJdCustomerCodeOptions(LogisticsAddressOptions, value === null || value === void 0 ? void 0 : value.interceptCompany);
+  }, [LogisticsAddressOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
   var returnValue = useMemo(function () {
     var _value$interceptAddre, _value$interceptAddre2, _value$interceptAddre3;
     var uk = LogisticsAddress === null || LogisticsAddress === void 0 ? void 0 : LogisticsAddress.getUkByInfo({
@@ -13614,9 +13627,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,
@@ -13635,7 +13645,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         },
         interceptLogisticsApiStatusReason: undefined,
         interceptLogisticsUserKCode: undefined,
-        interceptLogisticsUserSecretKey: undefined
+        interceptLogisticsUserSecretKey: undefined,
+        interceptLogisticsCustomerCode: undefined
       });
     }
     if (type === 'interceptLogisticsApiStatus') {
@@ -13716,7 +13727,37 @@ 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'
+        }));
+      }
+    }, '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');
+    },
+    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'
@@ -13761,7 +13802,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,
@@ -21253,17 +21294,18 @@ var getColumns$2 = function getColumns(_ref) {
 };
 
 var getYesOrNo$4 = function getYesOrNo(val) {
+  var content = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['是', '否'];
   switch (val) {
     case true:
     case '1':
     case 1:
-      return '是';
+      return content[0];
     case false:
     case '0':
     case 0:
       return '否';
     default:
-      return null;
+      return content[1];
   }
 };
 
@@ -21462,7 +21504,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
       }
     }, {
       dataIndex: 'isPackage',
@@ -21694,7 +21736,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, isNull(val) ? null : val ? '赠品' : '非赠品');
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
       }
     }, {
       dataIndex: 'isPackage',
@@ -27211,6 +27253,16 @@ var getOrderListSingleton$2 = function getOrderListSingleton(orderNo) {
         }
       }).then(function (data) {
         if (data === null || data === void 0 ? void 0 : data.success) {
+          var _data$data, _data$data$doOrders;
+          if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$doOrders = _data$data.doOrders) === null || _data$data$doOrders === void 0 ? void 0 : _data$data$doOrders.length) {
+            var _data$data2;
+            (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.doOrders.forEach(function (item) {
+              item.platformOrderNo = data.platformOrderNo;
+              item.shopCode = data.shopCode;
+              item.shopName = data.shopName;
+              item.split = data.split;
+            });
+          }
           resolve((data === null || data === void 0 ? void 0 : data.data) || {});
           // 延迟10秒清除,保证订单的时效性
           setTimeout(function () {

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/dist/src/constants/constants.d.ts

@@ -1 +1 @@
-export declare const getYesOrNo: (val: boolean | string | number) => "是" | "否" | null;
+export declare const getYesOrNo: (val: boolean | string | number, content?: string[]) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.10.9-beta.13",
+  "version": "2.10.9-beta.15",
   "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.9-beta.12",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.15",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e3f8d7e54fb659a27f9a5b4dce555178609caf1d"
+  "gitHead": "951c615176f420e82fd527c8f4b1245c922ebc74"
 }