@kmkf-fe-packages/services-components 2.2.13-beta.5 → 2.2.13-beta.51
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.js +1 -1
- package/dist/esm/commonComponents/OperationLog/index.d.ts +2 -1
- package/dist/esm/commonComponents/OperationLog/index.js +4 -2
- package/dist/esm/components/BS/BsLogistics/index.js +7 -7
- package/dist/esm/components/BS/BsSystemOrder/index.js +17 -8
- 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/expressCompany.js +14 -1
- package/dist/esm/components/Common/index.d.ts +1 -1
- package/dist/esm/components/Common/index.js +15 -7
- 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 +282 -57
- package/dist/esm/components/FlowOverallStatusSelect/index.d.ts +40 -0
- package/dist/esm/components/FlowOverallStatusSelect/index.js +185 -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/JST/JstSendGood/index.js +1 -1
- package/dist/esm/components/Public/Goods/index.d.ts +1 -11
- package/dist/esm/components/Public/Goods/index.js +5 -1
- package/dist/esm/components/Public/ReissueGoods/index.js +18 -0
- 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/Select/index.d.ts +1 -0
- package/dist/esm/components/Select/index.js +15 -6
- package/dist/esm/components/ShopInput/index.d.ts +5 -5
- package/dist/esm/components/ShopInput/index.js +12 -9
- package/dist/esm/factory.d.ts +2 -2
- package/dist/esm/factory.js +7 -7
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.js +2 -0
- package/package.json +4 -4
|
@@ -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;
|
|
@@ -14,7 +14,7 @@ var getTemplate = function getTemplate(companyUserConfig) {
|
|
|
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
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.
|
|
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
|
|
18
18
|
});
|
|
19
19
|
};
|
|
20
20
|
function useGetHasErpData(reduxData) {
|
|
@@ -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")) {
|
|
@@ -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
|
JY_LOGISTICS: {
|
|
@@ -16,6 +16,7 @@ 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,
|
|
@@ -28,9 +29,10 @@ var typeMap = {
|
|
|
28
29
|
};
|
|
29
30
|
var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
30
31
|
var _this = this,
|
|
32
|
+
_getSystemShowHead,
|
|
31
33
|
_typeMap$options$type,
|
|
32
|
-
|
|
33
|
-
_this$
|
|
34
|
+
_options$componentCon,
|
|
35
|
+
_this$componentConfig5;
|
|
34
36
|
_classCallCheck(this, BsSystemOrder);
|
|
35
37
|
_defineProperty(this, "name", void 0);
|
|
36
38
|
_defineProperty(this, "id", void 0);
|
|
@@ -45,12 +47,14 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
45
47
|
_defineProperty(this, "dataType", void 0);
|
|
46
48
|
_defineProperty(this, "children", void 0);
|
|
47
49
|
_defineProperty(this, "renderClient", function (record) {
|
|
50
|
+
var _this$componentConfig;
|
|
48
51
|
return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
|
|
49
52
|
id: _this.id,
|
|
50
53
|
label: _this.name,
|
|
51
54
|
value: /*#__PURE__*/React.createElement(BsSystemOrderTable, {
|
|
52
55
|
value: record === null || record === void 0 ? void 0 : record["".concat(_this.id)],
|
|
53
|
-
type: _this.type
|
|
56
|
+
type: _this.type,
|
|
57
|
+
showHeader: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
|
|
54
58
|
})
|
|
55
59
|
})) : null;
|
|
56
60
|
});
|
|
@@ -58,13 +62,15 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
58
62
|
return null;
|
|
59
63
|
});
|
|
60
64
|
_defineProperty(this, "renderLog", function (r) {
|
|
65
|
+
var _this$componentConfig2;
|
|
61
66
|
if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].key)])) return null;
|
|
62
67
|
return /*#__PURE__*/React.createElement(BsSystemOrderTable, {
|
|
63
68
|
value: {
|
|
64
69
|
showOrderInfo: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].key)],
|
|
65
70
|
selectIds: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].selectId)]
|
|
66
71
|
},
|
|
67
|
-
type: _this.type
|
|
72
|
+
type: _this.type,
|
|
73
|
+
showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
|
|
68
74
|
});
|
|
69
75
|
});
|
|
70
76
|
_defineProperty(this, "getComponentValue", function (r) {
|
|
@@ -74,7 +80,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
74
80
|
return null;
|
|
75
81
|
});
|
|
76
82
|
_defineProperty(this, "editRender", function (p) {
|
|
77
|
-
var _this$
|
|
83
|
+
var _this$componentConfig3, _this$componentConfig4;
|
|
78
84
|
return /*#__PURE__*/React.createElement(GetFormItem, {
|
|
79
85
|
title: _this.name,
|
|
80
86
|
name: _this.id,
|
|
@@ -82,7 +88,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
82
88
|
required: false,
|
|
83
89
|
hidden: p === null || p === void 0 ? void 0 : p.hidden,
|
|
84
90
|
display: p === null || p === void 0 ? void 0 : p.display,
|
|
85
|
-
tooltip: (_this$
|
|
91
|
+
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 : "",
|
|
86
92
|
component: /*#__PURE__*/React.createElement(SystemOrder, _extends({}, _this.componentConfig, {
|
|
87
93
|
onChange: p === null || p === void 0 ? void 0 : p.onChange,
|
|
88
94
|
type: _this.type
|
|
@@ -111,7 +117,10 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
111
117
|
this.effects = options === null || options === void 0 ? void 0 : options.effects;
|
|
112
118
|
this.isCombinationComponent = true;
|
|
113
119
|
this.canSort = false;
|
|
114
|
-
this.children = ((
|
|
120
|
+
this.children = ((_getSystemShowHead = getSystemShowHead({
|
|
121
|
+
columns: ((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.columns) || [],
|
|
122
|
+
showHeader: (options === null || options === void 0 ? void 0 : (_options$componentCon = options.componentConfig) === null || _options$componentCon === void 0 ? void 0 : _options$componentCon.showHeader) || []
|
|
123
|
+
})) === null || _getSystemShowHead === void 0 ? void 0 : _getSystemShowHead.map(function (column) {
|
|
115
124
|
return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
|
|
116
125
|
transformValue: column.render,
|
|
117
126
|
renderExport: column.renderExport,
|
|
@@ -121,7 +130,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
121
130
|
}));
|
|
122
131
|
})) || [];
|
|
123
132
|
this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
|
|
124
|
-
this.rules = this !== null && this !== void 0 && (_this$
|
|
133
|
+
this.rules = this !== null && this !== void 0 && (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
|
|
125
134
|
required: true,
|
|
126
135
|
validator: function validator(_, value) {
|
|
127
136
|
var _value$selectIds;
|
|
@@ -25,7 +25,8 @@ var componentType = {
|
|
|
25
25
|
GY_RETURN_GOODS: "gyReturnType",
|
|
26
26
|
JST_REISSUE_GOODS: "jstReissueType",
|
|
27
27
|
JST_RETURN_GOODS: "jstReturnType",
|
|
28
|
-
KM_REISSUE_GOODS: "kmReissueType"
|
|
28
|
+
KM_REISSUE_GOODS: "kmReissueType",
|
|
29
|
+
JY_REISSUE_GOODS: "jyReissueType"
|
|
29
30
|
};
|
|
30
31
|
var BsMemo = /*#__PURE__*/_createClass(function BsMemo(options) {
|
|
31
32
|
var _this = this;
|
|
@@ -26,7 +26,8 @@ var componentType = {
|
|
|
26
26
|
GY_RETURN_GOODS: "gyReturnType",
|
|
27
27
|
JST_REISSUE_GOODS: "jstReissueType",
|
|
28
28
|
JST_RETURN_GOODS: "jstReturnType",
|
|
29
|
-
KM_REISSUE_GOODS: "kmReissueType"
|
|
29
|
+
KM_REISSUE_GOODS: "kmReissueType",
|
|
30
|
+
JY_REISSUE_GOODS: "jyReissueType"
|
|
30
31
|
};
|
|
31
32
|
var BsType = /*#__PURE__*/_createClass(function BsType(options) {
|
|
32
33
|
var _this = this;
|
|
@@ -21,7 +21,8 @@ var componentType = {
|
|
|
21
21
|
GY_RETURN_GOODS: "gySystemOrderNo",
|
|
22
22
|
JST_REISSUE_GOODS: "jstSystemOrderNo",
|
|
23
23
|
JST_RETURN_GOODS: "jstSystemOrderNo",
|
|
24
|
-
KM_REISSUE_GOODS: "kmSystemOrderNo"
|
|
24
|
+
KM_REISSUE_GOODS: "kmSystemOrderNo",
|
|
25
|
+
JY_REISSUE_GOODS: "jySystemOrderNo"
|
|
25
26
|
};
|
|
26
27
|
var SystemOrderNo = /*#__PURE__*/_createClass(function SystemOrderNo(options) {
|
|
27
28
|
var _this = this;
|
|
@@ -101,7 +101,20 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
|
|
|
101
101
|
});
|
|
102
102
|
_defineProperty(this, "renderExport", function (value, record) {
|
|
103
103
|
var _this$expressDateInst, _this$expressDateInst2;
|
|
104
|
-
|
|
104
|
+
var name = (_this$expressDateInst = _this.expressDateInstance) === null || _this$expressDateInst === void 0 ? void 0 : (_this$expressDateInst2 = _this$expressDateInst.getExpressNameByCode) === null || _this$expressDateInst2 === void 0 ? void 0 : _this$expressDateInst2.call(_this$expressDateInst, record === null || record === void 0 ? void 0 : record["".concat(_this.id)], false);
|
|
105
|
+
if (!name) {
|
|
106
|
+
var _typeMap$_this$type3, _items$find;
|
|
107
|
+
var _this$id$split3 = _this.id.split("_"),
|
|
108
|
+
_this$id$split4 = _slicedToArray(_this$id$split3, 3),
|
|
109
|
+
key = _this$id$split4[0],
|
|
110
|
+
parentKey = _this$id$split4[1],
|
|
111
|
+
childKey = _this$id$split4[2];
|
|
112
|
+
var items = record === null || record === void 0 ? void 0 : record["".concat(key, "_").concat(parentKey, "_").concat((_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.key)];
|
|
113
|
+
name = items === null || items === void 0 ? void 0 : (_items$find = items.find(function (item) {
|
|
114
|
+
return item.logisticsCompany === (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]);
|
|
115
|
+
})) === null || _items$find === void 0 ? void 0 : _items$find.logisticsCompanyName;
|
|
116
|
+
}
|
|
117
|
+
return name || (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) || "--";
|
|
105
118
|
});
|
|
106
119
|
_defineProperty(this, "editRender", function () {
|
|
107
120
|
return null;
|
|
@@ -40,7 +40,7 @@ export declare const BsGoodsTable: ({ list, showHeader, text, type, }: {
|
|
|
40
40
|
}) => React.JSX.Element;
|
|
41
41
|
export declare const FileRender: ({ fileList, canDownload }: any) => React.JSX.Element;
|
|
42
42
|
export declare const KmVideoRender: ({ fileList, canDownload }: any) => React.JSX.Element;
|
|
43
|
-
export declare const BsSystemOrderTable: ({ value, type }: any) => React.JSX.Element;
|
|
43
|
+
export declare const BsSystemOrderTable: ({ value, type, showHeader }: any) => React.JSX.Element;
|
|
44
44
|
export declare const MsgContent: ({ horizontal, list, valueKey, failValue, options, }: any) => React.JSX.Element;
|
|
45
45
|
export declare const AlipayBill: (props: any) => React.JSX.Element;
|
|
46
46
|
export declare const RenderPicturePro: (props: any) => React.JSX.Element;
|
|
@@ -15,7 +15,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
15
15
|
import { Form, Button, Modal, Tooltip, Space, Image, Popover, Table, message, Typography } from "antd";
|
|
16
16
|
import { DownloadOutlined } from "@ant-design/icons";
|
|
17
17
|
import React, { useState, useMemo } from "react";
|
|
18
|
-
import { ExpressData, SendDataCenter } from "@kmkf-fe-packages/kmkf-utils";
|
|
18
|
+
import { ExpressData, SendDataCenter, getSystemShowHead } from "@kmkf-fe-packages/kmkf-utils";
|
|
19
19
|
import { getAlipayBillReceipt } from "../../service/api";
|
|
20
20
|
import { CopyToClipboard } from "react-copy-to-clipboard";
|
|
21
21
|
import styles from "./index.module.less";
|
|
@@ -272,7 +272,7 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
|
|
|
272
272
|
var company = "";
|
|
273
273
|
if (logisticsCompanyFormType === "input") {
|
|
274
274
|
company = logisticsCompany;
|
|
275
|
-
} else if (
|
|
275
|
+
} else if (["gy", "jy"].includes(platformType)) {
|
|
276
276
|
// 管易为了兼容之前的补发物流信息,若不存在logisticsCompanyName值则去匹配物流映射列表展示物流公司名称
|
|
277
277
|
company = ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName;
|
|
278
278
|
} else {
|
|
@@ -305,8 +305,9 @@ export var BsExpressRender = function BsExpressRender(_ref7) {
|
|
|
305
305
|
platformType = _ref7$platformType === void 0 ? "default" : _ref7$platformType,
|
|
306
306
|
logisticsCompanyFormType = _ref7.logisticsCompanyFormType;
|
|
307
307
|
return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
|
|
308
|
-
var logisticsCompany = item.logisticsCompany
|
|
309
|
-
|
|
308
|
+
var logisticsCompany = item.logisticsCompany,
|
|
309
|
+
logisticsCompanyName = item.logisticsCompanyName;
|
|
310
|
+
var company = logisticsCompanyFormType === "input" ? logisticsCompany : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName || logisticsCompany;
|
|
310
311
|
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
|
|
311
312
|
content: content(item, index),
|
|
312
313
|
overlayStyle: {
|
|
@@ -768,7 +769,9 @@ export var KmVideoRender = function KmVideoRender(_ref13) {
|
|
|
768
769
|
};
|
|
769
770
|
export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
770
771
|
var value = _ref14.value,
|
|
771
|
-
type = _ref14.type
|
|
772
|
+
type = _ref14.type,
|
|
773
|
+
_ref14$showHeader = _ref14.showHeader,
|
|
774
|
+
showHeader = _ref14$showHeader === void 0 ? [] : _ref14$showHeader;
|
|
772
775
|
var columnMap = {
|
|
773
776
|
BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
|
|
774
777
|
KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
|
|
@@ -804,15 +807,20 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
804
807
|
};
|
|
805
808
|
}
|
|
806
809
|
};
|
|
810
|
+
var columns = getSystemShowHead({
|
|
811
|
+
columns: columnMap[type] || [],
|
|
812
|
+
showHeader: showHeader
|
|
813
|
+
});
|
|
807
814
|
return /*#__PURE__*/React.createElement(Table, {
|
|
808
815
|
dataSource: (value === null || value === void 0 ? void 0 : value.showOrderInfo) || [],
|
|
809
|
-
columns:
|
|
816
|
+
columns: columns || [],
|
|
810
817
|
rowSelection: rowSelection,
|
|
811
818
|
rowKey: rowKeyMap[type] || "billNo",
|
|
812
819
|
size: "small",
|
|
813
820
|
pagination: false,
|
|
814
821
|
scroll: {
|
|
815
|
-
x: "100%"
|
|
822
|
+
x: "100%",
|
|
823
|
+
y: 500
|
|
816
824
|
},
|
|
817
825
|
locale: {
|
|
818
826
|
emptyText: "暂无数据"
|
|
@@ -19,8 +19,8 @@ declare class CommonDataTime implements ComponentInterface {
|
|
|
19
19
|
constructor(options: PickOption);
|
|
20
20
|
getValues: (value: string) => string;
|
|
21
21
|
renderClient: (record: any) => React.JSX.Element | null;
|
|
22
|
-
renderPc: (value: any, record: Record) =>
|
|
23
|
-
renderLog: (r: Record) =>
|
|
22
|
+
renderPc: (value: any, record: Record) => string;
|
|
23
|
+
renderLog: (r: Record) => string | null;
|
|
24
24
|
getComponentValue: (r: Record) => any;
|
|
25
25
|
renderExport: (value: any, record: Record) => string;
|
|
26
26
|
editRender: () => null;
|
|
@@ -40,8 +40,8 @@ var CommonDataTime = /*#__PURE__*/_createClass(function CommonDataTime(options)
|
|
|
40
40
|
}) : null;
|
|
41
41
|
});
|
|
42
42
|
_defineProperty(this, "renderPc", function (value, record) {
|
|
43
|
-
var
|
|
44
|
-
return
|
|
43
|
+
var time = record === null || record === void 0 ? void 0 : record["".concat(_this.id)];
|
|
44
|
+
return time ? moment(time).format("YYYY-MM-DD HH:mm:ss") : "--";
|
|
45
45
|
// if (record?.[`${this.id}`] === undefined) {
|
|
46
46
|
// return <span>--</span>;
|
|
47
47
|
// }
|