kmkf-work-order-service-component 0.1.1 → 0.1.2
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/WorkOrder/common/utils/tools.js +0 -2
- package/dist/esm/WorkOrder/components/CustomizeFormModal/index.js +1 -2
- package/dist/esm/WorkOrder/components/CustomizeFormModal/index.module.less +5 -1
- package/dist/esm/WorkOrder/components/ListOrderItem/index.js +103 -71
- package/dist/esm/WorkOrder/components/ListOrderItem/index.module.less +7 -5
- package/dist/esm/WorkOrder/components/PayListOrderItem/ModifyModal.js +1 -1
- package/dist/esm/WorkOrder/components/PayListOrderItem/RecordModal.js +2 -2
- package/dist/esm/WorkOrder/components/PayListOrderItem/index.js +12 -7
- package/dist/esm/WorkOrder/components/RecordLog/index.js +1 -1
- package/dist/esm/WorkOrder/components/TransferOrderModal/index.js +2 -2
- package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.js +1 -1
- package/dist/esm/WorkOrder/index.js +37 -27
- package/dist/esm/WorkOrder/index.less +8 -0
- package/dist/esm/WorkOrder/model/workOrder.js +7 -9
- package/package.json +1 -1
- package/dist/esm/WorkOrder/components/PayListOrderItem/index.module.less +0 -0
@@ -603,7 +603,6 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
603
603
|
};
|
604
604
|
|
605
605
|
export var calcWorkOrderList = function calcWorkOrderList(source, templateColumns, type) {
|
606
|
-
console.time('calcWorkOrderList');
|
607
606
|
var transDataSourceItem = transDataSource(templateColumns, type);
|
608
607
|
var finalSource = source === null || source === void 0 ? void 0 : source.map(function (item) {
|
609
608
|
var value = transDataSourceItem(item);
|
@@ -613,7 +612,6 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
|
|
613
612
|
id: item.id
|
614
613
|
});
|
615
614
|
});
|
616
|
-
console.timeEnd('calcWorkOrderList');
|
617
615
|
return finalSource;
|
618
616
|
}; //订单返填
|
619
617
|
|
@@ -98,7 +98,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
|
|
98
98
|
openModal: openModal,
|
99
99
|
closeModal: closeModal
|
100
100
|
};
|
101
|
-
}, []);
|
101
|
+
}, [shopList]);
|
102
102
|
|
103
103
|
var asyncDoSave = /*#__PURE__*/function () {
|
104
104
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(workOrderDetail, templateDetail) {
|
@@ -360,7 +360,6 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
|
|
360
360
|
}], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data3 = _templateDetail.data) === null || _templateDetail$data3 === void 0 ? void 0 : _templateDetail$data3.componentDtoList, 'init');
|
361
361
|
form.setFieldsValue(_objectSpread({}, get(_transData, '0', {})));
|
362
362
|
} //如果有订单号 订单返填
|
363
|
-
// console.log(orderNo);
|
364
363
|
|
365
364
|
|
366
365
|
if (orderNo) {
|
@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
21
21
|
* @Author: litian
|
22
22
|
* @Date: 2022-09-07 17:04:02
|
23
23
|
* @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
|
24
|
-
* @LastEditTime: 2022-10-
|
24
|
+
* @LastEditTime: 2022-10-21 14:39:21
|
25
25
|
*/
|
26
26
|
import React from 'react';
|
27
27
|
import { factory } from "../Widget";
|
@@ -45,9 +45,8 @@ function ListOrderItem(props) {
|
|
45
45
|
|
46
46
|
var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], componentDtoList),
|
47
47
|
_calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
|
48
|
-
transData = _calcWorkOrderList2[0];
|
48
|
+
transData = _calcWorkOrderList2[0]; //列表头部
|
49
49
|
|
50
|
-
console.log('transData', transData); //列表头部
|
51
50
|
|
52
51
|
var ItemHeader = function ItemHeader() {
|
53
52
|
// 获取工单状态组件自定义文案
|
@@ -68,38 +67,85 @@ function ListOrderItem(props) {
|
|
68
67
|
}
|
69
68
|
|
70
69
|
return status;
|
71
|
-
}; //
|
70
|
+
}; // 处理工单状态
|
72
71
|
|
73
72
|
|
74
|
-
var
|
73
|
+
var showTextButton = function showTextButton(jsonMap, status) {
|
74
|
+
var msg = '';
|
75
|
+
|
75
76
|
for (var key in jsonMap) {
|
76
77
|
if (jsonMap.hasOwnProperty(key)) {
|
77
78
|
if (~key.indexOf('_status')) {
|
78
79
|
if (jsonMap[key] === '0') {
|
79
|
-
|
80
|
+
msg = '未' + status;
|
81
|
+
} else if (jsonMap[key] === '1') {
|
82
|
+
msg = '已' + status;
|
80
83
|
}
|
81
84
|
}
|
82
85
|
}
|
83
86
|
}
|
84
|
-
}; // 处理工单状态
|
85
87
|
|
88
|
+
return msg;
|
89
|
+
};
|
86
90
|
|
87
|
-
var
|
88
|
-
|
91
|
+
var id = item.id,
|
92
|
+
templateDetailDto = item.templateDetailDto,
|
93
|
+
jsonMap = item.jsonMap;
|
94
|
+
var componentDtoList = templateDetailDto ? templateDetailDto.componentDtoList : [];
|
95
|
+
var status = showStatusText(componentDtoList);
|
96
|
+
var showMsg = showTextButton(jsonMap, status);
|
97
|
+
return /*#__PURE__*/_jsx("div", {
|
98
|
+
className: styles.orderItem,
|
99
|
+
children: /*#__PURE__*/_jsx("div", {
|
100
|
+
className: styles.orderItemLeft,
|
101
|
+
children: /*#__PURE__*/_jsxs("div", {
|
102
|
+
className: styles.orderItemType,
|
103
|
+
children: [/*#__PURE__*/_jsx("div", {
|
104
|
+
className: styles.orderItemLeftIcon
|
105
|
+
}), /*#__PURE__*/_jsxs("div", {
|
106
|
+
className: styles.orderItemLeftName,
|
107
|
+
children: [templateDetailDto ? templateDetailDto.name : '', showMsg.length > 1 && /*#__PURE__*/_jsx("div", {
|
108
|
+
className: "".concat(styles.orderItemStatus, " ").concat(showMsg.includes('已') ? styles.done : styles.undo),
|
109
|
+
children: showMsg
|
110
|
+
})]
|
111
|
+
})]
|
112
|
+
})
|
113
|
+
})
|
114
|
+
});
|
115
|
+
};
|
89
116
|
|
117
|
+
var ItemActions = function ItemActions() {
|
118
|
+
// 获取工单状态组件自定义文案
|
119
|
+
var showStatusText = function showStatusText(componentDtoList) {
|
120
|
+
var status = '';
|
121
|
+
var len = componentDtoList.length;
|
122
|
+
|
123
|
+
for (var i = 0; i < len; i++) {
|
124
|
+
var obj = componentDtoList[i];
|
125
|
+
|
126
|
+
if (obj.workOrderComponentType === 'STATUS') {
|
127
|
+
var _obj$componentConfig2 = obj.componentConfig,
|
128
|
+
customStatusText = _obj$componentConfig2.customStatusText,
|
129
|
+
isUseCustomStatus = _obj$componentConfig2.isUseCustomStatus;
|
130
|
+
status = isUseCustomStatus ? customStatusText : '处理';
|
131
|
+
break;
|
132
|
+
}
|
133
|
+
}
|
134
|
+
|
135
|
+
return status;
|
136
|
+
}; // 判断是否存在工单状态组件,并且未处理
|
137
|
+
|
138
|
+
|
139
|
+
var showStatusButton = function showStatusButton(jsonMap) {
|
90
140
|
for (var key in jsonMap) {
|
91
141
|
if (jsonMap.hasOwnProperty(key)) {
|
92
142
|
if (~key.indexOf('_status')) {
|
93
143
|
if (jsonMap[key] === '0') {
|
94
|
-
|
95
|
-
} else if (jsonMap[key] === '1') {
|
96
|
-
msg = '已' + status;
|
144
|
+
return true;
|
97
145
|
}
|
98
146
|
}
|
99
147
|
}
|
100
148
|
}
|
101
|
-
|
102
|
-
return msg;
|
103
149
|
}; // 售后打款组件
|
104
150
|
|
105
151
|
|
@@ -176,74 +222,55 @@ function ListOrderItem(props) {
|
|
176
222
|
onTransfer === null || onTransfer === void 0 ? void 0 : onTransfer(item);
|
177
223
|
};
|
178
224
|
|
179
|
-
var
|
180
|
-
templateDetailDto = item.templateDetailDto,
|
225
|
+
var templateDetailDto = item.templateDetailDto,
|
181
226
|
jsonMap = item.jsonMap;
|
182
227
|
var componentDtoList = templateDetailDto ? templateDetailDto.componentDtoList : [];
|
183
228
|
var status = showStatusText(componentDtoList);
|
184
229
|
var hasStatus = showStatusButton(jsonMap);
|
185
|
-
var showMsg = showTextButton(jsonMap, status);
|
186
230
|
var showEditorBtn = isAfterSalePayment(componentDtoList);
|
187
231
|
return /*#__PURE__*/_jsxs("div", {
|
188
|
-
className: styles.
|
189
|
-
children: [/*#__PURE__*/_jsx("div", {
|
190
|
-
|
191
|
-
children: /*#__PURE__*/_jsxs("div", {
|
192
|
-
className: styles.orderItemType,
|
193
|
-
children: [/*#__PURE__*/_jsx("div", {
|
194
|
-
className: styles.orderItemLeftIcon
|
195
|
-
}), /*#__PURE__*/_jsxs("div", {
|
196
|
-
className: styles.orderItemLeftName,
|
197
|
-
children: [templateDetailDto ? templateDetailDto.name : '', showMsg.length > 1 && /*#__PURE__*/_jsx("div", {
|
198
|
-
className: "".concat(styles.orderItemStatus, " ").concat(showMsg.includes('已') ? styles.done : styles.undo),
|
199
|
-
children: showMsg
|
200
|
-
})]
|
201
|
-
})]
|
202
|
-
})
|
203
|
-
}), /*#__PURE__*/_jsxs("div", {
|
204
|
-
className: styles.orderItemRight,
|
205
|
-
children: [hasStatus ? /*#__PURE__*/_jsx("div", {
|
206
|
-
children: /*#__PURE__*/_jsx("span", {
|
207
|
-
className: styles.orderItemOperate,
|
208
|
-
onClick: function onClick() {
|
209
|
-
return upDateState(item, status);
|
210
|
-
},
|
211
|
-
children: status
|
212
|
-
})
|
213
|
-
}) : null, hasStatus ? /*#__PURE__*/_jsx("div", {
|
214
|
-
children: /*#__PURE__*/_jsx("span", {
|
215
|
-
className: styles.orderItemOperate,
|
216
|
-
onClick: function onClick() {
|
217
|
-
return transferOrder(item);
|
218
|
-
},
|
219
|
-
children: "\u8F6C\u4EA4"
|
220
|
-
})
|
221
|
-
}) : null, showEditorBtn ? null : /*#__PURE__*/_jsx("span", {
|
232
|
+
className: styles.orderItemRight,
|
233
|
+
children: [hasStatus ? /*#__PURE__*/_jsx("div", {
|
234
|
+
children: /*#__PURE__*/_jsx("span", {
|
222
235
|
className: styles.orderItemOperate,
|
223
236
|
onClick: function onClick() {
|
224
|
-
return
|
237
|
+
return upDateState(item, status);
|
225
238
|
},
|
226
|
-
children:
|
227
|
-
})
|
228
|
-
|
229
|
-
|
230
|
-
return onDelete(item);
|
231
|
-
},
|
232
|
-
okText: "\u786E\u5B9A",
|
233
|
-
cancelText: "\u53D6\u6D88",
|
234
|
-
children: /*#__PURE__*/_jsx("span", {
|
235
|
-
className: styles.orderItemOperate,
|
236
|
-
children: "\u5220\u9664"
|
237
|
-
})
|
238
|
-
}), /*#__PURE__*/_jsx("span", {
|
239
|
+
children: status
|
240
|
+
})
|
241
|
+
}) : null, hasStatus ? /*#__PURE__*/_jsx("div", {
|
242
|
+
children: /*#__PURE__*/_jsx("span", {
|
239
243
|
className: styles.orderItemOperate,
|
240
244
|
onClick: function onClick() {
|
241
|
-
return
|
245
|
+
return transferOrder(item);
|
242
246
|
},
|
243
|
-
children: "\
|
244
|
-
})
|
247
|
+
children: "\u8F6C\u4EA4"
|
248
|
+
})
|
249
|
+
}) : null, showEditorBtn ? null : /*#__PURE__*/_jsx("span", {
|
250
|
+
className: styles.orderItemOperate,
|
251
|
+
onClick: function onClick() {
|
252
|
+
return onEdit(item);
|
253
|
+
},
|
254
|
+
children: "\u4FEE\u6539"
|
255
|
+
}), /*#__PURE__*/_jsx(Popconfirm, {
|
256
|
+
title: "\u5220\u9664\u5DE5\u5355\u540E\u5C06\u65E0\u6CD5\u6062\u590D\uFF0C\u786E\u8BA4\u8981\u5220\u9664\u8BE5\u6761\u6570\u636E\u5417\uFF1F",
|
257
|
+
onConfirm: function onConfirm() {
|
258
|
+
return onDelete(item);
|
259
|
+
},
|
260
|
+
okText: "\u786E\u5B9A",
|
261
|
+
cancelText: "\u53D6\u6D88",
|
262
|
+
children: /*#__PURE__*/_jsx("span", {
|
263
|
+
className: styles.orderItemOperate,
|
264
|
+
children: "\u5220\u9664"
|
265
|
+
})
|
266
|
+
}), /*#__PURE__*/_jsx("span", {
|
267
|
+
className: styles.orderItemOperate,
|
268
|
+
onClick: function onClick() {
|
269
|
+
return onLog(item);
|
270
|
+
},
|
271
|
+
children: "\u8BB0\u5F55"
|
245
272
|
})]
|
246
|
-
}
|
273
|
+
});
|
247
274
|
};
|
248
275
|
|
249
276
|
var ItemView = function ItemView(_ref) {
|
@@ -264,7 +291,7 @@ function ListOrderItem(props) {
|
|
264
291
|
|
265
292
|
return /*#__PURE__*/_jsxs("div", {
|
266
293
|
className: styles.listOrderItemBox,
|
267
|
-
children: [ItemHeader
|
294
|
+
children: [/*#__PURE__*/_jsx(ItemHeader, {}), ItemView({
|
268
295
|
label: '提交时间',
|
269
296
|
value: moment(transData.created).format('YYYY-MM-DD HH:mm:ss'),
|
270
297
|
key: 'created'
|
@@ -300,7 +327,12 @@ function ListOrderItem(props) {
|
|
300
327
|
value: instance.render(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || ''], transData),
|
301
328
|
key: t.uniqueKey
|
302
329
|
}) : null;
|
303
|
-
})
|
330
|
+
}), /*#__PURE__*/_jsx(Divider, {
|
331
|
+
dashed: true,
|
332
|
+
style: {
|
333
|
+
margin: '8px 0'
|
334
|
+
}
|
335
|
+
}), /*#__PURE__*/_jsx(ItemActions, {})]
|
304
336
|
});
|
305
337
|
}
|
306
338
|
|
@@ -18,6 +18,7 @@
|
|
18
18
|
|
19
19
|
.orderItemType {
|
20
20
|
display: flex;
|
21
|
+
align-items: center;
|
21
22
|
// align-items: center;
|
22
23
|
color: rgba(0, 0, 0, 0.85);
|
23
24
|
font-weight: normal;
|
@@ -41,13 +42,14 @@
|
|
41
42
|
display: inline-block;
|
42
43
|
box-sizing: border-box;
|
43
44
|
height: 24px;
|
45
|
+
margin-left: 8px;
|
44
46
|
padding: 0px 4px;
|
45
47
|
line-height: 23px;
|
46
48
|
white-space: nowrap;
|
47
49
|
// align-items: center;
|
48
50
|
// justify-content: center;
|
49
51
|
text-align: center;
|
50
|
-
border-radius:
|
52
|
+
border-radius: 4px;
|
51
53
|
}
|
52
54
|
|
53
55
|
.undo {
|
@@ -62,11 +64,11 @@
|
|
62
64
|
border: 1px solid #dffacd;
|
63
65
|
}
|
64
66
|
}
|
67
|
+
}
|
65
68
|
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
}
|
69
|
+
.orderItemRight {
|
70
|
+
display: flex;
|
71
|
+
justify-content: flex-end;
|
70
72
|
}
|
71
73
|
|
72
74
|
.orderItemOperate {
|
@@ -23,7 +23,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
23
23
|
* @Author: litian
|
24
24
|
* @Date: 2022-09-09 16:58:00
|
25
25
|
* @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
|
26
|
-
* @LastEditTime: 2022-10-
|
26
|
+
* @LastEditTime: 2022-10-21 11:27:52
|
27
27
|
*/
|
28
28
|
import React, { useImperativeHandle, forwardRef, useState } from 'react';
|
29
29
|
import { Drawer } from 'antd';
|
@@ -107,7 +107,7 @@ function RecordModal(props, ref) {
|
|
107
107
|
return /*#__PURE__*/_jsx(Drawer, {
|
108
108
|
title: "\u8BB0\u5F55",
|
109
109
|
width: '90%',
|
110
|
-
|
110
|
+
open: visible,
|
111
111
|
onClose: function onClose() {
|
112
112
|
return setVisible(false);
|
113
113
|
},
|
@@ -406,9 +406,9 @@ function PayListOrderItem(props) {
|
|
406
406
|
|
407
407
|
return /*#__PURE__*/_jsxs("div", {
|
408
408
|
className: styles.listOrderItemBox,
|
409
|
-
children: [/*#__PURE__*/
|
409
|
+
children: [/*#__PURE__*/_jsx("div", {
|
410
410
|
className: styles.orderItem,
|
411
|
-
children:
|
411
|
+
children: /*#__PURE__*/_jsx("div", {
|
412
412
|
className: styles.orderItemLeft,
|
413
413
|
children: /*#__PURE__*/_jsxs("div", {
|
414
414
|
className: styles.orderItemType,
|
@@ -425,10 +425,7 @@ function PayListOrderItem(props) {
|
|
425
425
|
children: workPayStatusDesc
|
426
426
|
})]
|
427
427
|
})
|
428
|
-
})
|
429
|
-
className: styles.orderItemRight,
|
430
|
-
children: btnList
|
431
|
-
})]
|
428
|
+
})
|
432
429
|
}), /*#__PURE__*/_jsx("div", {
|
433
430
|
className: styles.workOrderInfo,
|
434
431
|
children: renderFormItem([{
|
@@ -464,8 +461,16 @@ function PayListOrderItem(props) {
|
|
464
461
|
label: '支付宝账号:',
|
465
462
|
value: accountNoMix
|
466
463
|
}])
|
464
|
+
}), /*#__PURE__*/_jsx(Divider, {
|
465
|
+
dashed: true,
|
466
|
+
style: {
|
467
|
+
margin: '12px 0'
|
468
|
+
}
|
469
|
+
}), /*#__PURE__*/_jsx("span", {
|
470
|
+
className: styles.orderItemRight,
|
471
|
+
children: btnList
|
467
472
|
})]
|
468
|
-
}
|
473
|
+
});
|
469
474
|
}
|
470
475
|
|
471
476
|
export default PayListOrderItem;
|
@@ -23,7 +23,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
23
23
|
* @Author: litian
|
24
24
|
* @Date: 2022-09-15 10:51:44
|
25
25
|
* @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
|
26
|
-
* @LastEditTime: 2022-10-11
|
26
|
+
* @LastEditTime: 2022-10-21 11:46:22
|
27
27
|
*/
|
28
28
|
import React, { useState, useImperativeHandle, forwardRef } from 'react';
|
29
29
|
import { Modal, Form, Select } from 'antd';
|
@@ -116,7 +116,7 @@ var TransCustomerModal = function TransCustomerModal(props, ref) {
|
|
116
116
|
return /*#__PURE__*/_jsx(Modal, {
|
117
117
|
title: "\u8F6C\u4EA4\u5BA2\u670D",
|
118
118
|
centered: true,
|
119
|
-
|
119
|
+
open: visible,
|
120
120
|
width: 400,
|
121
121
|
okText: "\u786E\u5B9A",
|
122
122
|
cancelText: "\u53D6\u6D88",
|
@@ -143,7 +143,7 @@ export var ShowTotalImage = function ShowTotalImage(_ref4) {
|
|
143
143
|
},
|
144
144
|
children: "\u67E5\u770B\u5168\u90E8(".concat(total, ")")
|
145
145
|
}), /*#__PURE__*/_jsx(Modal, {
|
146
|
-
|
146
|
+
open: visible,
|
147
147
|
footer: null,
|
148
148
|
onCancel: function onCancel() {
|
149
149
|
return setVisible(false);
|
@@ -28,14 +28,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
28
28
|
* @Author: wangzhenggui jianjia.wzg@raycloud.com
|
29
29
|
* @Date: 2022-09-16 11:19:43
|
30
30
|
* @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
|
31
|
-
* @LastEditTime: 2022-10-
|
31
|
+
* @LastEditTime: 2022-10-21 14:47:07
|
32
32
|
* @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
|
33
33
|
* @Description:
|
34
34
|
*
|
35
35
|
* Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
|
36
36
|
*/
|
37
37
|
import React, { useState, useEffect, useRef } from 'react';
|
38
|
-
import Wrapper from "./components/Wrapper";
|
39
38
|
import { Tabs, Select, Pagination, Cascader, DatePicker, Space, Checkbox, Spin, message } from 'antd';
|
40
39
|
import { useAppSelector, useAppDispatch } from "./model/hooks";
|
41
40
|
import { fetchQueryGroupCustomTemplate, fetchQueryWorkOrder, fetchQueryCurrentCompanyUser, fetchQueryPaymentWorkOrderList, fetchDeleteWorkOrder } from "./model/workOrder";
|
@@ -54,6 +53,7 @@ import { transferWorkOrder } from "./model/servers/api";
|
|
54
53
|
import get from 'lodash/get';
|
55
54
|
import refreshImg from "./common/imgs/refresh.png";
|
56
55
|
import emptyImg from "./common/imgs/empty.png";
|
56
|
+
import moment from 'moment';
|
57
57
|
import "./index.less";
|
58
58
|
import { jsx as _jsx } from "react/jsx-runtime";
|
59
59
|
import { jsxs as _jsxs } from "react/jsx-runtime";
|
@@ -125,7 +125,8 @@ var WorkOrder = function WorkOrder(props) {
|
|
125
125
|
|
126
126
|
return /*#__PURE__*/_jsx(Spin, {
|
127
127
|
spinning: loading,
|
128
|
-
children: /*#__PURE__*/_jsxs(
|
128
|
+
children: /*#__PURE__*/_jsxs("div", {
|
129
|
+
className: "order_container",
|
129
130
|
children: [/*#__PURE__*/_jsx("header", {
|
130
131
|
className: "order_header",
|
131
132
|
children: /*#__PURE__*/_jsxs("div", {
|
@@ -144,13 +145,18 @@ var WorkOrder = function WorkOrder(props) {
|
|
144
145
|
children: "\u6253\u6B3E\u5DE5\u5355"
|
145
146
|
})]
|
146
147
|
})
|
147
|
-
}), OrderList
|
148
|
+
}), /*#__PURE__*/_jsx(OrderList, {
|
149
|
+
tabActive: tabActive
|
150
|
+
}), /*#__PURE__*/_jsx(PayOrderList, {
|
151
|
+
tabActive: tabActive
|
152
|
+
})]
|
148
153
|
})
|
149
154
|
});
|
150
|
-
};
|
151
|
-
|
155
|
+
};
|
152
156
|
|
153
|
-
|
157
|
+
//工单列表
|
158
|
+
var OrderList = function OrderList(_ref) {
|
159
|
+
var tabActive = _ref.tabActive;
|
154
160
|
var dispatch = useAppDispatch();
|
155
161
|
var groupAllList = useAppSelector(function (state) {
|
156
162
|
return state.workOrder.groupAllList;
|
@@ -172,7 +178,6 @@ var OrderList = function OrderList(tabActive) {
|
|
172
178
|
});
|
173
179
|
var buyerNick = platformInfo.buyerNick,
|
174
180
|
buyerId = platformInfo.buyerId;
|
175
|
-
var isFirst = useRef(false);
|
176
181
|
var recordLogRef = useRef();
|
177
182
|
var transferRef = useRef();
|
178
183
|
var customizeFormRef = useRef();
|
@@ -259,7 +264,7 @@ var OrderList = function OrderList(tabActive) {
|
|
259
264
|
};
|
260
265
|
|
261
266
|
var onDelete = /*#__PURE__*/function () {
|
262
|
-
var
|
267
|
+
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(item) {
|
263
268
|
var _item$templateDetailD;
|
264
269
|
|
265
270
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
@@ -306,7 +311,7 @@ var OrderList = function OrderList(tabActive) {
|
|
306
311
|
}));
|
307
312
|
|
308
313
|
return function onDelete(_x) {
|
309
|
-
return
|
314
|
+
return _ref2.apply(this, arguments);
|
310
315
|
};
|
311
316
|
}();
|
312
317
|
|
@@ -316,7 +321,7 @@ var OrderList = function OrderList(tabActive) {
|
|
316
321
|
|
317
322
|
|
318
323
|
var transCustomer = /*#__PURE__*/function () {
|
319
|
-
var
|
324
|
+
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record, currentCustomer) {
|
320
325
|
var id, jsonMap, _record$templateDetai, componentDtoList, uniqueKey, params, workOrderStatusKey;
|
321
326
|
|
322
327
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
@@ -358,7 +363,7 @@ var OrderList = function OrderList(tabActive) {
|
|
358
363
|
}));
|
359
364
|
|
360
365
|
return function transCustomer(_x2, _x3) {
|
361
|
-
return
|
366
|
+
return _ref3.apply(this, arguments);
|
362
367
|
};
|
363
368
|
}();
|
364
369
|
|
@@ -454,14 +459,14 @@ var OrderList = function OrderList(tabActive) {
|
|
454
459
|
}), /*#__PURE__*/_jsx("main", {
|
455
460
|
className: "custom_box_main",
|
456
461
|
children: orderList.length ? orderList.map(function (item) {
|
457
|
-
return ListOrderItem
|
462
|
+
return /*#__PURE__*/_jsx(ListOrderItem, {
|
458
463
|
item: item,
|
459
464
|
onEdit: onEdit,
|
460
465
|
onLog: onLog,
|
461
466
|
onRefresh: onSearch,
|
462
467
|
onTransfer: onTransfer,
|
463
468
|
onDelete: onDelete
|
464
|
-
});
|
469
|
+
}, item.id);
|
465
470
|
}) : /*#__PURE__*/_jsx("div", {
|
466
471
|
className: "custom_box_main_empty",
|
467
472
|
children: /*#__PURE__*/_jsxs("div", {
|
@@ -473,7 +478,7 @@ var OrderList = function OrderList(tabActive) {
|
|
473
478
|
})]
|
474
479
|
})
|
475
480
|
})
|
476
|
-
}), /*#__PURE__*/_jsx("div", {
|
481
|
+
}), total > 0 && /*#__PURE__*/_jsx("div", {
|
477
482
|
className: "custom_box_page",
|
478
483
|
children: /*#__PURE__*/_jsx(Pagination, {
|
479
484
|
showSizeChanger: false,
|
@@ -494,8 +499,8 @@ var OrderList = function OrderList(tabActive) {
|
|
494
499
|
}), /*#__PURE__*/_jsx(CustomizeFormModal, {
|
495
500
|
ref: customizeFormRef,
|
496
501
|
shopList: shopList,
|
497
|
-
onSuccess: function onSuccess(
|
498
|
-
var type =
|
502
|
+
onSuccess: function onSuccess(_ref4) {
|
503
|
+
var type = _ref4.type;
|
499
504
|
onSearch();
|
500
505
|
|
501
506
|
if (type === 'ADD') {
|
@@ -511,10 +516,13 @@ var OrderList = function OrderList(tabActive) {
|
|
511
516
|
}
|
512
517
|
})]
|
513
518
|
});
|
514
|
-
};
|
519
|
+
};
|
515
520
|
|
521
|
+
//打款工单列表
|
522
|
+
var PayOrderList = function PayOrderList(_ref5) {
|
523
|
+
var _paySearch$time;
|
516
524
|
|
517
|
-
var
|
525
|
+
var tabActive = _ref5.tabActive;
|
518
526
|
var dispatch = useAppDispatch();
|
519
527
|
var payOrderList = useAppSelector(function (state) {
|
520
528
|
return state.workOrder.payOrderList;
|
@@ -684,10 +692,14 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
684
692
|
children: "\u5F53\u524D\u4E70\u5BB6"
|
685
693
|
}), /*#__PURE__*/_jsx(RangePicker, {
|
686
694
|
allowClear: false,
|
687
|
-
value: paySearch.time
|
695
|
+
value: (_paySearch$time = paySearch.time) === null || _paySearch$time === void 0 ? void 0 : _paySearch$time.map(function (item) {
|
696
|
+
return moment(item);
|
697
|
+
}),
|
688
698
|
showTime: true,
|
689
699
|
onChange: function onChange(dates) {
|
690
|
-
return upDateState('time', dates)
|
700
|
+
return upDateState('time', dates.map(function (item) {
|
701
|
+
return item.format('YYYY-MM-DD HH:mm:ss');
|
702
|
+
}));
|
691
703
|
}
|
692
704
|
})]
|
693
705
|
}), /*#__PURE__*/_jsx("div", {
|
@@ -700,21 +712,19 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
700
712
|
alt: ""
|
701
713
|
})
|
702
714
|
})]
|
703
|
-
}), /*#__PURE__*/_jsx("
|
715
|
+
}), /*#__PURE__*/_jsx("div", {
|
704
716
|
className: "payment_box_main",
|
705
717
|
children: payOrderList.length ? payOrderList.map(function (item) {
|
706
|
-
return PayListOrderItem
|
718
|
+
return /*#__PURE__*/_jsx(PayListOrderItem, {
|
707
719
|
record: item,
|
708
|
-
onRefresh:
|
709
|
-
return onSearch();
|
710
|
-
},
|
720
|
+
onRefresh: onSearch,
|
711
721
|
onEdit: function onEdit(record, type) {
|
712
722
|
return handleOpenModify(_objectSpread(_objectSpread({}, record), {}, {
|
713
723
|
shopList: shopList
|
714
724
|
}), type);
|
715
725
|
},
|
716
726
|
onLog: handleOpenLog
|
717
|
-
});
|
727
|
+
}, item.id);
|
718
728
|
}) : /*#__PURE__*/_jsx("div", {
|
719
729
|
className: "custom_box_main_empty",
|
720
730
|
children: /*#__PURE__*/_jsxs("div", {
|
@@ -1,3 +1,6 @@
|
|
1
|
+
.order_container {
|
2
|
+
padding-bottom: 40px;
|
3
|
+
}
|
1
4
|
.order_header {
|
2
5
|
padding: 16px 16px 0 16px;
|
3
6
|
|
@@ -159,9 +162,14 @@
|
|
159
162
|
}
|
160
163
|
|
161
164
|
.custom_box_page {
|
165
|
+
position: fixed;
|
166
|
+
bottom: 0px;
|
162
167
|
display: flex;
|
163
168
|
justify-content: flex-end;
|
169
|
+
width: 100%;
|
170
|
+
height: 40px;
|
164
171
|
padding: 0 16px;
|
172
|
+
background-color: #fff;
|
165
173
|
}
|
166
174
|
}
|
167
175
|
|
@@ -29,7 +29,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
|
|
29
29
|
* @Author: litian
|
30
30
|
* @Date: 2022-09-06 17:44:56
|
31
31
|
* @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
|
32
|
-
* @LastEditTime: 2022-10-
|
32
|
+
* @LastEditTime: 2022-10-21 13:45:42
|
33
33
|
*/
|
34
34
|
import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
|
35
35
|
import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList, deleteWorkOrder } from "../model/servers/api";
|
@@ -64,7 +64,7 @@ var initialState = {
|
|
64
64
|
//打款工单搜索条件
|
65
65
|
pageNo: 1,
|
66
66
|
pageSize: 20,
|
67
|
-
time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
|
67
|
+
time: [moment().subtract(31, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'), moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')],
|
68
68
|
workPayStatus: '',
|
69
69
|
timeType: 'submitTime',
|
70
70
|
isBuyer: false
|
@@ -171,16 +171,14 @@ export var fetchQueryWorkOrder = createAsyncThunk('workOrder/queryWorkOrder', /*
|
|
171
171
|
|
172
172
|
export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPaymentWorkOrderList', /*#__PURE__*/function () {
|
173
173
|
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_, action) {
|
174
|
-
var _action$getState2, paySearch, global, timeType, _paySearch$time,
|
174
|
+
var _action$getState2, paySearch, global, timeType, _paySearch$time, start, end, workPayStatus, pageNo, pageSize, isBuyer, params, _yield$queryPaymentWo, data;
|
175
175
|
|
176
176
|
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
177
177
|
while (1) {
|
178
178
|
switch (_context4.prev = _context4.next) {
|
179
179
|
case 0:
|
180
180
|
_action$getState2 = action.getState(), paySearch = _action$getState2.workOrder.paySearch, global = _action$getState2.global;
|
181
|
-
timeType = paySearch.timeType, _paySearch$time = _slicedToArray(paySearch.time, 2),
|
182
|
-
start = startTime ? moment(startTime).valueOf() : '';
|
183
|
-
end = endTime ? moment(endTime).valueOf() : '';
|
181
|
+
timeType = paySearch.timeType, _paySearch$time = _slicedToArray(paySearch.time, 2), start = _paySearch$time[0], end = _paySearch$time[1], workPayStatus = paySearch.workPayStatus, pageNo = paySearch.pageNo, pageSize = paySearch.pageSize, isBuyer = paySearch.isBuyer;
|
184
182
|
params = {
|
185
183
|
workPayStatus: workPayStatus,
|
186
184
|
pageNo: pageNo,
|
@@ -204,15 +202,15 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
|
|
204
202
|
params.buyerOpenUid = global.platformInfo.buyerId;
|
205
203
|
}
|
206
204
|
|
207
|
-
_context4.next =
|
205
|
+
_context4.next = 7;
|
208
206
|
return queryPaymentWorkOrderList(params);
|
209
207
|
|
210
|
-
case
|
208
|
+
case 7:
|
211
209
|
_yield$queryPaymentWo = _context4.sent;
|
212
210
|
data = _yield$queryPaymentWo.data;
|
213
211
|
return _context4.abrupt("return", data);
|
214
212
|
|
215
|
-
case
|
213
|
+
case 10:
|
216
214
|
case "end":
|
217
215
|
return _context4.stop();
|
218
216
|
}
|
package/package.json
CHANGED
File without changes
|