@kmkf-fe-packages/services-components 2.2.39-beta.13 → 2.2.39-beta.14
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/commonComponents/GlobalContext/orderQuery/useGetErpSendData.js +10 -9
- package/dist/esm/components/BS/BsLogistics/index.js +18 -9
- package/dist/esm/components/BS/BsSystemOrder/index.js +2 -2
- package/dist/esm/components/BS/common/expressCode.js +3 -0
- package/dist/esm/components/BS/common/expressCompany.js +3 -0
- package/dist/esm/components/Common/constants/columnsBaseInfoMap.js +4 -2
- package/dist/esm/components/Common/index.js +3 -1
- package/dist/esm/components/CommonHeaderGood/index.js +389 -0
- package/dist/esm/components/JST/JstSendGood/index.js +9 -1
- package/dist/esm/components/KmErpSendGood/index.js +1 -1
- package/dist/esm/components/Public/Goods/index.js +4 -0
- package/dist/esm/factory.d.ts +1 -1
- package/dist/esm/factory.js +4 -0
- package/dist/esm/service/api.d.ts +1 -0
- package/dist/esm/service/api.js +6 -0
- package/package.json +4 -4
|
@@ -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, hasJy, promises;
|
|
26
|
+
var hasWdt, hasGy, hasJst, hasJy, hasJky, promises;
|
|
27
27
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
28
28
|
while (1) switch (_context.prev = _context.next) {
|
|
29
29
|
case 0:
|
|
@@ -31,29 +31,30 @@ 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, hasJy = hasErpData.hasJy;
|
|
34
|
+
hasWdt = hasErpData.hasWdt, hasGy = hasErpData.hasGy, hasJst = hasErpData.hasJst, hasJy = hasErpData.hasJy, hasJky = hasErpData.hasJky;
|
|
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
|
-
|
|
40
|
+
if (hasJky || notJudgedErp) promises.push(SendDataCenter.getInstance("jky").fetchData);
|
|
41
|
+
_context.next = 11;
|
|
41
42
|
return Promise.all(promises.map(function (promise) {
|
|
42
43
|
return promise();
|
|
43
44
|
}));
|
|
44
|
-
case
|
|
45
|
+
case 11:
|
|
45
46
|
setGlobalState("success");
|
|
46
|
-
_context.next =
|
|
47
|
+
_context.next = 17;
|
|
47
48
|
break;
|
|
48
|
-
case
|
|
49
|
-
_context.prev =
|
|
49
|
+
case 14:
|
|
50
|
+
_context.prev = 14;
|
|
50
51
|
_context.t0 = _context["catch"](1);
|
|
51
52
|
setGlobalState("failed");
|
|
52
|
-
case
|
|
53
|
+
case 17:
|
|
53
54
|
case "end":
|
|
54
55
|
return _context.stop();
|
|
55
56
|
}
|
|
56
|
-
}, _callee, null, [[1,
|
|
57
|
+
}, _callee, null, [[1, 14]]);
|
|
57
58
|
}));
|
|
58
59
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
59
60
|
return _ref.apply(this, arguments);
|
|
@@ -82,15 +82,6 @@ var typeMap = {
|
|
|
82
82
|
companyDataType: "string",
|
|
83
83
|
companyCodeType: "arrayObject"
|
|
84
84
|
},
|
|
85
|
-
JY_LOGISTICS: {
|
|
86
|
-
key: "jyLogisticsList",
|
|
87
|
-
name: "巨益",
|
|
88
|
-
company: "jyLogisticsCompany",
|
|
89
|
-
code: "jyLogisticsCode",
|
|
90
|
-
platformType: "jy",
|
|
91
|
-
companyDataType: "arrayObject",
|
|
92
|
-
companyCodeType: "arrayObject"
|
|
93
|
-
},
|
|
94
85
|
SKX_LOGISTICS: {
|
|
95
86
|
key: "skxLogisticsList",
|
|
96
87
|
name: "斯凯奇",
|
|
@@ -110,6 +101,24 @@ var typeMap = {
|
|
|
110
101
|
companyDataType: "like",
|
|
111
102
|
companyCodeType: "like",
|
|
112
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"
|
|
113
|
+
},
|
|
114
|
+
JKY_LOGISTICS: {
|
|
115
|
+
key: "jkyLogisticsList",
|
|
116
|
+
name: "吉客云",
|
|
117
|
+
company: "jkyLogisticsCompany",
|
|
118
|
+
code: "jkyLogisticsCode",
|
|
119
|
+
platformType: "jky",
|
|
120
|
+
companyDataType: "string",
|
|
121
|
+
companyCodeType: "arrayObject"
|
|
113
122
|
}
|
|
114
123
|
};
|
|
115
124
|
var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
|
|
@@ -11,7 +11,7 @@ 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, JY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_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, JKY_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";
|
|
@@ -26,6 +26,7 @@ var typeMap = {
|
|
|
26
26
|
GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG,
|
|
27
27
|
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG,
|
|
28
28
|
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG,
|
|
29
|
+
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG,
|
|
29
30
|
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG
|
|
30
31
|
};
|
|
31
32
|
var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
@@ -122,7 +123,6 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
122
123
|
columns: ((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.columns) || [],
|
|
123
124
|
showHeader: (options === null || options === void 0 ? void 0 : (_options$componentCon = options.componentConfig) === null || _options$componentCon === void 0 ? void 0 : _options$componentCon.showHeader) || []
|
|
124
125
|
})) === 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));
|
|
126
126
|
return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
|
|
127
127
|
transformValue: column.render,
|
|
128
128
|
renderExport: column.renderExport,
|
|
@@ -7,13 +7,13 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
|
|
|
7
7
|
import system from "./system";
|
|
8
8
|
import bs_e3 from "./bs_e3";
|
|
9
9
|
import bs from "./bs";
|
|
10
|
-
import { getJstColumns, getWlnColumns, getGyColumns, getWdtColumns, getKmColumns, getJyColumns, getSkxColumns } from "@kmkf-fe-packages/basic-components";
|
|
10
|
+
import { getJstColumns, getWlnColumns, getGyColumns, getWdtColumns, getKmColumns, getJyColumns, getSkxColumns, getJkyColumns } from "@kmkf-fe-packages/basic-components";
|
|
11
11
|
import defaultColumns from "./defaultColumns";
|
|
12
12
|
export var getColumnsMap = function getColumnsMap(args) {
|
|
13
13
|
var _ref = args || {},
|
|
14
14
|
_ref$text = _ref.text,
|
|
15
15
|
text = _ref$text === void 0 ? "" : _ref$text;
|
|
16
|
-
return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
|
|
16
|
+
return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
|
|
17
17
|
text: text
|
|
18
18
|
})), bs_e3()), getWdtColumns({
|
|
19
19
|
text: text,
|
|
@@ -28,6 +28,8 @@ export var getColumnsMap = function getColumnsMap(args) {
|
|
|
28
28
|
disabled: true
|
|
29
29
|
})), getJyColumns({
|
|
30
30
|
disabled: true
|
|
31
|
+
})), getJkyColumns({
|
|
32
|
+
disabled: true
|
|
31
33
|
})), getSkxColumns({})), {}, {
|
|
32
34
|
default: defaultColumns({
|
|
33
35
|
text: text
|
|
@@ -21,7 +21,7 @@ import { CopyToClipboard } from "react-copy-to-clipboard";
|
|
|
21
21
|
import styles from "./index.module.less";
|
|
22
22
|
import defaultImg from "./img/default-img.png";
|
|
23
23
|
import CopyText from "../../commonComponents/CopyText";
|
|
24
|
-
import { 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, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
|
|
24
|
+
import { 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, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
|
|
25
25
|
import { getColumnsMap } from "./constants/columnsBaseInfoMap";
|
|
26
26
|
import { VideoCameraTwoTone } from "@ant-design/icons";
|
|
27
27
|
import { ApaasImage } from "@kmkf-fe-packages/basic-components";
|
|
@@ -782,6 +782,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
782
782
|
GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns,
|
|
783
783
|
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
|
|
784
784
|
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
|
|
785
|
+
JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
|
|
785
786
|
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
|
|
786
787
|
};
|
|
787
788
|
var rowKeyMap = {
|
|
@@ -793,6 +794,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
793
794
|
GY_SYSTEM_ORDER: "billNo",
|
|
794
795
|
JST_SYSTEM_ORDER: "oId",
|
|
795
796
|
JY_SYSTEM_ORDER: "tradeNo",
|
|
797
|
+
JKY_SYSTEM_ORDER: "tradeNo",
|
|
796
798
|
WDT_RETURN_BILL_NO: "refundNo"
|
|
797
799
|
};
|
|
798
800
|
var rowSelection = {
|
|
@@ -2063,6 +2063,395 @@ var GoodHeaderMap = {
|
|
|
2063
2063
|
width: 200
|
|
2064
2064
|
}
|
|
2065
2065
|
}
|
|
2066
|
+
},
|
|
2067
|
+
JKY_GOODS: {
|
|
2068
|
+
headerMap: {
|
|
2069
|
+
goodsNo: {
|
|
2070
|
+
component: BsHeaderChild,
|
|
2071
|
+
name: "货品编号",
|
|
2072
|
+
key: "goodsNo",
|
|
2073
|
+
width: 150
|
|
2074
|
+
},
|
|
2075
|
+
goodsName: {
|
|
2076
|
+
component: BsHeaderChild,
|
|
2077
|
+
name: "货品名称",
|
|
2078
|
+
key: "goodsName",
|
|
2079
|
+
width: 150
|
|
2080
|
+
},
|
|
2081
|
+
goodsId: {
|
|
2082
|
+
component: BsHeaderChild,
|
|
2083
|
+
name: "货品ID",
|
|
2084
|
+
key: "goodsId",
|
|
2085
|
+
width: 150
|
|
2086
|
+
},
|
|
2087
|
+
barcode: {
|
|
2088
|
+
component: BsHeaderChild,
|
|
2089
|
+
name: "货品条码",
|
|
2090
|
+
key: "barcode",
|
|
2091
|
+
width: 150
|
|
2092
|
+
},
|
|
2093
|
+
specName: {
|
|
2094
|
+
component: BsHeaderChild,
|
|
2095
|
+
name: "规格名称",
|
|
2096
|
+
key: "specName",
|
|
2097
|
+
width: 150
|
|
2098
|
+
},
|
|
2099
|
+
specId: {
|
|
2100
|
+
component: BsHeaderChild,
|
|
2101
|
+
name: "规格ID",
|
|
2102
|
+
key: "specId",
|
|
2103
|
+
width: 150
|
|
2104
|
+
},
|
|
2105
|
+
skuImgUrl: {
|
|
2106
|
+
component: BsHeaderPic,
|
|
2107
|
+
name: "规格图片",
|
|
2108
|
+
key: "skuImgUrl",
|
|
2109
|
+
width: 150
|
|
2110
|
+
},
|
|
2111
|
+
sellCount: {
|
|
2112
|
+
component: BsHeaderChild,
|
|
2113
|
+
name: "数量",
|
|
2114
|
+
key: "sellCount",
|
|
2115
|
+
width: 100
|
|
2116
|
+
},
|
|
2117
|
+
actualSendCount: {
|
|
2118
|
+
component: BsHeaderChild,
|
|
2119
|
+
name: "实发数量",
|
|
2120
|
+
key: "actualSendCount",
|
|
2121
|
+
width: 150
|
|
2122
|
+
},
|
|
2123
|
+
sellPrice: {
|
|
2124
|
+
component: BsHeaderChild,
|
|
2125
|
+
name: "单价",
|
|
2126
|
+
key: "sellPrice",
|
|
2127
|
+
width: 150
|
|
2128
|
+
},
|
|
2129
|
+
sellTotal: {
|
|
2130
|
+
component: BsHeaderChild,
|
|
2131
|
+
name: "金额",
|
|
2132
|
+
key: "sellTotal",
|
|
2133
|
+
width: 150
|
|
2134
|
+
},
|
|
2135
|
+
discountTotal: {
|
|
2136
|
+
component: BsHeaderChild,
|
|
2137
|
+
name: "抵扣金额",
|
|
2138
|
+
key: "discountTotal",
|
|
2139
|
+
width: 150
|
|
2140
|
+
},
|
|
2141
|
+
shareFavourableFee: {
|
|
2142
|
+
component: BsHeaderChild,
|
|
2143
|
+
name: "分摊金额",
|
|
2144
|
+
key: "shareFavourableFee",
|
|
2145
|
+
width: 150
|
|
2146
|
+
},
|
|
2147
|
+
shareFavourableAfterFee: {
|
|
2148
|
+
component: BsHeaderChild,
|
|
2149
|
+
name: "分摊后金额",
|
|
2150
|
+
key: "shareFavourableAfterFee",
|
|
2151
|
+
width: 150
|
|
2152
|
+
},
|
|
2153
|
+
customerPrice: {
|
|
2154
|
+
component: BsHeaderChild,
|
|
2155
|
+
name: "终端销售单价",
|
|
2156
|
+
key: "customerPrice",
|
|
2157
|
+
width: 150
|
|
2158
|
+
},
|
|
2159
|
+
customerTotal: {
|
|
2160
|
+
component: BsHeaderChild,
|
|
2161
|
+
name: "终端销售金额",
|
|
2162
|
+
key: "customerTotal",
|
|
2163
|
+
width: 150
|
|
2164
|
+
},
|
|
2165
|
+
divideSellTotal: {
|
|
2166
|
+
component: BsHeaderChild,
|
|
2167
|
+
name: "实付金额",
|
|
2168
|
+
key: "divideSellTotal",
|
|
2169
|
+
width: 150
|
|
2170
|
+
},
|
|
2171
|
+
isGift: {
|
|
2172
|
+
component: BsHeaderChild,
|
|
2173
|
+
name: "是否赠品",
|
|
2174
|
+
key: "isGift",
|
|
2175
|
+
width: 150,
|
|
2176
|
+
transformValue: function transformValue(val) {
|
|
2177
|
+
if (isNull(val)) return "--";
|
|
2178
|
+
return val === "1" ? "是" : "否";
|
|
2179
|
+
},
|
|
2180
|
+
renderExport: function renderExport(val) {
|
|
2181
|
+
if (isNull(val)) return "--";
|
|
2182
|
+
return val === "1" ? "是" : "否";
|
|
2183
|
+
}
|
|
2184
|
+
},
|
|
2185
|
+
isFit: {
|
|
2186
|
+
component: BsHeaderChild,
|
|
2187
|
+
name: "是否组合装",
|
|
2188
|
+
key: "isFit",
|
|
2189
|
+
width: 150,
|
|
2190
|
+
transformValue: function transformValue(val) {
|
|
2191
|
+
if (isNull(val)) return "--";
|
|
2192
|
+
return val === "1" ? "是" : "否";
|
|
2193
|
+
},
|
|
2194
|
+
renderExport: function renderExport(val) {
|
|
2195
|
+
if (isNull(val)) return "--";
|
|
2196
|
+
return val === "1" ? "是" : "否";
|
|
2197
|
+
}
|
|
2198
|
+
},
|
|
2199
|
+
isPresell: {
|
|
2200
|
+
component: BsHeaderChild,
|
|
2201
|
+
name: "是否预售货品",
|
|
2202
|
+
key: "isPresell",
|
|
2203
|
+
width: 150
|
|
2204
|
+
},
|
|
2205
|
+
brandName: {
|
|
2206
|
+
component: BsHeaderChild,
|
|
2207
|
+
name: "品牌",
|
|
2208
|
+
key: "brandName",
|
|
2209
|
+
width: 200
|
|
2210
|
+
},
|
|
2211
|
+
cateName: {
|
|
2212
|
+
component: BsHeaderChild,
|
|
2213
|
+
name: "货品类别",
|
|
2214
|
+
key: "cateName",
|
|
2215
|
+
width: 150
|
|
2216
|
+
},
|
|
2217
|
+
goodsTags: {
|
|
2218
|
+
component: BsHeaderChild,
|
|
2219
|
+
name: "货品标签",
|
|
2220
|
+
key: "goodsTags",
|
|
2221
|
+
width: 250
|
|
2222
|
+
},
|
|
2223
|
+
goodsMemo: {
|
|
2224
|
+
component: BsHeaderChild,
|
|
2225
|
+
name: "货品备注",
|
|
2226
|
+
key: "goodsMemo",
|
|
2227
|
+
width: 250
|
|
2228
|
+
},
|
|
2229
|
+
tradeGoodsNo: {
|
|
2230
|
+
component: BsHeaderChild,
|
|
2231
|
+
name: "交易货品编号",
|
|
2232
|
+
key: "tradeGoodsNo",
|
|
2233
|
+
width: 250
|
|
2234
|
+
},
|
|
2235
|
+
tradeGoodsName: {
|
|
2236
|
+
component: BsHeaderChild,
|
|
2237
|
+
name: "交易货品名称",
|
|
2238
|
+
key: "tradeGoodsName",
|
|
2239
|
+
width: 250
|
|
2240
|
+
},
|
|
2241
|
+
tradeGoodsSpec: {
|
|
2242
|
+
component: BsHeaderChild,
|
|
2243
|
+
name: "交易规格名称",
|
|
2244
|
+
key: "tradeGoodsSpec",
|
|
2245
|
+
width: 250
|
|
2246
|
+
},
|
|
2247
|
+
sourceSubtradeNo: {
|
|
2248
|
+
component: BsHeaderChild,
|
|
2249
|
+
name: "网店子订单号",
|
|
2250
|
+
key: "sourceSubtradeNo",
|
|
2251
|
+
width: 250
|
|
2252
|
+
},
|
|
2253
|
+
platGoodsId: {
|
|
2254
|
+
component: BsHeaderChild,
|
|
2255
|
+
name: "平台商品ID",
|
|
2256
|
+
key: "platGoodsId",
|
|
2257
|
+
width: 250
|
|
2258
|
+
},
|
|
2259
|
+
subTradeId: {
|
|
2260
|
+
component: BsHeaderChild,
|
|
2261
|
+
name: "商品明细ID",
|
|
2262
|
+
key: "subTradeId",
|
|
2263
|
+
width: 250
|
|
2264
|
+
},
|
|
2265
|
+
batchNo: {
|
|
2266
|
+
component: BsHeaderChild,
|
|
2267
|
+
name: "批次号",
|
|
2268
|
+
key: "batchNo",
|
|
2269
|
+
width: 250
|
|
2270
|
+
},
|
|
2271
|
+
sendCount: {
|
|
2272
|
+
component: BsHeaderChild,
|
|
2273
|
+
name: "批次数量",
|
|
2274
|
+
key: "sendCount",
|
|
2275
|
+
width: 250
|
|
2276
|
+
},
|
|
2277
|
+
productDate: {
|
|
2278
|
+
component: BsHeaderChild,
|
|
2279
|
+
name: "生产日期",
|
|
2280
|
+
key: "productDate",
|
|
2281
|
+
width: 250
|
|
2282
|
+
},
|
|
2283
|
+
expireDate: {
|
|
2284
|
+
component: BsHeaderChild,
|
|
2285
|
+
name: "到期日期",
|
|
2286
|
+
key: "expireDate",
|
|
2287
|
+
width: 250
|
|
2288
|
+
}
|
|
2289
|
+
},
|
|
2290
|
+
itemKey: {
|
|
2291
|
+
goodsNo: "货品编号",
|
|
2292
|
+
goodsName: "货品名称",
|
|
2293
|
+
goodsId: "货品ID",
|
|
2294
|
+
barcode: "货品条码",
|
|
2295
|
+
specName: "规格名称",
|
|
2296
|
+
specId: "规格ID",
|
|
2297
|
+
skuImgUrl: "规格图片",
|
|
2298
|
+
sellCount: "数量",
|
|
2299
|
+
actualSendCount: "实发数量",
|
|
2300
|
+
sellPrice: "单价",
|
|
2301
|
+
sellTotal: "金额",
|
|
2302
|
+
discountTotal: "抵扣金额",
|
|
2303
|
+
shareFavourableFee: "分摊金额",
|
|
2304
|
+
shareFavourableAfterFee: "分摊后金额",
|
|
2305
|
+
customerPrice: "终端销售单价",
|
|
2306
|
+
customerTotal: "终端销售金额",
|
|
2307
|
+
divideSellTotal: "实付金额",
|
|
2308
|
+
isGift: "是否赠品",
|
|
2309
|
+
isFit: "是否组合装",
|
|
2310
|
+
isPresell: "是否预售货品",
|
|
2311
|
+
brandName: "品牌",
|
|
2312
|
+
cateName: "货品类别",
|
|
2313
|
+
goodsTags: "货品标签",
|
|
2314
|
+
goodsMemo: "货品备注",
|
|
2315
|
+
tradeGoodsNo: "交易货品编号",
|
|
2316
|
+
tradeGoodsName: "交易货品名称",
|
|
2317
|
+
tradeGoodsSpec: "交易规格名称",
|
|
2318
|
+
sourceSubtradeNo: "网店子订单号",
|
|
2319
|
+
platGoodsId: "平台商品ID",
|
|
2320
|
+
subTradeId: "商品明细ID",
|
|
2321
|
+
batchNo: "批次号",
|
|
2322
|
+
sendCount: "批次数量",
|
|
2323
|
+
productDate: "生产日期",
|
|
2324
|
+
expireDate: "到期日期"
|
|
2325
|
+
},
|
|
2326
|
+
moneyKey: "sellTotal"
|
|
2327
|
+
},
|
|
2328
|
+
JKY_REISSUE_GOODS: {
|
|
2329
|
+
headerMap: {
|
|
2330
|
+
goodsNo: {
|
|
2331
|
+
component: BsHeaderChild,
|
|
2332
|
+
name: "货品编号",
|
|
2333
|
+
key: "goodsNo",
|
|
2334
|
+
width: 150
|
|
2335
|
+
},
|
|
2336
|
+
goodsName: {
|
|
2337
|
+
component: BsHeaderChild,
|
|
2338
|
+
name: "货品名称",
|
|
2339
|
+
key: "goodsName",
|
|
2340
|
+
width: 150
|
|
2341
|
+
},
|
|
2342
|
+
goodsId: {
|
|
2343
|
+
component: BsHeaderChild,
|
|
2344
|
+
name: "货品ID",
|
|
2345
|
+
key: "goodsId",
|
|
2346
|
+
width: 150
|
|
2347
|
+
},
|
|
2348
|
+
barcode: {
|
|
2349
|
+
component: BsHeaderChild,
|
|
2350
|
+
name: "货品条码",
|
|
2351
|
+
key: "barcode",
|
|
2352
|
+
width: 150
|
|
2353
|
+
},
|
|
2354
|
+
specName: {
|
|
2355
|
+
component: BsHeaderChild,
|
|
2356
|
+
name: "规格名称",
|
|
2357
|
+
key: "specName",
|
|
2358
|
+
width: 150
|
|
2359
|
+
},
|
|
2360
|
+
specId: {
|
|
2361
|
+
component: BsHeaderChild,
|
|
2362
|
+
name: "规格ID",
|
|
2363
|
+
key: "specId",
|
|
2364
|
+
width: 150
|
|
2365
|
+
},
|
|
2366
|
+
skuImgUrl: {
|
|
2367
|
+
component: BsHeaderPic,
|
|
2368
|
+
name: "规格图片",
|
|
2369
|
+
key: "skuImgUrl",
|
|
2370
|
+
width: 150
|
|
2371
|
+
},
|
|
2372
|
+
sellCount: {
|
|
2373
|
+
component: BsHeaderChild,
|
|
2374
|
+
name: "发货数量",
|
|
2375
|
+
key: "sellCount",
|
|
2376
|
+
width: 100
|
|
2377
|
+
},
|
|
2378
|
+
sellPrice: {
|
|
2379
|
+
component: BsHeaderChild,
|
|
2380
|
+
name: "单价",
|
|
2381
|
+
key: "sellPrice",
|
|
2382
|
+
width: 150
|
|
2383
|
+
},
|
|
2384
|
+
sellTotal: {
|
|
2385
|
+
component: BsHeaderChild,
|
|
2386
|
+
name: "总金额",
|
|
2387
|
+
key: "sellTotal",
|
|
2388
|
+
width: 150
|
|
2389
|
+
},
|
|
2390
|
+
reason: {
|
|
2391
|
+
component: BsHeaderChild,
|
|
2392
|
+
name: "退换原因",
|
|
2393
|
+
key: "reason",
|
|
2394
|
+
width: 250
|
|
2395
|
+
},
|
|
2396
|
+
isGift: {
|
|
2397
|
+
component: BsHeaderChild,
|
|
2398
|
+
name: "是否赠品",
|
|
2399
|
+
key: "isGift",
|
|
2400
|
+
width: 150,
|
|
2401
|
+
transformValue: function transformValue(val) {
|
|
2402
|
+
if (isNull(val)) return "--";
|
|
2403
|
+
return val === "1" ? "是" : "否";
|
|
2404
|
+
},
|
|
2405
|
+
renderExport: function renderExport(val) {
|
|
2406
|
+
if (isNull(val)) return "--";
|
|
2407
|
+
return val === "1" ? "是" : "否";
|
|
2408
|
+
}
|
|
2409
|
+
},
|
|
2410
|
+
isFit: {
|
|
2411
|
+
component: BsHeaderChild,
|
|
2412
|
+
name: "是否组合装",
|
|
2413
|
+
key: "isFit",
|
|
2414
|
+
width: 150,
|
|
2415
|
+
transformValue: function transformValue(val) {
|
|
2416
|
+
if (isNull(val)) return "--";
|
|
2417
|
+
return val === "1" ? "是" : "否";
|
|
2418
|
+
},
|
|
2419
|
+
renderExport: function renderExport(val) {
|
|
2420
|
+
if (isNull(val)) return "--";
|
|
2421
|
+
return val === "1" ? "是" : "否";
|
|
2422
|
+
}
|
|
2423
|
+
},
|
|
2424
|
+
brandName: {
|
|
2425
|
+
component: BsHeaderChild,
|
|
2426
|
+
name: "品牌",
|
|
2427
|
+
key: "brandName",
|
|
2428
|
+
width: 150
|
|
2429
|
+
},
|
|
2430
|
+
cateName: {
|
|
2431
|
+
component: BsHeaderChild,
|
|
2432
|
+
name: "货品类别",
|
|
2433
|
+
key: "cateName",
|
|
2434
|
+
width: 150
|
|
2435
|
+
}
|
|
2436
|
+
},
|
|
2437
|
+
itemKey: {
|
|
2438
|
+
goodsNo: "货品编号",
|
|
2439
|
+
goodsName: "货品名称",
|
|
2440
|
+
goodsId: "货品ID",
|
|
2441
|
+
barcode: "货品条码",
|
|
2442
|
+
specName: "规格名称",
|
|
2443
|
+
specId: "规格ID",
|
|
2444
|
+
skuImgUrl: "规格图片",
|
|
2445
|
+
sellCount: "发货数量",
|
|
2446
|
+
sellPrice: "单价",
|
|
2447
|
+
sellTotal: "总金额",
|
|
2448
|
+
reason: "退换原因",
|
|
2449
|
+
isGift: "是否赠品",
|
|
2450
|
+
isFit: "是否组合装",
|
|
2451
|
+
brandName: "品牌",
|
|
2452
|
+
cateName: "货品类别"
|
|
2453
|
+
},
|
|
2454
|
+
moneyKey: "sellTotal"
|
|
2066
2455
|
}
|
|
2067
2456
|
};
|
|
2068
2457
|
GoodHeaderMap["WDT_REISSUE_GOODS"] = GoodHeaderMap["WDT_GOODS"];
|
|
@@ -78,6 +78,14 @@ var typeMap = {
|
|
|
78
78
|
sendName: "jySendName",
|
|
79
79
|
platformType: "jy",
|
|
80
80
|
dataType: "weakenArray"
|
|
81
|
+
},
|
|
82
|
+
JKY_SEND_GOOD: {
|
|
83
|
+
key: "jkySendGood",
|
|
84
|
+
name: "jky",
|
|
85
|
+
sendId: "jkySendId",
|
|
86
|
+
sendName: "jkySendName",
|
|
87
|
+
platformType: "jky",
|
|
88
|
+
dataType: "weakenArray"
|
|
81
89
|
}
|
|
82
90
|
};
|
|
83
91
|
var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
|
|
@@ -184,7 +192,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
|
|
|
184
192
|
});
|
|
185
193
|
_defineProperty(this, "filterConfig", function (item) {
|
|
186
194
|
var _typeMap$_this$type8, _typeMap$_this$type9, _typeMap$_this$type11;
|
|
187
|
-
return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "KM_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD"].includes(_this.type) ? {
|
|
195
|
+
return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "KM_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD", "JKY_SEND_GOOD"].includes(_this.type) ? {
|
|
188
196
|
searchDefaultConditions: SYMBOL.in,
|
|
189
197
|
type: item.type,
|
|
190
198
|
id: "".concat(item.id, "_").concat((_typeMap$_this$type8 = typeMap[_this.type]) === null || _typeMap$_this$type8 === void 0 ? void 0 : _typeMap$_this$type8.sendName),
|
|
@@ -106,7 +106,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
|
|
|
106
106
|
});
|
|
107
107
|
});
|
|
108
108
|
_defineProperty(this, "filterConfig", function (item) {
|
|
109
|
-
return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD"].includes(_this.type) ? {
|
|
109
|
+
return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD", "JKY_SEND_GOOD"].includes(_this.type) ? {
|
|
110
110
|
searchDefaultConditions: SYMBOL.in,
|
|
111
111
|
type: item.type,
|
|
112
112
|
id: "".concat(item.id, "_").concat(_this.suffixSendName),
|
package/dist/esm/factory.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect } from "./index";
|
|
2
2
|
import { PickOption } from "./type";
|
|
3
|
-
export declare const factory: (type: string, options: PickOption) => BsLogistics |
|
|
3
|
+
export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | JstSendGood | PublicGoods | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyGoods | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
|
package/dist/esm/factory.js
CHANGED
|
@@ -145,6 +145,7 @@ export var factory = function factory(type, options) {
|
|
|
145
145
|
case "GY_SYSTEM_ORDER":
|
|
146
146
|
case "JST_SYSTEM_ORDER":
|
|
147
147
|
case "JY_SYSTEM_ORDER":
|
|
148
|
+
case "JKY_SYSTEM_ORDER":
|
|
148
149
|
case "WDT_RETURN_BILL_NO":
|
|
149
150
|
return new BsSystemOrder(options);
|
|
150
151
|
case "JST_SEND_GOOD":
|
|
@@ -155,6 +156,7 @@ export var factory = function factory(type, options) {
|
|
|
155
156
|
case "KM_SEND_GOOD":
|
|
156
157
|
case "GY_SEND_GOOD":
|
|
157
158
|
case "JY_SEND_GOOD":
|
|
159
|
+
case "JKY_SEND_GOOD":
|
|
158
160
|
return new JstSendGood(options);
|
|
159
161
|
case "BS_POSTING":
|
|
160
162
|
return new BsPosting(options);
|
|
@@ -165,6 +167,7 @@ export var factory = function factory(type, options) {
|
|
|
165
167
|
case "GY_GOODS":
|
|
166
168
|
return new GyGoods(options);
|
|
167
169
|
case "JY_GOODS":
|
|
170
|
+
case "JKY_GOODS":
|
|
168
171
|
case "KM_GOODS":
|
|
169
172
|
case "JST_GOODS":
|
|
170
173
|
case "WDT_AFTERSALE_GOODS":
|
|
@@ -210,6 +213,7 @@ export var factory = function factory(type, options) {
|
|
|
210
213
|
case "KM_LOGISTICS":
|
|
211
214
|
case "GY_LOGISTICS":
|
|
212
215
|
case "JY_LOGISTICS":
|
|
216
|
+
case "JKY_LOGISTICS":
|
|
213
217
|
case "SKX_LOGISTICS":
|
|
214
218
|
case "SKX_RETURN_LOGISTICS":
|
|
215
219
|
return new BsLogistics(options);
|
|
@@ -12,6 +12,7 @@ export declare const queryBsE3LogisticsCompany: () => Promise<void>;
|
|
|
12
12
|
export declare const queryJSTLogisticsCompany: () => Promise<void>;
|
|
13
13
|
export declare const queryGYLogisticsCompany: () => Promise<void>;
|
|
14
14
|
export declare const queryJYLogisticsCompany: () => Promise<void>;
|
|
15
|
+
export declare const queryJKYLogisticsCompany: () => Promise<void>;
|
|
15
16
|
export declare const queryWLNLogisticsCompany: () => Promise<void>;
|
|
16
17
|
export declare const queryKMLogisticsCompany: () => Promise<void>;
|
|
17
18
|
export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
|
package/dist/esm/service/api.js
CHANGED
|
@@ -301,6 +301,12 @@ export var queryJYLogisticsCompany = function queryJYLogisticsCompany() {
|
|
|
301
301
|
instance.expressData = data;
|
|
302
302
|
}).catch(console.log);
|
|
303
303
|
};
|
|
304
|
+
export var queryJKYLogisticsCompany = function queryJKYLogisticsCompany() {
|
|
305
|
+
var instance = ExpressData.getInstance("jky");
|
|
306
|
+
return servers.JKY.getLogisticsDataAsync().then(function (data) {
|
|
307
|
+
instance.expressData = data;
|
|
308
|
+
}).catch(console.log);
|
|
309
|
+
};
|
|
304
310
|
export var queryWLNLogisticsCompany = function queryWLNLogisticsCompany() {
|
|
305
311
|
var instance = ExpressData.getInstance("wln");
|
|
306
312
|
return servers.WLN.getLogisticsDataAsync().then(function (data) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/services-components",
|
|
3
|
-
"version": "2.2.39-beta.
|
|
3
|
+
"version": "2.2.39-beta.14",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
]
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@kmkf-fe-packages/basic-components": "2.2.39-beta.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "2.2.39-beta.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "2.2.39-beta.14",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "2.2.39-beta.14",
|
|
26
26
|
"b64-to-blob": "^1.2.19",
|
|
27
27
|
"html2canvas": "^1.4.1",
|
|
28
28
|
"react-pdf-js": "^5.1.0"
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "02671cc897620877ff1d3154371954783272bb27",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|