@kmkf-fe-packages/services-components 2.9.1-beta.14 → 2.9.1-beta.16
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/useGoodsSourceFormat.js +9 -5
- package/dist/esm/commonComponents/GlobalContext/hook/dist/useGetHasErpData.js +3 -0
- package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.js +1 -0
- package/dist/esm/commonComponents/GlobalContext/index.js +3 -1
- package/dist/esm/commonComponents/OperationLog/index.js +2 -0
- package/dist/esm/components/BS/BsGoods/dist/index.js +3 -0
- package/dist/esm/components/BS/BsGoods/index.js +1 -0
- package/dist/esm/components/Common/dist/index.js +3 -1
- package/dist/esm/components/Common/index.js +7 -7
- package/dist/esm/components/ErpTradeId/components/OrderNum/communication.js +2 -0
- package/dist/esm/components/PicturePro/PictureName.js +3 -1
- package/dist/esm/components/PicturePro/index.js +3 -1
- package/dist/esm/components/Public/AsyncSelect/index.js +7 -4
- package/dist/esm/components/ReceiverAddress/index.js +3 -2
- package/dist/esm/components/Select/index.js +1 -0
- package/dist/esm/factory.d.ts +1 -1
- package/dist/esm/service/api.js +18 -10
- package/dist/esm/service/request.js +4 -1
- package/package.json +4 -4
|
@@ -311,7 +311,7 @@ export var useGoodsSourceFormat = function useGoodsSourceFormat(goodsSource) {
|
|
|
311
311
|
getShopList().then(function (_ref5) {
|
|
312
312
|
var data = _ref5.data;
|
|
313
313
|
setShopList(data);
|
|
314
|
-
}).catch(
|
|
314
|
+
}).catch(console.warn);
|
|
315
315
|
queryCompanyUserSimpleInfoList().then(function (_ref6) {
|
|
316
316
|
var data = _ref6.data;
|
|
317
317
|
setUserList((data || []).map(function (_ref7) {
|
|
@@ -322,7 +322,7 @@ export var useGoodsSourceFormat = function useGoodsSourceFormat(goodsSource) {
|
|
|
322
322
|
value: userKey
|
|
323
323
|
};
|
|
324
324
|
}));
|
|
325
|
-
}).catch(
|
|
325
|
+
}).catch(console.warn);
|
|
326
326
|
getGroupList().then(function (_ref8) {
|
|
327
327
|
var data = _ref8.data;
|
|
328
328
|
setGroupList((data || []).map(function (_ref9) {
|
|
@@ -335,7 +335,7 @@ export var useGoodsSourceFormat = function useGoodsSourceFormat(goodsSource) {
|
|
|
335
335
|
relationUserList: relationUserList
|
|
336
336
|
};
|
|
337
337
|
}));
|
|
338
|
-
}).catch(
|
|
338
|
+
}).catch(console.warn);
|
|
339
339
|
|
|
340
340
|
// return () => {
|
|
341
341
|
// setShopList(void 0);
|
|
@@ -419,9 +419,13 @@ export var useGoodsSourceFormat = function useGoodsSourceFormat(goodsSource) {
|
|
|
419
419
|
// newFilterItems,
|
|
420
420
|
// allTableColumns,
|
|
421
421
|
// });
|
|
422
|
-
}).catch(function (error) {
|
|
422
|
+
}).catch(function (error) {
|
|
423
|
+
console.log("**** 获取表头信息 error", error);
|
|
424
|
+
});
|
|
423
425
|
}
|
|
424
|
-
}).catch(function (error) {
|
|
426
|
+
}).catch(function (error) {
|
|
427
|
+
console.log("**** in 获取流程数据 error", error);
|
|
428
|
+
});
|
|
425
429
|
}
|
|
426
430
|
}, [shopList, userList, groupList]);
|
|
427
431
|
return {
|
|
@@ -18,6 +18,7 @@ var getTemplate = function getTemplate(companyUserConfig) {
|
|
|
18
18
|
function useGetHasErpData() {
|
|
19
19
|
var companyUserConfig = react_redux_1.useSelector(toolkit_1.createSelector([function (state) {
|
|
20
20
|
var _a, _b, _c, _d;
|
|
21
|
+
console.log("state--useSelector", state);
|
|
21
22
|
/**
|
|
22
23
|
* pc main
|
|
23
24
|
* 端 workOrder
|
|
@@ -30,6 +31,7 @@ function useGetHasErpData() {
|
|
|
30
31
|
try {
|
|
31
32
|
companyUserConfig = JSON.parse(companyUserConfig);
|
|
32
33
|
} catch (e) {
|
|
34
|
+
console.error("companyUserConfig转换异常", companyUserConfig);
|
|
33
35
|
companyUserConfig = {};
|
|
34
36
|
}
|
|
35
37
|
}
|
|
@@ -40,6 +42,7 @@ function useGetHasErpData() {
|
|
|
40
42
|
setHasErpDataJson = _a[1];
|
|
41
43
|
react_1.useEffect(function () {
|
|
42
44
|
setHasErpDataJson(getTemplate(companyUserConfig));
|
|
45
|
+
console.log("companyUserConfig---", companyUserConfig);
|
|
43
46
|
}, [companyUserConfig]);
|
|
44
47
|
var hasErpData = react_1.useMemo(function () {
|
|
45
48
|
return JSON.parse(hasErpDataJson);
|
|
@@ -62,7 +62,9 @@ var Global = function Global(_ref) {
|
|
|
62
62
|
}
|
|
63
63
|
setUserInfo(_userInfo);
|
|
64
64
|
localStorage.setItem("reduxData_userInfo", JSON.stringify(_userInfo));
|
|
65
|
-
} catch (e) {
|
|
65
|
+
} catch (e) {
|
|
66
|
+
console.error(e);
|
|
67
|
+
}
|
|
66
68
|
}, [JSON.stringify(reduxData)]);
|
|
67
69
|
useEffect(function () {
|
|
68
70
|
initDataSource();
|
|
@@ -29,6 +29,7 @@ var OperationLog = function OperationLog(_ref) {
|
|
|
29
29
|
beforeList = JSON.parse(before);
|
|
30
30
|
afterList = JSON.parse(after);
|
|
31
31
|
} catch (e) {
|
|
32
|
+
console.log(e);
|
|
32
33
|
beforeList = [];
|
|
33
34
|
afterList = [];
|
|
34
35
|
}
|
|
@@ -135,6 +136,7 @@ var OperationLog = function OperationLog(_ref) {
|
|
|
135
136
|
}
|
|
136
137
|
return /*#__PURE__*/React.createElement("div", null, content);
|
|
137
138
|
} catch (e) {
|
|
139
|
+
console.error("日志信息JSON转换异常", e);
|
|
138
140
|
return /*#__PURE__*/React.createElement("div", null, content);
|
|
139
141
|
}
|
|
140
142
|
};
|
|
@@ -25,6 +25,7 @@ var BsGoods = /** @class */function () {
|
|
|
25
25
|
var _a;
|
|
26
26
|
this.renderClient = function (record) {
|
|
27
27
|
var _a, _b;
|
|
28
|
+
console.log("in renderclient");
|
|
28
29
|
return !kmkf_utils_1.isNull(record === null || record === void 0 ? void 0 : record["" + _this.id]) ? react_1["default"].createElement(react_1["default"].Fragment, null, react_1["default"].createElement(ItemView_1["default"], {
|
|
29
30
|
id: _this.id,
|
|
30
31
|
label: _this.name,
|
|
@@ -39,6 +40,7 @@ var BsGoods = /** @class */function () {
|
|
|
39
40
|
};
|
|
40
41
|
this.renderLog = function (r) {
|
|
41
42
|
var _a;
|
|
43
|
+
console.log("in renderclient");
|
|
42
44
|
if (kmkf_utils_1.isNull(r === null || r === void 0 ? void 0 : r[_this.id + "_bsGoods"])) return null;
|
|
43
45
|
return react_1["default"].createElement(Common_1.BsGoodsTable, {
|
|
44
46
|
list: (r === null || r === void 0 ? void 0 : r[_this.id + "_bsGoods"]) || [],
|
|
@@ -53,6 +55,7 @@ var BsGoods = /** @class */function () {
|
|
|
53
55
|
};
|
|
54
56
|
this.editRender = function (p) {
|
|
55
57
|
var _a, _b, _c, _d, _e, _f;
|
|
58
|
+
console.log("in renderclient");
|
|
56
59
|
return react_1["default"].createElement(GetFormItem_1["default"], {
|
|
57
60
|
title: _this.name,
|
|
58
61
|
name: _this.id,
|
|
@@ -148,6 +148,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
|
|
|
148
148
|
required: true,
|
|
149
149
|
validator: function validator(_, value) {
|
|
150
150
|
var _value$bsGoods3;
|
|
151
|
+
console.log("111");
|
|
151
152
|
if (!value || !(value !== null && value !== void 0 && (_value$bsGoods3 = value.bsGoods) !== null && _value$bsGoods3 !== void 0 && _value$bsGoods3.length)) {
|
|
152
153
|
return Promise.reject(new Error("请选择bs商品"));
|
|
153
154
|
}
|
|
@@ -189,7 +189,9 @@ exports.showImage = function (_a) {
|
|
|
189
189
|
src: picUrl
|
|
190
190
|
}), react_1["default"].createElement("div", {
|
|
191
191
|
className: index_module_less_1["default"].options,
|
|
192
|
-
onClick: function onClick() {
|
|
192
|
+
onClick: function onClick() {
|
|
193
|
+
console.log("show---", showHeader);
|
|
194
|
+
}
|
|
193
195
|
}, type === "itemId" && react_1["default"].createElement(TextTool, {
|
|
194
196
|
title: "商品id",
|
|
195
197
|
text: item.numIid
|
|
@@ -337,15 +337,15 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
|
|
|
337
337
|
idKey = _ref8.idKey;
|
|
338
338
|
var getContentData = function getContentData(item, index) {
|
|
339
339
|
if (item.platformId) return {
|
|
340
|
-
text: "平台售后单号",
|
|
340
|
+
text: item.hiddenPrefix ? undefined : "平台售后单号",
|
|
341
341
|
id: item.platformId
|
|
342
342
|
};
|
|
343
343
|
if (item.returnLogisticsCode) return {
|
|
344
|
-
text: "物流单号",
|
|
344
|
+
text: item.hiddenPrefix ? undefined : "物流单号",
|
|
345
345
|
id: item.returnLogisticsCode
|
|
346
346
|
};
|
|
347
347
|
return {
|
|
348
|
-
text: "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1),
|
|
348
|
+
text: item.hiddenPrefix ? undefined : "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1),
|
|
349
349
|
id: item.systemOrderId || item.systemOrderNo || (item === null || item === void 0 ? void 0 : item[idKey])
|
|
350
350
|
};
|
|
351
351
|
};
|
|
@@ -355,7 +355,7 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
|
|
|
355
355
|
style: {
|
|
356
356
|
textAlign: "center"
|
|
357
357
|
}
|
|
358
|
-
}, contentData.text, "\uFF1A", contentData.id));
|
|
358
|
+
}, contentData.text ? "".concat(contentData.text, "\uFF1A") : "", contentData.id));
|
|
359
359
|
};
|
|
360
360
|
return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
|
|
361
361
|
var _options$find;
|
|
@@ -377,7 +377,7 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
|
|
|
377
377
|
var currentOption = options.find(function (option) {
|
|
378
378
|
return item[valueKey] === option.value;
|
|
379
379
|
});
|
|
380
|
-
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, isShowPopover ? /*#__PURE__*/React.createElement(Popover, {
|
|
380
|
+
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, isShowPopover && getContentData(item, index).text ? /*#__PURE__*/React.createElement(Popover, {
|
|
381
381
|
content: orderContent(item, index),
|
|
382
382
|
overlayStyle: {
|
|
383
383
|
zIndex: 1080
|
|
@@ -769,7 +769,7 @@ export var KmVideoRender = function KmVideoRender(_ref13) {
|
|
|
769
769
|
src: fileUrl
|
|
770
770
|
})));
|
|
771
771
|
};
|
|
772
|
-
var RADIO_TABLE_KEYS = [
|
|
772
|
+
var RADIO_TABLE_KEYS = ["PLATFORM_AFTER_SALES_ORDER"];
|
|
773
773
|
export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
774
774
|
var value = _ref14.value,
|
|
775
775
|
type = _ref14.type,
|
|
@@ -803,7 +803,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
|
|
|
803
803
|
PLATFORM_AFTER_SALES_ORDER: "afterSaleOrderId"
|
|
804
804
|
};
|
|
805
805
|
var rowSelection = {
|
|
806
|
-
type: isRadio ?
|
|
806
|
+
type: isRadio ? "radio" : "checkbox",
|
|
807
807
|
selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || ((value === null || value === void 0 ? void 0 : value.showOrderInfo) || []).reduce(function (prv, next) {
|
|
808
808
|
if (next.select) {
|
|
809
809
|
prv.push(next[rowKeyMap[type]] || "billNo");
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// 查询订单详情
|
|
2
2
|
export var queryOrderDetail = function queryOrderDetail(tid) {
|
|
3
3
|
var _window, _window$parent;
|
|
4
|
+
console.log('请求ERP订单详情', tid);
|
|
4
5
|
(_window = window) === null || _window === void 0 ? void 0 : (_window$parent = _window.parent) === null || _window$parent === void 0 ? void 0 : _window$parent.postMessage({
|
|
5
6
|
method: 'queryOrder',
|
|
6
7
|
data: {
|
|
@@ -12,6 +13,7 @@ export var queryOrderDetail = function queryOrderDetail(tid) {
|
|
|
12
13
|
// 查询抖店openId
|
|
13
14
|
export var queryDouDianOpenId = function queryDouDianOpenId(originTid) {
|
|
14
15
|
var _window2, _window2$parent;
|
|
16
|
+
console.log('查询抖音店铺买家id', originTid);
|
|
15
17
|
(_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$parent = _window2.parent) === null || _window2$parent === void 0 ? void 0 : _window2$parent.postMessage({
|
|
16
18
|
method: 'queryDouDianOpenId',
|
|
17
19
|
data: {
|
|
@@ -74,7 +74,9 @@ var PictureName = /*#__PURE__*/_createClass(function PictureName(options) {
|
|
|
74
74
|
document.body.removeChild(a);
|
|
75
75
|
window.URL.revokeObjectURL(url);
|
|
76
76
|
});
|
|
77
|
-
} catch (error) {
|
|
77
|
+
} catch (error) {
|
|
78
|
+
console.error(error);
|
|
79
|
+
}
|
|
78
80
|
};
|
|
79
81
|
return /*#__PURE__*/React.createElement(Space, {
|
|
80
82
|
className: "pictruePc"
|
|
@@ -92,7 +92,9 @@ var BasicPicturePro = /*#__PURE__*/_createClass(function BasicPicturePro(options
|
|
|
92
92
|
document.body.removeChild(a);
|
|
93
93
|
window.URL.revokeObjectURL(url);
|
|
94
94
|
});
|
|
95
|
-
} catch (error) {
|
|
95
|
+
} catch (error) {
|
|
96
|
+
console.error(error);
|
|
97
|
+
}
|
|
96
98
|
} else {
|
|
97
99
|
copy("".concat(hostUrl, "/").concat(item.url));
|
|
98
100
|
message.success('图片链接复制成功');
|
|
@@ -45,7 +45,9 @@ var typeMap = {
|
|
|
45
45
|
}
|
|
46
46
|
version = ((_companyUserConfig = companyUserConfig) === null || _companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl = _companyUserConfig.plugins) === null || _companyUserConfig$pl === void 0 ? void 0 : (_companyUserConfig$pl2 = _companyUserConfig$pl.wdt) === null || _companyUserConfig$pl2 === void 0 ? void 0 : _companyUserConfig$pl2.version) || "flagship";
|
|
47
47
|
}
|
|
48
|
-
} catch (error) {
|
|
48
|
+
} catch (error) {
|
|
49
|
+
console.error(error);
|
|
50
|
+
}
|
|
49
51
|
if (version === "flagship") return 1;
|
|
50
52
|
},
|
|
51
53
|
handleOptions: function handleOptions(options) {
|
|
@@ -227,14 +229,15 @@ var AsyncSelect = /*#__PURE__*/function () {
|
|
|
227
229
|
componentConfig: this.componentConfig
|
|
228
230
|
});
|
|
229
231
|
}
|
|
230
|
-
_context.next =
|
|
232
|
+
_context.next = 14;
|
|
231
233
|
break;
|
|
232
234
|
case 11:
|
|
233
235
|
_context.prev = 11;
|
|
234
236
|
_context.t1 = _context["catch"](1);
|
|
235
|
-
|
|
236
|
-
return _context.abrupt("return", options);
|
|
237
|
+
console.debug("api error", _context.t1);
|
|
237
238
|
case 14:
|
|
239
|
+
return _context.abrupt("return", options);
|
|
240
|
+
case 15:
|
|
238
241
|
case "end":
|
|
239
242
|
return _context.stop();
|
|
240
243
|
}
|
|
@@ -94,12 +94,13 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
|
|
|
94
94
|
copy("".concat(addressText).concat(detail));
|
|
95
95
|
message.success('复制成功');
|
|
96
96
|
case 14:
|
|
97
|
-
_context.next =
|
|
97
|
+
_context.next = 19;
|
|
98
98
|
break;
|
|
99
99
|
case 16:
|
|
100
100
|
_context.prev = 16;
|
|
101
101
|
_context.t0 = _context["catch"](1);
|
|
102
|
-
|
|
102
|
+
console.log(_context.t0);
|
|
103
|
+
case 19:
|
|
103
104
|
case "end":
|
|
104
105
|
return _context.stop();
|
|
105
106
|
}
|
|
@@ -83,6 +83,7 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
|
|
|
83
83
|
});
|
|
84
84
|
_defineProperty(this, "renderClient", function (record) {
|
|
85
85
|
var _this$optionsMap;
|
|
86
|
+
console.log("renderClient", record, _this.getIsValue());
|
|
86
87
|
// 特殊自定义组件为平台状态时匹配出label
|
|
87
88
|
var label = _this.getIsValue() ? (_this$optionsMap = _this.optionsMap) === null || _this$optionsMap === void 0 ? void 0 : _this$optionsMap[record === null || record === void 0 ? void 0 : record[_this.id]] : record === null || record === void 0 ? void 0 : record[_this.id];
|
|
88
89
|
return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
|
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, 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, ReturnWarehouse, KmExchange } from "./index";
|
|
2
2
|
import { PickOption } from "./type";
|
|
3
|
-
export declare const factory: (type: string, options: PickOption) => CommonMultiStatus |
|
|
3
|
+
export declare const factory: (type: string, options: PickOption) => CommonMultiStatus | 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 | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | PublicGoods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
|
package/dist/esm/service/api.js
CHANGED
|
@@ -211,6 +211,7 @@ export var queryExpressInterceptData = function queryExpressInterceptData() {
|
|
|
211
211
|
value: _toConsumableArray(typeObj[key]).join(",")
|
|
212
212
|
};
|
|
213
213
|
});
|
|
214
|
+
console.log("typeObj---", typeObj, instance.typeOptions, companyTypeMap);
|
|
214
215
|
instance.typeConditionOptions = Object.keys(instance.typeNameMap).map(function (key) {
|
|
215
216
|
var type = key.split("|")[0];
|
|
216
217
|
return {
|
|
@@ -238,7 +239,10 @@ export var queryExpressInterceptData = function queryExpressInterceptData() {
|
|
|
238
239
|
}
|
|
239
240
|
});
|
|
240
241
|
instance.statusConditionOptions = tempList;
|
|
241
|
-
|
|
242
|
+
console.log("instance-----2", instance);
|
|
243
|
+
}).catch(function (e) {
|
|
244
|
+
console.log(e);
|
|
245
|
+
});
|
|
242
246
|
};
|
|
243
247
|
export var queryLogisticsAddressData = function queryLogisticsAddressData() {
|
|
244
248
|
return request({
|
|
@@ -249,7 +253,9 @@ export var queryLogisticsAddressData = function queryLogisticsAddressData() {
|
|
|
249
253
|
var data = res.data;
|
|
250
254
|
var instance = LogisticsAddressData.getInstance();
|
|
251
255
|
instance.addressData = data;
|
|
252
|
-
}).catch(function (e) {
|
|
256
|
+
}).catch(function (e) {
|
|
257
|
+
console.log(e);
|
|
258
|
+
});
|
|
253
259
|
};
|
|
254
260
|
export var queryAllLogisticsCompany = function queryAllLogisticsCompany() {
|
|
255
261
|
return request({
|
|
@@ -272,49 +278,50 @@ export var queryWdtLogisticsCompany = function queryWdtLogisticsCompany() {
|
|
|
272
278
|
var instance = ExpressData.getInstance("wdt");
|
|
273
279
|
return servers.getWdtSellerLogisticsCompanyRelation().then(function (data) {
|
|
274
280
|
instance.expressData = data;
|
|
275
|
-
}).catch(
|
|
281
|
+
}).catch(console.log);
|
|
276
282
|
};
|
|
277
283
|
export var queryBsE3LogisticsCompany = function queryBsE3LogisticsCompany() {
|
|
278
284
|
var instance = ExpressData.getInstance("bsE3");
|
|
279
285
|
return servers.BSE3.getLogisticsDataAsync().then(function (data) {
|
|
280
286
|
instance.expressData = data;
|
|
281
|
-
}).catch(
|
|
287
|
+
}).catch(console.log);
|
|
282
288
|
};
|
|
283
289
|
export var queryJSTLogisticsCompany = function queryJSTLogisticsCompany() {
|
|
284
290
|
var instance = ExpressData.getInstance("jst");
|
|
285
291
|
return servers.JST.getLogisticsDataAsync().then(function (data) {
|
|
286
292
|
instance.expressData = data;
|
|
287
|
-
}).catch(
|
|
293
|
+
}).catch(console.log);
|
|
288
294
|
};
|
|
289
295
|
export var queryGYLogisticsCompany = function queryGYLogisticsCompany() {
|
|
290
296
|
var instance = ExpressData.getInstance("gy");
|
|
291
297
|
return servers.GY.getLogisticsDataAsync().then(function (data) {
|
|
292
298
|
instance.expressData = data;
|
|
293
|
-
}).catch(
|
|
299
|
+
}).catch(console.log);
|
|
294
300
|
};
|
|
295
301
|
export var queryJYLogisticsCompany = function queryJYLogisticsCompany() {
|
|
296
302
|
var instance = ExpressData.getInstance("jy");
|
|
297
303
|
return servers.JY.getLogisticsDataAsync().then(function (data) {
|
|
298
304
|
instance.expressData = data;
|
|
299
|
-
}).catch(
|
|
305
|
+
}).catch(console.log);
|
|
300
306
|
};
|
|
301
307
|
export var queryJKYLogisticsCompany = function queryJKYLogisticsCompany() {
|
|
302
308
|
var instance = ExpressData.getInstance("jky");
|
|
309
|
+
console.log("queryJKYLogisticsCompany");
|
|
303
310
|
return servers.JKY.getLogisticsDataAsync().then(function (data) {
|
|
304
311
|
instance.expressData = data;
|
|
305
|
-
}).catch(
|
|
312
|
+
}).catch(console.log);
|
|
306
313
|
};
|
|
307
314
|
export var queryWLNLogisticsCompany = function queryWLNLogisticsCompany() {
|
|
308
315
|
var instance = ExpressData.getInstance("wln");
|
|
309
316
|
return servers.WLN.getLogisticsDataAsync().then(function (data) {
|
|
310
317
|
instance.expressData = data;
|
|
311
|
-
}).catch(
|
|
318
|
+
}).catch(console.log);
|
|
312
319
|
};
|
|
313
320
|
export var queryKMLogisticsCompany = function queryKMLogisticsCompany() {
|
|
314
321
|
var instance = ExpressData.getInstance("km");
|
|
315
322
|
return servers.KM.getLogisticsDataAsync().then(function (data) {
|
|
316
323
|
instance.expressData = data;
|
|
317
|
-
}).catch(
|
|
324
|
+
}).catch(console.log);
|
|
318
325
|
};
|
|
319
326
|
// 获取支付宝电子回单
|
|
320
327
|
export var getAlipayBillReceipt = function getAlipayBillReceipt(data) {
|
|
@@ -338,6 +345,7 @@ export var queryLabel = function queryLabel() {
|
|
|
338
345
|
var finalData = JSON.parse(data);
|
|
339
346
|
instance.labelData = finalData;
|
|
340
347
|
} catch (e) {
|
|
348
|
+
console.error("转换标签数据数据异常");
|
|
341
349
|
instance.labelData = [];
|
|
342
350
|
}
|
|
343
351
|
});
|
|
@@ -52,10 +52,13 @@ var requestApi = function requestApi(_ref) {
|
|
|
52
52
|
message.warn(res.message);
|
|
53
53
|
} else if (infoLevel === 'error') {
|
|
54
54
|
message.error(res.message);
|
|
55
|
-
} else {
|
|
55
|
+
} else {
|
|
56
|
+
console.log(res.message);
|
|
57
|
+
}
|
|
56
58
|
reject(res);
|
|
57
59
|
}
|
|
58
60
|
}).catch(function (e) {
|
|
61
|
+
console.error('请求错误', e);
|
|
59
62
|
reject(e);
|
|
60
63
|
});
|
|
61
64
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/services-components",
|
|
3
|
-
"version": "2.9.1-beta.
|
|
3
|
+
"version": "2.9.1-beta.16",
|
|
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.9.1-beta.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "2.9.1-beta.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "2.9.1-beta.16",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "2.9.1-beta.16",
|
|
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": "0d4c65d4544173d9f760d4677cc695763cf78792",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|