kmkf-work-order-service-component 0.0.1-alpha.1 → 0.0.1-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +38 -0
- package/dist/esm/WorkOrder/common/cache/index.d.ts +4 -2
- package/dist/esm/WorkOrder/common/cache/index.js +31 -21
- package/dist/esm/WorkOrder/common/constant.js +2 -2
- package/dist/esm/WorkOrder/common/imgs/empty.png +0 -0
- package/dist/esm/WorkOrder/common/styles/base.less +2 -2
- package/dist/esm/WorkOrder/common/styles/theme.less +46 -1
- package/dist/esm/WorkOrder/common/utils/formatAddrData.js +6 -5
- package/dist/esm/WorkOrder/common/utils/tools.js +23 -20
- package/dist/esm/WorkOrder/components/CustomizeFormModal/index.js +55 -20
- package/dist/esm/WorkOrder/components/CustomizeFormModal/index.module.less +12 -3
- package/dist/esm/WorkOrder/components/CustomizeFormModal/wrap.d.ts +2 -2
- package/dist/esm/WorkOrder/components/CustomizeFormModal/wrap.js +3 -3
- package/dist/esm/WorkOrder/components/ListOrderItem/index.js +12 -3
- package/dist/esm/WorkOrder/components/ListOrderItem/index.module.less +5 -1
- package/dist/esm/WorkOrder/components/PayListOrderItem/ModifyModal.js +58 -16
- package/dist/esm/WorkOrder/components/PayListOrderItem/RecordModal.js +4 -4
- package/dist/esm/WorkOrder/components/PayListOrderItem/index.js +0 -2
- package/dist/esm/WorkOrder/components/PayListOrderItem/record.module.less +6 -0
- package/dist/esm/WorkOrder/components/RecordLog/index.js +3 -5
- package/dist/esm/WorkOrder/components/RecordLog/index.module.less +2 -0
- package/dist/esm/WorkOrder/components/Widget/basic/Address/index.js +2 -2
- package/dist/esm/WorkOrder/components/Widget/basic/Checkbox/index.js +2 -4
- package/dist/esm/WorkOrder/components/Widget/basic/Picture/index.js +1 -2
- package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.js +3 -6
- package/dist/esm/WorkOrder/components/Widget/electricity/EBuyerName/index.js +3 -4
- package/dist/esm/WorkOrder/components/Widget/electricity/EBuyerNick/index.js +2 -3
- package/dist/esm/WorkOrder/components/Widget/electricity/EItemEncode/index.js +4 -3
- package/dist/esm/WorkOrder/components/Widget/electricity/EItemId/index.js +4 -3
- package/dist/esm/WorkOrder/components/Widget/electricity/EItemSelect/index.js +4 -3
- package/dist/esm/WorkOrder/components/Widget/electricity/EReceiverAddress/index.js +3 -4
- package/dist/esm/WorkOrder/components/Widget/electricity/ETradeId/index.d.ts +1 -0
- package/dist/esm/WorkOrder/components/Widget/electricity/ETradeId/index.js +21 -12
- package/dist/esm/WorkOrder/components/Widget/electricity/Express/index.js +1 -2
- package/dist/esm/WorkOrder/components/Widget/third/ItemSelect/index.js +4 -3
- package/dist/esm/WorkOrder/components/Widget/third/Payment/PaymentAmount.js +4 -3
- package/dist/esm/WorkOrder/components/Widget/third/Payment/index.js +3 -4
- package/dist/esm/WorkOrder/index.d.ts +1 -1
- package/dist/esm/WorkOrder/index.js +160 -126
- package/dist/esm/WorkOrder/index.module.less +40 -8
- package/dist/esm/WorkOrder/model/servers/api.d.ts +1 -0
- package/dist/esm/WorkOrder/model/servers/api.js +11 -3
- package/dist/esm/WorkOrder/model/servers/request.js +7 -13
- package/dist/esm/WorkOrder/model/workOrder.js +8 -6
- package/package.json +5 -3
- package/dist/esm/WorkOrder/common/imgs/close.png +0 -0
- package/dist/esm/WorkOrder/common/imgs/kmgd.png +0 -0
- package/dist/esm/WorkOrder/common/imgs/logo.png +0 -0
package/README.md
CHANGED
@@ -1,3 +1,11 @@
|
|
1
|
+
<!--
|
2
|
+
* @Description:
|
3
|
+
* @Author: litian
|
4
|
+
* @Date: 2022-09-21 09:16:51
|
5
|
+
* @LastEditors: litian
|
6
|
+
* @LastEditTime: 2022-09-22 11:27:58
|
7
|
+
-->
|
8
|
+
|
1
9
|
# kmkf-work-order-service-component
|
2
10
|
|
3
11
|
## Getting Started
|
@@ -31,3 +39,33 @@ Build library via `father`,
|
|
31
39
|
```bash
|
32
40
|
$ npm run build
|
33
41
|
```
|
42
|
+
|
43
|
+
## 企业工单工单项目抽离模块
|
44
|
+
|
45
|
+
- 自定义工单
|
46
|
+
- 打款工单
|
47
|
+
|
48
|
+
link 方式 https://cloud.tencent.com/developer/article/1842631
|
49
|
+
|
50
|
+
模块引用方式
|
51
|
+
|
52
|
+
```
|
53
|
+
import { WorkOrder } from 'kmkf-work-order-service-component'
|
54
|
+
|
55
|
+
cosnt Text = ()=>{
|
56
|
+
return <WorkOrder platform="FXG"
|
57
|
+
shopId={shopId}
|
58
|
+
buyerNick={buyerNick}
|
59
|
+
buyerId={buyerId}
|
60
|
+
orderNo={orderNo}></WorkOrder>
|
61
|
+
}
|
62
|
+
|
63
|
+
```
|
64
|
+
|
65
|
+
| 字段 | 说明 | 数据类型 |
|
66
|
+
| --------- | -------- | ------------------------------------ |
|
67
|
+
| platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| |
|
68
|
+
| shopId | 店铺 ID | number |
|
69
|
+
| buyerNick | 买家昵称 | string |
|
70
|
+
| buyerId | 买家 id | string |
|
71
|
+
| orderNo | 订单 id | string |
|
@@ -10,11 +10,13 @@ declare const _default: {
|
|
10
10
|
getAllFormatExpressData: () => any;
|
11
11
|
setHistoryList: (data?: historyListType[]) => void;
|
12
12
|
getHistoryList: () => historyListType[];
|
13
|
-
setGrayEnv: (isGray:
|
14
|
-
getGrayEnv: () =>
|
13
|
+
setGrayEnv: (isGray: string) => void;
|
14
|
+
getGrayEnv: () => string | null;
|
15
15
|
setHost: (host: string) => void;
|
16
16
|
getHost: () => any;
|
17
|
+
removeHost: () => any;
|
17
18
|
setCookie: (cookie: string) => void;
|
18
19
|
getCookie: () => any;
|
20
|
+
removeCookie: () => void;
|
19
21
|
};
|
20
22
|
export default _default;
|
@@ -2,83 +2,91 @@
|
|
2
2
|
* @Author: wangzhenggui jianjia.wzg@raycloud.com
|
3
3
|
* @Date: 2022-09-14 15:05:38
|
4
4
|
* @LastEditors: litian
|
5
|
-
* @LastEditTime: 2022-09-
|
5
|
+
* @LastEditTime: 2022-09-21 10:06:27
|
6
6
|
* @FilePath: /dy-work-order/src/common/cache/index.ts
|
7
7
|
* @Description:
|
8
8
|
*
|
9
9
|
* Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
|
10
10
|
*/
|
11
|
-
import store from 'store2';
|
12
|
-
|
13
11
|
// 地市信息
|
14
12
|
var setAddressData = function setAddressData(data) {
|
15
|
-
|
13
|
+
localStorage.setItem('addressData', JSON.stringify(data));
|
16
14
|
};
|
17
15
|
|
18
16
|
var getAddressData = function getAddressData() {
|
19
|
-
return
|
17
|
+
return JSON.parse(localStorage.getItem('addressData') || '[]');
|
20
18
|
};
|
21
19
|
|
22
20
|
var setAddressNameMap = function setAddressNameMap(data) {
|
23
|
-
|
21
|
+
localStorage.setItem('addressNameMap', JSON.stringify(data));
|
24
22
|
};
|
25
23
|
|
26
24
|
var getAddressNameMap = function getAddressNameMap() {
|
27
|
-
return
|
25
|
+
return JSON.parse(localStorage.getItem('addressNameMap') || '{}');
|
28
26
|
}; // 物流公司信息
|
29
27
|
|
30
28
|
|
31
29
|
var setAllOriginExpressData = function setAllOriginExpressData(data) {
|
32
|
-
|
30
|
+
localStorage.setItem('allOriginExpressData', JSON.stringify(data));
|
33
31
|
};
|
34
32
|
|
35
33
|
var getAllOriginExpressData = function getAllOriginExpressData() {
|
36
|
-
return
|
34
|
+
return JSON.parse(localStorage.getItem('allOriginExpressData') || '[]');
|
37
35
|
};
|
38
36
|
|
39
37
|
var setAllFormatExpressData = function setAllFormatExpressData(data) {
|
40
|
-
|
38
|
+
localStorage.setItem('allFormatExpressData', JSON.stringify(data));
|
41
39
|
};
|
42
40
|
|
43
41
|
var getAllFormatExpressData = function getAllFormatExpressData() {
|
44
|
-
return
|
42
|
+
return JSON.parse(localStorage.getItem('allFormatExpressData') || '[]');
|
45
43
|
}; // 用户登陆信息
|
46
44
|
|
47
45
|
|
48
46
|
var setHistoryList = function setHistoryList() {
|
49
47
|
var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
50
|
-
|
48
|
+
localStorage.setItem('historyList', JSON.stringify(data) || '[]');
|
51
49
|
};
|
52
50
|
|
53
51
|
var getHistoryList = function getHistoryList() {
|
54
|
-
return
|
52
|
+
return JSON.parse(localStorage.getItem('historyList') || '[]');
|
55
53
|
}; // 设置灰度环境
|
56
54
|
|
57
55
|
|
58
56
|
var setGrayEnv = function setGrayEnv(isGray) {
|
59
|
-
|
57
|
+
localStorage.setItem('grayEnv', isGray);
|
60
58
|
};
|
61
59
|
|
62
60
|
var getGrayEnv = function getGrayEnv() {
|
63
|
-
return
|
61
|
+
return localStorage.getItem('grayEnv');
|
64
62
|
}; // 设置当前host
|
65
63
|
|
66
64
|
|
67
65
|
var setHost = function setHost(host) {
|
68
|
-
|
66
|
+
localStorage.setItem('kmkf_kmgd_host', host);
|
69
67
|
};
|
70
68
|
|
71
69
|
var getHost = function getHost() {
|
72
|
-
return
|
70
|
+
return localStorage.getItem('kmkf_kmgd_host');
|
71
|
+
};
|
72
|
+
|
73
|
+
var removeHost = function removeHost() {
|
74
|
+
return localStorage.removeItem('kmkf_kmgd_host');
|
73
75
|
}; // 设置cookie
|
74
76
|
|
75
77
|
|
76
78
|
var setCookie = function setCookie(cookie) {
|
77
|
-
|
78
|
-
};
|
79
|
+
localStorage.setItem('kmkf_kmgd_cookie', cookie);
|
80
|
+
}; //获取cookie
|
81
|
+
|
79
82
|
|
80
83
|
var getCookie = function getCookie() {
|
81
|
-
return
|
84
|
+
return localStorage.getItem('kmkf_kmgd_cookie');
|
85
|
+
}; //删除cookie
|
86
|
+
|
87
|
+
|
88
|
+
var removeCookie = function removeCookie() {
|
89
|
+
localStorage.removeItem('kmkf_kmgd_cookie');
|
82
90
|
};
|
83
91
|
|
84
92
|
export default {
|
@@ -96,6 +104,8 @@ export default {
|
|
96
104
|
getGrayEnv: getGrayEnv,
|
97
105
|
setHost: setHost,
|
98
106
|
getHost: getHost,
|
107
|
+
removeHost: removeHost,
|
99
108
|
setCookie: setCookie,
|
100
|
-
getCookie: getCookie
|
109
|
+
getCookie: getCookie,
|
110
|
+
removeCookie: removeCookie
|
101
111
|
};
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/*
|
2
2
|
* @Author: wangzhenggui jianjia.wzg@raycloud.com
|
3
3
|
* @Date: 2022-09-14 16:01:46
|
4
|
-
* @LastEditors:
|
5
|
-
* @LastEditTime: 2022-09-
|
4
|
+
* @LastEditors: litian
|
5
|
+
* @LastEditTime: 2022-09-19 17:33:45
|
6
6
|
* @FilePath: /dy-work-order/src/common/constant.ts
|
7
7
|
* @Description:
|
8
8
|
*
|
Binary file
|
@@ -1,3 +1,3 @@
|
|
1
|
-
@import 'antd/dist/antd.css';
|
2
|
-
@import 'normalize.css';
|
1
|
+
// @import 'antd/dist/antd.css';
|
2
|
+
// @import 'normalize.css';
|
3
3
|
@import './theme.less';
|
@@ -24,6 +24,7 @@ a {
|
|
24
24
|
height: 24px;
|
25
25
|
}
|
26
26
|
|
27
|
+
.ant-modal-content .ant-btn-primary,
|
27
28
|
.ant-btn-primary {
|
28
29
|
background: #1966ff;
|
29
30
|
}
|
@@ -31,7 +32,9 @@ a {
|
|
31
32
|
.ant-input,
|
32
33
|
.ant-btn-primary,
|
33
34
|
.ant-pagination-options-quick-jumper input,
|
34
|
-
.ant-select:not(.ant-select-customize-input) .ant-select-selector
|
35
|
+
.ant-select:not(.ant-select-customize-input) .ant-select-selector,
|
36
|
+
.ant-modal-content,
|
37
|
+
.ant-btn {
|
35
38
|
border-radius: 4px;
|
36
39
|
}
|
37
40
|
|
@@ -49,3 +52,45 @@ a {
|
|
49
52
|
.ant-upload-picture-card-wrapper {
|
50
53
|
width: auto;
|
51
54
|
}
|
55
|
+
|
56
|
+
.ant-form-item-label {
|
57
|
+
color: rgba(0, 0, 0, 0.55);
|
58
|
+
font-weight: normal;
|
59
|
+
font-size: 14px;
|
60
|
+
text-align: left;
|
61
|
+
}
|
62
|
+
|
63
|
+
.ant-form-item {
|
64
|
+
margin-bottom: 20px;
|
65
|
+
}
|
66
|
+
|
67
|
+
.ant-cascader-menu-item-content {
|
68
|
+
max-width: 150px;
|
69
|
+
overflow: hidden;
|
70
|
+
white-space: nowrap;
|
71
|
+
text-overflow: ellipsis;
|
72
|
+
}
|
73
|
+
|
74
|
+
.ant-picker-panel-container .ant-picker-panels {
|
75
|
+
flex-wrap: wrap;
|
76
|
+
}
|
77
|
+
|
78
|
+
.goodsMain {
|
79
|
+
height: 260px;
|
80
|
+
|
81
|
+
.goodItem {
|
82
|
+
box-sizing: border-box;
|
83
|
+
width: 85px;
|
84
|
+
height: 126px;
|
85
|
+
margin: 0 8px 8px 0;
|
86
|
+
padding: 4px;
|
87
|
+
background: #ffffff;
|
88
|
+
border: 1px solid rgba(0, 0, 0, 0.15);
|
89
|
+
border-radius: 4px;
|
90
|
+
|
91
|
+
.goodImg {
|
92
|
+
width: 77px;
|
93
|
+
height: 77px;
|
94
|
+
}
|
95
|
+
}
|
96
|
+
}
|
@@ -11,7 +11,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
|
|
11
11
|
* @Author: litian
|
12
12
|
* @Date: 2022-09-07 18:12:23
|
13
13
|
* @LastEditors: litian
|
14
|
-
* @LastEditTime: 2022-09-
|
14
|
+
* @LastEditTime: 2022-09-21 10:34:39
|
15
15
|
*/
|
16
16
|
|
17
17
|
/*处理省市区*/
|
@@ -34,7 +34,7 @@ var formatAddrData = {
|
|
34
34
|
case 0:
|
35
35
|
apaasAddress = window.localStorage.getItem('address');
|
36
36
|
apaasAddressMap = window.localStorage.getItem('addressMap');
|
37
|
-
apaasSaveTime = window.localStorage.getItem('
|
37
|
+
apaasSaveTime = window.localStorage.getItem('addressSaveTime'); //判断是否过期 缓存7天
|
38
38
|
|
39
39
|
isExpire = apaasSaveTime ? Number(apaasSaveTime) + 7 * 3600 * 24 * 1000 < new Date().getTime() : true;
|
40
40
|
|
@@ -43,8 +43,8 @@ var formatAddrData = {
|
|
43
43
|
break;
|
44
44
|
}
|
45
45
|
|
46
|
-
this.addrData = apaasAddress;
|
47
|
-
this.addrNameMap = apaasAddressMap;
|
46
|
+
this.addrData = JSON.parse(apaasAddress);
|
47
|
+
this.addrNameMap = JSON.parse(apaasAddressMap || '{}');
|
48
48
|
return _context.abrupt("return");
|
49
49
|
|
50
50
|
case 8:
|
@@ -71,7 +71,7 @@ var formatAddrData = {
|
|
71
71
|
this.addrNameMap = map;
|
72
72
|
window.localStorage.setItem('address', JSON.stringify(res));
|
73
73
|
window.localStorage.setItem('addressMap', JSON.stringify(map));
|
74
|
-
window.localStorage.setItem('
|
74
|
+
window.localStorage.setItem('addressSaveTime', new Date().getTime().toString());
|
75
75
|
|
76
76
|
case 19:
|
77
77
|
case "end":
|
@@ -128,6 +128,7 @@ var formatAddrData = {
|
|
128
128
|
}
|
129
129
|
},
|
130
130
|
getNameByCode: function getNameByCode(code) {
|
131
|
+
console.log('getNameByCode', code, ((this.addrData || {})[code] || [])[0]);
|
131
132
|
return ((this.addrData || {})[code] || [])[0];
|
132
133
|
}
|
133
134
|
};
|
@@ -17,6 +17,7 @@ import V from 'voca';
|
|
17
17
|
import { orderDetail } from "../../model/servers/api";
|
18
18
|
import moment from 'moment';
|
19
19
|
import express from "./express";
|
20
|
+
import cache from "../cache";
|
20
21
|
var ONLY_SHOW_COMPONENT_TYPE = ['RADIO', 'INPUT', 'TEXTAREA', 'CHECKBOX', 'SELECT', 'DATETIME', 'PICTURE', 'MULT_SELECT', 'ORDINARY_INVOICE'];
|
21
22
|
/**
|
22
23
|
* 校验数据是不是空
|
@@ -147,6 +148,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
147
148
|
name: item.name
|
148
149
|
});
|
149
150
|
params.buyerNick = get(nowData, "".concat(item.uniqueKey, ".buyerNick"), '');
|
151
|
+
params.buyerOpenUid = get(nowData, "".concat(item.uniqueKey, ".buyerOpenUid"), '');
|
150
152
|
} else if (item.workOrderComponentType === 'RECEIVER_ADDRESS_INPUT') {
|
151
153
|
contentVoList.push({
|
152
154
|
uniqueKey: "".concat(item.uniqueKey, "_province"),
|
@@ -235,6 +237,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
235
237
|
} else if (item.workOrderComponentType === 'PICTURE') {
|
236
238
|
var _value$map;
|
237
239
|
|
240
|
+
var host = cache.getHost();
|
238
241
|
var value = nowData[item.uniqueKey];
|
239
242
|
contentVoList.push({
|
240
243
|
uniqueKey: "".concat(item.uniqueKey, "_picture"),
|
@@ -245,8 +248,8 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
245
248
|
item = item.substring(1, item.length);
|
246
249
|
}
|
247
250
|
|
248
|
-
if (item.startsWith(
|
249
|
-
item = item.replace("".concat(
|
251
|
+
if (item.startsWith(host)) {
|
252
|
+
item = item.replace("".concat(host, "/"), '');
|
250
253
|
}
|
251
254
|
|
252
255
|
return item;
|
@@ -362,6 +365,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
362
365
|
});
|
363
366
|
});
|
364
367
|
|
368
|
+
params.buyerNick = get(nowData, "".concat(item.uniqueKey, ".enterprisePaymentBuyerNick"), '');
|
365
369
|
params.buyerOpenUid = get(nowData, "".concat(item.uniqueKey, ".enterprisePaymentBuyerOpenUid"), '');
|
366
370
|
} else if (item.workOrderComponentType === 'ITEM_ID') {
|
367
371
|
contentVoList.push({
|
@@ -511,8 +515,9 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
511
515
|
} else if (nex.workOrderComponentType === 'DATETIME') {
|
512
516
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_dateTime")], item.jsonMap["".concat(nex.uniqueKey, "_dateTime")]) || config.dateTime));
|
513
517
|
} else if (nex.workOrderComponentType === 'PICTURE') {
|
518
|
+
var host = cache.getHost();
|
514
519
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_picture")] ? formatPictures(item.jsonMap["".concat(nex.uniqueKey, "_picture")]).map(function (item) {
|
515
|
-
return "".concat(
|
520
|
+
return "".concat(host, "/").concat(item);
|
516
521
|
}) : []));
|
517
522
|
} else if (nex.workOrderComponentType === 'BASIC_MULT_SELECT') {
|
518
523
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_basicMultSelect")], '') || config.basicMultSelect || []));
|
@@ -628,16 +633,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
628
633
|
shopSourceStr = (_shopList$find = shopList.find(function (item) {
|
629
634
|
return item.shopId == shopId;
|
630
635
|
})) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr;
|
631
|
-
|
632
|
-
if (!(shopSourceStr !== 'FXG')) {
|
633
|
-
_context.next = 5;
|
634
|
-
break;
|
635
|
-
}
|
636
|
-
|
637
|
-
return _context.abrupt("return");
|
638
|
-
|
639
|
-
case 5:
|
640
|
-
_context.next = 7;
|
636
|
+
_context.next = 5;
|
641
637
|
return orderDetail({
|
642
638
|
shopId: shopId,
|
643
639
|
//店铺id
|
@@ -645,10 +641,18 @@ export var orderBack = /*#__PURE__*/function () {
|
|
645
641
|
|
646
642
|
});
|
647
643
|
|
648
|
-
case
|
644
|
+
case 5:
|
649
645
|
_yield$orderDetail = _context.sent;
|
650
646
|
data = _yield$orderDetail.data;
|
651
|
-
|
647
|
+
|
648
|
+
if (data) {
|
649
|
+
_context.next = 9;
|
650
|
+
break;
|
651
|
+
}
|
652
|
+
|
653
|
+
return _context.abrupt("return");
|
654
|
+
|
655
|
+
case 9:
|
652
656
|
orderNo = data.orderNo, provinceCode = data.provinceCode, cityCode = data.cityCode, townCode = data.townCode, orderCreateDateTime = data.orderCreateDateTime, orderPaymentDateTime = data.orderPaymentDateTime, orderDeliveryDateTime = data.orderDeliveryDateTime, orderClosingDateTime = data.orderClosingDateTime, productId = data.productId, productCode = data.productCode;
|
653
657
|
transField = {
|
654
658
|
tradeId: orderNo,
|
@@ -665,8 +669,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
665
669
|
finalResponse = _objectSpread(_objectSpread({}, data), transField); //获取当前表单字段
|
666
670
|
|
667
671
|
formValue = form.getFieldsValue();
|
668
|
-
detail = finalResponse || {};
|
669
|
-
console.log(shopSourceStr, finalResponse); //抖音数据
|
672
|
+
detail = finalResponse || {}; //抖音数据
|
670
673
|
|
671
674
|
if (shopSourceStr === 'FXG') {
|
672
675
|
detail = updateDYDetails(finalResponse);
|
@@ -723,11 +726,11 @@ export var orderBack = /*#__PURE__*/function () {
|
|
723
726
|
|
724
727
|
newData = calcWorkOrderList([{
|
725
728
|
jsonMap: detailsValue
|
726
|
-
}], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init');
|
727
|
-
|
729
|
+
}], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init'); // console.log('detailsValue=========', formValue, detailsValue, newData[0]);
|
730
|
+
|
728
731
|
form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), newData[0]));
|
729
732
|
|
730
|
-
case
|
733
|
+
case 21:
|
731
734
|
case "end":
|
732
735
|
return _context.stop();
|
733
736
|
}
|
@@ -38,7 +38,7 @@ import { get, find, some } from 'lodash';
|
|
38
38
|
import zhCN from 'antd/es/locale/zh_CN';
|
39
39
|
import moment from 'moment';
|
40
40
|
import 'moment/locale/zh-cn';
|
41
|
-
import { calcWorkOrderList, submitDataTransOldFormat } from "../../common/utils/tools";
|
41
|
+
import { calcWorkOrderList, submitDataTransOldFormat, orderBack } from "../../common/utils/tools";
|
42
42
|
import { factory } from "../Widget";
|
43
43
|
import { queryTemplateDetail, addWorkOrder, queryWorkOrderDetail, updateWorkOrder } from "../../model/servers/api";
|
44
44
|
import styles from "./index.module.less";
|
@@ -278,13 +278,13 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
|
|
278
278
|
|
279
279
|
var queryDetail = /*#__PURE__*/function () {
|
280
280
|
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
|
281
|
-
var templateId, workOrderId, shopId, record, _workOrderDetail2, _workOrderDetail2$dat, _workOrderDetail2$dat2, _workOrderDetail, _templateDetail, _workOrderDetail3, _templateDetail$data, transData, _templateDetail$data2, _transData;
|
281
|
+
var templateId, workOrderId, shopId, record, orderNo, buyerId, _workOrderDetail2, _workOrderDetail2$dat, _workOrderDetail2$dat2, _workOrderDetail, _templateDetail, _workOrderDetail3, _templateDetail$data, transData, _templateDetail$data2, _templateDetail$data3, jsonMap, _transData;
|
282
282
|
|
283
283
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
284
284
|
while (1) {
|
285
285
|
switch (_context2.prev = _context2.next) {
|
286
286
|
case 0:
|
287
|
-
templateId = _ref2.templateId, workOrderId = _ref2.workOrderId, shopId = _ref2.shopId, record = _ref2.record;
|
287
|
+
templateId = _ref2.templateId, workOrderId = _ref2.workOrderId, shopId = _ref2.shopId, record = _ref2.record, orderNo = _ref2.orderNo, buyerId = _ref2.buyerId;
|
288
288
|
form.resetFields();
|
289
289
|
_context2.prev = 2;
|
290
290
|
setLoading(true);
|
@@ -317,8 +317,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
|
|
317
317
|
setWorkOrderDetail(_workOrderDetail.data);
|
318
318
|
|
319
319
|
if (workOrderId) {
|
320
|
-
transData = calcWorkOrderList([(_workOrderDetail3 = _workOrderDetail) === null || _workOrderDetail3 === void 0 ? void 0 : _workOrderDetail3.data], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data = _templateDetail.data) === null || _templateDetail$data === void 0 ? void 0 : _templateDetail$data.componentDtoList);
|
321
|
-
|
320
|
+
transData = calcWorkOrderList([(_workOrderDetail3 = _workOrderDetail) === null || _workOrderDetail3 === void 0 ? void 0 : _workOrderDetail3.data], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data = _templateDetail.data) === null || _templateDetail$data === void 0 ? void 0 : _templateDetail$data.componentDtoList); // console.log(transData);
|
321
|
+
|
322
322
|
form.setFieldsValue(_objectSpread(_objectSpread({}, get(transData, '0', {})), {}, {
|
323
323
|
shopId: shopId,
|
324
324
|
shopName: record.shopName,
|
@@ -327,32 +327,52 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
|
|
327
327
|
processTime: record.processTime
|
328
328
|
}));
|
329
329
|
} else {
|
330
|
+
//获取一些默认数据
|
331
|
+
jsonMap = _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data2 = _templateDetail.data) === null || _templateDetail$data2 === void 0 ? void 0 : _templateDetail$data2.componentDtoList.reduce(function (prv, next) {
|
332
|
+
if (next.workOrderComponentType === 'BUYER_NICK_INPUT') {
|
333
|
+
prv["".concat(next.uniqueKey, "_buyerOpenUid")] = buyerId;
|
334
|
+
}
|
335
|
+
|
336
|
+
return prv;
|
337
|
+
});
|
330
338
|
_transData = calcWorkOrderList([{
|
331
|
-
jsonMap:
|
332
|
-
}], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$
|
339
|
+
jsonMap: jsonMap
|
340
|
+
}], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data3 = _templateDetail.data) === null || _templateDetail$data3 === void 0 ? void 0 : _templateDetail$data3.componentDtoList, 'init');
|
333
341
|
form.setFieldsValue(_objectSpread({}, get(_transData, '0', {})));
|
342
|
+
} //如果有订单号 订单返填
|
343
|
+
// console.log(orderNo);
|
344
|
+
|
345
|
+
|
346
|
+
if (orderNo) {
|
347
|
+
orderBack({
|
348
|
+
order_no: orderNo,
|
349
|
+
form: form,
|
350
|
+
shopId: shopId,
|
351
|
+
shopList: shopList,
|
352
|
+
templateDetail: _templateDetail === null || _templateDetail === void 0 ? void 0 : _templateDetail.data
|
353
|
+
});
|
334
354
|
}
|
335
355
|
|
336
356
|
document.getElementsByClassName('ant-form')[0].scrollTop = 0;
|
337
|
-
_context2.next =
|
357
|
+
_context2.next = 22;
|
338
358
|
break;
|
339
359
|
|
340
|
-
case
|
341
|
-
_context2.prev =
|
360
|
+
case 19:
|
361
|
+
_context2.prev = 19;
|
342
362
|
_context2.t0 = _context2["catch"](2);
|
343
363
|
console.error('获取模板信息错误', _context2.t0);
|
344
364
|
|
345
|
-
case
|
346
|
-
_context2.prev =
|
365
|
+
case 22:
|
366
|
+
_context2.prev = 22;
|
347
367
|
setLoading(false);
|
348
|
-
return _context2.finish(
|
368
|
+
return _context2.finish(22);
|
349
369
|
|
350
|
-
case
|
370
|
+
case 25:
|
351
371
|
case "end":
|
352
372
|
return _context2.stop();
|
353
373
|
}
|
354
374
|
}
|
355
|
-
}, _callee2, null, [[2,
|
375
|
+
}, _callee2, null, [[2, 19, 22, 25]]);
|
356
376
|
}));
|
357
377
|
|
358
378
|
return function queryDetail(_x3) {
|
@@ -369,8 +389,10 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
|
|
369
389
|
shopId = _ref4.shopId,
|
370
390
|
workOrderId = _ref4.workOrderId,
|
371
391
|
_ref4$record = _ref4.record,
|
372
|
-
record = _ref4$record === void 0 ? {} : _ref4$record
|
373
|
-
|
392
|
+
record = _ref4$record === void 0 ? {} : _ref4$record,
|
393
|
+
orderNo = _ref4.orderNo,
|
394
|
+
buyerId = _ref4.buyerId;
|
395
|
+
// console.log('openModal---------', templateId, shopId, workOrderId, (record = {}));
|
374
396
|
setVisible(true);
|
375
397
|
setTemplateId(templateId);
|
376
398
|
setWorkOrderId(workOrderId);
|
@@ -379,7 +401,9 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
|
|
379
401
|
templateId: templateId,
|
380
402
|
workOrderId: workOrderId,
|
381
403
|
shopId: shopId,
|
382
|
-
record: record
|
404
|
+
record: record,
|
405
|
+
orderNo: orderNo,
|
406
|
+
buyerId: buyerId
|
383
407
|
});
|
384
408
|
};
|
385
409
|
|
@@ -388,6 +412,9 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
|
|
388
412
|
|
389
413
|
if (look) {
|
390
414
|
btnGroup = /*#__PURE__*/_jsx(Space, {
|
415
|
+
style: {
|
416
|
+
float: 'right'
|
417
|
+
},
|
391
418
|
children: /*#__PURE__*/_jsx(Button, {
|
392
419
|
type: "primary",
|
393
420
|
onClick: function onClick() {
|
@@ -398,6 +425,9 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
|
|
398
425
|
});
|
399
426
|
} else {
|
400
427
|
btnGroup = /*#__PURE__*/_jsxs(Space, {
|
428
|
+
style: {
|
429
|
+
float: 'right'
|
430
|
+
},
|
401
431
|
children: [/*#__PURE__*/_jsx(Button, {
|
402
432
|
onClick: function onClick() {
|
403
433
|
return closeModal();
|
@@ -418,7 +448,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
|
|
418
448
|
|
419
449
|
return /*#__PURE__*/_jsx(Drawer, {
|
420
450
|
title: title || '工单录入',
|
421
|
-
width:
|
451
|
+
width: '100%',
|
422
452
|
open: visible,
|
423
453
|
onClose: closeModal,
|
424
454
|
footer: renderFooter(),
|
@@ -428,7 +458,12 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
|
|
428
458
|
locale: zhCN,
|
429
459
|
children: /*#__PURE__*/_jsx(Form, {
|
430
460
|
form: form,
|
431
|
-
|
461
|
+
labelCol: {
|
462
|
+
span: 6
|
463
|
+
},
|
464
|
+
wrapperCol: {
|
465
|
+
span: 18
|
466
|
+
},
|
432
467
|
className: styles.customizeFormModalClassName,
|
433
468
|
style: {
|
434
469
|
maxHeight: '500px'
|
@@ -67,15 +67,24 @@
|
|
67
67
|
}
|
68
68
|
}
|
69
69
|
|
70
|
+
:global(.ant-form-item) {
|
71
|
+
margin-bottom: 20px;
|
72
|
+
}
|
73
|
+
|
70
74
|
:global(.ant-form-item-label) {
|
71
75
|
position: relative;
|
72
|
-
|
76
|
+
max-width: 30%;
|
77
|
+
color: rgba(0, 0, 0, 0.55);
|
78
|
+
// font-weight: bold;
|
73
79
|
font-size: 14px;
|
80
|
+
white-space: normal;
|
81
|
+
text-align: left;
|
74
82
|
}
|
75
83
|
|
76
84
|
:global(.form-item-label--index .ant-form-item-label label) {
|
77
|
-
padding-left: 23px;
|
78
|
-
|
85
|
+
// padding-left: 23px;
|
86
|
+
text-align: left;
|
87
|
+
// font-family: 'PingFangSC-Semibold';
|
79
88
|
|
80
89
|
&[title='处理客服'] {
|
81
90
|
padding-left: 0;
|
@@ -8,7 +8,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
|
8
8
|
* @Author: wangzhenggui jianjia.wzg@raycloud.com
|
9
9
|
* @Date: 2022-09-13 14:30:28
|
10
10
|
* @LastEditors: litian
|
11
|
-
* @LastEditTime: 2022-09-
|
11
|
+
* @LastEditTime: 2022-09-19 10:01:49
|
12
12
|
* @FilePath: /dy-work-order/src/components/CustomizeFormModal/wrap.tsx
|
13
13
|
* @Description:
|
14
14
|
*
|
@@ -31,9 +31,9 @@ var openCustomizeWOrkOrder = function openCustomizeWOrkOrder(prefixParams) {
|
|
31
31
|
function render() {
|
32
32
|
reactRender( /*#__PURE__*/_jsx(CustomizeFormModal, {
|
33
33
|
ref: ref,
|
34
|
-
onSuccess: function onSuccess() {
|
34
|
+
onSuccess: function onSuccess(val) {
|
35
35
|
if (typeof (prefixParams === null || prefixParams === void 0 ? void 0 : prefixParams.onSuccess) === 'function') {
|
36
|
-
return prefixParams === null || prefixParams === void 0 ? void 0 : prefixParams.onSuccess();
|
36
|
+
return prefixParams === null || prefixParams === void 0 ? void 0 : prefixParams.onSuccess(val);
|
37
37
|
}
|
38
38
|
|
39
39
|
destroy();
|