@kmkf-fe-packages/services-components 2.3.0-rc.1 → 2.3.1
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/esm/Hooks/useColumnsConfig.d.ts +1 -1
- package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.d.ts +1 -1
- package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.js +3 -2
- package/dist/esm/commonComponents/GlobalContext/index.js +10 -3
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpAddressData.js +12 -11
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpLogisticsCompany.js +13 -12
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpSendData.js +10 -9
- package/dist/esm/commonComponents/OperationLog/index.d.ts +2 -1
- package/dist/esm/commonComponents/OperationLog/index.js +4 -2
- package/dist/esm/commonComponents/ShopList/index.js +3 -1
- package/dist/esm/components/BS/BsLogistics/index.js +18 -7
- package/dist/esm/components/BS/BsSystemOrder/index.js +22 -10
- package/dist/esm/components/BS/common/BsHeaderGood.js +2 -2
- package/dist/esm/components/BS/common/BsHeaderPic.d.ts +2 -0
- package/dist/esm/components/BS/common/BsHeaderPic.js +13 -1
- package/dist/esm/components/BS/common/BsMemo.js +2 -1
- package/dist/esm/components/BS/common/BsType.js +2 -1
- package/dist/esm/components/BS/common/SystemOrderNo.js +2 -1
- package/dist/esm/components/BS/common/expressCode.js +3 -0
- package/dist/esm/components/BS/common/expressCompany.js +17 -1
- package/dist/esm/components/BsE3/BsReissueE3/index.js +4 -1
- package/dist/esm/components/Common/constants/bs.js +2 -2
- package/dist/esm/components/Common/constants/columnsBaseInfoMap.js +4 -2
- package/dist/esm/components/Common/constants/defaultColumns.js +2 -2
- package/dist/esm/components/Common/constants/wdt.js +104 -0
- package/dist/esm/components/Common/index.d.ts +1 -1
- package/dist/esm/components/Common/index.js +34 -21
- package/dist/esm/components/CommonDataTime/index.d.ts +2 -2
- package/dist/esm/components/CommonDataTime/index.js +2 -2
- package/dist/esm/components/CommonHeaderGood/index.js +704 -6
- package/dist/esm/components/CommonInput/index.js +11 -3
- package/dist/esm/components/File/index.js +0 -1
- package/dist/esm/components/FlowOverallStatusSelect/index.d.ts +40 -0
- package/dist/esm/components/FlowOverallStatusSelect/index.js +180 -0
- package/dist/esm/components/GY/GyGoods/index.js +3 -1
- package/dist/esm/components/GY/GyReissue/index.js +3 -1
- package/dist/esm/components/GY/GyReturn/index.js +3 -1
- package/dist/esm/components/Input/index.d.ts +4 -4
- package/dist/esm/components/Input/index.js +35 -31
- package/dist/esm/components/JST/JstSendGood/index.js +9 -1
- package/dist/esm/components/KmErpSendGood/index.js +1 -1
- package/dist/esm/components/LogisticsInterception/columnHeader.js +1 -1
- package/dist/esm/components/LogisticsInterception/index.d.ts +20 -0
- package/dist/esm/components/LogisticsInterception/index.js +10 -5
- package/dist/esm/components/LogisticsInterception/interceptApiStatusReason.d.ts +45 -0
- package/dist/esm/components/LogisticsInterception/interceptApiStatusReason.js +97 -0
- package/dist/esm/components/LogisticsInterception/interceptSenderMobile.js +3 -2
- package/dist/esm/components/LogisticsMoreInterception/InterceptAddress.js +4 -2
- package/dist/esm/components/LogisticsMoreInterception/InterceptApiStatus.js +1 -1
- package/dist/esm/components/LogisticsMoreInterception/interceptSenderMobile.d.ts +5 -5
- package/dist/esm/components/LogisticsMoreInterception/interceptSenderMobile.js +9 -9
- package/dist/esm/components/OrderSubForm/index.d.ts +7 -0
- package/dist/esm/components/OrderSubForm/index.js +14 -0
- package/dist/esm/components/PaymentVoucherCode/Preview.js +35 -9
- package/dist/esm/components/Picture/index.d.ts +5 -5
- package/dist/esm/components/Picture/index.js +20 -20
- package/dist/esm/components/PicturePro/index.d.ts +6 -6
- package/dist/esm/components/PicturePro/index.js +25 -25
- package/dist/esm/components/PostIng/index.d.ts +5 -0
- package/dist/esm/components/PostIng/index.js +42 -8
- package/dist/esm/components/Public/Goods/index.d.ts +1 -8
- package/dist/esm/components/Public/Goods/index.js +16 -1
- package/dist/esm/components/Public/ReissueGoods/index.js +25 -3
- package/dist/esm/components/Reissue/Logistics/index.js +2 -2
- package/dist/esm/components/Remark/index.d.ts +18 -2
- package/dist/esm/components/Remark/index.js +37 -2
- package/dist/esm/components/ReturnLogistics/index.d.ts +7 -6
- package/dist/esm/components/ReturnLogistics/index.js +34 -17
- package/dist/esm/components/Select/index.d.ts +1 -0
- package/dist/esm/components/Select/index.js +19 -11
- package/dist/esm/components/ShopInput/index.d.ts +5 -5
- package/dist/esm/components/ShopInput/index.js +12 -9
- package/dist/esm/components/StatusSelect/index.js +4 -0
- package/dist/esm/components/WDT/WdtRessuie/index.js +28 -8
- package/dist/esm/factory.d.ts +2 -2
- package/dist/esm/factory.js +18 -7
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.js +2 -0
- package/dist/esm/service/api.d.ts +2 -0
- package/dist/esm/service/api.js +27 -1
- package/dist/esm/type.d.ts +1 -0
- package/package.json +4 -4
- package/dist/esm/components/Common/constants/gy.d.ts +0 -3
- package/dist/esm/components/Common/constants/gy.js +0 -219
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import LogisticsInterception from "../components/LogisticsInterception";
|
|
2
2
|
import LogisticsMoreInterception from "../components/LogisticsMoreInterception";
|
|
3
|
-
export declare const newRenderColumnItem: (effects: any) => (item: any) => import("../components/BS/BsLogistics").default | import("../components/
|
|
3
|
+
export declare const newRenderColumnItem: (effects: any) => (item: any) => import("../components/BS/BsLogistics").default | import("../components/TradeId").default | import("../components/Input").default | import("../components/TypeInput").default | import("../components/Address").default | import("../components/Cascader").default | import("../components/Checkbox").default | import("../components/DataTime").default | import("../components/Select").default | import("../components/SelectOption").default | import("../components/Radio").default | import("../components/TextArea").default | import("../components/Picture").default | import("../components/PicturePro").default | import("../components/MultSelect").default | import("../components/Grade").default | import("../components/Rate").default | import("../components/File").default | import("../components/PostIng").default | import("../components/SubForm").default | import("../components/CommonDataTime").default | import("../components/ShopName").default | import("../components/BuyerNick").default | import("../components/ReceiverName").default | import("../components/ReceiverMobile").default | import("../components/ReceiverAddress").default | import("../components/TradeDateTime").default | import("../components/Logistics").default | import("../components/ReturnLogistics").default | import("../components/ActualPayment").default | import("../components/Remark").default | import("../components/Alipay").default | import("../components/EItemSelect").default | import("../components/EItemId").default | import("../components/EItemEnCode").default | import("../components/SystemOrderNo").default | import("../components/Ordinary").default | import("../components/ThirdItemSelect").default | import("../components/Payment").default | import("../components/Reissue/Logistics").default | import("../components/JST/JstItemSelect").default | import("../components/JST/JstSendGood").default | import("../components/JST/JstSupply").default | import("../components/BS/BsSystemOrder").default | import("../components/BS/BsGoods").default | import("../components/BsE3/BsGoods").default | import("../components/Public/Goods").default | import("../components/Public/ReissueGoods").default | import("../components/Public/Exchange").default | import("../components/BsE3/BsReissueE3").default | import("../components/BS/BsExchange").default | import("../components/BS/BsReissue").default | import("../components/BS/BsReturn").default | import("../components/FlowStatusSelect").default | import("../components/FlowMarkSelect").default | import("../components/FlowTag").default | import("../components/TemplateSelect").default | import("../components/WorkOrderId").default | LogisticsInterception | LogisticsMoreInterception | import("../components/LogisticsTrajectory").default | import("../components/LogisticsMoreTrajectory").default | import("../components/PlatForm").default | import("../components/ShopInput").default | import("../components/Submitter").default | import("../components/PrevSubmitter").default | import("../components/FlowCreator").default | import("../components/Handler").default | import("../components/CompletedUser").default | import("../components/FlowWorkOrderId").default | import("../components/StatusSelect").default | import("../components/Calculation").default | import("../components/CommonSystemOrder").default | import("../components/CommonMultiStatus").default | import("../components/NodeDeadLine").default | import("../components/HandlerDeadLine").default | import("../components/NodeStayDuration").default | import("../components/WLN/WlnGoods").default | import("../components/BS/BsPosting").default | import("../components/NodeInput").default | import("../components/FlowWorkOrderStatus").default | import("../components/MsgStatus").default | import("../components/WDT/WdtGoods").default | import("../components/WDT/WdtRessuie").default | import("../components/WDT/WdtReturn").default | import("../components/WDT/WdtExchange").default | import("../components/WDT/WdtShopSelect").default | import("../components/KM/KmVideo").default | import("../components/CommonInput").default | import("../components/PaymentVoucherCode").default | import("../components/Label").default | import("../components/MemberLevel").default | import("../components/AfterSalesOrderId").default | import("../components/GY/GyGoods").default | import("../components/GY/GyReissue").default | import("../components/GY/GyReturn").default | import("../components/Public/AsyncSelect").default | import("../components/SKX/SkxIdInputSelect").default | import("../components/SKX/SkxGoods").default | import("../components/OrderSubForm").default;
|
|
4
4
|
export declare const useColumnsConfig: ({ queryWorkOrderDetail, flatTemplateList, shopList, sortState, onChangeSort, handleReset, handleSubmit, handleChangeSingleWorkOrderMark, userList, tbAppKey, isShare, openSingleColumnsFilter, openSingleColumnsSort, }: {
|
|
5
5
|
queryWorkOrderDetail?: ((p: any) => void) | undefined;
|
|
6
6
|
flatTemplateList?: any;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy";
|
|
1
|
+
declare type HasErpDataKeyType = "hasWln" | "hasWdt" | "hasBs" | "hasE3" | "hasJst" | "hasGy" | "hasJy";
|
|
2
2
|
declare function useGetHasErpData(reduxData: any): Record<HasErpDataKeyType, boolean>;
|
|
3
3
|
export default useGetHasErpData;
|
|
@@ -6,14 +6,15 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
|
|
|
6
6
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
7
7
|
import { useEffect, useMemo, useState } from "react";
|
|
8
8
|
var getTemplate = function getTemplate(companyUserConfig) {
|
|
9
|
-
var _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig$pl5, _companyUserConfig$pl6, _companyUserConfig$pl7, _companyUserConfig$pl8, _companyUserConfig$pl9, _companyUserConfig$pl10, _companyUserConfig$pl11, _companyUserConfig$pl12, _companyUserConfig$pl13, _companyUserConfig$pl14, _companyUserConfig$pl15, _companyUserConfig$pl16, _companyUserConfig$pl17, _companyUserConfig$pl18;
|
|
9
|
+
var _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig$pl5, _companyUserConfig$pl6, _companyUserConfig$pl7, _companyUserConfig$pl8, _companyUserConfig$pl9, _companyUserConfig$pl10, _companyUserConfig$pl11, _companyUserConfig$pl12, _companyUserConfig$pl13, _companyUserConfig$pl14, _companyUserConfig$pl15, _companyUserConfig$pl16, _companyUserConfig$pl17, _companyUserConfig$pl18, _companyUserConfig$pl19, _companyUserConfig$pl20, _companyUserConfig$pl21;
|
|
10
10
|
return JSON.stringify({
|
|
11
11
|
hasWln: (_companyUserConfig$pl = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl2 = companyUserConfig.plugins) === null || _companyUserConfig$pl2 === void 0 ? void 0 : (_companyUserConfig$pl3 = _companyUserConfig$pl2.wln) === null || _companyUserConfig$pl3 === void 0 ? void 0 : _companyUserConfig$pl3.show) !== null && _companyUserConfig$pl !== void 0 ? _companyUserConfig$pl : false,
|
|
12
12
|
hasWdt: (_companyUserConfig$pl4 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl5 = companyUserConfig.plugins) === null || _companyUserConfig$pl5 === void 0 ? void 0 : (_companyUserConfig$pl6 = _companyUserConfig$pl5.wdt) === null || _companyUserConfig$pl6 === void 0 ? void 0 : _companyUserConfig$pl6.show) !== null && _companyUserConfig$pl4 !== void 0 ? _companyUserConfig$pl4 : false,
|
|
13
13
|
hasBs: (_companyUserConfig$pl7 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl8 = companyUserConfig.plugins) === null || _companyUserConfig$pl8 === void 0 ? void 0 : (_companyUserConfig$pl9 = _companyUserConfig$pl8.bs) === null || _companyUserConfig$pl9 === void 0 ? void 0 : _companyUserConfig$pl9.show) !== null && _companyUserConfig$pl7 !== void 0 ? _companyUserConfig$pl7 : false,
|
|
14
14
|
hasE3: (_companyUserConfig$pl10 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl11 = companyUserConfig.plugins) === null || _companyUserConfig$pl11 === void 0 ? void 0 : (_companyUserConfig$pl12 = _companyUserConfig$pl11.bse3) === null || _companyUserConfig$pl12 === void 0 ? void 0 : _companyUserConfig$pl12.show) !== null && _companyUserConfig$pl10 !== void 0 ? _companyUserConfig$pl10 : false,
|
|
15
15
|
hasJst: (_companyUserConfig$pl13 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl14 = companyUserConfig.plugins) === null || _companyUserConfig$pl14 === void 0 ? void 0 : (_companyUserConfig$pl15 = _companyUserConfig$pl14.jst) === null || _companyUserConfig$pl15 === void 0 ? void 0 : _companyUserConfig$pl15.show) !== null && _companyUserConfig$pl13 !== void 0 ? _companyUserConfig$pl13 : false,
|
|
16
|
-
hasGy: (_companyUserConfig$pl16 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl17 = companyUserConfig.plugins) === null || _companyUserConfig$pl17 === void 0 ? void 0 : (_companyUserConfig$pl18 = _companyUserConfig$pl17.gy) === null || _companyUserConfig$pl18 === void 0 ? void 0 : _companyUserConfig$pl18.show) !== null && _companyUserConfig$pl16 !== void 0 ? _companyUserConfig$pl16 : false
|
|
16
|
+
hasGy: (_companyUserConfig$pl16 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl17 = companyUserConfig.plugins) === null || _companyUserConfig$pl17 === void 0 ? void 0 : (_companyUserConfig$pl18 = _companyUserConfig$pl17.gy) === null || _companyUserConfig$pl18 === void 0 ? void 0 : _companyUserConfig$pl18.show) !== null && _companyUserConfig$pl16 !== void 0 ? _companyUserConfig$pl16 : false,
|
|
17
|
+
hasJy: (_companyUserConfig$pl19 = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl20 = companyUserConfig.plugins) === null || _companyUserConfig$pl20 === void 0 ? void 0 : (_companyUserConfig$pl21 = _companyUserConfig$pl20.juYi) === null || _companyUserConfig$pl21 === void 0 ? void 0 : _companyUserConfig$pl21.show) !== null && _companyUserConfig$pl19 !== void 0 ? _companyUserConfig$pl19 : false
|
|
17
18
|
});
|
|
18
19
|
};
|
|
19
20
|
function useGetHasErpData(reduxData) {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
+
function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
|
|
3
|
+
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
4
|
+
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
2
5
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
6
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
7
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
8
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
6
9
|
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
7
|
-
function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
|
|
8
|
-
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
9
|
-
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
10
10
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
11
11
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
12
12
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
@@ -15,6 +15,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
|
|
|
15
15
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
16
16
|
import React, { useEffect, useState, useMemo } from "react";
|
|
17
17
|
import { Skeleton, Button, Alert, Space, message } from "antd";
|
|
18
|
+
import { cloneDeep } from "lodash";
|
|
18
19
|
import { queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryLabel, queryAllLogisticsCompany, queryKMLogisticsCompany } from "../../service/api";
|
|
19
20
|
import { servers, SendDataCenter } from "@kmkf-fe-packages/kmkf-utils";
|
|
20
21
|
import useGetErpLogisticsCompany from "./orderQuery/useGetErpLogisticsCompany";
|
|
@@ -48,6 +49,12 @@ var Global = function Global(_ref) {
|
|
|
48
49
|
try {
|
|
49
50
|
var _reduxData$main, _reduxData$workOrder, _reduxData$global;
|
|
50
51
|
var userInfo = (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$main = reduxData.main) === null || _reduxData$main === void 0 ? void 0 : _reduxData$main.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$workOrder = reduxData.workOrder) === null || _reduxData$workOrder === void 0 ? void 0 : _reduxData$workOrder.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$global = reduxData.global) === null || _reduxData$global === void 0 ? void 0 : _reduxData$global.userInfo) || {};
|
|
52
|
+
var companyUserConfig = cloneDeep(userInfo.companyUserConfig);
|
|
53
|
+
if (companyUserConfig && typeof companyUserConfig === "string") {
|
|
54
|
+
userInfo = _objectSpread(_objectSpread({}, userInfo), {}, {
|
|
55
|
+
companyUserConfig: JSON.parse(companyUserConfig)
|
|
56
|
+
});
|
|
57
|
+
}
|
|
51
58
|
localStorage.setItem("reduxData_userInfo", JSON.stringify(userInfo));
|
|
52
59
|
} catch (e) {
|
|
53
60
|
console.error(e);
|
|
@@ -22,36 +22,37 @@ function useGetErpAddressData(reduxData, notJudgedErp) {
|
|
|
22
22
|
}, [hasErpData, notJudgedErp]);
|
|
23
23
|
var asyncQueryData = /*#__PURE__*/function () {
|
|
24
24
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
|
|
25
|
-
var hasBs, hasWdt, hasGy, promises;
|
|
25
|
+
var hasBs, hasWdt, hasGy, hasJst, promises;
|
|
26
26
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
27
27
|
while (1) switch (_context.prev = _context.next) {
|
|
28
28
|
case 0:
|
|
29
29
|
if (!isReload) {
|
|
30
30
|
setGlobalState("loading");
|
|
31
31
|
}
|
|
32
|
-
hasBs = hasErpData.hasBs, hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy;
|
|
32
|
+
hasBs = hasErpData.hasBs, hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst;
|
|
33
33
|
promises = [];
|
|
34
34
|
if (hasBs || notJudgedErp) promises.push(servers.queryBsAddressData);
|
|
35
35
|
if (hasWdt || notJudgedErp) promises.push(servers.queryWdtAddressData);
|
|
36
36
|
if (hasGy || notJudgedErp) promises.push(servers.queryGyAddressData);
|
|
37
|
-
|
|
38
|
-
_context.
|
|
37
|
+
if (hasJst || notJudgedErp) promises.push(servers.queryJstAddressData);
|
|
38
|
+
_context.prev = 7;
|
|
39
|
+
_context.next = 10;
|
|
39
40
|
return Promise.all(promises.map(function (promise) {
|
|
40
41
|
return promise();
|
|
41
42
|
}));
|
|
42
|
-
case
|
|
43
|
+
case 10:
|
|
43
44
|
setGlobalState("success");
|
|
44
|
-
_context.next =
|
|
45
|
+
_context.next = 16;
|
|
45
46
|
break;
|
|
46
|
-
case
|
|
47
|
-
_context.prev =
|
|
48
|
-
_context.t0 = _context["catch"](
|
|
47
|
+
case 13:
|
|
48
|
+
_context.prev = 13;
|
|
49
|
+
_context.t0 = _context["catch"](7);
|
|
49
50
|
setGlobalState("failed");
|
|
50
|
-
case
|
|
51
|
+
case 16:
|
|
51
52
|
case "end":
|
|
52
53
|
return _context.stop();
|
|
53
54
|
}
|
|
54
|
-
}, _callee, null, [[
|
|
55
|
+
}, _callee, null, [[7, 13]]);
|
|
55
56
|
}));
|
|
56
57
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
57
58
|
return _ref.apply(this, arguments);
|
|
@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
|
|
|
10
10
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
11
11
|
import { useEffect, useState } from "react";
|
|
12
12
|
import useGetHasErpData from "../hook/useGetHasErpData";
|
|
13
|
-
import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany, queryGYLogisticsCompany } from "../../../service/api";
|
|
13
|
+
import { queryWdtLogisticsCompany, queryBsE3LogisticsCompany, queryJSTLogisticsCompany, queryWLNLogisticsCompany, queryGYLogisticsCompany, queryJYLogisticsCompany } from "../../../service/api";
|
|
14
14
|
function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
15
15
|
var _useState = useState("loading"),
|
|
16
16
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -22,38 +22,39 @@ function useGetErpLogisticsCompany(reduxData, notJudgedErp) {
|
|
|
22
22
|
}, [hasErpData, notJudgedErp]);
|
|
23
23
|
var asyncQueryData = /*#__PURE__*/function () {
|
|
24
24
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
|
|
25
|
-
var hasWdt, hasE3, hasJst, hasWln, hasGy, promises;
|
|
25
|
+
var hasWdt, hasE3, hasJst, hasWln, hasGy, hasJy, promises;
|
|
26
26
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
27
27
|
while (1) switch (_context.prev = _context.next) {
|
|
28
28
|
case 0:
|
|
29
29
|
if (!isReload) {
|
|
30
30
|
setGlobalState("loading");
|
|
31
31
|
}
|
|
32
|
-
hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln, hasGy = hasErpData.hasGy;
|
|
32
|
+
hasWdt = hasErpData.hasWdt, hasE3 = hasErpData.hasE3, hasJst = hasErpData.hasJst, hasWln = hasErpData.hasWln, hasGy = hasErpData.hasGy, hasJy = hasErpData.hasJy;
|
|
33
33
|
promises = [];
|
|
34
34
|
if (hasWdt || notJudgedErp) promises.push(queryWdtLogisticsCompany);
|
|
35
35
|
if (hasE3 || notJudgedErp) promises.push(queryBsE3LogisticsCompany);
|
|
36
36
|
if (hasJst || notJudgedErp) promises.push(queryJSTLogisticsCompany);
|
|
37
37
|
if (hasWln || notJudgedErp) promises.push(queryWLNLogisticsCompany);
|
|
38
38
|
if (hasGy || notJudgedErp) promises.push(queryGYLogisticsCompany);
|
|
39
|
-
|
|
40
|
-
_context.
|
|
39
|
+
if (hasJy || notJudgedErp) promises.push(queryJYLogisticsCompany);
|
|
40
|
+
_context.prev = 9;
|
|
41
|
+
_context.next = 12;
|
|
41
42
|
return Promise.all(promises.map(function (promise) {
|
|
42
43
|
return promise();
|
|
43
44
|
}));
|
|
44
|
-
case
|
|
45
|
+
case 12:
|
|
45
46
|
setGlobalState("success");
|
|
46
|
-
_context.next =
|
|
47
|
+
_context.next = 18;
|
|
47
48
|
break;
|
|
48
|
-
case
|
|
49
|
-
_context.prev =
|
|
50
|
-
_context.t0 = _context["catch"](
|
|
49
|
+
case 15:
|
|
50
|
+
_context.prev = 15;
|
|
51
|
+
_context.t0 = _context["catch"](9);
|
|
51
52
|
setGlobalState("failed");
|
|
52
|
-
case
|
|
53
|
+
case 18:
|
|
53
54
|
case "end":
|
|
54
55
|
return _context.stop();
|
|
55
56
|
}
|
|
56
|
-
}, _callee, null, [[
|
|
57
|
+
}, _callee, null, [[9, 15]]);
|
|
57
58
|
}));
|
|
58
59
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
59
60
|
return _ref.apply(this, arguments);
|
|
@@ -23,7 +23,7 @@ function useGetErpSendData(reduxData, notJudgedErp) {
|
|
|
23
23
|
}, [hasErpData, notJudgedErp]);
|
|
24
24
|
var asyncQueryData = /*#__PURE__*/function () {
|
|
25
25
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hasErpData, notJudgedErp, isReload) {
|
|
26
|
-
var hasWdt, hasGy, hasJst, promises;
|
|
26
|
+
var hasWdt, hasGy, hasJst, hasJy, promises;
|
|
27
27
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
28
28
|
while (1) switch (_context.prev = _context.next) {
|
|
29
29
|
case 0:
|
|
@@ -31,28 +31,29 @@ function useGetErpSendData(reduxData, notJudgedErp) {
|
|
|
31
31
|
setGlobalState("loading");
|
|
32
32
|
}
|
|
33
33
|
_context.prev = 1;
|
|
34
|
-
hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst;
|
|
34
|
+
hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst, hasJy = hasErpData.hasJy;
|
|
35
35
|
promises = [];
|
|
36
36
|
if (hasWdt || notJudgedErp) promises.push(SendDataCenter.getInstance("wdt").fetchData);
|
|
37
37
|
if (hasGy || notJudgedErp) promises.push(SendDataCenter.getInstance("gy").fetchData);
|
|
38
38
|
if (hasJst || notJudgedErp) promises.push(SendDataCenter.getInstance("jst").fetchData);
|
|
39
|
-
|
|
39
|
+
if (hasJy || notJudgedErp) promises.push(SendDataCenter.getInstance("jy").fetchData);
|
|
40
|
+
_context.next = 10;
|
|
40
41
|
return Promise.all(promises.map(function (promise) {
|
|
41
42
|
return promise();
|
|
42
43
|
}));
|
|
43
|
-
case
|
|
44
|
+
case 10:
|
|
44
45
|
setGlobalState("success");
|
|
45
|
-
_context.next =
|
|
46
|
+
_context.next = 16;
|
|
46
47
|
break;
|
|
47
|
-
case
|
|
48
|
-
_context.prev =
|
|
48
|
+
case 13:
|
|
49
|
+
_context.prev = 13;
|
|
49
50
|
_context.t0 = _context["catch"](1);
|
|
50
51
|
setGlobalState("failed");
|
|
51
|
-
case
|
|
52
|
+
case 16:
|
|
52
53
|
case "end":
|
|
53
54
|
return _context.stop();
|
|
54
55
|
}
|
|
55
|
-
}, _callee, null, [[1,
|
|
56
|
+
}, _callee, null, [[1, 13]]);
|
|
56
57
|
}));
|
|
57
58
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
58
59
|
return _ref.apply(this, arguments);
|
|
@@ -4,6 +4,7 @@ declare type OperationLogProps = {
|
|
|
4
4
|
operation: string;
|
|
5
5
|
componentDtoList: any[];
|
|
6
6
|
plat: any;
|
|
7
|
+
shopList: any[];
|
|
7
8
|
};
|
|
8
|
-
declare const OperationLog: ({ content, operation, componentDtoList, plat, }: OperationLogProps) => React.JSX.Element | null;
|
|
9
|
+
declare const OperationLog: ({ content, operation, componentDtoList, plat, shopList, }: OperationLogProps) => React.JSX.Element | null;
|
|
9
10
|
export default OperationLog;
|
|
@@ -11,7 +11,8 @@ var OperationLog = function OperationLog(_ref) {
|
|
|
11
11
|
var content = _ref.content,
|
|
12
12
|
operation = _ref.operation,
|
|
13
13
|
componentDtoList = _ref.componentDtoList,
|
|
14
|
-
plat = _ref.plat
|
|
14
|
+
plat = _ref.plat,
|
|
15
|
+
shopList = _ref.shopList;
|
|
15
16
|
if (!content) return null;
|
|
16
17
|
try {
|
|
17
18
|
//todo过滤一些固定字段 展示不确定
|
|
@@ -80,7 +81,8 @@ var OperationLog = function OperationLog(_ref) {
|
|
|
80
81
|
componentConfig: item.componentConfig,
|
|
81
82
|
type: item.workOrderComponentType,
|
|
82
83
|
effects: {
|
|
83
|
-
env: plat.platform
|
|
84
|
+
env: plat.platform,
|
|
85
|
+
shopList: shopList
|
|
84
86
|
}
|
|
85
87
|
});
|
|
86
88
|
if (operation !== null && operation !== void 0 && operation.startsWith("UPDATE")) {
|
|
@@ -30,8 +30,10 @@ var ShopList = function ShopList(_ref) {
|
|
|
30
30
|
var plat = (_platDatInstance$getP = platDatInstance.getPlatData()) === null || _platDatInstance$getP === void 0 ? void 0 : _platDatInstance$getP.find(function (plat) {
|
|
31
31
|
return plat.platformType === item.shopSource;
|
|
32
32
|
});
|
|
33
|
+
var shopName = plat !== null && plat !== void 0 && plat.platformName ? "\u3010".concat(plat === null || plat === void 0 ? void 0 : plat.platformName, "\u3011").concat(item.shopName) : item.shopName;
|
|
33
34
|
return /*#__PURE__*/React.createElement(Select.Option, {
|
|
34
35
|
disabled: item.disabled || disabledList.includes(item === null || item === void 0 ? void 0 : item[valueMapping]),
|
|
36
|
+
title: "".concat((plat === null || plat === void 0 ? void 0 : plat.platformName) || "").concat(item.shopName),
|
|
35
37
|
value: item === null || item === void 0 ? void 0 : item[valueMapping],
|
|
36
38
|
key: item === null || item === void 0 ? void 0 : item[valueMapping],
|
|
37
39
|
label: "".concat((plat === null || plat === void 0 ? void 0 : plat.platformName) || "").concat(item.shopName)
|
|
@@ -40,7 +42,7 @@ var ShopList = function ShopList(_ref) {
|
|
|
40
42
|
marginRight: 5
|
|
41
43
|
},
|
|
42
44
|
type: item.shopSource
|
|
43
|
-
}), /*#__PURE__*/React.createElement("span", null,
|
|
45
|
+
}), /*#__PURE__*/React.createElement("span", null, shopName));
|
|
44
46
|
}));
|
|
45
47
|
};
|
|
46
48
|
export default ShopList;
|
|
@@ -25,7 +25,7 @@ var typeMap = {
|
|
|
25
25
|
company: "bsLogisticsCompany",
|
|
26
26
|
code: "bsLogisticsCode",
|
|
27
27
|
platformType: "default",
|
|
28
|
-
companyDataType: "
|
|
28
|
+
companyDataType: "string",
|
|
29
29
|
companyCodeType: "arrayObject"
|
|
30
30
|
},
|
|
31
31
|
BS_E3_LOGISTICS: {
|
|
@@ -34,7 +34,7 @@ var typeMap = {
|
|
|
34
34
|
company: "bsE3LogisticsCompany",
|
|
35
35
|
code: "bsE3LogisticsCode",
|
|
36
36
|
platformType: "bsE3",
|
|
37
|
-
companyDataType: "
|
|
37
|
+
companyDataType: "string",
|
|
38
38
|
companyCodeType: "arrayObject"
|
|
39
39
|
},
|
|
40
40
|
WLN_LOGISTICS: {
|
|
@@ -43,7 +43,7 @@ var typeMap = {
|
|
|
43
43
|
company: "wlnLogisticsCompany",
|
|
44
44
|
code: "wlnLogisticsCode",
|
|
45
45
|
platformType: "wln",
|
|
46
|
-
companyDataType: "
|
|
46
|
+
companyDataType: "string",
|
|
47
47
|
companyCodeType: "arrayObject"
|
|
48
48
|
},
|
|
49
49
|
WDT_LOGISTICS: {
|
|
@@ -52,7 +52,7 @@ var typeMap = {
|
|
|
52
52
|
company: "wdtLogisticsCompany",
|
|
53
53
|
code: "wdtLogisticsCode",
|
|
54
54
|
platformType: "wdt",
|
|
55
|
-
companyDataType: "
|
|
55
|
+
companyDataType: "string",
|
|
56
56
|
companyCodeType: "arrayObject"
|
|
57
57
|
},
|
|
58
58
|
JST_LOGISTICS: {
|
|
@@ -61,7 +61,7 @@ var typeMap = {
|
|
|
61
61
|
company: "logisticsCompany",
|
|
62
62
|
code: "logisticsCode",
|
|
63
63
|
platformType: "jst",
|
|
64
|
-
companyDataType: "
|
|
64
|
+
companyDataType: "string",
|
|
65
65
|
companyCodeType: "arrayObject"
|
|
66
66
|
},
|
|
67
67
|
KM_LOGISTICS: {
|
|
@@ -70,7 +70,7 @@ var typeMap = {
|
|
|
70
70
|
company: "kmLogisticsCompany",
|
|
71
71
|
code: "kmLogisticsCode",
|
|
72
72
|
platformType: "km",
|
|
73
|
-
companyDataType: "
|
|
73
|
+
companyDataType: "string",
|
|
74
74
|
companyCodeType: "arrayObject"
|
|
75
75
|
},
|
|
76
76
|
GY_LOGISTICS: {
|
|
@@ -79,7 +79,7 @@ var typeMap = {
|
|
|
79
79
|
company: "gyLogisticsCompany",
|
|
80
80
|
code: "gyLogisticsCode",
|
|
81
81
|
platformType: "gy",
|
|
82
|
-
companyDataType: "
|
|
82
|
+
companyDataType: "string",
|
|
83
83
|
companyCodeType: "arrayObject"
|
|
84
84
|
},
|
|
85
85
|
SKX_LOGISTICS: {
|
|
@@ -101,6 +101,15 @@ var typeMap = {
|
|
|
101
101
|
companyDataType: "like",
|
|
102
102
|
companyCodeType: "like",
|
|
103
103
|
logisticsCompanyFormType: "input"
|
|
104
|
+
},
|
|
105
|
+
JY_LOGISTICS: {
|
|
106
|
+
key: "jyLogisticsList",
|
|
107
|
+
name: "巨益",
|
|
108
|
+
company: "jyLogisticsCompany",
|
|
109
|
+
code: "jyLogisticsCode",
|
|
110
|
+
platformType: "jy",
|
|
111
|
+
companyDataType: "string",
|
|
112
|
+
companyCodeType: "arrayObject"
|
|
104
113
|
}
|
|
105
114
|
};
|
|
106
115
|
var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
|
|
@@ -198,6 +207,7 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
|
|
|
198
207
|
_defineProperty(this, "editRender", function (p) {
|
|
199
208
|
var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4, _this$expressDateInst2, _typeMap$_this$type6;
|
|
200
209
|
var onLogisticsCodeBlur = function onLogisticsCodeBlur(val) {
|
|
210
|
+
var _p$onBlur2;
|
|
201
211
|
if (_this.isChange) {
|
|
202
212
|
var _this$effects, _this$effects$form, _p$onBlur;
|
|
203
213
|
(_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : (_this$effects$form = _this$effects.form) === null || _this$effects$form === void 0 ? void 0 : _this$effects$form.setFieldsValue({
|
|
@@ -206,6 +216,7 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
|
|
|
206
216
|
_this.type === "SKX_RETURN_LOGISTICS" && (p === null || p === void 0 ? void 0 : (_p$onBlur = p.onBlur) === null || _p$onBlur === void 0 ? void 0 : _p$onBlur.call(p, val, "skxReturnTHLogisticsCode"));
|
|
207
217
|
_this.isChange = false;
|
|
208
218
|
}
|
|
219
|
+
_this.type === "SKX_LOGISTICS" && (p === null || p === void 0 ? void 0 : (_p$onBlur2 = p.onBlur) === null || _p$onBlur2 === void 0 ? void 0 : _p$onBlur2.call(p, val, "skxLogisticsCode"));
|
|
209
220
|
};
|
|
210
221
|
var onLogisticsCodeChange = function onLogisticsCodeChange() {
|
|
211
222
|
_this.isChange = true;
|
|
@@ -11,11 +11,12 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
|
|
|
11
11
|
import React from "react";
|
|
12
12
|
import GetFormItem from "../../GetFormItem";
|
|
13
13
|
import ItemView from "../../../commonComponents/ItemView";
|
|
14
|
-
import { isNull, KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG } from "@kmkf-fe-packages/kmkf-utils";
|
|
14
|
+
import { isNull, KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG } from "@kmkf-fe-packages/kmkf-utils";
|
|
15
15
|
import { BsSystemOrder as SystemOrder } from "@kmkf-fe-packages/basic-components";
|
|
16
16
|
import { BsSystemOrderTable } from "../../Common";
|
|
17
17
|
import { BsHeaderChild } from "../common/index";
|
|
18
18
|
import { SYMBOL, batchInput } from "../../../constant";
|
|
19
|
+
import { getSystemShowHead } from "@kmkf-fe-packages/kmkf-utils";
|
|
19
20
|
var typeMap = {
|
|
20
21
|
BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG,
|
|
21
22
|
KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG,
|
|
@@ -23,13 +24,16 @@ var typeMap = {
|
|
|
23
24
|
WDT_SYSTEM_ORDER: WDT_SYSTEM_ORDER_CONFIG,
|
|
24
25
|
BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG,
|
|
25
26
|
GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG,
|
|
26
|
-
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG
|
|
27
|
+
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG,
|
|
28
|
+
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG,
|
|
29
|
+
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG
|
|
27
30
|
};
|
|
28
31
|
var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
29
32
|
var _this = this,
|
|
33
|
+
_getSystemShowHead,
|
|
30
34
|
_typeMap$options$type,
|
|
31
|
-
|
|
32
|
-
_this$
|
|
35
|
+
_options$componentCon,
|
|
36
|
+
_this$componentConfig5;
|
|
33
37
|
_classCallCheck(this, BsSystemOrder);
|
|
34
38
|
_defineProperty(this, "name", void 0);
|
|
35
39
|
_defineProperty(this, "id", void 0);
|
|
@@ -44,12 +48,14 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
44
48
|
_defineProperty(this, "dataType", void 0);
|
|
45
49
|
_defineProperty(this, "children", void 0);
|
|
46
50
|
_defineProperty(this, "renderClient", function (record) {
|
|
51
|
+
var _this$componentConfig;
|
|
47
52
|
return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
|
|
48
53
|
id: _this.id,
|
|
49
54
|
label: _this.name,
|
|
50
55
|
value: /*#__PURE__*/React.createElement(BsSystemOrderTable, {
|
|
51
56
|
value: record === null || record === void 0 ? void 0 : record["".concat(_this.id)],
|
|
52
|
-
type: _this.type
|
|
57
|
+
type: _this.type,
|
|
58
|
+
showHeader: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
|
|
53
59
|
})
|
|
54
60
|
})) : null;
|
|
55
61
|
});
|
|
@@ -57,13 +63,15 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
57
63
|
return null;
|
|
58
64
|
});
|
|
59
65
|
_defineProperty(this, "renderLog", function (r) {
|
|
66
|
+
var _this$componentConfig2;
|
|
60
67
|
if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].key)])) return null;
|
|
61
68
|
return /*#__PURE__*/React.createElement(BsSystemOrderTable, {
|
|
62
69
|
value: {
|
|
63
70
|
showOrderInfo: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].key)],
|
|
64
71
|
selectIds: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].selectId)]
|
|
65
72
|
},
|
|
66
|
-
type: _this.type
|
|
73
|
+
type: _this.type,
|
|
74
|
+
showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
|
|
67
75
|
});
|
|
68
76
|
});
|
|
69
77
|
_defineProperty(this, "getComponentValue", function (r) {
|
|
@@ -73,7 +81,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
73
81
|
return null;
|
|
74
82
|
});
|
|
75
83
|
_defineProperty(this, "editRender", function (p) {
|
|
76
|
-
var _this$
|
|
84
|
+
var _this$componentConfig3, _this$componentConfig4;
|
|
77
85
|
return /*#__PURE__*/React.createElement(GetFormItem, {
|
|
78
86
|
title: _this.name,
|
|
79
87
|
name: _this.id,
|
|
@@ -81,7 +89,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
81
89
|
required: false,
|
|
82
90
|
hidden: p === null || p === void 0 ? void 0 : p.hidden,
|
|
83
91
|
display: p === null || p === void 0 ? void 0 : p.display,
|
|
84
|
-
tooltip: (_this$
|
|
92
|
+
tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : "",
|
|
85
93
|
component: /*#__PURE__*/React.createElement(SystemOrder, _extends({}, _this.componentConfig, {
|
|
86
94
|
onChange: p === null || p === void 0 ? void 0 : p.onChange,
|
|
87
95
|
type: _this.type
|
|
@@ -110,7 +118,11 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
110
118
|
this.effects = options === null || options === void 0 ? void 0 : options.effects;
|
|
111
119
|
this.isCombinationComponent = true;
|
|
112
120
|
this.canSort = false;
|
|
113
|
-
this.children = ((
|
|
121
|
+
this.children = ((_getSystemShowHead = getSystemShowHead({
|
|
122
|
+
columns: ((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.columns) || [],
|
|
123
|
+
showHeader: (options === null || options === void 0 ? void 0 : (_options$componentCon = options.componentConfig) === null || _options$componentCon === void 0 ? void 0 : _options$componentCon.showHeader) || []
|
|
124
|
+
})) === null || _getSystemShowHead === void 0 ? void 0 : _getSystemShowHead.map(function (column) {
|
|
125
|
+
console.log("column", column, "".concat(options.id, "_").concat(typeMap[options.type].key, "_").concat(column.dataIndex));
|
|
114
126
|
return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
|
|
115
127
|
transformValue: column.render,
|
|
116
128
|
renderExport: column.renderExport,
|
|
@@ -120,7 +132,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
120
132
|
}));
|
|
121
133
|
})) || [];
|
|
122
134
|
this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
|
|
123
|
-
this.rules = this !== null && this !== void 0 && (_this$
|
|
135
|
+
this.rules = this !== null && this !== void 0 && (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
|
|
124
136
|
required: true,
|
|
125
137
|
validator: function validator(_, value) {
|
|
126
138
|
var _value$selectIds;
|
|
@@ -79,7 +79,7 @@ var HeaderMap = {
|
|
|
79
79
|
},
|
|
80
80
|
share: {
|
|
81
81
|
component: BsHeaderChild,
|
|
82
|
-
name: "
|
|
82
|
+
name: "均摊单价",
|
|
83
83
|
key: "share",
|
|
84
84
|
width: 120
|
|
85
85
|
},
|
|
@@ -231,7 +231,7 @@ var BsHeaderGods = /*#__PURE__*/function () {
|
|
|
231
231
|
skuName: "sku名称",
|
|
232
232
|
money: "实付金额",
|
|
233
233
|
number: "数量",
|
|
234
|
-
share: "
|
|
234
|
+
share: "均摊单价",
|
|
235
235
|
type: "赠品类型",
|
|
236
236
|
batch: "批次号",
|
|
237
237
|
expireDate: "有效期"
|
|
@@ -13,6 +13,8 @@ declare class BsChildPic implements ComponentInterface {
|
|
|
13
13
|
canSort: boolean;
|
|
14
14
|
children: ComponentInterface[];
|
|
15
15
|
dataType: ComponentInterface["dataType"];
|
|
16
|
+
transformValue?: (val: any, record?: any, parentName?: string) => any;
|
|
17
|
+
export?: (val: any, record?: any, parentName?: string) => any;
|
|
16
18
|
constructor(options: PickOption);
|
|
17
19
|
getParentId: () => string;
|
|
18
20
|
renderClient: (record: any) => React.JSX.Element | null;
|