kmkf-work-order-service-component 0.4.10-alpha.1 → 0.4.10-alpha.3
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/FormRender/index.js +39 -5
- package/dist/esm/FormRender/index.less +1 -1
- package/dist/esm/SingleShopWorkOrder/components/CustomizeFormModal/index.js +4 -4
- package/dist/esm/SingleShopWorkOrder/components/CustomizeFormModal/index.less +1 -1
- package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.js +2 -3
- package/dist/esm/common/utils/tools.d.ts +1 -0
- package/dist/esm/common/utils/tools.js +184 -162
- package/package.json +1 -1
@@ -433,14 +433,14 @@ var FormRender = function FormRender(props, ref) {
|
|
433
433
|
|
434
434
|
|
435
435
|
var orderBackReplace = function orderBackReplace(value) {
|
436
|
-
var
|
437
|
-
|
436
|
+
var orderNo = value.orderNo,
|
437
|
+
buyerNick = value.buyerNick,
|
438
438
|
receiveMobile = value.receiveMobile,
|
439
439
|
alipayAccount = value.alipayAccount,
|
440
440
|
expressLogisticsCode = value.expressLogisticsCode;
|
441
441
|
queryReplaceCount({
|
442
|
-
tradeId:
|
443
|
-
buyerNick:
|
442
|
+
tradeId: orderNo,
|
443
|
+
buyerNick: buyerNick,
|
444
444
|
receiveMobile: receiveMobile,
|
445
445
|
alipayAccount: alipayAccount,
|
446
446
|
expressLogisticsCode: expressLogisticsCode
|
@@ -654,7 +654,41 @@ var FormRender = function FormRender(props, ref) {
|
|
654
654
|
|
655
655
|
return cur;
|
656
656
|
}, []);
|
657
|
-
form.resetFields(needClearFormFields);
|
657
|
+
form.resetFields(needClearFormFields); //如果有聚水潭组件 设置成初始值
|
658
|
+
|
659
|
+
var hasJst = get(templateDetail, 'componentDtoList', []).some(function (item) {
|
660
|
+
return ['JST_LOGISTICS', 'JST_SUPPLY', 'JST_SEND_GOOD'].includes(item.workOrderComponentType);
|
661
|
+
});
|
662
|
+
|
663
|
+
if (hasJst) {
|
664
|
+
var jstValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
|
665
|
+
switch (next.workOrderComponentType) {
|
666
|
+
case 'JST_LOGISTICS':
|
667
|
+
prv[next.uniqueKey] = [{
|
668
|
+
logisticsCompany: null,
|
669
|
+
logisticsCode: null
|
670
|
+
}];
|
671
|
+
break;
|
672
|
+
|
673
|
+
case 'JST_SUPPLY':
|
674
|
+
prv[next.uniqueKey] = [{
|
675
|
+
supplyId: null
|
676
|
+
}];
|
677
|
+
break;
|
678
|
+
|
679
|
+
case 'JST_SEND_GOOD':
|
680
|
+
prv[next.uniqueKey] = [{
|
681
|
+
sendName: '',
|
682
|
+
sendId: ''
|
683
|
+
}];
|
684
|
+
break;
|
685
|
+
}
|
686
|
+
|
687
|
+
return prv;
|
688
|
+
}, {});
|
689
|
+
form.setFieldsValue(jstValue);
|
690
|
+
} //切换店铺时,判断是否有订单号 有订单号自动订单返填
|
691
|
+
|
658
692
|
|
659
693
|
var allValue = form.getFieldsValue();
|
660
694
|
var tradeIdUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo3 = templateDetail.componentDtoList.find(function (item) {
|
@@ -463,14 +463,14 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
|
|
463
463
|
|
464
464
|
|
465
465
|
var orderBackReplace = function orderBackReplace(value) {
|
466
|
-
var
|
467
|
-
|
466
|
+
var orderNo = value.orderNo,
|
467
|
+
buyerNick = value.buyerNick,
|
468
468
|
receiveMobile = value.receiveMobile,
|
469
469
|
alipayAccount = value.alipayAccount,
|
470
470
|
expressLogisticsCode = value.expressLogisticsCode;
|
471
471
|
queryReplaceCount({
|
472
|
-
tradeId:
|
473
|
-
buyerNick:
|
472
|
+
tradeId: orderNo,
|
473
|
+
buyerNick: buyerNick,
|
474
474
|
receiveMobile: receiveMobile,
|
475
475
|
alipayAccount: alipayAccount,
|
476
476
|
expressLogisticsCode: expressLogisticsCode
|
@@ -220,11 +220,10 @@ var content = function content(item, index) {
|
|
220
220
|
export var JstGoodImage = function JstGoodImage(_ref6) {
|
221
221
|
var list = _ref6.list,
|
222
222
|
type = _ref6.type;
|
223
|
-
console.log(list);
|
224
223
|
return list.length ? (list || []).map(function (item, index) {
|
225
224
|
var logisticsCompany = item.logisticsCompany;
|
226
225
|
var company = express.getExpressNameByCode(logisticsCompany);
|
227
|
-
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null,
|
226
|
+
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
|
228
227
|
content: content(item, index)
|
229
228
|
}, /*#__PURE__*/React.createElement("span", {
|
230
229
|
key: index,
|
@@ -232,6 +231,6 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
|
|
232
231
|
color: '#1890ff',
|
233
232
|
cursor: 'pointer'
|
234
233
|
}
|
235
|
-
}, "\u5305\u88F9".concat(index + 1), ":"))
|
234
|
+
}, "\u5305\u88F9".concat(index + 1), ":")), type === 1 ? /*#__PURE__*/React.createElement("span", null, company && item.logisticsCode ? [company, item.logisticsCode].join('/') : company ? company : item.logisticsCode) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyId) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendName, item.sendId].join('/') : item.sendId ? item.sendId : item.sendName) : null));
|
236
235
|
}) : null;
|
237
236
|
};
|
@@ -78,5 +78,6 @@ export declare const getReplaceWarnValues: (templateDetail: {
|
|
78
78
|
}, keyValues: {
|
79
79
|
[x: string]: any;
|
80
80
|
}) => any;
|
81
|
+
export declare const taobaoGoodHandle: (arr: any[], type: string, config: any) => any;
|
81
82
|
export declare const HasJstHandle: (templateDetail: any) => any;
|
82
83
|
export declare const updateJSTItemListHandle: (list?: any[], type?: string) => any;
|
@@ -802,7 +802,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
802
802
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
803
803
|
var _shopList$find;
|
804
804
|
|
805
|
-
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,
|
805
|
+
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;
|
806
806
|
|
807
807
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
808
808
|
while (1) {
|
@@ -826,18 +826,15 @@ export var orderBack = /*#__PURE__*/function () {
|
|
826
826
|
return item.shopId == shopId;
|
827
827
|
})) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr;
|
828
828
|
_context.prev = 5;
|
829
|
-
// let taobaoId = shopList.find(
|
830
|
-
// (item: any) => item.shopSourceStr === 'TAOBAO' && item.shopId == shopId,
|
831
|
-
// )?.taobaoId;
|
832
829
|
promise = [orderDetail({
|
833
830
|
shopId: shopId,
|
834
831
|
//店铺id
|
835
832
|
orderNo: order_no,
|
836
833
|
//订单id
|
837
834
|
templateId: templateDetail.uniqueKey
|
838
|
-
})];
|
835
|
+
})]; //判断是否有聚水潭组件 有就请求jst订单接口
|
836
|
+
|
839
837
|
hasJst = HasJstHandle(templateDetail);
|
840
|
-
console.log(hasJst, templateDetail);
|
841
838
|
|
842
839
|
if (hasJst) {
|
843
840
|
promise.push(jstOrderDetail({
|
@@ -845,157 +842,143 @@ export var orderBack = /*#__PURE__*/function () {
|
|
845
842
|
}));
|
846
843
|
}
|
847
844
|
|
848
|
-
_context.next =
|
845
|
+
_context.next = 11;
|
849
846
|
return Promise.allSettled(promise);
|
850
847
|
|
851
|
-
case
|
848
|
+
case 11:
|
852
849
|
_yield$Promise$allSet = _context.sent;
|
853
850
|
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 2);
|
854
851
|
data = _yield$Promise$allSet2[0];
|
855
852
|
jstOrder = _yield$Promise$allSet2[1];
|
856
|
-
orderInfo = data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data;
|
857
|
-
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;
|
858
|
-
_ref3 = orderInfo || {}, orderNo = _ref3.orderNo, provinceCode = _ref3.provinceCode, cityCode = _ref3.cityCode, townCode = _ref3.townCode, orderCreateDateTime = _ref3.orderCreateDateTime, orderPaymentDateTime = _ref3.orderPaymentDateTime, orderDeliveryDateTime = _ref3.orderDeliveryDateTime, orderClosingDateTime = _ref3.orderClosingDateTime, itemList = _ref3.itemList, buyerNick = _ref3.buyerNick, buyerOpenUid = _ref3.buyerOpenUid, jstItemList = _ref3.jstItemList;
|
859
|
-
transField = orderInfo ? {
|
860
|
-
tradeId: orderNo,
|
861
|
-
province: provinceCode,
|
862
|
-
city: cityCode,
|
863
|
-
district: townCode,
|
864
|
-
tradeCreateDateTime: orderCreateDateTime,
|
865
|
-
tradePaymentDateTime: orderPaymentDateTime,
|
866
|
-
tradeDeliveryDateTime: orderDeliveryDateTime,
|
867
|
-
tradeClosingDateTime: orderClosingDateTime,
|
868
|
-
goodId: itemList,
|
869
|
-
goodSerial: itemList,
|
870
|
-
jstItemSelectThird: jstItemList,
|
871
|
-
jstLogistics: jstItemList,
|
872
|
-
jstSupply: jstItemList,
|
873
|
-
jstSendGood: jstItemList
|
874
|
-
} : {};
|
875
|
-
|
876
|
-
if (jstInfo) {
|
877
|
-
transField = _objectSpread(_objectSpread({}, transField), {}, {
|
878
|
-
jstItemSelectThird: jstInfo,
|
879
|
-
jstLogistics: jstInfo,
|
880
|
-
jstSupply: jstInfo,
|
881
|
-
jstSendGood: jstInfo
|
882
|
-
});
|
883
|
-
}
|
884
|
-
|
885
|
-
finalResponse = {};
|
886
|
-
|
887
|
-
if (orderInfo) {
|
888
|
-
finalResponse = _objectSpread(_objectSpread({}, orderInfo || {}), transField);
|
889
|
-
}
|
890
|
-
|
891
|
-
if (buyerNick || buyerOpenUid) {
|
892
|
-
finalResponse = _objectSpread(_objectSpread({}, finalResponse), {}, {
|
893
|
-
buyer: {
|
894
|
-
buyerNick: buyerNick,
|
895
|
-
buyerOpenUid: buyerOpenUid
|
896
|
-
} || {},
|
897
|
-
payBuyer: {
|
898
|
-
buyerNick: buyerNick,
|
899
|
-
buyerOpenUid: buyerOpenUid
|
900
|
-
} || {}
|
901
|
-
});
|
902
|
-
} //获取当前表单字段
|
903
|
-
|
853
|
+
orderInfo = (data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data) || {};
|
854
|
+
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) || []; //获取当前表单字段
|
904
855
|
|
905
856
|
formValue = form.getFieldsValue();
|
906
|
-
detail =
|
857
|
+
detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
|
858
|
+
jstItemList: jstInfo
|
859
|
+
}); //抖音数据特殊处理
|
907
860
|
|
908
861
|
if (shopSourceStr === 'FXG') {
|
909
|
-
detail = updateDYDetails(
|
910
|
-
}
|
911
|
-
|
912
|
-
|
913
|
-
|
914
|
-
|
915
|
-
|
916
|
-
|
917
|
-
|
918
|
-
|
919
|
-
|
920
|
-
|
921
|
-
|
922
|
-
|
923
|
-
|
924
|
-
|
925
|
-
|
926
|
-
|
927
|
-
|
928
|
-
|
929
|
-
|
930
|
-
|
931
|
-
|
932
|
-
|
933
|
-
|
934
|
-
|
935
|
-
|
936
|
-
|
937
|
-
|
938
|
-
|
939
|
-
|
940
|
-
|
941
|
-
|
942
|
-
|
943
|
-
|
944
|
-
|
945
|
-
|
946
|
-
|
947
|
-
|
948
|
-
|
949
|
-
|
950
|
-
|
951
|
-
|
952
|
-
|
953
|
-
|
954
|
-
|
955
|
-
|
956
|
-
|
957
|
-
|
958
|
-
|
959
|
-
|
960
|
-
|
961
|
-
|
962
|
-
|
963
|
-
|
964
|
-
|
965
|
-
|
966
|
-
|
967
|
-
|
968
|
-
|
969
|
-
|
970
|
-
|
971
|
-
|
972
|
-
|
973
|
-
|
974
|
-
|
975
|
-
|
976
|
-
|
977
|
-
|
978
|
-
|
979
|
-
|
980
|
-
|
981
|
-
|
982
|
-
|
983
|
-
|
984
|
-
|
985
|
-
|
986
|
-
|
987
|
-
|
988
|
-
|
989
|
-
|
990
|
-
|
991
|
-
|
992
|
-
|
993
|
-
|
994
|
-
|
862
|
+
detail = updateDYDetails(detail);
|
863
|
+
} //整合返回值
|
864
|
+
|
865
|
+
|
866
|
+
values = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
|
867
|
+
var uniqueKey = next.uniqueKey;
|
868
|
+
|
869
|
+
switch (next.workOrderComponentType) {
|
870
|
+
case 'TRADE_ID_INPUT':
|
871
|
+
prv[uniqueKey] = detail['orderNo'];
|
872
|
+
break;
|
873
|
+
|
874
|
+
case 'BUYER_NICK_INPUT':
|
875
|
+
prv[uniqueKey] = {
|
876
|
+
buyerNick: detail['buyerNick'],
|
877
|
+
buyerOpenUid: detail['buyerOpenUid']
|
878
|
+
};
|
879
|
+
break;
|
880
|
+
|
881
|
+
case 'RECEIVER_NAME_INPUT':
|
882
|
+
prv[uniqueKey] = detail['receiveName'];
|
883
|
+
break;
|
884
|
+
|
885
|
+
case 'RECEIVER_MOBILE_INPUT':
|
886
|
+
prv[uniqueKey] = detail['receiveMobile'];
|
887
|
+
break;
|
888
|
+
|
889
|
+
case 'RECEIVER_ADDRESS_INPUT':
|
890
|
+
prv[uniqueKey] = {
|
891
|
+
address: [+detail['provinceCode'], +detail['cityCode'], +detail['townCode']],
|
892
|
+
detail: detail['address'] || ''
|
893
|
+
};
|
894
|
+
break;
|
895
|
+
|
896
|
+
case 'TRADE_CREATE_DATETIME':
|
897
|
+
prv[uniqueKey] = detail['orderCreateDateTime'];
|
898
|
+
break;
|
899
|
+
|
900
|
+
case 'TRADE_PAYMENT_DATETIME':
|
901
|
+
prv[uniqueKey] = detail['orderPaymentDateTime'];
|
902
|
+
break;
|
903
|
+
|
904
|
+
case 'TRADE_DELIVERY_DATETIME':
|
905
|
+
prv[uniqueKey] = detail['orderDeliveryDateTime'];
|
906
|
+
break;
|
907
|
+
|
908
|
+
case 'TRADE_CLOSING_DATETIME':
|
909
|
+
prv[uniqueKey] = detail['orderClosingDateTime'];
|
910
|
+
break;
|
911
|
+
|
912
|
+
case 'ACTUAL_PAYMENT':
|
913
|
+
prv[uniqueKey] = detail['actualPayment'];
|
914
|
+
break;
|
915
|
+
|
916
|
+
case 'EXPRESS_LOGISTICS_SELECT':
|
917
|
+
prv[uniqueKey] = {
|
918
|
+
company: detail['expressLogisticsCompany'],
|
919
|
+
order: detail['expressLogisticsCode']
|
920
|
+
};
|
921
|
+
break;
|
922
|
+
|
923
|
+
case 'RETURN_LOGISTICS_SELECT':
|
924
|
+
prv[uniqueKey] = {
|
925
|
+
company: detail['returnLogisticsCompany'],
|
926
|
+
order: detail['returnLogisticsCode']
|
927
|
+
};
|
928
|
+
break;
|
929
|
+
|
930
|
+
case 'ALI_PAY_INPUT':
|
931
|
+
prv[uniqueKey] = {
|
932
|
+
name: detail['alipayName'],
|
933
|
+
user: detail['alipayAccount']
|
934
|
+
};
|
935
|
+
break;
|
936
|
+
|
937
|
+
case 'ITEM_SELECT':
|
938
|
+
case 'ITEM_ID':
|
939
|
+
case 'ITEM_ENCODE':
|
940
|
+
prv[uniqueKey] = taobaoGoodHandle(detail['itemList'], next.workOrderComponentType, next.componentConfig);
|
941
|
+
break;
|
942
|
+
|
943
|
+
case 'REMARK_INPUT':
|
944
|
+
prv[uniqueKey] = {
|
945
|
+
remark: detail['remark'] || '',
|
946
|
+
flag: !!detail['flag'] ? Number(detail['flag']) : detail['flag']
|
947
|
+
};
|
948
|
+
break;
|
949
|
+
|
950
|
+
case 'ENTERPRISE_PAYMENT':
|
951
|
+
//编辑的时候不能修改打款信息
|
952
|
+
if (type === 'edit') break;
|
953
|
+
prv[uniqueKey] = {
|
954
|
+
enterprisePaymentTid: '',
|
955
|
+
enterprisePaymentRefundFee: '',
|
956
|
+
enterprisePaymentBuyerNick: detail['buyerNick'],
|
957
|
+
enterprisePaymentBuyerOpenUid: detail['buyerOpenUid'],
|
958
|
+
enterprisePaymentAlipayNick: '',
|
959
|
+
enterprisePaymentAlipayNo: ''
|
960
|
+
};
|
961
|
+
break;
|
962
|
+
|
963
|
+
case 'JST_ITEM_SELECT_THIRD':
|
964
|
+
prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'itemList');
|
965
|
+
break;
|
966
|
+
|
967
|
+
case 'JST_SUPPLY':
|
968
|
+
prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'supply');
|
969
|
+
break;
|
970
|
+
|
971
|
+
case 'JST_SEND_GOOD':
|
972
|
+
prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'send');
|
973
|
+
break;
|
974
|
+
|
975
|
+
case 'JST_LOGISTICS':
|
976
|
+
prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'logistics');
|
977
|
+
break;
|
995
978
|
}
|
996
979
|
|
997
980
|
return prv;
|
998
|
-
}, {});
|
981
|
+
}, {}); //新建的情况下订单返填不能清空打款信息
|
999
982
|
|
1000
983
|
if (type !== 'edit') {
|
1001
984
|
paymentUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList.find(function (item) {
|
@@ -1003,29 +986,28 @@ export var orderBack = /*#__PURE__*/function () {
|
|
1003
986
|
})) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.uniqueKey;
|
1004
987
|
|
1005
988
|
if (paymentUniqueKey && orderInfo) {
|
1006
|
-
|
989
|
+
values[paymentUniqueKey] = _objectSpread(_objectSpread(_objectSpread({}, formValue[paymentUniqueKey]), values[paymentUniqueKey]), {}, {
|
1007
990
|
enterprisePaymentTid: order_no
|
1008
991
|
});
|
1009
992
|
}
|
1010
993
|
}
|
1011
994
|
|
1012
|
-
console.
|
1013
|
-
|
1014
|
-
|
1015
|
-
|
1016
|
-
_context.next = 37;
|
995
|
+
console.log(values);
|
996
|
+
form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
|
997
|
+
callback === null || callback === void 0 ? void 0 : callback(detail);
|
998
|
+
_context.next = 29;
|
1017
999
|
break;
|
1018
1000
|
|
1019
|
-
case
|
1020
|
-
_context.prev =
|
1001
|
+
case 27:
|
1002
|
+
_context.prev = 27;
|
1021
1003
|
_context.t0 = _context["catch"](5);
|
1022
1004
|
|
1023
|
-
case
|
1005
|
+
case 29:
|
1024
1006
|
case "end":
|
1025
1007
|
return _context.stop();
|
1026
1008
|
}
|
1027
1009
|
}
|
1028
|
-
}, _callee, null, [[5,
|
1010
|
+
}, _callee, null, [[5, 27]]);
|
1029
1011
|
}));
|
1030
1012
|
|
1031
1013
|
return function orderBack(_x) {
|
@@ -1034,24 +1016,23 @@ export var orderBack = /*#__PURE__*/function () {
|
|
1034
1016
|
}(); //抖音平台数据处理
|
1035
1017
|
|
1036
1018
|
var updateDYDetails = function updateDYDetails(value) {
|
1037
|
-
var details = _objectSpread({}, value);
|
1019
|
+
var details = _objectSpread({}, value); //处理地址
|
1038
1020
|
|
1039
|
-
var address = ['province', 'city', 'district']; //处理地址
|
1040
1021
|
|
1041
|
-
if (details['
|
1022
|
+
if (details['provinceCode']) {
|
1042
1023
|
//直辖市区特殊处理
|
1043
1024
|
var addList = ['110000', '120000', '310000', '500000'];
|
1044
1025
|
|
1045
|
-
if (addList.includes(details.
|
1046
|
-
var
|
1047
|
-
var newCity =
|
1026
|
+
if (addList.includes(details.provinceCode)) {
|
1027
|
+
var cityCode = details['cityCode'];
|
1028
|
+
var newCity = cityCode.split('');
|
1048
1029
|
newCity[3] = '1';
|
1049
|
-
details['
|
1030
|
+
details['cityCode'] = newCity.join('');
|
1050
1031
|
}
|
1051
1032
|
} //处理时间
|
1052
1033
|
|
1053
1034
|
|
1054
|
-
var times = ['
|
1035
|
+
var times = ['orderClosingDateTime', 'orderCreateDateTime', 'orderDeliveryDateTime', 'orderPaymentDateTime'];
|
1055
1036
|
times.forEach(function (item) {
|
1056
1037
|
if (details[item]) {
|
1057
1038
|
details[item] = moment(details[item]).format('YYYY-MM-DD HH:mm:ss');
|
@@ -1157,6 +1138,47 @@ export var getReplaceWarnValues = function getReplaceWarnValues(templateDetail,
|
|
1157
1138
|
});
|
1158
1139
|
return prv;
|
1159
1140
|
}, []);
|
1141
|
+
}; //淘宝商品组件信息处理
|
1142
|
+
|
1143
|
+
export var taobaoGoodHandle = function taobaoGoodHandle(arr, type, config) {
|
1144
|
+
var list = JSON.parse(JSON.stringify(arr));
|
1145
|
+
var changeSku = config.changeSku;
|
1146
|
+
return list.map(function (item) {
|
1147
|
+
var numIid = item.numIid,
|
1148
|
+
title = item.title,
|
1149
|
+
picUrl = item.picUrl,
|
1150
|
+
price = item.price,
|
1151
|
+
outerId = item.outerId,
|
1152
|
+
skuId = item.skuId,
|
1153
|
+
platform = item.platform,
|
1154
|
+
skuInfoDTO = item.skuInfoDTO;
|
1155
|
+
var params = {
|
1156
|
+
numIid: numIid,
|
1157
|
+
title: title,
|
1158
|
+
picUrl: picUrl,
|
1159
|
+
price: price,
|
1160
|
+
platform: platform
|
1161
|
+
};
|
1162
|
+
|
1163
|
+
if (skuInfoDTO) {
|
1164
|
+
params.picUrl = skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.picUrl;
|
1165
|
+
params.price = skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.price;
|
1166
|
+
params.skuId = skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.skuId;
|
1167
|
+
}
|
1168
|
+
|
1169
|
+
if (changeSku) {
|
1170
|
+
params.propertiesName = item.propertiesName;
|
1171
|
+
}
|
1172
|
+
|
1173
|
+
if (type === 'ITEM_ENCODE') {
|
1174
|
+
params.outerId = outerId;
|
1175
|
+
} else if (type === 'ITEM_SELECT_THIRD') {
|
1176
|
+
params.itemId = '';
|
1177
|
+
params.supplierName = '';
|
1178
|
+
}
|
1179
|
+
|
1180
|
+
return params;
|
1181
|
+
});
|
1160
1182
|
}; //聚水潭订单返填
|
1161
1183
|
|
1162
1184
|
export var HasJstHandle = function HasJstHandle(templateDetail) {
|