@kmkf-fe-packages/kmkf-work-order-service-component 2.10.18 → 2.10.20
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/FlowTemplateDetailV2/components/CurrentNode/index.js +3 -2
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +2 -2
- package/dist/esm/FlowTemplateDetailV2/components/Item/index.js +3 -2
- package/dist/esm/FlowTemplateDetailV2/components/OrderRemark/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/OrderRemark/index.js +20 -6
- package/dist/esm/FlowTemplateDetailV2/components/RenderDetail/index.d.ts +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/RenderDetail/index.js +6 -3
- package/dist/esm/FlowTemplateDetailV2/index.js +7 -3
- package/dist/esm/GlobalContext/hook/dist/useGetHasErpData.js +9 -9
- package/dist/esm/GlobalContext/orderQuery/dist/useGetErpAddressData.js +15 -15
- package/dist/esm/GlobalContext/orderQuery/dist/useGetErpLogisticsCompany.js +15 -15
- package/dist/esm/common/utils/dist/submitDataTransOldFormat.js +54 -54
- package/dist/esm/common/utils/dist/tools.js +59 -59
- package/dist/esm/common/utils/dist/transformWorkOrderData.js +136 -136
- package/dist/esm/model/customizeWorkOrder/dist/api.js +5 -5
- package/dist/esm/model/customizeWorkOrder/dist/index.js +9 -9
- package/dist/esm/model/customizeWorkOrder/dist/selector.js +3 -3
- package/dist/esm/model/customizeWorkOrder/dist/types.js +1 -1
- package/dist/esm/model/dist/global.js +3 -3
- package/dist/esm/model/dist/hooks.js +2 -2
- package/dist/esm/model/dist/login.js +9 -9
- package/dist/esm/model/dist/store.js +10 -10
- package/dist/esm/model/dist/userData.js +3 -3
- package/dist/esm/model/dist/workOrder.js +12 -12
- package/dist/esm/model/flowTemplateDetail/dist/api.js +24 -24
- package/dist/esm/model/flowTemplateDetail/dist/types.js +27 -27
- package/dist/esm/model/logicFlow/dist/api.js +2 -2
- package/dist/esm/model/logicFlow/dist/index.js +9 -9
- package/dist/esm/model/logicFlow/dist/selector.js +3 -3
- package/dist/esm/model/logicFlow/dist/types.js +1 -1
- package/dist/esm/model/logicFlow/selector.d.ts +3 -0
- package/dist/esm/model/paymentWorkOrder/dist/index.js +3 -3
- package/dist/esm/model/paymentWorkOrder/dist/selector.js +3 -3
- package/dist/esm/model/paymentWorkOrder/dist/types.js +1 -1
- package/dist/esm/model/servers/dist/api.js +69 -69
- package/dist/esm/model/servers/dist/request.js +6 -6
- package/dist/esm/model/singleShopWorkOrder/dist/index.js +9 -9
- package/dist/esm/model/singleShopWorkOrder/dist/selector.js +3 -3
- package/dist/esm/model/singleShopWorkOrder/dist/types.js +1 -1
- package/dist/esm/model/types/dist/login.js +1 -1
- package/dist/esm/model/types/dist/singleWorkOrder.js +1 -1
- package/dist/esm/model/types/dist/workOrder.js +1 -1
- package/package.json +5 -5
|
@@ -424,7 +424,7 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
424
424
|
}();
|
|
425
425
|
var isArtificialNode = tag === 'artificial';
|
|
426
426
|
var isAutoNode = tag === 'auto';
|
|
427
|
-
var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'LBDJ_ONE_PRICE_ORDER', 'JST_OBTAIN_REISSUE_LOGISTICS', 'JST_REISSUE_NEW', 'JST_RETURN_EXCHANGE', 'JST_INBOUND_STATUS_SYNC', 'KM_WAREHOUSING_STATUS_EVENT', 'DAXIDI_INBOUND_STATUS_SYNC'].includes(eventType);
|
|
427
|
+
var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'LBDJ_ONE_PRICE_ORDER', 'JST_OBTAIN_REISSUE_LOGISTICS', 'JST_REISSUE_NEW', 'JST_RETURN_EXCHANGE', 'JST_INBOUND_STATUS_SYNC', 'KM_WAREHOUSING_STATUS_EVENT', 'DAXIDI_INBOUND_STATUS_SYNC', 'MESSAGE_CHANNEL_SEND'].includes(eventType);
|
|
428
428
|
var showEdit = isArtificialNode && isCurrentNodeHandler && !readonly && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.flowStatus) === FlowStatus.COMPLETED;
|
|
429
429
|
// TODO: 决策节点给后端修复数据加了一个入口
|
|
430
430
|
// @ts-ignore
|
|
@@ -495,7 +495,8 @@ var CurrentNode = function CurrentNode(props, ref) {
|
|
|
495
495
|
workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
|
|
496
496
|
transData: transData,
|
|
497
497
|
platform: plat.platform,
|
|
498
|
-
onOpenWangWang: onOpenWangWang
|
|
498
|
+
onOpenWangWang: onOpenWangWang,
|
|
499
|
+
shopList: shopList
|
|
499
500
|
}) : /*#__PURE__*/React.createElement(FormRender, {
|
|
500
501
|
ref: formRenderRef,
|
|
501
502
|
isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no24 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
|
|
@@ -33,7 +33,7 @@ import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME,
|
|
|
33
33
|
INNER_REPLACE_COMPONENT, reversalFormValues, wdtReturnBillNoBackValues, afterSaleOrderBackValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, jkySystemOrderBackValues, dxdSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue, FIXED_FIELD_CAN_MODIFY_SHOP } from "../../../common/utils/tools";
|
|
34
34
|
import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel } from "../../../model/servers/api";
|
|
35
35
|
import { factory } from '@kmkf-fe-packages/services-components';
|
|
36
|
-
import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage, afterSaleOrderBack, DxdSuppliersData } from '@kmkf-fe-packages/kmkf-utils';
|
|
36
|
+
import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage, afterSaleOrderBack, DxdSuppliersData, isYouzanShop } from '@kmkf-fe-packages/kmkf-utils';
|
|
37
37
|
import ShopName from "../ShopName";
|
|
38
38
|
import { PlatForm } from "../../../model/flowTemplateDetail/types";
|
|
39
39
|
import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
|
|
@@ -397,7 +397,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
397
397
|
var shop = (shopList || []).find(function (item) {
|
|
398
398
|
return item.shopId === shopId;
|
|
399
399
|
});
|
|
400
|
-
if (shop && !shop.notJoin && ['TAOBAO', 'JD', 'PDD', 'KS', 'FXG', 'SPH', 'WXXD', 'XHS'].includes(shop.shopSourceStr)) {
|
|
400
|
+
if (shop && !shop.notJoin && (isYouzanShop(shop) || ['TAOBAO', 'JD', 'PDD', 'YLBB', 'KS', 'FXG', 'SPH', 'WXXD', 'XHS'].includes(shop.shopSourceStr))) {
|
|
401
401
|
orderDetail({
|
|
402
402
|
shopId: shopId,
|
|
403
403
|
//店铺id
|
|
@@ -275,7 +275,7 @@ var NodeItem = function NodeItem(props) {
|
|
|
275
275
|
isAllStaff: data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$nodeInfo = _data$data11.nodeInfo) === null || _data$data11$nodeInfo === void 0 ? void 0 : (_data$data11$nodeInfo2 = _data$data11$nodeInfo.assistants) === null || _data$data11$nodeInfo2 === void 0 ? void 0 : _data$data11$nodeInfo2.isAllStaff
|
|
276
276
|
});
|
|
277
277
|
}, [data, plat.userKey, assistantMap]);
|
|
278
|
-
var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'WDT_STORE_STATUS', 'BS_E3_RETAIL_RETURN_IN_STOCK_SYNC', 'RETAIL_RETURN_IN_STOCK_SYNC', 'PLATFORM_LOGISTICS_INTERCEPT', 'LBDJ_ONE_PRICE_ORDER', 'JST_ORDER_REMARK', 'KM_WAREHOUSING_STATUS_EVENT', 'DAXIDI_INBOUND_STATUS_SYNC', 'JST_OBTAIN_REISSUE_LOGISTICS', 'JST_REISSUE_NEW', 'JST_RETURN_EXCHANGE', 'JST_INBOUND_STATUS_SYNC'].includes(eventNodeType);
|
|
278
|
+
var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'WDT_STORE_STATUS', 'BS_E3_RETAIL_RETURN_IN_STOCK_SYNC', 'RETAIL_RETURN_IN_STOCK_SYNC', 'PLATFORM_LOGISTICS_INTERCEPT', 'LBDJ_ONE_PRICE_ORDER', 'JST_ORDER_REMARK', 'KM_WAREHOUSING_STATUS_EVENT', 'DAXIDI_INBOUND_STATUS_SYNC', 'JST_OBTAIN_REISSUE_LOGISTICS', 'JST_REISSUE_NEW', 'JST_RETURN_EXCHANGE', 'JST_INBOUND_STATUS_SYNC', 'MESSAGE_CHANNEL_SEND'].includes(eventNodeType);
|
|
279
279
|
// 人工节点+打开状态+当前工单提交人是当前完成人+状态是待处理
|
|
280
280
|
var showEdit = isArtificialNode && open && isCurrentNodeHandler && !readonly && [FlowStatus.PROCESSING, FlowStatus.COMPLETED].includes(flowStatus);
|
|
281
281
|
|
|
@@ -347,7 +347,8 @@ var NodeItem = function NodeItem(props) {
|
|
|
347
347
|
workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data21 = data.data) === null || _data$data21 === void 0 ? void 0 : _data$data21.workOrderTemplateInfo,
|
|
348
348
|
transData: transData,
|
|
349
349
|
platform: plat.platform,
|
|
350
|
-
onOpenWangWang: onOpenWangWang
|
|
350
|
+
onOpenWangWang: onOpenWangWang,
|
|
351
|
+
shopList: shopList
|
|
351
352
|
})), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
|
|
352
353
|
flowEventData: data === null || data === void 0 ? void 0 : (_data$data22 = data.data) === null || _data$data22 === void 0 ? void 0 : _data$data22.flowEventData,
|
|
353
354
|
shopList: shopList
|
|
@@ -13,6 +13,8 @@ import { debounce } from 'lodash';
|
|
|
13
13
|
import { Button, Modal, Form, Input, Radio, message, Space, Checkbox, Popconfirm } from 'antd';
|
|
14
14
|
import { DownOutlined, UpOutlined } from '@ant-design/icons';
|
|
15
15
|
import moment from 'moment';
|
|
16
|
+
import { YouzanStar } from '@kmkf-fe-packages/basic-components';
|
|
17
|
+
import { isYouzanShop, normalizeYouzanStar } from '@kmkf-fe-packages/kmkf-utils';
|
|
16
18
|
var TextArea = Input.TextArea;
|
|
17
19
|
import { updatePlatformMemo, getSellerRemark } from "../../../model/servers/api";
|
|
18
20
|
import styles from "./index.module.less";
|
|
@@ -35,11 +37,15 @@ var flagList = [trade0, trade1, trade2, trade3, trade4, trade5];
|
|
|
35
37
|
var OrderRemark = function OrderRemark(props) {
|
|
36
38
|
var shopUniqueKey = props.shopUniqueKey,
|
|
37
39
|
shopSourceStr = props.shopSourceStr,
|
|
40
|
+
shopSource = props.shopSource,
|
|
38
41
|
tid = props.tid,
|
|
39
42
|
shopId = props.shopId,
|
|
40
43
|
orderRemarkObj = props.orderRemarkObj,
|
|
41
44
|
plat = props.plat,
|
|
42
45
|
onJumpMemoPage = props.onJumpMemoPage;
|
|
46
|
+
var isYouzan = isYouzanShop({
|
|
47
|
+
shopSource: shopSource
|
|
48
|
+
});
|
|
43
49
|
var _useState = useState({
|
|
44
50
|
remark: '',
|
|
45
51
|
flag: null
|
|
@@ -127,7 +133,8 @@ var OrderRemark = function OrderRemark(props) {
|
|
|
127
133
|
setIsShowDetail(!isShowDetail);
|
|
128
134
|
};
|
|
129
135
|
var resetData = function resetData(remark, flag) {
|
|
130
|
-
var
|
|
136
|
+
var _normalizeYouzanStar;
|
|
137
|
+
var flagValue = isYouzan ? (_normalizeYouzanStar = normalizeYouzanStar(flag)) !== null && _normalizeYouzanStar !== void 0 ? _normalizeYouzanStar : null : flag || flag === 0 ? Number(flag) : null;
|
|
131
138
|
var remarkValue = remark || '';
|
|
132
139
|
setRemark(remarkValue);
|
|
133
140
|
setFlag(flagValue);
|
|
@@ -145,7 +152,8 @@ var OrderRemark = function OrderRemark(props) {
|
|
|
145
152
|
setLoading(true);
|
|
146
153
|
var values = form.getFieldsValue();
|
|
147
154
|
var newRemark = values.remark;
|
|
148
|
-
var
|
|
155
|
+
var selectedFlag = values.flag || values.flag === 0 ? values.flag + '' : '';
|
|
156
|
+
var newFlag = shopSourceStr === 'YLBB' && !selectedFlag ? '1' : selectedFlag;
|
|
149
157
|
if (memoConfig !== null && memoConfig !== void 0 && memoConfig.submitter) {
|
|
150
158
|
newRemark = "".concat(newRemark, " ").concat(plat === null || plat === void 0 ? void 0 : plat.accountName);
|
|
151
159
|
}
|
|
@@ -194,7 +202,11 @@ var OrderRemark = function OrderRemark(props) {
|
|
|
194
202
|
type: "link"
|
|
195
203
|
}, "\u5C55\u5F00 ", /*#__PURE__*/React.createElement(UpOutlined, null))), /*#__PURE__*/React.createElement("div", {
|
|
196
204
|
className: "".concat(styles['remark-detail-wrap'], " ").concat(!isShowDetailBtn || isShowDetail ? '' : styles.furled)
|
|
197
|
-
}, /*#__PURE__*/React.createElement("span", null, "\u5356\u5BB6\u5907\u6CE8\uFF1A"),
|
|
205
|
+
}, /*#__PURE__*/React.createElement("span", null, "\u5356\u5BB6\u5907\u6CE8\uFF1A"), isYouzan ? normalizeYouzanStar(flag) && /*#__PURE__*/React.createElement(YouzanStar, {
|
|
206
|
+
compact: true,
|
|
207
|
+
disabled: true,
|
|
208
|
+
value: flag || undefined
|
|
209
|
+
}) : (flag || flag === 0) && flagList[Number(flag)] && /*#__PURE__*/React.createElement("img", {
|
|
198
210
|
src: flagList[Number(flag)]
|
|
199
211
|
}), /*#__PURE__*/React.createElement("span", {
|
|
200
212
|
className: styles['remark-detail']
|
|
@@ -204,7 +216,7 @@ var OrderRemark = function OrderRemark(props) {
|
|
|
204
216
|
onClick: showOrderRemarkModel
|
|
205
217
|
}, "\u7F16\u8F91\u5907\u6CE8"))) : /*#__PURE__*/React.createElement("div", {
|
|
206
218
|
className: styles['empty-wrap']
|
|
207
|
-
}, /*#__PURE__*/React.createElement("img", {
|
|
219
|
+
}, !isYouzan && /*#__PURE__*/React.createElement("img", {
|
|
208
220
|
src: flagList[0]
|
|
209
221
|
}), /*#__PURE__*/React.createElement(Button, {
|
|
210
222
|
type: "link",
|
|
@@ -223,11 +235,13 @@ var OrderRemark = function OrderRemark(props) {
|
|
|
223
235
|
}, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form, {
|
|
224
236
|
form: form
|
|
225
237
|
}, /*#__PURE__*/React.createElement(Form.Item, {
|
|
226
|
-
label:
|
|
238
|
+
label: isYouzan ? '星标' : '标记',
|
|
227
239
|
name: "flag",
|
|
228
240
|
initialValue: flag || flag === 0 ? Number(flag) : null
|
|
229
|
-
}, /*#__PURE__*/React.createElement(Radio.Group, null, flagList === null || flagList === void 0 ? void 0 : flagList.map(function (item, index) {
|
|
241
|
+
}, isYouzan ? /*#__PURE__*/React.createElement(YouzanStar, null) : /*#__PURE__*/React.createElement(Radio.Group, null, flagList === null || flagList === void 0 ? void 0 : flagList.map(function (item, index) {
|
|
230
242
|
if (shopSourceStr === 'PDD' && index === 0) return;
|
|
243
|
+
// 1688仅支持红、黄、绿、蓝四种旗帜。
|
|
244
|
+
if (shopSourceStr === 'YLBB' && [0, 5].includes(index)) return;
|
|
231
245
|
// 微信视频号小店/微信小店无紫色旗帜,隐藏 index 5
|
|
232
246
|
if (['SPH', 'WXXD'].includes(shopSourceStr) && index === 5) return;
|
|
233
247
|
return /*#__PURE__*/React.createElement(Radio, {
|
|
@@ -13,7 +13,8 @@ var RenderDetail = function RenderDetail(props) {
|
|
|
13
13
|
var workOrderTemplateInfo = props.workOrderTemplateInfo,
|
|
14
14
|
transData = props.transData,
|
|
15
15
|
platform = props.platform,
|
|
16
|
-
onOpenWangWang = props.onOpenWangWang
|
|
16
|
+
onOpenWangWang = props.onOpenWangWang,
|
|
17
|
+
shopList = props.shopList;
|
|
17
18
|
var _workOrderTemplateInf = workOrderTemplateInfo.preNodeComponentDtoList,
|
|
18
19
|
preNodeComponentDtoList = _workOrderTemplateInf === void 0 ? [] : _workOrderTemplateInf,
|
|
19
20
|
_workOrderTemplateInf2 = workOrderTemplateInfo.componentDtoList,
|
|
@@ -40,7 +41,8 @@ var RenderDetail = function RenderDetail(props) {
|
|
|
40
41
|
componentConfig: t.componentConfig,
|
|
41
42
|
type: t.workOrderComponentType,
|
|
42
43
|
effects: {
|
|
43
|
-
env: platform
|
|
44
|
+
env: platform,
|
|
45
|
+
shopList: shopList
|
|
44
46
|
}
|
|
45
47
|
});
|
|
46
48
|
// 淘宝端的买家昵称是需要亮灯展示的
|
|
@@ -60,7 +62,8 @@ var RenderDetail = function RenderDetail(props) {
|
|
|
60
62
|
componentConfig: t.componentConfig,
|
|
61
63
|
type: t.workOrderComponentType,
|
|
62
64
|
effects: {
|
|
63
|
-
env: platform
|
|
65
|
+
env: platform,
|
|
66
|
+
shopList: shopList
|
|
64
67
|
}
|
|
65
68
|
});
|
|
66
69
|
// 淘宝端的买家昵称是需要亮灯展示的
|
|
@@ -55,7 +55,7 @@ import { Provide, Context } from "./context";
|
|
|
55
55
|
import { WORK_ORDER_STATUS_AI_BUILD } from "../common/constant";
|
|
56
56
|
import { useSelector } from "./context/useSelector";
|
|
57
57
|
import { pollOperationResult } from "./pollOperationResult";
|
|
58
|
-
import { pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
|
|
58
|
+
import { isYouzanShop, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
|
|
59
59
|
import { PlatForm } from "../WorkOrder/types";
|
|
60
60
|
import Layout from "./components/Layout";
|
|
61
61
|
import JumpCustomerIcon from "./components/XiaozhiConversation";
|
|
@@ -164,6 +164,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
164
164
|
var isShowRemark = false;
|
|
165
165
|
var shopUniqueKey = '';
|
|
166
166
|
var shopSourceStr = '';
|
|
167
|
+
var shopSource = '';
|
|
167
168
|
var shop;
|
|
168
169
|
var shopId = '';
|
|
169
170
|
var formShopId = Form.useWatch('shopId', form) || flowShopId;
|
|
@@ -181,8 +182,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
181
182
|
}
|
|
182
183
|
if (shop) {
|
|
183
184
|
shopUniqueKey = shop.accessToken || '';
|
|
184
|
-
isShowRemark = !shop.notJoin && !!shop.shopSourceStr &&
|
|
185
|
+
isShowRemark = !shop.notJoin && !readonly && (isYouzanShop(shop) || !!shop.shopSourceStr && ['TAOBAO', 'JD', 'PDD', 'YLBB', 'KS', 'FXG', 'SPH', 'WXXD', 'XHS'].includes(shop.shopSourceStr));
|
|
185
186
|
shopSourceStr = shop.shopSourceStr;
|
|
187
|
+
shopSource = shop.shopSource;
|
|
186
188
|
}
|
|
187
189
|
var shopItem = useMemo(function () {
|
|
188
190
|
return shopList.find(function (t) {
|
|
@@ -1267,7 +1269,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1267
1269
|
workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
|
|
1268
1270
|
transData: transDataall,
|
|
1269
1271
|
platform: plat.platform,
|
|
1270
|
-
onOpenWangWang: onOpenWangWang
|
|
1272
|
+
onOpenWangWang: onOpenWangWang,
|
|
1273
|
+
shopList: shopList
|
|
1271
1274
|
}));
|
|
1272
1275
|
};
|
|
1273
1276
|
var reFreshPanel = function reFreshPanel() {
|
|
@@ -1534,6 +1537,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
1534
1537
|
}, /*#__PURE__*/React.createElement(OrderRemark, {
|
|
1535
1538
|
shopUniqueKey: shopUniqueKey,
|
|
1536
1539
|
shopSourceStr: shopSourceStr,
|
|
1540
|
+
shopSource: shopSource,
|
|
1537
1541
|
shopId: shopId || formShopId,
|
|
1538
1542
|
tid: tid,
|
|
1539
1543
|
form: form,
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
|
|
1
|
+
'use strict';
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
|
-
var react_1 = require(
|
|
5
|
-
var react_redux_1 = require(
|
|
6
|
-
var toolkit_1 = require(
|
|
4
|
+
var react_1 = require('react');
|
|
5
|
+
var react_redux_1 = require('react-redux');
|
|
6
|
+
var toolkit_1 = require('@reduxjs/toolkit');
|
|
7
7
|
var getTemplate = function getTemplate(companyUserConfig) {
|
|
8
8
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
|
|
9
9
|
return JSON.stringify({
|
|
@@ -18,7 +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(
|
|
21
|
+
console.log('state--useSelector', state);
|
|
22
22
|
/**
|
|
23
23
|
* pc main
|
|
24
24
|
* 端 workOrder
|
|
@@ -27,11 +27,11 @@ function useGetHasErpData() {
|
|
|
27
27
|
}], function (state) {
|
|
28
28
|
var _a;
|
|
29
29
|
var companyUserConfig = (_a = state === null || state === void 0 ? void 0 : state.companyUserConfig) !== null && _a !== void 0 ? _a : {};
|
|
30
|
-
if (typeof companyUserConfig ===
|
|
30
|
+
if (typeof companyUserConfig === 'string') {
|
|
31
31
|
try {
|
|
32
32
|
companyUserConfig = JSON.parse(companyUserConfig);
|
|
33
33
|
} catch (e) {
|
|
34
|
-
console.error(
|
|
34
|
+
console.error('companyUserConfig转换异常', companyUserConfig);
|
|
35
35
|
companyUserConfig = {};
|
|
36
36
|
}
|
|
37
37
|
}
|
|
@@ -42,11 +42,11 @@ function useGetHasErpData() {
|
|
|
42
42
|
setHasErpDataJson = _a[1];
|
|
43
43
|
react_1.useEffect(function () {
|
|
44
44
|
setHasErpDataJson(getTemplate(companyUserConfig));
|
|
45
|
-
console.log(
|
|
45
|
+
console.log('companyUserConfig---', companyUserConfig);
|
|
46
46
|
}, [companyUserConfig]);
|
|
47
47
|
var hasErpData = react_1.useMemo(function () {
|
|
48
48
|
return JSON.parse(hasErpDataJson);
|
|
49
49
|
}, [hasErpDataJson]);
|
|
50
50
|
return hasErpData;
|
|
51
51
|
}
|
|
52
|
-
exports[
|
|
52
|
+
exports['default'] = useGetHasErpData;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
'use strict';
|
|
2
2
|
|
|
3
3
|
var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
|
|
4
4
|
function adopt(value) {
|
|
@@ -16,7 +16,7 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
|
|
|
16
16
|
}
|
|
17
17
|
function rejected(value) {
|
|
18
18
|
try {
|
|
19
|
-
step(generator[
|
|
19
|
+
step(generator['throw'](value));
|
|
20
20
|
} catch (e) {
|
|
21
21
|
reject(e);
|
|
22
22
|
}
|
|
@@ -43,9 +43,9 @@ var __generator = this && this.__generator || function (thisArg, body) {
|
|
|
43
43
|
g;
|
|
44
44
|
return g = {
|
|
45
45
|
next: verb(0),
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}, typeof Symbol ===
|
|
46
|
+
throw: verb(1),
|
|
47
|
+
return: verb(2)
|
|
48
|
+
}, typeof Symbol === 'function' && (g[Symbol.iterator] = function () {
|
|
49
49
|
return this;
|
|
50
50
|
}), g;
|
|
51
51
|
function verb(n) {
|
|
@@ -54,9 +54,9 @@ var __generator = this && this.__generator || function (thisArg, body) {
|
|
|
54
54
|
};
|
|
55
55
|
}
|
|
56
56
|
function step(op) {
|
|
57
|
-
if (f) throw new TypeError(
|
|
57
|
+
if (f) throw new TypeError('Generator is already executing.');
|
|
58
58
|
while (_) try {
|
|
59
|
-
if (f = 1, y && (t = op[0] & 2 ? y[
|
|
59
|
+
if (f = 1, y && (t = op[0] & 2 ? y['return'] : op[0] ? y['throw'] || ((t = y['return']) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
60
60
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
61
61
|
switch (op[0]) {
|
|
62
62
|
case 0:
|
|
@@ -116,16 +116,16 @@ var __generator = this && this.__generator || function (thisArg, body) {
|
|
|
116
116
|
}
|
|
117
117
|
};
|
|
118
118
|
exports.__esModule = true;
|
|
119
|
-
var react_1 = require(
|
|
119
|
+
var react_1 = require('react');
|
|
120
120
|
var useGetHasErpData_1 = require("../hook/useGetHasErpData");
|
|
121
|
-
var ahooks_1 = require(
|
|
122
|
-
var kmkf_utils_1 = require(
|
|
121
|
+
var ahooks_1 = require('ahooks');
|
|
122
|
+
var kmkf_utils_1 = require('@kmkf-fe-packages/kmkf-utils');
|
|
123
123
|
function useGetErpAddressData(notJudgedErp) {
|
|
124
124
|
var _this = this;
|
|
125
|
-
var _a = react_1.useState(
|
|
125
|
+
var _a = react_1.useState('loading'),
|
|
126
126
|
globalState = _a[0],
|
|
127
127
|
setGlobalState = _a[1];
|
|
128
|
-
var hasErpData = useGetHasErpData_1[
|
|
128
|
+
var hasErpData = useGetHasErpData_1['default']();
|
|
129
129
|
ahooks_1.useUpdateEffect(function () {
|
|
130
130
|
asyncQueryData(hasErpData, notJudgedErp);
|
|
131
131
|
}, [hasErpData, notJudgedErp]);
|
|
@@ -148,11 +148,11 @@ function useGetErpAddressData(notJudgedErp) {
|
|
|
148
148
|
}))];
|
|
149
149
|
case 2:
|
|
150
150
|
_a.sent();
|
|
151
|
-
setGlobalState(
|
|
151
|
+
setGlobalState('success');
|
|
152
152
|
return [3 /*break*/, 4];
|
|
153
153
|
case 3:
|
|
154
154
|
e_1 = _a.sent();
|
|
155
|
-
setGlobalState(
|
|
155
|
+
setGlobalState('failed');
|
|
156
156
|
return [3 /*break*/, 4];
|
|
157
157
|
case 4:
|
|
158
158
|
return [2 /*return*/];
|
|
@@ -177,4 +177,4 @@ function useGetErpAddressData(notJudgedErp) {
|
|
|
177
177
|
|
|
178
178
|
return [globalState, onReload];
|
|
179
179
|
}
|
|
180
|
-
exports[
|
|
180
|
+
exports['default'] = useGetErpAddressData;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
'use strict';
|
|
2
2
|
|
|
3
3
|
var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
|
|
4
4
|
function adopt(value) {
|
|
@@ -16,7 +16,7 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
|
|
|
16
16
|
}
|
|
17
17
|
function rejected(value) {
|
|
18
18
|
try {
|
|
19
|
-
step(generator[
|
|
19
|
+
step(generator['throw'](value));
|
|
20
20
|
} catch (e) {
|
|
21
21
|
reject(e);
|
|
22
22
|
}
|
|
@@ -43,9 +43,9 @@ var __generator = this && this.__generator || function (thisArg, body) {
|
|
|
43
43
|
g;
|
|
44
44
|
return g = {
|
|
45
45
|
next: verb(0),
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}, typeof Symbol ===
|
|
46
|
+
throw: verb(1),
|
|
47
|
+
return: verb(2)
|
|
48
|
+
}, typeof Symbol === 'function' && (g[Symbol.iterator] = function () {
|
|
49
49
|
return this;
|
|
50
50
|
}), g;
|
|
51
51
|
function verb(n) {
|
|
@@ -54,9 +54,9 @@ var __generator = this && this.__generator || function (thisArg, body) {
|
|
|
54
54
|
};
|
|
55
55
|
}
|
|
56
56
|
function step(op) {
|
|
57
|
-
if (f) throw new TypeError(
|
|
57
|
+
if (f) throw new TypeError('Generator is already executing.');
|
|
58
58
|
while (_) try {
|
|
59
|
-
if (f = 1, y && (t = op[0] & 2 ? y[
|
|
59
|
+
if (f = 1, y && (t = op[0] & 2 ? y['return'] : op[0] ? y['throw'] || ((t = y['return']) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
60
60
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
61
61
|
switch (op[0]) {
|
|
62
62
|
case 0:
|
|
@@ -116,16 +116,16 @@ var __generator = this && this.__generator || function (thisArg, body) {
|
|
|
116
116
|
}
|
|
117
117
|
};
|
|
118
118
|
exports.__esModule = true;
|
|
119
|
-
var react_1 = require(
|
|
119
|
+
var react_1 = require('react');
|
|
120
120
|
var useGetHasErpData_1 = require("../hook/useGetHasErpData");
|
|
121
|
-
var ahooks_1 = require(
|
|
121
|
+
var ahooks_1 = require('ahooks');
|
|
122
122
|
var api_1 = require("../../../service/api");
|
|
123
123
|
function useGetErpLogisticsCompany(notJudgedErp) {
|
|
124
124
|
var _this = this;
|
|
125
|
-
var _a = react_1.useState(
|
|
125
|
+
var _a = react_1.useState('loading'),
|
|
126
126
|
globalState = _a[0],
|
|
127
127
|
setGlobalState = _a[1];
|
|
128
|
-
var hasErpData = useGetHasErpData_1[
|
|
128
|
+
var hasErpData = useGetHasErpData_1['default']();
|
|
129
129
|
ahooks_1.useUpdateEffect(function () {
|
|
130
130
|
asyncQueryData(hasErpData, notJudgedErp);
|
|
131
131
|
}, [hasErpData, notJudgedErp]);
|
|
@@ -142,7 +142,7 @@ function useGetErpLogisticsCompany(notJudgedErp) {
|
|
|
142
142
|
if (hasJst || notJudgedErp) promises.push(api_1.queryJSTLogisticsCompany);
|
|
143
143
|
if (hasWln || notJudgedErp) promises.push(api_1.queryWLNLogisticsCompany);
|
|
144
144
|
if (!hasWdt && !hasE3 && !hasJst && !hasWln && !notJudgedErp) {
|
|
145
|
-
setGlobalState(
|
|
145
|
+
setGlobalState('success');
|
|
146
146
|
return [2 /*return*/];
|
|
147
147
|
}
|
|
148
148
|
|
|
@@ -154,11 +154,11 @@ function useGetErpLogisticsCompany(notJudgedErp) {
|
|
|
154
154
|
}))];
|
|
155
155
|
case 2:
|
|
156
156
|
_a.sent();
|
|
157
|
-
setGlobalState(
|
|
157
|
+
setGlobalState('success');
|
|
158
158
|
return [3 /*break*/, 4];
|
|
159
159
|
case 3:
|
|
160
160
|
e_1 = _a.sent();
|
|
161
|
-
setGlobalState(
|
|
161
|
+
setGlobalState('failed');
|
|
162
162
|
return [3 /*break*/, 4];
|
|
163
163
|
case 4:
|
|
164
164
|
return [2 /*return*/];
|
|
@@ -183,4 +183,4 @@ function useGetErpLogisticsCompany(notJudgedErp) {
|
|
|
183
183
|
|
|
184
184
|
return [globalState, onReload];
|
|
185
185
|
}
|
|
186
|
-
exports[
|
|
186
|
+
exports['default'] = useGetErpLogisticsCompany;
|