kmkf-work-order-service-component 0.5.1-alpha.2 → 0.5.1-alpha.3
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/esm/FormRender/index.js +15 -12
- package/dist/esm/common/utils/tools.js +26 -13
- package/package.json +1 -1
@@ -257,7 +257,7 @@ var FormRender = function FormRender(props, ref) {
|
|
257
257
|
});
|
258
258
|
}
|
259
259
|
|
260
|
-
_context.next =
|
260
|
+
_context.next = 38;
|
261
261
|
break;
|
262
262
|
|
263
263
|
case 24:
|
@@ -278,11 +278,14 @@ var FormRender = function FormRender(props, ref) {
|
|
278
278
|
accessToken: get(find(shopList, function (s) {
|
279
279
|
return s.shopId === shopId;
|
280
280
|
}), 'accessToken', ''),
|
281
|
-
buyerOpenUid: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid) || buyerId,
|
282
|
-
buyerNick: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerNick) || buyerNick,
|
283
281
|
source: get(platformMap, "".concat(platform), '工单通')
|
284
282
|
};
|
285
|
-
_params.workOrderComponentVos = submitDataTransOldFormat(data, templateDetail, !!workOrderId, workOrderDetail, _params);
|
283
|
+
_params.workOrderComponentVos = submitDataTransOldFormat(data, templateDetail, !!workOrderId, workOrderDetail, _params); //飞鸽端外部传递买家id
|
284
|
+
|
285
|
+
if (platform === 'fxg') {
|
286
|
+
_params.buyerOpenUid = buyerId;
|
287
|
+
}
|
288
|
+
|
286
289
|
hasEnterPrisePayment = some(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, function (item) {
|
287
290
|
return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
|
288
291
|
});
|
@@ -308,10 +311,10 @@ var FormRender = function FormRender(props, ref) {
|
|
308
311
|
|
309
312
|
console.debug('增加数据参数', _params); // return;
|
310
313
|
|
311
|
-
_context.next =
|
314
|
+
_context.next = 34;
|
312
315
|
return addWorkOrder(_params);
|
313
316
|
|
314
|
-
case
|
317
|
+
case 34:
|
315
318
|
_yield$addWorkOrder = _context.sent;
|
316
319
|
_success = _yield$addWorkOrder.success;
|
317
320
|
_result = _yield$addWorkOrder.data;
|
@@ -324,13 +327,13 @@ var FormRender = function FormRender(props, ref) {
|
|
324
327
|
});
|
325
328
|
}
|
326
329
|
|
327
|
-
case
|
330
|
+
case 38:
|
328
331
|
console.groupEnd();
|
329
|
-
_context.next =
|
332
|
+
_context.next = 44;
|
330
333
|
break;
|
331
334
|
|
332
|
-
case
|
333
|
-
_context.prev =
|
335
|
+
case 41:
|
336
|
+
_context.prev = 41;
|
334
337
|
_context.t0 = _context["catch"](0);
|
335
338
|
|
336
339
|
// 表单校验失败错误时,将错误第一项滚动到可视区域
|
@@ -346,12 +349,12 @@ var FormRender = function FormRender(props, ref) {
|
|
346
349
|
}, 0);
|
347
350
|
}
|
348
351
|
|
349
|
-
case
|
352
|
+
case 44:
|
350
353
|
case "end":
|
351
354
|
return _context.stop();
|
352
355
|
}
|
353
356
|
}
|
354
|
-
}, _callee, null, [[0,
|
357
|
+
}, _callee, null, [[0, 41]]);
|
355
358
|
}));
|
356
359
|
|
357
360
|
return function asyncDoSave(_x, _x2) {
|
@@ -34,7 +34,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
|
|
34
34
|
|
35
35
|
import { get, isEmpty, find, keys, every } from 'lodash';
|
36
36
|
import V from 'voca';
|
37
|
-
import { orderDetail, jstOrderDetail } from "../../model/servers/api";
|
37
|
+
import { orderDetail, getThirdOpenUidByOrderNo, jstOrderDetail } from "../../model/servers/api";
|
38
38
|
import moment from 'moment';
|
39
39
|
import express from "./express";
|
40
40
|
import cache from "../cache";
|
@@ -796,7 +796,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
796
796
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
797
797
|
var _shopList$find;
|
798
798
|
|
799
|
-
var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, JOIN_SHOP, shopSourceStr, _data$value, _jstOrder$value, _jstOrder$value$data, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, orderInfo, jstInfo, formValue, detail, values, _templateDetail$compo, paymentUniqueKey;
|
799
|
+
var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, JOIN_SHOP, shopSourceStr, _shopList$find2, _data$value, _buyer$value, _jstOrder$value, _jstOrder$value$data, taobaoId, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, buyer, jstOrder, orderInfo, buyerInfo, jstInfo, formValue, detail, values, _templateDetail$compo, paymentUniqueKey;
|
800
800
|
|
801
801
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
802
802
|
while (1) {
|
@@ -820,13 +820,24 @@ export var orderBack = /*#__PURE__*/function () {
|
|
820
820
|
return item.shopId == shopId;
|
821
821
|
})) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr;
|
822
822
|
_context.prev = 5;
|
823
|
+
taobaoId = (_shopList$find2 = shopList.find(function (item) {
|
824
|
+
return item.shopSourceStr === 'TAOBAO' && item.shopId == shopId;
|
825
|
+
})) === null || _shopList$find2 === void 0 ? void 0 : _shopList$find2.taobaoId;
|
823
826
|
promise = [orderDetail({
|
824
827
|
shopId: shopId,
|
825
828
|
//店铺id
|
826
829
|
orderNo: order_no,
|
827
830
|
//订单id
|
828
831
|
templateId: templateDetail.uniqueKey
|
829
|
-
})];
|
832
|
+
})];
|
833
|
+
taobaoId ? promise.push(getThirdOpenUidByOrderNo({
|
834
|
+
orderNo: order_no,
|
835
|
+
toAppKey: '21819818',
|
836
|
+
platform: 'tb',
|
837
|
+
taobaoId: taobaoId
|
838
|
+
})) : promise.push(new Promise(function (resolve) {
|
839
|
+
resolve({});
|
840
|
+
})); //判断是否有聚水潭组件 有就请求jst订单接口
|
830
841
|
|
831
842
|
hasJst = HasJstHandle(templateDetail);
|
832
843
|
|
@@ -836,19 +847,21 @@ export var orderBack = /*#__PURE__*/function () {
|
|
836
847
|
}));
|
837
848
|
}
|
838
849
|
|
839
|
-
_context.next =
|
850
|
+
_context.next = 13;
|
840
851
|
return Promise.allSettled(promise);
|
841
852
|
|
842
|
-
case
|
853
|
+
case 13:
|
843
854
|
_yield$Promise$allSet = _context.sent;
|
844
|
-
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet,
|
855
|
+
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 3);
|
845
856
|
data = _yield$Promise$allSet2[0];
|
846
|
-
|
857
|
+
buyer = _yield$Promise$allSet2[1];
|
858
|
+
jstOrder = _yield$Promise$allSet2[2];
|
847
859
|
orderInfo = (data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data) || {};
|
860
|
+
buyerInfo = (buyer === null || buyer === void 0 ? void 0 : (_buyer$value = buyer.value) === null || _buyer$value === void 0 ? void 0 : _buyer$value.data) || {};
|
848
861
|
jstInfo = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : (_jstOrder$value$data = _jstOrder$value.data) === null || _jstOrder$value$data === void 0 ? void 0 : _jstOrder$value$data.orders) || []; //获取当前表单字段
|
849
862
|
|
850
863
|
formValue = form.getFieldsValue();
|
851
|
-
detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
|
864
|
+
detail = _objectSpread(_objectSpread(_objectSpread({}, orderInfo), buyerInfo), {}, {
|
852
865
|
jstItemList: jstInfo
|
853
866
|
}); //抖音数据特殊处理
|
854
867
|
|
@@ -990,19 +1003,19 @@ export var orderBack = /*#__PURE__*/function () {
|
|
990
1003
|
|
991
1004
|
form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
|
992
1005
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
993
|
-
_context.next =
|
1006
|
+
_context.next = 32;
|
994
1007
|
break;
|
995
1008
|
|
996
|
-
case
|
997
|
-
_context.prev =
|
1009
|
+
case 30:
|
1010
|
+
_context.prev = 30;
|
998
1011
|
_context.t0 = _context["catch"](5);
|
999
1012
|
|
1000
|
-
case
|
1013
|
+
case 32:
|
1001
1014
|
case "end":
|
1002
1015
|
return _context.stop();
|
1003
1016
|
}
|
1004
1017
|
}
|
1005
|
-
}, _callee, null, [[5,
|
1018
|
+
}, _callee, null, [[5, 30]]);
|
1006
1019
|
}));
|
1007
1020
|
|
1008
1021
|
return function orderBack(_x) {
|