@kmkf-fe-packages/services-components 2.2.13-beta.87 → 2.2.13-beta.92
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/components/BS/BsSystemOrder/index.js +3 -2
- package/dist/esm/components/BsE3/BsReissueE3/index.js +4 -1
- package/dist/esm/components/Common/constants/wdt.js +104 -0
- package/dist/esm/components/Common/index.js +5 -3
- package/dist/esm/components/CommonHeaderGood/index.js +140 -0
- package/dist/esm/components/Public/Goods/index.js +4 -0
- package/dist/esm/components/Public/ReissueGoods/index.js +7 -3
- package/dist/esm/components/ReturnLogistics/index.d.ts +7 -6
- package/dist/esm/components/ReturnLogistics/index.js +34 -17
- package/dist/esm/factory.d.ts +1 -1
- package/dist/esm/factory.js +2 -0
- package/package.json +4 -4
|
@@ -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 } 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";
|
|
@@ -25,7 +25,8 @@ var typeMap = {
|
|
|
25
25
|
BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG,
|
|
26
26
|
GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG,
|
|
27
27
|
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG,
|
|
28
|
-
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG
|
|
28
|
+
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG,
|
|
29
|
+
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG
|
|
29
30
|
};
|
|
30
31
|
var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
31
32
|
var _this = this,
|
|
@@ -178,11 +178,14 @@ var BsE3Reissue = /*#__PURE__*/_createClass(function BsE3Reissue(options) {
|
|
|
178
178
|
this.rules = this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
|
|
179
179
|
required: true,
|
|
180
180
|
validator: function validator(_, value) {
|
|
181
|
-
var _value, _typeMap$options$type6;
|
|
181
|
+
var _value, _typeMap$options$type6, _typeMap$options$type8;
|
|
182
182
|
if (!value || !(value !== null && value !== void 0 && (_value = value["".concat((_typeMap$options$type6 = typeMap[options.type]) === null || _typeMap$options$type6 === void 0 ? void 0 : _typeMap$options$type6.key)]) !== null && _value !== void 0 && _value.length)) {
|
|
183
183
|
var _typeMap$options$type7;
|
|
184
184
|
return Promise.reject(new Error("".concat((_typeMap$options$type7 = typeMap[options.type]) === null || _typeMap$options$type7 === void 0 ? void 0 : _typeMap$options$type7.errMsg)));
|
|
185
185
|
}
|
|
186
|
+
if (!value || !(value !== null && value !== void 0 && value["".concat((_typeMap$options$type8 = typeMap[options.type]) === null || _typeMap$options$type8 === void 0 ? void 0 : _typeMap$options$type8.systemOrderNo)])) {
|
|
187
|
+
return Promise.reject(new Error("\u8BF7\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"));
|
|
188
|
+
}
|
|
186
189
|
return Promise.resolve();
|
|
187
190
|
}
|
|
188
191
|
}] : [];
|
|
@@ -299,6 +299,110 @@ var getColumns = function getColumns(_ref) {
|
|
|
299
299
|
};
|
|
300
300
|
return /*#__PURE__*/React.createElement("span", null, typeMap[val]);
|
|
301
301
|
}
|
|
302
|
+
}],
|
|
303
|
+
//旺店通售后商品信息
|
|
304
|
+
WDT_AFTERSALE_GOODS: [{
|
|
305
|
+
dataIndex: "oid",
|
|
306
|
+
title: "原始子单号",
|
|
307
|
+
align: "center",
|
|
308
|
+
ellipsis: true,
|
|
309
|
+
width: 200
|
|
310
|
+
}, {
|
|
311
|
+
dataIndex: "goodsName",
|
|
312
|
+
title: "货品名称",
|
|
313
|
+
align: "center",
|
|
314
|
+
ellipsis: true,
|
|
315
|
+
width: 150
|
|
316
|
+
}, {
|
|
317
|
+
dataIndex: "goodsNo",
|
|
318
|
+
title: "货品编码",
|
|
319
|
+
align: "center",
|
|
320
|
+
ellipsis: true,
|
|
321
|
+
width: 150
|
|
322
|
+
}, {
|
|
323
|
+
dataIndex: "specName",
|
|
324
|
+
title: "规格名称",
|
|
325
|
+
align: "center",
|
|
326
|
+
ellipsis: true,
|
|
327
|
+
width: 150
|
|
328
|
+
}, {
|
|
329
|
+
dataIndex: "specNo",
|
|
330
|
+
title: "商家编码",
|
|
331
|
+
align: "center",
|
|
332
|
+
ellipsis: true,
|
|
333
|
+
width: 150
|
|
334
|
+
}, {
|
|
335
|
+
dataIndex: "specCode",
|
|
336
|
+
title: "规格编号",
|
|
337
|
+
align: "center",
|
|
338
|
+
ellipsis: true,
|
|
339
|
+
width: 150
|
|
340
|
+
}, {
|
|
341
|
+
dataIndex: "barcode",
|
|
342
|
+
title: "条码",
|
|
343
|
+
align: "center",
|
|
344
|
+
ellipsis: true,
|
|
345
|
+
width: 150
|
|
346
|
+
}, {
|
|
347
|
+
dataIndex: "apiGoodsName",
|
|
348
|
+
title: "平台货品名称",
|
|
349
|
+
align: "center",
|
|
350
|
+
ellipsis: true,
|
|
351
|
+
width: 150
|
|
352
|
+
}, {
|
|
353
|
+
dataIndex: "apiSpecName",
|
|
354
|
+
title: "平台规格名称",
|
|
355
|
+
align: "center",
|
|
356
|
+
ellipsis: true,
|
|
357
|
+
width: 150
|
|
358
|
+
}, {
|
|
359
|
+
dataIndex: "suiteName",
|
|
360
|
+
title: "组合装名称",
|
|
361
|
+
align: "center",
|
|
362
|
+
ellipsis: true,
|
|
363
|
+
width: 150
|
|
364
|
+
}, {
|
|
365
|
+
dataIndex: "suiteNo",
|
|
366
|
+
title: "组合装编号",
|
|
367
|
+
align: "center",
|
|
368
|
+
ellipsis: true,
|
|
369
|
+
width: 150
|
|
370
|
+
}, {
|
|
371
|
+
dataIndex: "stockinNum",
|
|
372
|
+
title: "入库数量",
|
|
373
|
+
align: "center",
|
|
374
|
+
ellipsis: true,
|
|
375
|
+
width: 100
|
|
376
|
+
}, {
|
|
377
|
+
dataIndex: "refundNum",
|
|
378
|
+
title: "退款数量",
|
|
379
|
+
align: "center",
|
|
380
|
+
ellipsis: true,
|
|
381
|
+
width: 100
|
|
382
|
+
}, {
|
|
383
|
+
dataIndex: "totalAmount",
|
|
384
|
+
title: "退货总额",
|
|
385
|
+
align: "center",
|
|
386
|
+
ellipsis: true,
|
|
387
|
+
width: 100
|
|
388
|
+
}, {
|
|
389
|
+
dataIndex: "refundAmount",
|
|
390
|
+
title: "已退款金额",
|
|
391
|
+
align: "center",
|
|
392
|
+
ellipsis: true,
|
|
393
|
+
width: 100
|
|
394
|
+
}, {
|
|
395
|
+
dataIndex: "orderNum",
|
|
396
|
+
title: "实际发出数量",
|
|
397
|
+
align: "center",
|
|
398
|
+
ellipsis: true,
|
|
399
|
+
width: 100
|
|
400
|
+
}, {
|
|
401
|
+
dataIndex: "giftType",
|
|
402
|
+
title: "赠品方式",
|
|
403
|
+
align: "center",
|
|
404
|
+
ellipsis: true,
|
|
405
|
+
width: 100
|
|
302
406
|
}]
|
|
303
407
|
};
|
|
304
408
|
//旺店通补发商品信息
|
|
@@ -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, 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, 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
|
var Paragraph = Typography.Paragraph;
|
|
@@ -780,7 +780,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
780
780
|
BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG.columns,
|
|
781
781
|
GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns,
|
|
782
782
|
JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
|
|
783
|
-
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns
|
|
783
|
+
JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns,
|
|
784
|
+
WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns
|
|
784
785
|
};
|
|
785
786
|
var rowKeyMap = {
|
|
786
787
|
BS_SYSTEM_ORDER: "billNo",
|
|
@@ -790,7 +791,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
790
791
|
BS_E3_SYSTEM_ORDER: "orderSn",
|
|
791
792
|
GY_SYSTEM_ORDER: "billNo",
|
|
792
793
|
JST_SYSTEM_ORDER: "oId",
|
|
793
|
-
JY_SYSTEM_ORDER: "tradeNo"
|
|
794
|
+
JY_SYSTEM_ORDER: "tradeNo",
|
|
795
|
+
WDT_RETURN_BILL_NO: "refundNo"
|
|
794
796
|
};
|
|
795
797
|
var rowSelection = {
|
|
796
798
|
selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || ((value === null || value === void 0 ? void 0 : value.showOrderInfo) || []).reduce(function (prv, next) {
|
|
@@ -146,6 +146,146 @@ var GoodHeaderMap = {
|
|
|
146
146
|
},
|
|
147
147
|
moneyKey: "orderPrice"
|
|
148
148
|
},
|
|
149
|
+
WDT_AFTERSALE_GOODS: {
|
|
150
|
+
headerMap: {
|
|
151
|
+
oid: {
|
|
152
|
+
component: BsHeaderChild,
|
|
153
|
+
name: "原始子单号",
|
|
154
|
+
key: "oid",
|
|
155
|
+
width: 200
|
|
156
|
+
},
|
|
157
|
+
goodsName: {
|
|
158
|
+
component: BsHeaderChild,
|
|
159
|
+
name: "货品名称",
|
|
160
|
+
key: "goodsName",
|
|
161
|
+
width: 150
|
|
162
|
+
},
|
|
163
|
+
goodsNo: {
|
|
164
|
+
component: BsHeaderChild,
|
|
165
|
+
name: "货品编码",
|
|
166
|
+
key: "goodsNo",
|
|
167
|
+
width: 150
|
|
168
|
+
},
|
|
169
|
+
specName: {
|
|
170
|
+
component: BsHeaderChild,
|
|
171
|
+
name: "规格名称",
|
|
172
|
+
key: "specName",
|
|
173
|
+
width: 150
|
|
174
|
+
},
|
|
175
|
+
specNo: {
|
|
176
|
+
component: BsHeaderChild,
|
|
177
|
+
name: "商家编码",
|
|
178
|
+
key: "specNo",
|
|
179
|
+
width: 150
|
|
180
|
+
},
|
|
181
|
+
specCode: {
|
|
182
|
+
component: BsHeaderChild,
|
|
183
|
+
name: "规格编号",
|
|
184
|
+
key: "specCode",
|
|
185
|
+
width: 150
|
|
186
|
+
},
|
|
187
|
+
barcode: {
|
|
188
|
+
component: BsHeaderChild,
|
|
189
|
+
name: "条码",
|
|
190
|
+
key: "barcode",
|
|
191
|
+
width: 150
|
|
192
|
+
},
|
|
193
|
+
apiGoodsName: {
|
|
194
|
+
component: BsHeaderChild,
|
|
195
|
+
name: "平台货品名称",
|
|
196
|
+
key: "apiGoodsName",
|
|
197
|
+
width: 150
|
|
198
|
+
},
|
|
199
|
+
apiSpecName: {
|
|
200
|
+
component: BsHeaderChild,
|
|
201
|
+
name: "平台规格名称",
|
|
202
|
+
key: "apiSpecName",
|
|
203
|
+
width: 150
|
|
204
|
+
},
|
|
205
|
+
suiteName: {
|
|
206
|
+
component: BsHeaderChild,
|
|
207
|
+
name: "组合装名称",
|
|
208
|
+
key: "suiteName",
|
|
209
|
+
width: 150
|
|
210
|
+
},
|
|
211
|
+
suiteNo: {
|
|
212
|
+
component: BsHeaderChild,
|
|
213
|
+
name: "组合装编号",
|
|
214
|
+
key: "suiteNo",
|
|
215
|
+
width: 150
|
|
216
|
+
},
|
|
217
|
+
stockinNum: {
|
|
218
|
+
component: BsHeaderChild,
|
|
219
|
+
name: "入库数量",
|
|
220
|
+
key: "stockinNum",
|
|
221
|
+
width: 100
|
|
222
|
+
},
|
|
223
|
+
refundNum: {
|
|
224
|
+
component: BsHeaderChild,
|
|
225
|
+
name: "退款数量",
|
|
226
|
+
key: "refundNum",
|
|
227
|
+
width: 100
|
|
228
|
+
},
|
|
229
|
+
totalAmount: {
|
|
230
|
+
component: BsHeaderChild,
|
|
231
|
+
name: "退货总额",
|
|
232
|
+
key: "totalAmount",
|
|
233
|
+
width: 100
|
|
234
|
+
},
|
|
235
|
+
refundAmount: {
|
|
236
|
+
component: BsHeaderChild,
|
|
237
|
+
name: "已退款金额",
|
|
238
|
+
key: "refundAmount",
|
|
239
|
+
width: 100
|
|
240
|
+
},
|
|
241
|
+
orderNum: {
|
|
242
|
+
component: BsHeaderChild,
|
|
243
|
+
name: "实际发出数量",
|
|
244
|
+
key: "orderNum",
|
|
245
|
+
width: 100
|
|
246
|
+
},
|
|
247
|
+
price: {
|
|
248
|
+
component: BsHeaderChild,
|
|
249
|
+
name: "价格",
|
|
250
|
+
key: "price",
|
|
251
|
+
width: 100
|
|
252
|
+
},
|
|
253
|
+
originalPrice: {
|
|
254
|
+
component: BsHeaderChild,
|
|
255
|
+
name: "原价",
|
|
256
|
+
key: "originalPrice",
|
|
257
|
+
width: 100
|
|
258
|
+
},
|
|
259
|
+
giftType: {
|
|
260
|
+
component: BsHeaderChild,
|
|
261
|
+
name: "赠品类型",
|
|
262
|
+
key: "giftType",
|
|
263
|
+
width: 100
|
|
264
|
+
}
|
|
265
|
+
},
|
|
266
|
+
itemKey: {
|
|
267
|
+
oid: "原始子单号",
|
|
268
|
+
goodsName: "货品名称",
|
|
269
|
+
goodsNo: "货品编码",
|
|
270
|
+
specName: "规格名称",
|
|
271
|
+
specNo: "商家编码",
|
|
272
|
+
specCode: "规格编号",
|
|
273
|
+
barcode: "条码",
|
|
274
|
+
apiGoodsName: "平台货品名称",
|
|
275
|
+
apiSpecName: "平台规格名称",
|
|
276
|
+
suiteName: "组合装名称",
|
|
277
|
+
suiteNo: "组合装编号",
|
|
278
|
+
stockinNum: "入库数量",
|
|
279
|
+
refundNum: "退款数量",
|
|
280
|
+
totalAmount: "退货总额",
|
|
281
|
+
refundAmount: "已退款金额",
|
|
282
|
+
orderNum: "实际发出数量",
|
|
283
|
+
price: "价格",
|
|
284
|
+
originalPrice: "原价",
|
|
285
|
+
giftType: "赠品类型"
|
|
286
|
+
},
|
|
287
|
+
moneyKey: "totalAmount"
|
|
288
|
+
},
|
|
149
289
|
WDT_RETURN_GOODS: {
|
|
150
290
|
headerMap: {
|
|
151
291
|
goodId: {
|
|
@@ -256,18 +256,22 @@ var PublicReissue = /*#__PURE__*/_createClass(function PublicReissue(options) {
|
|
|
256
256
|
this.rules = [{
|
|
257
257
|
required: isRequired,
|
|
258
258
|
validator: function validator(_, value) {
|
|
259
|
-
var _value, _typeMap$options$type11;
|
|
259
|
+
var _value, _typeMap$options$type11, _typeMap$options$type13;
|
|
260
260
|
if (isRequired && (!value || !(value !== null && value !== void 0 && (_value = value["".concat((_typeMap$options$type11 = typeMap[options.type]) === null || _typeMap$options$type11 === void 0 ? void 0 : _typeMap$options$type11.key)]) !== null && _value !== void 0 && _value.length))) {
|
|
261
261
|
var _typeMap$options$type12;
|
|
262
262
|
return Promise.reject(new Error("".concat((_typeMap$options$type12 = typeMap[options.type]) === null || _typeMap$options$type12 === void 0 ? void 0 : _typeMap$options$type12.errMsg)));
|
|
263
263
|
}
|
|
264
|
+
// 快麦补发商品补发系统单需要校验
|
|
265
|
+
if (isRequired && ["KM_REISSUE_GOODS"].includes(options.type) && (!value || !(value !== null && value !== void 0 && value["".concat((_typeMap$options$type13 = typeMap[options.type]) === null || _typeMap$options$type13 === void 0 ? void 0 : _typeMap$options$type13.systemOrderNo)]))) {
|
|
266
|
+
return Promise.reject(new Error("\u8BF7\u9009\u62E9\u8865\u53D1\u7CFB\u7EDF\u5355"));
|
|
267
|
+
}
|
|
264
268
|
return Promise.resolve();
|
|
265
269
|
}
|
|
266
270
|
}, {
|
|
267
271
|
required: isRequired,
|
|
268
272
|
validator: function validator(_rule, value) {
|
|
269
|
-
var _typeMap$options$
|
|
270
|
-
return ((_typeMap$options$
|
|
273
|
+
var _typeMap$options$type14, _typeMap$options$type15;
|
|
274
|
+
return ((_typeMap$options$type14 = typeMap[options.type]) === null || _typeMap$options$type14 === void 0 ? void 0 : (_typeMap$options$type15 = _typeMap$options$type14.validator) === null || _typeMap$options$type15 === void 0 ? void 0 : _typeMap$options$type15.call(_typeMap$options$type14, _rule, value, options.type)) || function () {
|
|
271
275
|
return Promise.resolve();
|
|
272
276
|
};
|
|
273
277
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { ComponentInterface, PickOption, Record, ColumnConfig } from
|
|
2
|
-
import React from
|
|
3
|
-
import { ExpressData } from
|
|
4
|
-
import Express from
|
|
5
|
-
import ExpressCode from
|
|
1
|
+
import { ComponentInterface, PickOption, Record, ColumnConfig } from "../../type";
|
|
2
|
+
import React from "react";
|
|
3
|
+
import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
|
|
4
|
+
import Express from "../Express";
|
|
5
|
+
import ExpressCode from "../ExpressCode";
|
|
6
6
|
declare class ReturnLogistics implements ComponentInterface {
|
|
7
7
|
name: string;
|
|
8
8
|
id: string;
|
|
@@ -18,7 +18,8 @@ declare class ReturnLogistics implements ComponentInterface {
|
|
|
18
18
|
formField: string;
|
|
19
19
|
canSort: boolean;
|
|
20
20
|
children: ComponentInterface[];
|
|
21
|
-
dataType: ComponentInterface[
|
|
21
|
+
dataType: ComponentInterface["dataType"];
|
|
22
|
+
isChange: boolean;
|
|
22
23
|
constructor(options: PickOption);
|
|
23
24
|
renderClient: (record: any) => React.JSX.Element;
|
|
24
25
|
renderPc: () => null;
|
|
@@ -8,9 +8,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
8
8
|
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; }
|
|
9
9
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
10
10
|
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); }
|
|
11
|
-
import React from
|
|
12
|
-
import { ExpressData } from
|
|
13
|
-
import { ExpressLogistics } from
|
|
11
|
+
import React from "react";
|
|
12
|
+
import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
|
|
13
|
+
import { ExpressLogistics } from "@kmkf-fe-packages/basic-components";
|
|
14
14
|
import Express from "../Express";
|
|
15
15
|
import ExpressCode from "../ExpressCode";
|
|
16
16
|
import GetFormItem from "../GetFormItem";
|
|
@@ -33,6 +33,7 @@ var ReturnLogistics = /*#__PURE__*/_createClass(function ReturnLogistics(options
|
|
|
33
33
|
_defineProperty(this, "canSort", void 0);
|
|
34
34
|
_defineProperty(this, "children", void 0);
|
|
35
35
|
_defineProperty(this, "dataType", void 0);
|
|
36
|
+
_defineProperty(this, "isChange", void 0);
|
|
36
37
|
_defineProperty(this, "renderClient", function (record) {
|
|
37
38
|
return /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.renderClient(record), _this.expressCode.renderClient(record));
|
|
38
39
|
});
|
|
@@ -53,6 +54,20 @@ var ReturnLogistics = /*#__PURE__*/_createClass(function ReturnLogistics(options
|
|
|
53
54
|
});
|
|
54
55
|
_defineProperty(this, "editRender", function (p) {
|
|
55
56
|
var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4;
|
|
57
|
+
var onReturnLogisticsCodeBlur = function onReturnLogisticsCodeBlur(val) {
|
|
58
|
+
if (_this.isChange) {
|
|
59
|
+
var _p$onBlur;
|
|
60
|
+
p === null || p === void 0 ? void 0 : (_p$onBlur = p.onBlur) === null || _p$onBlur === void 0 ? void 0 : _p$onBlur.call(p, val, "returnLogisticsCode");
|
|
61
|
+
_this.isChange = false;
|
|
62
|
+
}
|
|
63
|
+
};
|
|
64
|
+
var onReturnLogisticsCodeChange = function onReturnLogisticsCodeChange() {
|
|
65
|
+
_this.isChange = true;
|
|
66
|
+
for (var _len = arguments.length, e = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
67
|
+
e[_key] = arguments[_key];
|
|
68
|
+
}
|
|
69
|
+
p === null || p === void 0 ? void 0 : p.onChange.apply(p, e);
|
|
70
|
+
};
|
|
56
71
|
return /*#__PURE__*/React.createElement(GetFormItem, {
|
|
57
72
|
title: _this.name,
|
|
58
73
|
name: _this.id,
|
|
@@ -60,18 +75,19 @@ var ReturnLogistics = /*#__PURE__*/_createClass(function ReturnLogistics(options
|
|
|
60
75
|
hidden: p === null || p === void 0 ? void 0 : p.hidden,
|
|
61
76
|
display: p === null || p === void 0 ? void 0 : p.display,
|
|
62
77
|
required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
|
|
63
|
-
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 :
|
|
78
|
+
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 : "",
|
|
64
79
|
component: /*#__PURE__*/React.createElement(ExpressLogistics, _extends({}, _this.componentConfig, {
|
|
65
80
|
options: _this.expressDateInstance.getExpressData(),
|
|
66
|
-
onBlur:
|
|
81
|
+
onBlur: onReturnLogisticsCodeBlur,
|
|
82
|
+
onChange: onReturnLogisticsCodeChange
|
|
67
83
|
}))
|
|
68
84
|
});
|
|
69
85
|
});
|
|
70
86
|
_defineProperty(this, "filterConfig", function (item) {
|
|
71
87
|
return [_this.express.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
|
|
72
|
-
subKey:
|
|
88
|
+
subKey: "returnLogisticsCompany"
|
|
73
89
|
})), _this.expressCode.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
|
|
74
|
-
subKey:
|
|
90
|
+
subKey: "returnLogisticsCode"
|
|
75
91
|
}))];
|
|
76
92
|
});
|
|
77
93
|
this.name = options.name;
|
|
@@ -80,37 +96,38 @@ var ReturnLogistics = /*#__PURE__*/_createClass(function ReturnLogistics(options
|
|
|
80
96
|
this.formField = options.id;
|
|
81
97
|
this.type = options.type;
|
|
82
98
|
this.showContains = false;
|
|
83
|
-
this.dataType =
|
|
99
|
+
this.dataType = "string";
|
|
84
100
|
this.componentConfig = options.componentConfig;
|
|
85
101
|
this.expressDateInstance = ExpressData.getInstance();
|
|
86
102
|
this.express = new Express(_objectSpread(_objectSpread({}, options), {}, {
|
|
87
|
-
name:
|
|
103
|
+
name: "退货物流公司",
|
|
88
104
|
id: "".concat(options.id, "_returnLogisticsCompany")
|
|
89
105
|
}));
|
|
90
106
|
this.expressCode = new ExpressCode(_objectSpread(_objectSpread({}, options), {}, {
|
|
91
|
-
name:
|
|
107
|
+
name: "退货物流单号",
|
|
92
108
|
id: "".concat(options.id, "_returnLogisticsCode")
|
|
93
109
|
}));
|
|
94
110
|
this.isCombinationComponent = true;
|
|
95
111
|
this.canSort = false;
|
|
96
|
-
this.dataType =
|
|
112
|
+
this.dataType = "object";
|
|
97
113
|
this.children = [this.express, this.expressCode];
|
|
114
|
+
this.isChange = false;
|
|
98
115
|
this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
|
|
99
116
|
validator: function validator(_, value) {
|
|
100
117
|
var _this$componentConfig6;
|
|
101
118
|
if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.isSingle) {
|
|
102
119
|
var _this$componentConfig7, _this$componentConfig8;
|
|
103
|
-
if (((_this$componentConfig7 = _this.componentConfig) === null || _this$componentConfig7 === void 0 ? void 0 : _this$componentConfig7.showField) ===
|
|
104
|
-
return Promise.reject(new Error(
|
|
105
|
-
} else if (((_this$componentConfig8 = _this.componentConfig) === null || _this$componentConfig8 === void 0 ? void 0 : _this$componentConfig8.showField) ===
|
|
106
|
-
return Promise.reject(new Error(
|
|
120
|
+
if (((_this$componentConfig7 = _this.componentConfig) === null || _this$componentConfig7 === void 0 ? void 0 : _this$componentConfig7.showField) === "EXPRESS_COMPANY" && !(value !== null && value !== void 0 && value.company)) {
|
|
121
|
+
return Promise.reject(new Error("请选择物流公司"));
|
|
122
|
+
} else if (((_this$componentConfig8 = _this.componentConfig) === null || _this$componentConfig8 === void 0 ? void 0 : _this$componentConfig8.showField) === "EXPRESS_WAYBILL_CODE" && !(value !== null && value !== void 0 && value.order)) {
|
|
123
|
+
return Promise.reject(new Error("请输入物流单号"));
|
|
107
124
|
}
|
|
108
125
|
} else {
|
|
109
126
|
if (!(value !== null && value !== void 0 && value.company)) {
|
|
110
|
-
return Promise.reject(new Error(
|
|
127
|
+
return Promise.reject(new Error("请选择物流公司"));
|
|
111
128
|
}
|
|
112
129
|
if (!(value !== null && value !== void 0 && value.order)) {
|
|
113
|
-
return Promise.reject(new Error(
|
|
130
|
+
return Promise.reject(new Error("请输入物流单号"));
|
|
114
131
|
}
|
|
115
132
|
}
|
|
116
133
|
return Promise.resolve();
|
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 | BasicFile | JstSendGood | MsgStatus | BasicPicture | BasicPicturePro | BasicSelect | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelectOption | BasicRadio | BasicTextArea | BasicMultSelect | BasicGrade | BasicRate | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics |
|
|
3
|
+
export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | BsE3Reissue | BasicFile | JstSendGood | MsgStatus | BasicPicture | BasicPicturePro | PublicGoods | PublicReissueGoods | ReturnLogistics | BasicSelect | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelectOption | BasicRadio | BasicTextArea | BasicMultSelect | BasicGrade | BasicRate | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicExchange | 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 | 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 "WDT_RETURN_BILL_NO":
|
|
148
149
|
return new BsSystemOrder(options);
|
|
149
150
|
case "JST_SEND_GOOD":
|
|
150
151
|
case "BS_SEND_GOOD":
|
|
@@ -166,6 +167,7 @@ export var factory = function factory(type, options) {
|
|
|
166
167
|
case "JY_GOODS":
|
|
167
168
|
case "KM_GOODS":
|
|
168
169
|
case "JST_GOODS":
|
|
170
|
+
case "WDT_AFTERSALE_GOODS":
|
|
169
171
|
return new PublicGoods(options);
|
|
170
172
|
case "JST_REISSUE_GOODS":
|
|
171
173
|
case "KM_REISSUE_GOODS":
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/services-components",
|
|
3
|
-
"version": "2.2.13-beta.
|
|
3
|
+
"version": "2.2.13-beta.92",
|
|
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.13-beta.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "2.2.13-beta.92",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.92",
|
|
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": "f6534d25e1f818911244be34af72a26de1996afa",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|