@kmkf-fe-packages/kmkf-work-order-service-component 2.10.18 → 2.10.19
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/FormRender/index.js +1 -1
- package/dist/esm/FlowTemplateDetailV2/components/OrderRemark/index.js +4 -1
- package/dist/esm/FlowTemplateDetailV2/index.js +1 -1
- 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
|
@@ -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 && ['TAOBAO', 'JD', 'PDD', 'YLBB', 'KS', 'FXG', 'SPH', 'WXXD', 'XHS'].includes(shop.shopSourceStr)) {
|
|
401
401
|
orderDetail({
|
|
402
402
|
shopId: shopId,
|
|
403
403
|
//店铺id
|
|
@@ -145,7 +145,8 @@ var OrderRemark = function OrderRemark(props) {
|
|
|
145
145
|
setLoading(true);
|
|
146
146
|
var values = form.getFieldsValue();
|
|
147
147
|
var newRemark = values.remark;
|
|
148
|
-
var
|
|
148
|
+
var selectedFlag = values.flag || values.flag === 0 ? values.flag + '' : '';
|
|
149
|
+
var newFlag = shopSourceStr === 'YLBB' && !selectedFlag ? '1' : selectedFlag;
|
|
149
150
|
if (memoConfig !== null && memoConfig !== void 0 && memoConfig.submitter) {
|
|
150
151
|
newRemark = "".concat(newRemark, " ").concat(plat === null || plat === void 0 ? void 0 : plat.accountName);
|
|
151
152
|
}
|
|
@@ -228,6 +229,8 @@ var OrderRemark = function OrderRemark(props) {
|
|
|
228
229
|
initialValue: flag || flag === 0 ? Number(flag) : null
|
|
229
230
|
}, /*#__PURE__*/React.createElement(Radio.Group, null, flagList === null || flagList === void 0 ? void 0 : flagList.map(function (item, index) {
|
|
230
231
|
if (shopSourceStr === 'PDD' && index === 0) return;
|
|
232
|
+
// 1688仅支持红、黄、绿、蓝四种旗帜。
|
|
233
|
+
if (shopSourceStr === 'YLBB' && [0, 5].includes(index)) return;
|
|
231
234
|
// 微信视频号小店/微信小店无紫色旗帜,隐藏 index 5
|
|
232
235
|
if (['SPH', 'WXXD'].includes(shopSourceStr) && index === 5) return;
|
|
233
236
|
return /*#__PURE__*/React.createElement(Radio, {
|
|
@@ -181,7 +181,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
|
|
|
181
181
|
}
|
|
182
182
|
if (shop) {
|
|
183
183
|
shopUniqueKey = shop.accessToken || '';
|
|
184
|
-
isShowRemark = !shop.notJoin && !!shop.shopSourceStr && !readonly && ['TAOBAO', 'JD', 'PDD', 'KS', 'FXG', 'SPH', 'WXXD', 'XHS'].includes(shop.shopSourceStr);
|
|
184
|
+
isShowRemark = !shop.notJoin && !!shop.shopSourceStr && !readonly && ['TAOBAO', 'JD', 'PDD', 'YLBB', 'KS', 'FXG', 'SPH', 'WXXD', 'XHS'].includes(shop.shopSourceStr);
|
|
185
185
|
shopSourceStr = shop.shopSourceStr;
|
|
186
186
|
}
|
|
187
187
|
var shopItem = useMemo(function () {
|
|
@@ -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;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
'use strict';
|
|
2
2
|
|
|
3
3
|
var __assign = this && this.__assign || function () {
|
|
4
4
|
__assign = Object.assign || function (t) {
|
|
@@ -11,10 +11,10 @@ var __assign = this && this.__assign || function () {
|
|
|
11
11
|
return __assign.apply(this, arguments);
|
|
12
12
|
};
|
|
13
13
|
exports.__esModule = true;
|
|
14
|
-
var lodash_1 = require(
|
|
15
|
-
var moment_1 = require(
|
|
16
|
-
var voca_1 = require(
|
|
17
|
-
var kmkf_utils_1 = require(
|
|
14
|
+
var lodash_1 = require('lodash');
|
|
15
|
+
var moment_1 = require('moment');
|
|
16
|
+
var voca_1 = require('voca');
|
|
17
|
+
var kmkf_utils_1 = require('@kmkf-fe-packages/kmkf-utils');
|
|
18
18
|
var tools_1 = require("./tools");
|
|
19
19
|
var constant_1 = require("./constant");
|
|
20
20
|
var cache_1 = require("../cache");
|
|
@@ -51,8 +51,8 @@ var handleBuyerNickInput = function handleBuyerNickInput(_a) {
|
|
|
51
51
|
return function (item) {
|
|
52
52
|
var _a;
|
|
53
53
|
(_a = ['buyerNick', 'buyerOpenUid']) === null || _a === void 0 ? void 0 : _a.map(function (key) {
|
|
54
|
-
addContent(key, getNowData(item.uniqueKey +
|
|
55
|
-
upgradeParams(key, getNowData(item.uniqueKey +
|
|
54
|
+
addContent(key, getNowData(item.uniqueKey + '.' + key, ''));
|
|
55
|
+
upgradeParams(key, getNowData(item.uniqueKey + '.' + key, ''));
|
|
56
56
|
});
|
|
57
57
|
};
|
|
58
58
|
};
|
|
@@ -62,25 +62,25 @@ var handleReceiverAddressInput = function handleReceiverAddressInput(_a) {
|
|
|
62
62
|
return function (item) {
|
|
63
63
|
var _a;
|
|
64
64
|
(_a = ['province', 'city', 'district']) === null || _a === void 0 ? void 0 : _a.map(function (key, index) {
|
|
65
|
-
addContent(key, getNowData(item.uniqueKey +
|
|
65
|
+
addContent(key, getNowData(item.uniqueKey + '.address[' + index + ']', ''));
|
|
66
66
|
});
|
|
67
|
-
addContent('address', getNowData(item.uniqueKey +
|
|
67
|
+
addContent('address', getNowData(item.uniqueKey + '.detail', ''));
|
|
68
68
|
};
|
|
69
69
|
};
|
|
70
70
|
var handleExpressLogisticsSelect = function handleExpressLogisticsSelect(_a) {
|
|
71
71
|
var addContent = _a.addContent,
|
|
72
72
|
getNowData = _a.getNowData;
|
|
73
73
|
return function (item) {
|
|
74
|
-
addContent('expressLogisticsCompany', getNowData(item.uniqueKey +
|
|
75
|
-
addContent('expressLogisticsCode', getNowData(item.uniqueKey +
|
|
74
|
+
addContent('expressLogisticsCompany', getNowData(item.uniqueKey + '.company', ''));
|
|
75
|
+
addContent('expressLogisticsCode', getNowData(item.uniqueKey + '.order', ''));
|
|
76
76
|
};
|
|
77
77
|
};
|
|
78
78
|
var handleReturnLogisticsSelect = function handleReturnLogisticsSelect(_a) {
|
|
79
79
|
var addContent = _a.addContent,
|
|
80
80
|
getNowData = _a.getNowData;
|
|
81
81
|
return function (item) {
|
|
82
|
-
addContent('returnLogisticsCompany', getNowData(item.uniqueKey +
|
|
83
|
-
addContent('returnLogisticsCode', getNowData(item.uniqueKey +
|
|
82
|
+
addContent('returnLogisticsCompany', getNowData(item.uniqueKey + '.company', ''));
|
|
83
|
+
addContent('returnLogisticsCode', getNowData(item.uniqueKey + '.order', ''));
|
|
84
84
|
};
|
|
85
85
|
};
|
|
86
86
|
var handleRemarkInput = function handleRemarkInput(_a) {
|
|
@@ -96,17 +96,17 @@ var handleRemarkInput = function handleRemarkInput(_a) {
|
|
|
96
96
|
remarkSubmitTime = _a.remarkSubmitTime,
|
|
97
97
|
_b = _a.remarkSubmitTimeFormat,
|
|
98
98
|
remarkSubmitTimeFormat = _b === void 0 ? 'YYYY/MM/DD HH:mm:ss' : _b;
|
|
99
|
-
var current = getNowData(item.uniqueKey +
|
|
100
|
-
var old = getOldData(
|
|
101
|
-
var currentFlag = getNowData(item.uniqueKey +
|
|
102
|
-
var oldFlag = getOldData(
|
|
99
|
+
var current = getNowData(item.uniqueKey + '.remark', '');
|
|
100
|
+
var old = getOldData('jsonMap.' + item.uniqueKey + '_remark', '');
|
|
101
|
+
var currentFlag = getNowData(item.uniqueKey + '.flag', undefined);
|
|
102
|
+
var oldFlag = getOldData('jsonMap.' + item.uniqueKey + '_flag', undefined);
|
|
103
103
|
if (current.trim() !== old.trim() || Number(currentFlag) !== Number(oldFlag)) {
|
|
104
104
|
if (remarkSubmitter) {
|
|
105
|
-
current = current +
|
|
105
|
+
current = current + ' ' + accountName;
|
|
106
106
|
}
|
|
107
107
|
if (remarkSubmitTime) {
|
|
108
|
-
var submitTime = moment_1[
|
|
109
|
-
current = current +
|
|
108
|
+
var submitTime = moment_1['default']().format(remarkSubmitTimeFormat);
|
|
109
|
+
current = current + ' ' + submitTime;
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
addContent('remark', current);
|
|
@@ -126,8 +126,8 @@ var handleAlipayInput = function handleAlipayInput(_a) {
|
|
|
126
126
|
var addContent = _a.addContent,
|
|
127
127
|
getNowData = _a.getNowData;
|
|
128
128
|
return function (item) {
|
|
129
|
-
addContent('alipayName', getNowData(item.uniqueKey +
|
|
130
|
-
addContent('alipayAccount', getNowData(item.uniqueKey +
|
|
129
|
+
addContent('alipayName', getNowData(item.uniqueKey + '.name', ''));
|
|
130
|
+
addContent('alipayAccount', getNowData(item.uniqueKey + '.user', ''));
|
|
131
131
|
};
|
|
132
132
|
};
|
|
133
133
|
var handleStatus = function handleStatus(_a) {
|
|
@@ -135,7 +135,7 @@ var handleStatus = function handleStatus(_a) {
|
|
|
135
135
|
getNowData = _a.getNowData;
|
|
136
136
|
return function (item) {
|
|
137
137
|
['status', 'customerService'].map(function (key) {
|
|
138
|
-
addContent(key, getNowData(item.uniqueKey +
|
|
138
|
+
addContent(key, getNowData(item.uniqueKey + '.' + key, ''));
|
|
139
139
|
});
|
|
140
140
|
};
|
|
141
141
|
};
|
|
@@ -145,7 +145,7 @@ var handleOrdinaryInvoice = function handleOrdinaryInvoice(_a) {
|
|
|
145
145
|
return function (item) {
|
|
146
146
|
var _a;
|
|
147
147
|
(_a = lodash_1.get(item, 'componentConfig.extendList', [])) === null || _a === void 0 ? void 0 : _a.map(function (l) {
|
|
148
|
-
addContent(l.uniqueKey, getNowData(item.uniqueKey +
|
|
148
|
+
addContent(l.uniqueKey, getNowData(item.uniqueKey + '.' + l.uniqueKey, ''), l.name);
|
|
149
149
|
});
|
|
150
150
|
};
|
|
151
151
|
};
|
|
@@ -154,11 +154,11 @@ var handleLogisticsInterception = function handleLogisticsInterception(_a) {
|
|
|
154
154
|
getNowData = _a.getNowData;
|
|
155
155
|
return function (item) {
|
|
156
156
|
['interceptCompany', 'interceptCode', 'interceptSenderMobile', 'interceptType', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus', 'interceptLogisticsApiStatus'].map(function (key) {
|
|
157
|
-
addContent(key, getNowData(item.uniqueKey +
|
|
157
|
+
addContent(key, getNowData(item.uniqueKey + '.' + key, ''));
|
|
158
158
|
});
|
|
159
|
-
addContent('interceptProvince', getNowData(item.uniqueKey +
|
|
160
|
-
addContent('interceptCity', getNowData(item.uniqueKey +
|
|
161
|
-
addContent('interceptDistrict', getNowData(item.uniqueKey +
|
|
159
|
+
addContent('interceptProvince', getNowData(item.uniqueKey + '.interceptAddress[0]', ''));
|
|
160
|
+
addContent('interceptCity', getNowData(item.uniqueKey + '.interceptAddress[1]', ''));
|
|
161
|
+
addContent('interceptDistrict', getNowData(item.uniqueKey + '.interceptAddress[2]', ''));
|
|
162
162
|
};
|
|
163
163
|
};
|
|
164
164
|
var handleLogisticsInterceptionMore = function handleLogisticsInterceptionMore(_a) {
|
|
@@ -192,7 +192,7 @@ var handlePicture = function handlePicture(_a) {
|
|
|
192
192
|
getNowData = _a.getNowData;
|
|
193
193
|
return function (item) {
|
|
194
194
|
var _a;
|
|
195
|
-
var host = cache_1[
|
|
195
|
+
var host = cache_1['default'].getHost() || window.location.origin;
|
|
196
196
|
var value = getNowData(item.uniqueKey, undefined);
|
|
197
197
|
addContent('picture', (_a = value === null || value === void 0 ? void 0 : value.map(function (str) {
|
|
198
198
|
str = str.replace(/^data:image\/\w+;base64,/, '');
|
|
@@ -200,7 +200,7 @@ var handlePicture = function handlePicture(_a) {
|
|
|
200
200
|
str = str.substring(1, str.length);
|
|
201
201
|
}
|
|
202
202
|
if (str.startsWith(host)) {
|
|
203
|
-
str = str.replace(host +
|
|
203
|
+
str = str.replace(host + '/', '');
|
|
204
204
|
}
|
|
205
205
|
return str;
|
|
206
206
|
})) === null || _a === void 0 ? void 0 : _a.join(','));
|
|
@@ -243,7 +243,7 @@ var handleBasicAddress = function handleBasicAddress(_a) {
|
|
|
243
243
|
getNowData = _a.getNowData;
|
|
244
244
|
return function (item) {
|
|
245
245
|
['basicProvince', 'basicCity', 'basicDistrict'].map(function (key, index) {
|
|
246
|
-
addContent(key,
|
|
246
|
+
addContent(key, '' + getNowData(item.uniqueKey + '[' + index + ']', ''));
|
|
247
247
|
});
|
|
248
248
|
};
|
|
249
249
|
};
|
|
@@ -252,10 +252,10 @@ var handlePosting = function handlePosting(_a) {
|
|
|
252
252
|
getNowData = _a.getNowData;
|
|
253
253
|
return function (item) {
|
|
254
254
|
['postingDetail', 'postingReceiverName', 'postingReceiverMobile'].map(function (key) {
|
|
255
|
-
addContent(key, getNowData(item.uniqueKey +
|
|
255
|
+
addContent(key, getNowData(item.uniqueKey + '.' + key, ''));
|
|
256
256
|
});
|
|
257
257
|
['postingProvince', 'postingCity', 'postingDistrict'].map(function (key, index) {
|
|
258
|
-
addContent(key, getNowData(item.uniqueKey +
|
|
258
|
+
addContent(key, getNowData(item.uniqueKey + '.postingAddress[' + index + ']', ''));
|
|
259
259
|
});
|
|
260
260
|
};
|
|
261
261
|
};
|
|
@@ -265,10 +265,10 @@ var handleEnterprisePayment = function handleEnterprisePayment(_a) {
|
|
|
265
265
|
upgradeParams = _a.upgradeParams;
|
|
266
266
|
return function (item) {
|
|
267
267
|
['enterprisePaymentRefundFee', 'enterprisePaymentTid', 'enterprisePaymentBuyerNick', 'enterprisePaymentBuyerOpenUid', 'enterprisePaymentAlipayNick', 'enterprisePaymentAlipayNo', 'enterprisePaymentStatus'].map(function (key) {
|
|
268
|
-
addContent(key, key === 'enterprisePaymentStatus' ? getNowData(item.uniqueKey +
|
|
268
|
+
addContent(key, key === 'enterprisePaymentStatus' ? getNowData(item.uniqueKey + '.' + key, '未打款') : getNowData(item.uniqueKey + '.' + key, ''));
|
|
269
269
|
});
|
|
270
|
-
upgradeParams('buyerNick', getNowData(item.uniqueKey +
|
|
271
|
-
upgradeParams('buyerOpenUid', getNowData(item.uniqueKey +
|
|
270
|
+
upgradeParams('buyerNick', getNowData(item.uniqueKey + '.enterprisePaymentBuyerNick', ''));
|
|
271
|
+
upgradeParams('buyerOpenUid', getNowData(item.uniqueKey + '.enterprisePaymentBuyerOpenUid', ''));
|
|
272
272
|
};
|
|
273
273
|
};
|
|
274
274
|
var handleJstLogistics = function handleJstLogistics(_a) {
|
|
@@ -423,7 +423,7 @@ var handleLogisticsTrajectory = function handleLogisticsTrajectory(_a) {
|
|
|
423
423
|
getNowData = _a.getNowData;
|
|
424
424
|
return function (item) {
|
|
425
425
|
['trajectoryCompany', 'trajectoryCode', 'trajectorySnapshot', 'trajectoryPhone'].map(function (key) {
|
|
426
|
-
addContent(key, getNowData(item.uniqueKey +
|
|
426
|
+
addContent(key, getNowData(item.uniqueKey + '.' + key, ''));
|
|
427
427
|
});
|
|
428
428
|
};
|
|
429
429
|
};
|
|
@@ -518,22 +518,22 @@ var handleBsPosting = function handleBsPosting(_a) {
|
|
|
518
518
|
getNowData = _a.getNowData;
|
|
519
519
|
return function (item) {
|
|
520
520
|
['bsPostingProvince', 'bsPostingCity', 'bsPostingDistrict'].map(function (key, index) {
|
|
521
|
-
addContent(key, getNowData(item.uniqueKey +
|
|
521
|
+
addContent(key, getNowData(item.uniqueKey + '.postingAddress[' + index + ']', ''));
|
|
522
522
|
});
|
|
523
|
-
addContent('bsPostingDetail', getNowData(item.uniqueKey +
|
|
524
|
-
addContent('bsPostingReceiverName', getNowData(item.uniqueKey +
|
|
525
|
-
addContent('bsPostingReceiverMobile', getNowData(item.uniqueKey +
|
|
523
|
+
addContent('bsPostingDetail', getNowData(item.uniqueKey + '.postingDetail', ''));
|
|
524
|
+
addContent('bsPostingReceiverName', getNowData(item.uniqueKey + '.postingReceiverName', ''));
|
|
525
|
+
addContent('bsPostingReceiverMobile', getNowData(item.uniqueKey + '.postingReceiverMobile', ''));
|
|
526
526
|
};
|
|
527
527
|
};
|
|
528
528
|
var handleSystemOrder = function handleSystemOrder(_a) {
|
|
529
529
|
var addContent = _a.addContent,
|
|
530
530
|
getNowData = _a.getNowData;
|
|
531
531
|
return function (item) {
|
|
532
|
-
var selectIds = getNowData(item.uniqueKey +
|
|
532
|
+
var selectIds = getNowData(item.uniqueKey + '.selectIds', '');
|
|
533
533
|
console.log('触发---getGyOrderList--5');
|
|
534
|
-
var showOrderInfo = getNowData(item.uniqueKey +
|
|
534
|
+
var showOrderInfo = getNowData(item.uniqueKey + '.showOrderInfo', []);
|
|
535
535
|
var type = item.workOrderComponentType;
|
|
536
|
-
addContent(constant_1.SUBMIT_COMPONENT_SYSTEM_ORDER_MAP[type].no, getNowData(item.uniqueKey +
|
|
536
|
+
addContent(constant_1.SUBMIT_COMPONENT_SYSTEM_ORDER_MAP[type].no, getNowData(item.uniqueKey + '.orderNo', ''));
|
|
537
537
|
addContent(constant_1.SUBMIT_COMPONENT_SYSTEM_ORDER_MAP[type].ids, selectIds);
|
|
538
538
|
addContent(constant_1.SUBMIT_COMPONENT_SYSTEM_ORDER_MAP[type].order, showOrderInfo.map(function (item) {
|
|
539
539
|
return __assign(__assign({}, item), {
|
|
@@ -597,9 +597,9 @@ var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_a) {
|
|
|
597
597
|
return function (item) {
|
|
598
598
|
['bsE3SystemOrderNo', 'bsE3ReissueType', 'bsE3ReissueMemo', 'bsE3ReissueGoods'].map(function (key) {
|
|
599
599
|
if (key === 'bsE3ReissueGoods') {
|
|
600
|
-
addContent(key, getNowData(item.uniqueKey +
|
|
600
|
+
addContent(key, getNowData(item.uniqueKey + '.' + key, []));
|
|
601
601
|
} else {
|
|
602
|
-
addContent(key, getNowData(item.uniqueKey +
|
|
602
|
+
addContent(key, getNowData(item.uniqueKey + '.' + key, ''));
|
|
603
603
|
}
|
|
604
604
|
});
|
|
605
605
|
};
|
|
@@ -608,23 +608,23 @@ var handleDefault = function handleDefault(_a) {
|
|
|
608
608
|
var addContent = _a.addContent,
|
|
609
609
|
getNowData = _a.getNowData;
|
|
610
610
|
return function (item) {
|
|
611
|
-
addContent(voca_1[
|
|
611
|
+
addContent(voca_1['default'].camelCase(item.workOrderComponentType), getNowData(item.uniqueKey, ''));
|
|
612
612
|
};
|
|
613
613
|
};
|
|
614
614
|
var handleStatusField = function handleStatusField(_a) {
|
|
615
615
|
var addContent = _a.addContent,
|
|
616
616
|
getNowData = _a.getNowData;
|
|
617
617
|
return function (item) {
|
|
618
|
-
addContent(constant_1.SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].status, getNowData(item.uniqueKey +
|
|
619
|
-
addContent(constant_1.SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].reason, getNowData(item.uniqueKey +
|
|
618
|
+
addContent(constant_1.SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].status, getNowData(item.uniqueKey + '.status', ''));
|
|
619
|
+
addContent(constant_1.SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].reason, getNowData(item.uniqueKey + '.reason', ''));
|
|
620
620
|
};
|
|
621
621
|
};
|
|
622
622
|
var handleGoodStatus = function handleGoodStatus(_a) {
|
|
623
623
|
var addContent = _a.addContent,
|
|
624
624
|
getNowData = _a.getNowData;
|
|
625
625
|
return function (item) {
|
|
626
|
-
addContent(constant_1.SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].list, getNowData(
|
|
627
|
-
addContent(constant_1.SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].status, getNowData(
|
|
626
|
+
addContent(constant_1.SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].list, getNowData('' + item.uniqueKey, []));
|
|
627
|
+
addContent(constant_1.SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].status, getNowData('' + item.uniqueKey, []).map(function (item) {
|
|
628
628
|
return item.status;
|
|
629
629
|
}));
|
|
630
630
|
};
|
|
@@ -638,7 +638,7 @@ var processComponent = function processComponent(_a) {
|
|
|
638
638
|
getValueByField = _a.getValueByField;
|
|
639
639
|
return function (item) {
|
|
640
640
|
var contentVoList = [];
|
|
641
|
-
var uniqueKeyPrefix = item.uniqueKey +
|
|
641
|
+
var uniqueKeyPrefix = item.uniqueKey + '_';
|
|
642
642
|
var addContent = function addContent(suffix, content, name) {
|
|
643
643
|
contentVoList.push({
|
|
644
644
|
uniqueKey: uniqueKeyPrefix + suffix,
|
|
@@ -856,7 +856,7 @@ var processComponent = function processComponent(_a) {
|
|
|
856
856
|
}
|
|
857
857
|
if (updateFlag) {
|
|
858
858
|
contentVoList.forEach(function (cl) {
|
|
859
|
-
return cl.oldContent = getOldData(
|
|
859
|
+
return cl.oldContent = getOldData('jsonMap.' + cl.uniqueKey, '');
|
|
860
860
|
});
|
|
861
861
|
}
|
|
862
862
|
if (!updateFlag && item.workOrderComponentType === 'REMARK_INPUT') {
|
|
@@ -896,4 +896,4 @@ var submitDataTransOldFormat = function submitDataTransOldFormat(nowData, source
|
|
|
896
896
|
}));
|
|
897
897
|
return result;
|
|
898
898
|
};
|
|
899
|
-
exports[
|
|
899
|
+
exports['default'] = submitDataTransOldFormat;
|