@kmkf-fe-packages/kmkf-work-order-service-component 0.26.1-beta.8 → 0.26.1

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.
Files changed (11) hide show
  1. package/dist/esm/FlowTemplateDetail/components/FormRender/index.js +2 -8
  2. package/dist/esm/FlowTemplateDetail/components/PreNodeRender/index.js +1 -4
  3. package/dist/esm/FlowTemplateDetail/index.js +0 -13
  4. package/dist/esm/FormRender/index.js +1 -6
  5. package/dist/esm/FormRenderTemplateId/index.js +1 -6
  6. package/dist/esm/TradeList/index.js +2 -1
  7. package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.js +3 -11
  8. package/dist/esm/WorkOrder/index.js +2 -7
  9. package/dist/esm/common/utils/tools.js +80 -191
  10. package/dist/esm/model/logicFlow/selector.d.ts +3 -0
  11. package/package.json +5 -5
package/dist/esm/FlowTemplateDetail/components/FormRender/index.js CHANGED
@@ -31,7 +31,7 @@ import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME,
31
31
  INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo } from "../../../common/utils/tools";
32
32
  import { replaceCheck, orderDetail } from "../../../model/servers/api";
33
33
  import { factory } from '@kmkf-fe-packages/services-components';
34
- import { AddressData, ExpressData, ExpressInterceptData, PlatData, getExpression, formatDisplayConfig, BsAddressData, WdtAddressData, isNull } from '@kmkf-fe-packages/kmkf-utils';
34
+ import { getExpression, formatDisplayConfig, isNull } from '@kmkf-fe-packages/kmkf-utils';
35
35
  import ShopName from "../ShopName";
36
36
  import { PlatForm } from "../../../model/flowTemplateDetail/types";
37
37
  import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
@@ -84,7 +84,7 @@ var FormRender = function FormRender(props, ref) {
84
84
  var logisticsMappingConfig = useMemo(function () {
85
85
  return templateDetail.componentDtoList.filter(function (item) {
86
86
  var _item$componentConfig;
87
- return ['LOGISTICS_TRAJECTORY_MORE', 'LOGISTICS_INTERCEPTION_MORE'].includes(item.workOrderComponentType) && ((_item$componentConfig = item.componentConfig) === null || _item$componentConfig === void 0 ? void 0 : _item$componentConfig.isOpen);
87
+ return item.workOrderComponentType === 'LOGISTICS_TRAJECTORY_MORE' && ((_item$componentConfig = item.componentConfig) === null || _item$componentConfig === void 0 ? void 0 : _item$componentConfig.isOpen);
88
88
  });
89
89
  }, [templateDetail]);
90
90
  var finallyMappdingHideComponents = useRef(mappingConfig.hideComponents);
@@ -111,12 +111,6 @@ var FormRender = function FormRender(props, ref) {
111
111
  _useState6 = _slicedToArray(_useState5, 2),
112
112
  shopId = _useState6[0],
113
113
  setShopId = _useState6[1];
114
- AddressData.getInstance();
115
- ExpressData.getInstance();
116
- ExpressInterceptData.getInstance();
117
- PlatData.getInstance();
118
- BsAddressData.getInstance();
119
- WdtAddressData.getInstance();
120
114
  var _Form$useForm = Form.useForm(),
121
115
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
122
116
  preNodeForm = _Form$useForm2[0];
package/dist/esm/FlowTemplateDetail/components/PreNodeRender/index.js CHANGED
@@ -13,10 +13,7 @@ var PreNodeRender = function PreNodeRender(props) {
13
13
  id: t.uniqueKey,
14
14
  name: t.name,
15
15
  componentConfig: t.componentConfig,
16
- type: t.workOrderComponentType,
17
- effects: {
18
- env: platform
19
- }
16
+ type: t.workOrderComponentType
20
17
  });
21
18
  // 淘宝端的买家昵称是需要亮灯展示的
22
19
  if (platform === PlatForm.TB && ['ENTERPRISE_PAYMENT', 'BUYER_NICK_INPUT'].includes(t.workOrderComponentType)) {
package/dist/esm/FlowTemplateDetail/index.js CHANGED
@@ -20,7 +20,6 @@ import { get, find, isEmpty } from 'lodash';
20
20
  import { useDispatch, useSelector, Provider, batch } from 'react-redux';
21
21
  import store from "../model/store";
22
22
  import zhCN from 'antd/es/locale/zh_CN';
23
- import { AddressData, ExpressData, ExpressInterceptData, PlatData, BsAddressData, WdtAddressData } from '@kmkf-fe-packages/kmkf-utils';
24
23
  import { calcWorkOrderList, deleteCacheOrder } from "../common/utils/tools";
25
24
  import { setPlat, fetchPanelInfo, fetchAllFlowOperateRecord, setAction, setVisibleRemarkList, setAddRemarkVisible, setLoading, setClearStore } from "../model/flowTemplateDetail";
26
25
  import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType } from "../model/flowTemplateDetail/selector";
@@ -137,15 +136,6 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
137
136
  var submitRequestLock = useRef(false);
138
137
  // 保存请求锁
139
138
  var saveRequestLock = useRef(false);
140
- // 数据初始化
141
- var initHandle = function initHandle() {
142
- ExpressData.getInstance();
143
- AddressData.getInstance();
144
- ExpressInterceptData.getInstance();
145
- PlatData.getInstance();
146
- BsAddressData.getInstance();
147
- WdtAddressData.getInstance();
148
- };
149
139
  var onUpdateRemark = function onUpdateRemark(remark) {
150
140
  var flag = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
151
141
  setOrderRemarkObj({
@@ -928,9 +918,6 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
928
918
  useEffect(function () {
929
919
  dispatch(setPlat(plat));
930
920
  }, [plat]);
931
- useEffect(function () {
932
- initHandle();
933
- }, []);
934
921
  var isCurrentNodeHandler = useMemo(function () {
935
922
  var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$wo24, _currentNodeDetail$no17, _currentNodeDetail$no18;
936
923
  return currentUserHasOperatorAuth({
package/dist/esm/FormRender/index.js CHANGED
@@ -29,7 +29,7 @@ import 'moment/locale/zh-cn';
29
29
  import { calcWorkOrderList, submitDataTransOldFormat, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME } from "../common/utils/tools";
30
30
  import { queryTemplateDetail, addLogicFlowWorkOrder, queryWorkOrderDetail, updateWorkOrder, replaceCheck, queryTemplateIdByFlowId } from "../model/servers/api";
31
31
  import { factory, ShopList } from '@kmkf-fe-packages/services-components';
32
- import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, getExpression, formatDisplayConfig, isNull } from '@kmkf-fe-packages/kmkf-utils';
32
+ import { getExpression, formatDisplayConfig, isNull } from '@kmkf-fe-packages/kmkf-utils';
33
33
  import { PlatForm } from "../WorkOrder/types";
34
34
  import "./index.less";
35
35
  import { CHILD_FIELD_TYPE, CHILD_FIELD_VALUE } from "../common/constant";
@@ -105,11 +105,6 @@ var FormRender = function FormRender(props, ref) {
105
105
  _useState12 = _slicedToArray(_useState11, 2),
106
106
  shopId = _useState12[0],
107
107
  setShopId = _useState12[1];
108
- AddressData.getInstance();
109
- ExpressData.getInstance();
110
- ExpressInterceptData.getInstance();
111
- PlatData.getInstance();
112
- LogisticsAddressData.getInstance();
113
108
  // TODO: 千牛端淘宝备注信息，不需要订单反填逻辑
114
109
  var fromQNCreateWorkOrderByOrderNo = !!orderNo && platform === PlatForm.TB;
115
110
  useEffect(function () {
package/dist/esm/FormRenderTemplateId/index.js CHANGED
@@ -29,7 +29,7 @@ import 'moment/locale/zh-cn';
29
29
  import { calcWorkOrderList, submitDataTransOldFormat, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME } from "../common/utils/tools";
30
30
  import { queryTemplateDetail, addWorkOrder, queryWorkOrderDetail, updateWorkOrder, replaceCheck } from "../model/servers/api";
31
31
  import { factory, ShopList } from '@kmkf-fe-packages/services-components';
32
- import { AddressData, ExpressData, ExpressInterceptData, PlatData, formatDisplayConfig, getExpression, isNull } from '@kmkf-fe-packages/kmkf-utils';
32
+ import { formatDisplayConfig, getExpression, isNull } from '@kmkf-fe-packages/kmkf-utils';
33
33
  import "./index.less";
34
34
  import { CHILD_FIELD_TYPE, CHILD_FIELD_VALUE } from "../common/constant";
35
35
  var ShopName = function ShopName(_ref) {
@@ -102,11 +102,6 @@ var FormRender = function FormRender(props, ref) {
102
102
  _useState12 = _slicedToArray(_useState11, 2),
103
103
  shopId = _useState12[0],
104
104
  setShopId = _useState12[1];
105
- AddressData.getInstance();
106
- ExpressData.getInstance();
107
- ExpressInterceptData.getInstance();
108
- PlatData.getInstance();
109
- // LogisticsAddressData.getInstance();
110
105
  useEffect(function () {
111
106
  setShopId(currentShopId);
112
107
  }, [currentShopId]);
package/dist/esm/TradeList/index.js CHANGED
@@ -14,6 +14,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
14
14
  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; }
15
15
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
16
16
  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); }
17
+ import { Global } from '@kmkf-fe-packages/services-components';
17
18
  import { getTradeList } from "../model/servers/api";
18
19
  import { queryLogicFlowList } from "../model/logicFlow/api";
19
20
  import { Space, Drawer } from 'antd';
@@ -138,7 +139,7 @@ var TradePage = function TradePage(props) {
138
139
  var onDealWorkOrderSuccess = function onDealWorkOrderSuccess() {
139
140
  setFormRenderVisible(false);
140
141
  };
141
- return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, {
142
+ return /*#__PURE__*/React.createElement(Global, null, /*#__PURE__*/React.createElement(Space, {
142
143
  direction: "vertical",
143
144
  style: {
144
145
  display: 'flex',
package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.js CHANGED
@@ -125,9 +125,7 @@ function PaymentWorkOrderCard(props) {
125
125
  accountNoMix = record.accountNoMix,
126
126
  tidRepeatPaymentUks = record.tidRepeatPaymentUks,
127
127
  remitTime = record.remitTime,
128
- buyerOpenUid = record.buyerOpenUid,
129
- alipayBillReceiptDetailId = record.alipayBillReceiptDetailId,
130
- bizCode = record.bizCode;
128
+ buyerOpenUid = record.buyerOpenUid;
131
129
  var btnList = workPayStatusFuncMap[workPayStatus].map(function (id) {
132
130
  return /*#__PURE__*/React.createElement("div", {
133
131
  className: "orderItemOperate",
@@ -141,7 +139,7 @@ function PaymentWorkOrderCard(props) {
141
139
  _useState2 = _slicedToArray(_useState, 2),
142
140
  visible = _useState2[0],
143
141
  setVisible = _useState2[1];
144
- var _useState3 = useState(''),
142
+ var _useState3 = useState(""),
145
143
  _useState4 = _slicedToArray(_useState3, 2),
146
144
  msg = _useState4[0],
147
145
  setMsg = _useState4[1];
@@ -322,13 +320,7 @@ function PaymentWorkOrderCard(props) {
322
320
  label: "\u5DE5\u5355\u7F16\u53F7\uFF1A",
323
321
  value: workOrderId || paymentOrderKey,
324
322
  tidRepeatPaymentUks: tidRepeatPaymentUks
325
- }), renderFormItem([{
326
- label: '支付凭证编码:',
327
- value: alipayBillReceiptDetailId
328
- }, {
329
- label: '业务订单号:',
330
- value: bizCode
331
- }])), /*#__PURE__*/React.createElement(Divider, {
323
+ })), /*#__PURE__*/React.createElement(Divider, {
332
324
  dashed: true,
333
325
  style: {
334
326
  margin: '12px 0'
package/dist/esm/WorkOrder/index.js CHANGED
@@ -22,7 +22,7 @@ import { fetchQueryCurrentCompanyUser } from "../model/workOrder";
22
22
  import { fetchLogicFlowList } from "../model/logicFlow";
23
23
  import { setCurrentBuyerChecked, showPayment } from "../model/customizeWorkOrder";
24
24
  import store from "../model/store";
25
- import { AddressData, BsAddressData, WdtAddressData } from '@kmkf-fe-packages/kmkf-utils';
25
+ import { Global } from '@kmkf-fe-packages/services-components';
26
26
  import OrderList from "./components/WorkOrderList";
27
27
  import Reminder from "./components/Reminder";
28
28
  import PaymentWorkOrderList from "./components/PaymentWorkOrderList";
@@ -110,11 +110,6 @@ var WorkOrder = function WorkOrder(props) {
110
110
  dispatch(fetchLogicFlowList);
111
111
  dispatch(fetchQueryCurrentCompanyUser());
112
112
  dispatch(showPayment);
113
- // ExpressData.getInstance();
114
- AddressData.getInstance().initData();
115
- BsAddressData.getInstance().initData();
116
- WdtAddressData.getInstance().initData();
117
- // ExpressInterceptData.getInstance();
118
113
  };
119
114
  //判断是否店铺是否授权
120
115
  useEffect(function () {
@@ -140,7 +135,7 @@ var WorkOrder = function WorkOrder(props) {
140
135
  }
141
136
  return opt;
142
137
  }, [isShowPayment]);
143
- return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Spin, {
138
+ return /*#__PURE__*/React.createElement(Global, null, /*#__PURE__*/React.createElement(Spin, {
144
139
  spinning: loading
145
140
  }, /*#__PURE__*/React.createElement("div", {
146
141
  id: "customize-work-order-component",
package/dist/esm/common/utils/tools.js CHANGED
@@ -21,7 +21,7 @@ import { get, every, maxBy } from 'lodash';
21
21
  import V from 'voca';
22
22
  import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail } from "../../model/servers/api";
23
23
  import moment from 'moment';
24
- import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
24
+ import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
25
25
  import { cloneDeep, isEqual, set } from 'lodash';
26
26
  import Monitor from 'kmkf-monitor';
27
27
  import { PlatForm } from "../../model/flowTemplateDetail/types";
@@ -30,7 +30,6 @@ import cache from "../cache";
30
30
  // 淘宝商品组件信息处理
31
31
 
32
32
  var ONLY_SHOW_COMPONENT_TYPE = ['RADIO', 'INPUT', 'TEXTAREA', 'CHECKBOX', 'SELECT', 'DATETIME', 'PICTURE', 'MULT_SELECT', 'ORDINARY_INVOICE'];
33
- //表单提交单一字段映射
34
33
  var workTypeKeys = {
35
34
  SHOP_NAME_INPUT: 'shopName',
36
35
  //店铺名称
@@ -50,39 +49,7 @@ var workTypeKeys = {
50
49
  DATETIME: 'dateTime',
51
50
  TEXTAREA: 'textarea',
52
51
  SELECT: 'select',
53
- SYSTEM_ORDER_NO: 'systemOrderNo',
54
- NEW_PAYMENT_STATUS: 'newPaymentStatus',
55
- BUSINESS_ORDER_NO: 'businessOrderNo',
56
- PAYMENT_VOUCHER_CODE: 'paymentVoucherCode'
57
- };
58
- //表单获取组装数据单一字段映射
59
- var updateWorkTypeKeys = {
60
- BASIC_GRADE: 'basicGrade',
61
- TRADE_ID_INPUT: 'tradeId',
62
- SHOP_NAME_INPUT: 'shopName',
63
- RECEIVER_NAME_INPUT: 'receiveName',
64
- //收件人姓名
65
- RECEIVER_MOBILE_INPUT: 'receiveMobile',
66
- //收件人手机号
67
- TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
68
- //下单时间
69
- TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
70
- //付款时间
71
- TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
72
- //发货时间
73
- TRADE_CLOSING_DATETIME: 'tradeClosingDateTime',
74
- //成交时间
75
- ACTUAL_PAYMENT: 'actualPayment',
76
- SYSTEM_ORDER_NO: 'systemOrderNo',
77
- BS_SIGNING_TIME: 'bsSigningTime',
78
- BS_SEND_TIME: 'bsSendTime',
79
- BS_TRADE_PAYMENT_TIME: 'bsTradePaymentTime',
80
- BS_NET_RECEIPTS: 'bsNetReceipts',
81
- BS_PACKAGE_WEIGHT: 'bsPackageWeight',
82
- BS_DEPOSIT: 'bsDeposit',
83
- NEW_PAYMENT_STATUS: 'newPaymentStatus',
84
- BUSINESS_ORDER_NO: 'businessOrderNo',
85
- PAYMENT_VOUCHER_CODE: 'paymentVoucherCode'
52
+ SYSTEM_ORDER_NO: 'systemOrderNo'
86
53
  };
87
54
  var findNodeById = function findNodeById(tree) {
88
55
  var actived = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -307,53 +274,6 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
307
274
  content: get(nowData, "".concat(item.uniqueKey, ".interceptAddress[2]"), ''),
308
275
  name: item.name
309
276
  });
310
- } else if (item.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
311
- var logisticsInterceptionList = get(nowData, "".concat(item.uniqueKey), []);
312
- contentVoList.push({
313
- uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptList"),
314
- content: logisticsInterceptionList,
315
- name: item.name
316
- }, {
317
- uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptCompanyList"),
318
- content: logisticsInterceptionList.filter(function (t) {
319
- return t.interceptCompany;
320
- }).map(function (t) {
321
- return t.interceptCompany + '';
322
- }),
323
- name: item.name
324
- }, {
325
- uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptCodeList"),
326
- content: logisticsInterceptionList.filter(function (t) {
327
- return t.interceptCode;
328
- }).map(function (t) {
329
- return t.interceptCode + '';
330
- }),
331
- name: item.name
332
- }, {
333
- uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptTypeList"),
334
- content: logisticsInterceptionList.filter(function (t) {
335
- return t.interceptType;
336
- }).map(function (t) {
337
- return t.interceptType + '';
338
- }),
339
- name: item.name
340
- }, {
341
- uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptStatusList"),
342
- content: logisticsInterceptionList.filter(function (t) {
343
- return t.interceptLogisticsStatus;
344
- }).map(function (t) {
345
- return t.interceptLogisticsStatus + '';
346
- }),
347
- name: item.name
348
- }, {
349
- uniqueKey: "".concat(item.uniqueKey, "_logisticsInterceptSnapshotList"),
350
- content: logisticsInterceptionList.filter(function (t) {
351
- return t.interceptLogisticsSnapshot;
352
- }).map(function (t) {
353
- return t.interceptLogisticsSnapshot + '';
354
- }),
355
- name: item.name
356
- });
357
277
  } else if (item.workOrderComponentType === 'PICTURE') {
358
278
  var _value$map;
359
279
  var host = cache.getHost() || window.location.origin;
@@ -1162,9 +1082,6 @@ var transDataSource = function transDataSource(templateColumns) {
1162
1082
  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'edit';
1163
1083
  return function (item) {
1164
1084
  return templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.reduce(function (cur, nex) {
1165
- if (updateWorkTypeKeys[nex.workOrderComponentType]) {
1166
- return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_").concat(updateWorkTypeKeys[nex.workOrderComponentType])]));
1167
- }
1168
1085
  //如果是初始化创建赋初始值 编辑不赋值
1169
1086
  var config = type === 'init' ? nex.componentConfig : {};
1170
1087
  if (nex.workOrderComponentType === 'RADIO') {
@@ -1181,6 +1098,8 @@ var transDataSource = function transDataSource(templateColumns) {
1181
1098
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_textarea")] || (config === null || config === void 0 ? void 0 : config.textarea)));
1182
1099
  } else if (nex.workOrderComponentType === 'SELECT') {
1183
1100
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_select")] || (config === null || config === void 0 ? void 0 : config.select)));
1101
+ } else if (nex.workOrderComponentType === 'BASIC_GRADE') {
1102
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_basicGrade")]));
1184
1103
  } else if (nex.workOrderComponentType === 'RATE') {
1185
1104
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_rate")], [])));
1186
1105
  } else if (nex.workOrderComponentType === 'FILE') {
@@ -1202,17 +1121,35 @@ var transDataSource = function transDataSource(templateColumns) {
1202
1121
  postingReceiverName: item.jsonMap["".concat(nex.uniqueKey, "_postingReceiverName")],
1203
1122
  postingReceiverMobile: item.jsonMap["".concat(nex.uniqueKey, "_postingReceiverMobile")]
1204
1123
  }));
1124
+ } else if (nex.workOrderComponentType === 'TRADE_ID_INPUT') {
1125
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeId")]));
1205
1126
  } else if (nex.workOrderComponentType === 'BUYER_NICK_INPUT') {
1206
1127
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
1207
1128
  buyerNick: item.jsonMap["".concat(nex.uniqueKey, "_buyerNick")],
1208
1129
  buyerOpenUid: item.jsonMap["".concat(nex.uniqueKey, "_buyerOpenUid")]
1209
1130
  }));
1131
+ } else if (nex.workOrderComponentType === 'SHOP_NAME_INPUT') {
1132
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_shopName")]));
1133
+ } else if (nex.workOrderComponentType === 'RECEIVER_NAME_INPUT') {
1134
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_receiveName")]));
1135
+ } else if (nex.workOrderComponentType === 'RECEIVER_MOBILE_INPUT') {
1136
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_receiveMobile")]));
1137
+ } else if (nex.workOrderComponentType === 'TRADE_CREATE_DATETIME') {
1138
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeCreateDateTime")]));
1139
+ } else if (nex.workOrderComponentType === 'TRADE_PAYMENT_DATETIME') {
1140
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradePaymentDateTime")]));
1141
+ } else if (nex.workOrderComponentType === 'TRADE_DELIVERY_DATETIME') {
1142
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeDeliveryDateTime")]));
1143
+ } else if (nex.workOrderComponentType === 'TRADE_CLOSING_DATETIME') {
1144
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_tradeClosingDateTime")]));
1145
+ } else if (nex.workOrderComponentType === 'ACTUAL_PAYMENT') {
1146
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_actualPayment")]));
1210
1147
  } else if (nex.workOrderComponentType === 'ALI_PAY_INPUT') {
1211
- var _objectSpread12;
1212
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread12 = {}, _defineProperty(_objectSpread12, "".concat(nex.uniqueKey), {
1148
+ var _objectSpread21;
1149
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread21 = {}, _defineProperty(_objectSpread21, "".concat(nex.uniqueKey), {
1213
1150
  name: item.jsonMap["".concat(nex.uniqueKey, "_alipayName")],
1214
1151
  user: item.jsonMap["".concat(nex.uniqueKey, "_alipayAccount")]
1215
- }), _defineProperty(_objectSpread12, "".concat(nex.uniqueKey, "_alipayName"), item.jsonMap["".concat(nex.uniqueKey, "_alipayName")]), _defineProperty(_objectSpread12, "".concat(nex.uniqueKey, "_alipayAccount"), item.jsonMap["".concat(nex.uniqueKey, "_alipayAccount")]), _objectSpread12));
1152
+ }), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_alipayName"), item.jsonMap["".concat(nex.uniqueKey, "_alipayName")]), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_alipayAccount"), item.jsonMap["".concat(nex.uniqueKey, "_alipayAccount")]), _objectSpread21));
1216
1153
  } else if (nex.workOrderComponentType === 'CHECKBOX') {
1217
1154
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
1218
1155
  value: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_checkbox")], '') || (config === null || config === void 0 ? void 0 : config.checkbox) || [],
@@ -1247,35 +1184,35 @@ var transDataSource = function transDataSource(templateColumns) {
1247
1184
  detail: item.jsonMap["".concat(nex.uniqueKey, "_address")]
1248
1185
  }));
1249
1186
  } else if (nex.workOrderComponentType === 'EXPRESS_LOGISTICS_SELECT') {
1250
- var _objectSpread20;
1251
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread20 = {}, _defineProperty(_objectSpread20, "".concat(nex.uniqueKey), {
1187
+ var _objectSpread29;
1188
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread29 = {}, _defineProperty(_objectSpread29, "".concat(nex.uniqueKey), {
1252
1189
  company: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")],
1253
1190
  order: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]
1254
- }), _defineProperty(_objectSpread20, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")]), _defineProperty(_objectSpread20, "".concat(nex.uniqueKey, "_expressLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]), _objectSpread20));
1191
+ }), _defineProperty(_objectSpread29, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")]), _defineProperty(_objectSpread29, "".concat(nex.uniqueKey, "_expressLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]), _objectSpread29));
1255
1192
  } else if (nex.workOrderComponentType === 'RETURN_LOGISTICS_SELECT') {
1256
- var _objectSpread21;
1257
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread21 = {}, _defineProperty(_objectSpread21, "".concat(nex.uniqueKey), {
1193
+ var _objectSpread30;
1194
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread30 = {}, _defineProperty(_objectSpread30, "".concat(nex.uniqueKey), {
1258
1195
  company: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")],
1259
1196
  order: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]
1260
- }), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")]), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_returnLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]), _objectSpread21));
1197
+ }), _defineProperty(_objectSpread30, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")]), _defineProperty(_objectSpread30, "".concat(nex.uniqueKey, "_returnLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]), _objectSpread30));
1261
1198
  } else if (nex.workOrderComponentType === 'REMARK_INPUT') {
1262
1199
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
1263
1200
  flag: item.jsonMap["".concat(nex.uniqueKey, "_flag")] ? +item.jsonMap["".concat(nex.uniqueKey, "_flag")] : config !== null && config !== void 0 && config.flag ? +(config === null || config === void 0 ? void 0 : config.flag) : '',
1264
1201
  remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark) || ''
1265
1202
  }));
1266
1203
  } else if (nex.workOrderComponentType === 'STATUS') {
1267
- var _objectSpread23;
1268
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread23 = {}, _defineProperty(_objectSpread23, "".concat(nex.uniqueKey), {
1204
+ var _objectSpread32;
1205
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread32 = {}, _defineProperty(_objectSpread32, "".concat(nex.uniqueKey), {
1269
1206
  status: item.jsonMap["".concat(nex.uniqueKey, "_status")] || (config === null || config === void 0 ? void 0 : config.status),
1270
1207
  customerService: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_customerService")], item.jsonMap["".concat(nex.uniqueKey, "_customerService")])
1271
- }), _defineProperty(_objectSpread23, "".concat(nex.uniqueKey, "_processTime"), item.jsonMap['processTime']), _defineProperty(_objectSpread23, "".concat(nex.uniqueKey, "_lastProcessingTime"), item.jsonMap['lastProcessingTime']), _objectSpread23));
1208
+ }), _defineProperty(_objectSpread32, "".concat(nex.uniqueKey, "_processTime"), item.jsonMap['processTime']), _defineProperty(_objectSpread32, "".concat(nex.uniqueKey, "_lastProcessingTime"), item.jsonMap['lastProcessingTime']), _objectSpread32));
1272
1209
  } else if (nex.workOrderComponentType === 'ORDINARY_INVOICE') {
1273
- var _objectSpread24;
1274
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread24 = {}, _defineProperty(_objectSpread24, "".concat(nex.uniqueKey), {
1210
+ var _objectSpread33;
1211
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread33 = {}, _defineProperty(_objectSpread33, "".concat(nex.uniqueKey), {
1275
1212
  ordinaryMoney: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")],
1276
1213
  ordinarySerial: item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")],
1277
1214
  ordinaryTaitou: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]
1278
- }), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinaryMoney"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")] ? Number(item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")]).toFixed(2) : null), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinarySerial"), item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")]), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinaryTaitou"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]), _objectSpread24));
1215
+ }), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_ordinaryMoney"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")] ? Number(item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")]).toFixed(2) : null), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_ordinarySerial"), item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_ordinaryTaitou"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]), _objectSpread33));
1279
1216
  } else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION') {
1280
1217
  var _address3 = [transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptProvince")]), transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptCity")])];
1281
1218
  //兼容地址是只有省市的
@@ -1297,8 +1234,6 @@ var transDataSource = function transDataSource(templateColumns) {
1297
1234
  interceptLogisticsStatusOther: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsStatusOther")],
1298
1235
  interceptLogisticsSnapshot: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsSnapshot")]
1299
1236
  }));
1300
- } else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
1301
- return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_logisticsInterceptList")], [{}])));
1302
1237
  } else if (nex.workOrderComponentType === 'LOGISTICS_TRAJECTORY') {
1303
1238
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
1304
1239
  trajectoryCompany: item.jsonMap["".concat(nex.uniqueKey, "_trajectoryCompany")],
@@ -1322,8 +1257,8 @@ var transDataSource = function transDataSource(templateColumns) {
1322
1257
  });
1323
1258
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList));
1324
1259
  } else if (nex.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
1325
- var _objectSpread33;
1326
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread33 = {}, _defineProperty(_objectSpread33, "".concat(nex.uniqueKey), {
1260
+ var _objectSpread41;
1261
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread41 = {}, _defineProperty(_objectSpread41, "".concat(nex.uniqueKey), {
1327
1262
  enterprisePaymentAlipayNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")],
1328
1263
  enterprisePaymentAlipayNo: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")],
1329
1264
  enterprisePaymentBuyerNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")],
@@ -1331,7 +1266,9 @@ var transDataSource = function transDataSource(templateColumns) {
1331
1266
  enterprisePaymentRefundFee: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")],
1332
1267
  enterprisePaymentStatus: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")],
1333
1268
  enterprisePaymentTid: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]
1334
- }), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTime")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]), _objectSpread33));
1269
+ }), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTime")]), _defineProperty(_objectSpread41, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]), _objectSpread41));
1270
+ } else if (nex.workOrderComponentType === 'SYSTEM_ORDER_NO') {
1271
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_systemOrderNo")]));
1335
1272
  } else if (nex.workOrderComponentType === 'JST_LOGISTICS') {
1336
1273
  var _itemList2 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
1337
1274
  logisticsCompany: null,
@@ -1360,11 +1297,23 @@ var transDataSource = function transDataSource(templateColumns) {
1360
1297
  sendName: '',
1361
1298
  sendId: ''
1362
1299
  }]));
1300
+ } else if (nex.workOrderComponentType === 'BS_SIGNING_TIME') {
1301
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsSigningTime")]));
1302
+ } else if (nex.workOrderComponentType === 'BS_SEND_TIME') {
1303
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsSendTime")]));
1304
+ } else if (nex.workOrderComponentType === 'BS_TRADE_PAYMENT_TIME') {
1305
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsTradePaymentTime")]));
1306
+ } else if (nex.workOrderComponentType === 'BS_NET_RECEIPTS') {
1307
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsNetReceipts")]));
1308
+ } else if (nex.workOrderComponentType === 'BS_PACKAGE_WEIGHT') {
1309
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsPackageWeight")]));
1363
1310
  } else if (nex.workOrderComponentType === 'BS_MEMO') {
1364
1311
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
1365
1312
  remark: item.jsonMap["".concat(nex.uniqueKey, "_bsRemark")],
1366
1313
  flag: item.jsonMap["".concat(nex.uniqueKey, "_bsFlag")]
1367
1314
  }));
1315
+ } else if (nex.workOrderComponentType === 'BS_DEPOSIT') {
1316
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_bsDeposit")]));
1368
1317
  } else if (nex.workOrderComponentType === 'REISSUE_LOGISTICS') {
1369
1318
  var _itemList6 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_reissueLogisticsList")], [{
1370
1319
  logisticsCompany: null,
@@ -1621,7 +1570,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
1621
1570
  //订单返填
1622
1571
  export var orderBack = /*#__PURE__*/function () {
1623
1572
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
1624
- var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread55, _cacheOrderInfo;
1573
+ var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread70, _cacheOrderInfo;
1625
1574
  return _regeneratorRuntime().wrap(function _callee$(_context) {
1626
1575
  while (1) switch (_context.prev = _context.next) {
1627
1576
  case 0:
@@ -1855,7 +1804,7 @@ export var orderBack = /*#__PURE__*/function () {
1855
1804
  sessionStorage.setItem('cacheOmsOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, cacheOrderInfo), {}, _defineProperty({}, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))))));
1856
1805
  } else {
1857
1806
  _cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
1858
- sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread55 = {}, _defineProperty(_objectSpread55, order_no, values), _defineProperty(_objectSpread55, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread55))));
1807
+ sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread70 = {}, _defineProperty(_objectSpread70, order_no, values), _defineProperty(_objectSpread70, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread70))));
1859
1808
  }
1860
1809
  }
1861
1810
  // console.log('orderback', values);
@@ -2236,7 +2185,7 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
2236
2185
  //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
2237
2186
  if (!(value !== null && value !== void 0 && value.selectedRows)) return;
2238
2187
  var bsGoodsComponent = (_templateList$compone = templateList.componentDtoList) === null || _templateList$compone === void 0 ? void 0 : _templateList$compone.filter(function (item) {
2239
- return ['BS_GOODS', 'BS_DELIVERY_NO', 'BS_SEND_GOOD', 'BS_LOGISTICS', 'LOGISTICS_TRAJECTORY_MORE', 'LOGISTICS_INTERCEPTION_MORE'].includes(item.workOrderComponentType);
2188
+ return ['BS_GOODS', 'BS_DELIVERY_NO', 'BS_SEND_GOOD', 'BS_LOGISTICS', 'LOGISTICS_TRAJECTORY_MORE'].includes(item.workOrderComponentType);
2240
2189
  });
2241
2190
  if (!(bsGoodsComponent !== null && bsGoodsComponent !== void 0 && bsGoodsComponent.length)) return;
2242
2191
  var bsGoodsValue = form.getFieldValue(bsGoodsComponent[0].uniqueKey);
@@ -2247,6 +2196,7 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
2247
2196
  var values = bsOrderBackFormValues(orderInfo, {
2248
2197
  componentDtoList: bsGoodsComponent
2249
2198
  });
2199
+ console.log('bsSystemOrderBackValues', values);
2250
2200
  form.setFieldsValue(values);
2251
2201
  };
2252
2202
 
@@ -2385,92 +2335,31 @@ export var setLogisticsInfo = function setLogisticsInfo(_ref9) {
2385
2335
  codeUniqueKey = _componentConfig$logi.codeUniqueKey,
2386
2336
  codeType = _componentConfig$logi.codeType;
2387
2337
  if (companyUniqueKey === uniqueKey && workOrderComponentType === companyType) {
2388
- if (next.workOrderComponentType === 'LOGISTICS_TRAJECTORY_MORE') {
2389
- if (companyType === 'INPUT') {
2390
- prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
2391
- trajectoryCompany: ExpressData.getInstance().getExpressCodeByName(value, true)
2392
- })];
2393
- } else if (companyType === 'EXPRESS_LOGISTICS_SELECT') {
2394
- prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
2395
- trajectoryCompany: value.company,
2396
- trajectoryCode: value.order
2397
- })];
2398
- } else if (companyType === 'BS_LOGISTICS') {
2399
- prv[next.uniqueKey] = value.map(function (item) {
2400
- return {
2401
- trajectoryCompany: item.logisticsCompany,
2402
- trajectoryCode: item.logisticsCode,
2403
- trajectorySnapshot: '',
2404
- trajectoryPhone: ''
2405
- };
2406
- });
2407
- }
2408
- } else if (next.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
2409
- var expressInterceptData = ExpressInterceptData.getInstance().getExpressData();
2410
- if (companyType === 'INPUT') {
2411
- var interceptCompany = expressInterceptData.find(function (item) {
2412
- return item.value === value;
2413
- });
2414
- var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
2415
- var _item$config;
2416
- return item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.isDefault;
2417
- });
2418
- prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
2419
- interceptCompany: ExpressData.getInstance().getExpressCodeByName(value, false),
2420
- interceptType: returnValue === null || returnValue === void 0 ? void 0 : returnValue.value
2421
- })];
2422
- } else if (companyType === 'EXPRESS_LOGISTICS_SELECT') {
2423
- var _interceptCompany = expressInterceptData.find(function (item) {
2424
- return item.value === value;
2425
- });
2426
- var _returnValue = ((_interceptCompany === null || _interceptCompany === void 0 ? void 0 : _interceptCompany.interceptionTypeList) || []).find(function (item) {
2427
- var _item$config2;
2428
- return item === null || item === void 0 ? void 0 : (_item$config2 = item.config) === null || _item$config2 === void 0 ? void 0 : _item$config2.isDefault;
2429
- });
2430
- prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
2431
- interceptCompany: value.company,
2432
- interceptCode: value.order,
2433
- interceptType: _returnValue === null || _returnValue === void 0 ? void 0 : _returnValue.value
2434
- })];
2435
- } else if (companyType === 'BS_LOGISTICS') {
2436
- prv[next.uniqueKey] = value.map(function (item) {
2437
- var interceptCompany = expressInterceptData.find(function (t) {
2438
- return item.logisticsCompany === t.value;
2439
- });
2440
- var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (t) {
2441
- var _t$config;
2442
- return t === null || t === void 0 ? void 0 : (_t$config = t.config) === null || _t$config === void 0 ? void 0 : _t$config.isDefault;
2443
- });
2444
- return {
2445
- interceptCompany: item.logisticsCompany,
2446
- interceptCode: item.logisticsCode,
2447
- interceptType: returnValue === null || returnValue === void 0 ? void 0 : returnValue.value,
2448
- interceptSenderMobile: undefined,
2449
- interceptAddress: [],
2450
- interceptDetail: undefined,
2451
- interceptReceiverName: undefined,
2452
- interceptReceiverMobile: undefined,
2453
- interceptStatus: undefined,
2454
- interceptOther: undefined,
2455
- interceptLogisticsSnapshot: undefined
2456
- };
2457
- });
2458
- }
2338
+ if (companyType === 'INPUT') {
2339
+ prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
2340
+ trajectoryCompany: ExpressData.getInstance().getExpressCodeByName(value, true)
2341
+ })];
2342
+ } else if (companyType === 'EXPRESS_LOGISTICS_SELECT') {
2343
+ prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
2344
+ trajectoryCompany: value.company,
2345
+ trajectoryCode: value.order
2346
+ })];
2347
+ } else if (companyType === 'BS_LOGISTICS') {
2348
+ prv[next.uniqueKey] = value.map(function (item) {
2349
+ return {
2350
+ trajectoryCompany: item.logisticsCompany,
2351
+ trajectoryCode: item.logisticsCode,
2352
+ trajectorySnapshot: '',
2353
+ trajectoryPhone: ''
2354
+ };
2355
+ });
2459
2356
  }
2460
2357
  }
2461
2358
  if (codeUniqueKey === uniqueKey && workOrderComponentType === codeType) {
2462
- if (next.workOrderComponentType === 'LOGISTICS_TRAJECTORY_MORE') {
2463
- if (companyType === 'INPUT') {
2464
- prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
2465
- trajectoryCode: value
2466
- })];
2467
- }
2468
- } else if (next.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
2469
- if (companyType === 'INPUT') {
2470
- prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
2471
- interceptCode: value
2472
- })];
2473
- }
2359
+ if (companyType === 'INPUT') {
2360
+ prv[next.uniqueKey] = [_objectSpread(_objectSpread({}, logisticsValues === null || logisticsValues === void 0 ? void 0 : logisticsValues[0]), {}, {
2361
+ trajectoryCode: value
2362
+ })];
2474
2363
  }
2475
2364
  }
2476
2365
  return prv;
package/dist/esm/model/logicFlow/selector.d.ts CHANGED
@@ -6,6 +6,7 @@ export declare const selectFlowList: ((state: {
6
6
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
8
8
  logicFlow: import("./types").LogicFlowState;
9
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
9
10
  }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
10
11
  clearCache: () => void;
11
12
  }> & {
@@ -19,6 +20,7 @@ export declare const selectGroupFlowList: ((state: {
19
20
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
20
21
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
21
22
  logicFlow: import("./types").LogicFlowState;
23
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
22
24
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
23
25
  clearCache: () => void;
24
26
  }> & {
@@ -32,6 +34,7 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
32
34
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
33
35
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
34
36
  logicFlow: import("./types").LogicFlowState;
37
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
35
38
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
36
39
  clearCache: () => void;
37
40
  }> & {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "0.26.1-beta.8",
3
+ "version": "0.26.1",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,9 +32,9 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "^0.26.1-beta.5",
36
- "@kmkf-fe-packages/kmkf-utils": "^0.26.1-beta.1",
37
- "@kmkf-fe-packages/services-components": "^0.26.1-beta.8",
35
+ "@kmkf-fe-packages/basic-components": "^0.26.1",
36
+ "@kmkf-fe-packages/kmkf-utils": "^0.26.1",
37
+ "@kmkf-fe-packages/services-components": "^0.26.1",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
73
73
  "publishConfig": {
74
74
  "access": "public"
75
75
  },
76
- "gitHead": "737ad859ad5eb8b8d37a40e02dacf4e0fbdf203e",
76
+ "gitHead": "a0bba4d2173af489b94bcd39c30078628963767a",
77
77
  "gitHooks": {
78
78
  "pre-commit": "lint-staged"
79
79
  }