kmkf-work-order-service-component 0.0.1-alpha.9 → 0.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/esm/WorkOrder/common/utils/tools.d.ts +1 -1
- package/dist/esm/WorkOrder/common/utils/tools.js +38 -36
- package/dist/esm/WorkOrder/components/CustomizeFormModal/index.js +29 -12
- package/dist/esm/WorkOrder/components/CustomizeFormModal/index.module.less +1 -1
- package/dist/esm/WorkOrder/components/ListOrderItem/index.js +6 -5
- package/dist/esm/WorkOrder/components/ListOrderItem/index.module.less +2 -2
- package/dist/esm/WorkOrder/components/PayListOrderItem/ModifyModal.js +16 -2
- package/dist/esm/WorkOrder/components/PayListOrderItem/RecordModal.js +3 -2
- package/dist/esm/WorkOrder/components/PayListOrderItem/index.js +1 -0
- package/dist/esm/WorkOrder/components/RecordLog/index.js +1 -0
- package/dist/esm/WorkOrder/components/TransferOrderModal/index.js +4 -2
- package/dist/esm/WorkOrder/components/Widget/basic/Picture/index.js +1 -1
- package/dist/esm/WorkOrder/components/Widget/electricity/EItemEncode/index.js +2 -2
- package/dist/esm/WorkOrder/components/Widget/electricity/EItemId/index.js +2 -2
- package/dist/esm/WorkOrder/components/Widget/electricity/ETradeId/index.js +10 -2
- package/dist/esm/WorkOrder/components/Widget/third/ItemSelect/index.js +2 -2
- package/dist/esm/WorkOrder/index.d.ts +1 -0
- package/dist/esm/WorkOrder/index.js +122 -89
- package/dist/esm/WorkOrder/{index.module.less → index.less} +2 -1
- package/dist/esm/WorkOrder/model/workOrder.d.ts +5 -0
- package/dist/esm/WorkOrder/model/workOrder.js +23 -8
- package/package.json +2 -2
- package/dist/esm/WorkOrder/components/Widget/common/utils.d.ts +0 -0
- package/dist/esm/WorkOrder/components/Widget/common/utils.js +0 -98
@@ -28,7 +28,7 @@ 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: litian
|
31
|
-
* @LastEditTime: 2022-
|
31
|
+
* @LastEditTime: 2022-10-12 17:04:02
|
32
32
|
* @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
|
33
33
|
* @Description:
|
34
34
|
*
|
@@ -36,10 +36,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
36
36
|
*/
|
37
37
|
import React, { useState, useEffect, useRef } from 'react';
|
38
38
|
import Wrapper from "./components/Wrapper";
|
39
|
-
import { Tabs, Select, Pagination, Cascader, DatePicker, Space, Checkbox, message } from 'antd';
|
39
|
+
import { Tabs, Select, Pagination, Cascader, DatePicker, Space, Checkbox, Spin, message } from 'antd';
|
40
40
|
import { useAppSelector, useAppDispatch } from "./model/hooks";
|
41
41
|
import { fetchQueryGroupCustomTemplate, fetchQueryWorkOrder, fetchQueryCurrentCompanyUser, fetchQueryPaymentWorkOrderList } from "./model/workOrder";
|
42
|
-
import
|
42
|
+
import CustomizeFormModal from "./components/CustomizeFormModal";
|
43
|
+
import PayOrderModal from "./components/PayListOrderItem/ModifyModal";
|
43
44
|
import express from "./common/utils/express";
|
44
45
|
import formatAddrData from "./common/utils/formatAddrData";
|
45
46
|
import ListOrderItem from "./components/ListOrderItem";
|
@@ -47,14 +48,13 @@ import PayListOrderItem from "./components/PayListOrderItem";
|
|
47
48
|
import RecordModal from "./components/PayListOrderItem/RecordModal";
|
48
49
|
import RecordLog from "./components/RecordLog";
|
49
50
|
import TransferOrderModal from "./components/TransferOrderModal";
|
50
|
-
import openPaymentWOrkOrder from "./components/PayListOrderItem/wrap";
|
51
51
|
import store from "./model/store";
|
52
52
|
import { Provider } from 'react-redux';
|
53
53
|
import { transferWorkOrder } from "./model/servers/api";
|
54
54
|
import get from 'lodash/get';
|
55
55
|
import refreshImg from "./common/imgs/refresh.png";
|
56
56
|
import emptyImg from "./common/imgs/empty.png";
|
57
|
-
import
|
57
|
+
import "./index.less";
|
58
58
|
import { jsx as _jsx } from "react/jsx-runtime";
|
59
59
|
import { jsxs as _jsxs } from "react/jsx-runtime";
|
60
60
|
var Option = Select.Option;
|
@@ -72,12 +72,30 @@ var WorkOrder = function WorkOrder(props) {
|
|
72
72
|
|
73
73
|
return (_state$global = state.global) === null || _state$global === void 0 ? void 0 : _state$global.platformInfo;
|
74
74
|
});
|
75
|
+
var loading = useAppSelector(function (state) {
|
76
|
+
var _state$workOrder;
|
77
|
+
|
78
|
+
return (_state$workOrder = state.workOrder) === null || _state$workOrder === void 0 ? void 0 : _state$workOrder.loading;
|
79
|
+
});
|
75
80
|
|
76
81
|
var _useState = useState('custom'),
|
77
82
|
_useState2 = _slicedToArray(_useState, 2),
|
78
83
|
tabActive = _useState2[0],
|
79
84
|
setTabActive = _useState2[1];
|
80
85
|
|
86
|
+
useEffect(function () {
|
87
|
+
if (buyerId) {
|
88
|
+
dispatch({
|
89
|
+
type: 'workOrder/setIsBuyer',
|
90
|
+
payload: true
|
91
|
+
});
|
92
|
+
} else {
|
93
|
+
dispatch({
|
94
|
+
type: 'workOrder/setIsBuyer',
|
95
|
+
payload: false
|
96
|
+
});
|
97
|
+
}
|
98
|
+
}, [buyerId]);
|
81
99
|
useEffect(function () {
|
82
100
|
if (shopId != platformInfo.shopId) {
|
83
101
|
initHandle();
|
@@ -105,26 +123,29 @@ var WorkOrder = function WorkOrder(props) {
|
|
105
123
|
formatAddrData.initData();
|
106
124
|
};
|
107
125
|
|
108
|
-
return /*#__PURE__*/
|
109
|
-
|
110
|
-
|
111
|
-
children: /*#__PURE__*/
|
112
|
-
className:
|
113
|
-
children:
|
114
|
-
className: ""
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
126
|
+
return /*#__PURE__*/_jsx(Spin, {
|
127
|
+
spinning: loading,
|
128
|
+
children: /*#__PURE__*/_jsxs(Wrapper, {
|
129
|
+
children: [/*#__PURE__*/_jsx("header", {
|
130
|
+
className: "order_header",
|
131
|
+
children: /*#__PURE__*/_jsxs("div", {
|
132
|
+
className: "order_header_tabs",
|
133
|
+
children: [/*#__PURE__*/_jsx("div", {
|
134
|
+
className: "order_header_tabs_button ".concat(tabActive === 'custom' ? 'active' : ''),
|
135
|
+
onClick: function onClick() {
|
136
|
+
return setTabActive('custom');
|
137
|
+
},
|
138
|
+
children: "\u81EA\u5B9A\u4E49\u5DE5\u5355"
|
139
|
+
}), /*#__PURE__*/_jsx("div", {
|
140
|
+
className: "order_header_tabs_button border_left ".concat(tabActive === 'payment' ? 'active' : ''),
|
141
|
+
onClick: function onClick() {
|
142
|
+
return setTabActive('payment');
|
143
|
+
},
|
144
|
+
children: "\u6253\u6B3E\u5DE5\u5355"
|
145
|
+
})]
|
146
|
+
})
|
147
|
+
}), OrderList(tabActive), PayOrderList(tabActive)]
|
148
|
+
})
|
128
149
|
});
|
129
150
|
}; //工单列表
|
130
151
|
|
@@ -152,26 +173,9 @@ var OrderList = function OrderList(tabActive) {
|
|
152
173
|
var buyerNick = platformInfo.buyerNick,
|
153
174
|
buyerId = platformInfo.buyerId;
|
154
175
|
var isFirst = useRef(false);
|
155
|
-
var openCustomizeWOrkOrderModal = openCustomizeWOrkOrder({
|
156
|
-
shopList: shopList,
|
157
|
-
onSuccess: function onSuccess(_ref) {
|
158
|
-
var type = _ref.type;
|
159
|
-
onSearch();
|
160
|
-
|
161
|
-
if (type === 'ADD') {
|
162
|
-
dispatch({
|
163
|
-
type: 'global/setState',
|
164
|
-
payload: {
|
165
|
-
platformInfo: _objectSpread(_objectSpread({}, platformInfo), {}, {
|
166
|
-
orderNo: ''
|
167
|
-
})
|
168
|
-
}
|
169
|
-
});
|
170
|
-
}
|
171
|
-
}
|
172
|
-
});
|
173
176
|
var recordLogRef = useRef();
|
174
177
|
var transferRef = useRef();
|
178
|
+
var customizeFormRef = useRef();
|
175
179
|
var dayList = [{
|
176
180
|
name: '今日',
|
177
181
|
value: 0
|
@@ -197,10 +201,12 @@ var OrderList = function OrderList(tabActive) {
|
|
197
201
|
|
198
202
|
|
199
203
|
var upDateState = function upDateState(type, val) {
|
204
|
+
var _objectSpread2;
|
205
|
+
|
200
206
|
dispatch({
|
201
207
|
type: 'workOrder/setState',
|
202
208
|
payload: {
|
203
|
-
customSearch: _objectSpread(_objectSpread({}, customSearch), {},
|
209
|
+
customSearch: _objectSpread(_objectSpread({}, customSearch), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, type, val), _defineProperty(_objectSpread2, "pageNo", 1), _objectSpread2))
|
204
210
|
}
|
205
211
|
});
|
206
212
|
}; //分页
|
@@ -227,26 +233,23 @@ var OrderList = function OrderList(tabActive) {
|
|
227
233
|
|
228
234
|
|
229
235
|
var openCustomForm = function openCustomForm(id) {
|
230
|
-
|
231
|
-
message.error('请选择用户');
|
232
|
-
return;
|
233
|
-
}
|
234
|
-
|
235
|
-
openCustomizeWOrkOrderModal({
|
236
|
+
customizeFormRef.current.openModal({
|
236
237
|
templateId: id,
|
237
238
|
shopId: platformInfo.shopId + '',
|
238
239
|
orderNo: platformInfo.orderNo,
|
239
|
-
buyerId: platformInfo.buyerId
|
240
|
+
buyerId: platformInfo.buyerId,
|
241
|
+
buyerNick: platformInfo.buyerNick
|
240
242
|
});
|
241
243
|
}; //编辑
|
242
244
|
|
243
245
|
|
244
246
|
var onEdit = function onEdit(item) {
|
245
|
-
|
247
|
+
customizeFormRef.current.openModal({
|
246
248
|
templateId: item.templateDetailDto.uniqueKey,
|
247
249
|
record: item,
|
248
250
|
shopId: item.shopId,
|
249
|
-
workOrderId: item.id
|
251
|
+
workOrderId: item.id,
|
252
|
+
buyerNick: platformInfo.buyerNick
|
250
253
|
});
|
251
254
|
}; //记录
|
252
255
|
|
@@ -261,7 +264,7 @@ var OrderList = function OrderList(tabActive) {
|
|
261
264
|
|
262
265
|
|
263
266
|
var transCustomer = /*#__PURE__*/function () {
|
264
|
-
var
|
267
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, currentCustomer) {
|
265
268
|
var id, jsonMap, _record$templateDetai, componentDtoList, uniqueKey, params, workOrderStatusKey;
|
266
269
|
|
267
270
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
@@ -303,19 +306,19 @@ var OrderList = function OrderList(tabActive) {
|
|
303
306
|
}));
|
304
307
|
|
305
308
|
return function transCustomer(_x, _x2) {
|
306
|
-
return
|
309
|
+
return _ref.apply(this, arguments);
|
307
310
|
};
|
308
311
|
}();
|
309
312
|
|
310
313
|
return /*#__PURE__*/_jsxs("div", {
|
311
|
-
className:
|
314
|
+
className: "custom_box",
|
312
315
|
style: {
|
313
316
|
display: tabActive === 'custom' ? 'block' : 'none'
|
314
317
|
},
|
315
318
|
children: [/*#__PURE__*/_jsxs("div", {
|
316
|
-
className:
|
319
|
+
className: "custom_box_header",
|
317
320
|
children: [/*#__PURE__*/_jsx(Cascader, {
|
318
|
-
className:
|
321
|
+
className: "custom_box_header_cascader",
|
319
322
|
options: groupAllList,
|
320
323
|
placeholder: "\u8BF7\u8F93\u5165\u6A21\u7248\u540D\u79F0",
|
321
324
|
showSearch: true,
|
@@ -327,15 +330,15 @@ var OrderList = function OrderList(tabActive) {
|
|
327
330
|
label: item.label,
|
328
331
|
key: item.value + '',
|
329
332
|
children: /*#__PURE__*/_jsx("div", {
|
330
|
-
className:
|
333
|
+
className: "custom_temp_box",
|
331
334
|
children: /*#__PURE__*/_jsx("div", {
|
332
|
-
className:
|
335
|
+
className: "custom_temp_list",
|
333
336
|
children: /*#__PURE__*/_jsx(Space, {
|
334
337
|
size: [8, 8],
|
335
338
|
wrap: true,
|
336
339
|
children: item.children.map(function (t) {
|
337
340
|
return /*#__PURE__*/_jsx("div", {
|
338
|
-
className:
|
341
|
+
className: "custom_temp_list_button",
|
339
342
|
onClick: function onClick() {
|
340
343
|
return openCustomForm(t.value);
|
341
344
|
},
|
@@ -352,11 +355,11 @@ var OrderList = function OrderList(tabActive) {
|
|
352
355
|
}
|
353
356
|
})]
|
354
357
|
}), /*#__PURE__*/_jsxs("div", {
|
355
|
-
className:
|
358
|
+
className: "custom_box_search",
|
356
359
|
children: [/*#__PURE__*/_jsxs("div", {
|
357
|
-
className:
|
360
|
+
className: "custom_box_search_box",
|
358
361
|
children: [/*#__PURE__*/_jsx(Select, {
|
359
|
-
className:
|
362
|
+
className: "custom_box_search_date",
|
360
363
|
value: customSearch.filterDay,
|
361
364
|
onChange: function onChange(val) {
|
362
365
|
return upDateState('filterDay', val);
|
@@ -368,7 +371,7 @@ var OrderList = function OrderList(tabActive) {
|
|
368
371
|
}, item.name);
|
369
372
|
})
|
370
373
|
}), /*#__PURE__*/_jsx(Cascader, {
|
371
|
-
className:
|
374
|
+
className: "custom_box_search_cascader",
|
372
375
|
options: groupAllList,
|
373
376
|
showSearch: true,
|
374
377
|
onChange: function onChange(val) {
|
@@ -377,15 +380,19 @@ var OrderList = function OrderList(tabActive) {
|
|
377
380
|
value: customSearch.tempSelect,
|
378
381
|
allowClear: false
|
379
382
|
}), /*#__PURE__*/_jsx(Checkbox, {
|
380
|
-
className:
|
383
|
+
className: "custom_box_search_buyer",
|
381
384
|
checked: customSearch.isBuyer,
|
382
385
|
onChange: function onChange(e) {
|
383
|
-
|
386
|
+
if (!platformInfo.buyerId) {
|
387
|
+
return message.warning('请先选择买家,再查询工单!');
|
388
|
+
}
|
389
|
+
|
390
|
+
upDateState('isBuyer', e.target.checked);
|
384
391
|
},
|
385
392
|
children: "\u5F53\u524D\u4E70\u5BB6"
|
386
393
|
})]
|
387
394
|
}), /*#__PURE__*/_jsx("div", {
|
388
|
-
className:
|
395
|
+
className: "custom_box_search_refresh",
|
389
396
|
onClick: onSearch,
|
390
397
|
children: /*#__PURE__*/_jsx("img", {
|
391
398
|
src: refreshImg,
|
@@ -393,7 +400,7 @@ var OrderList = function OrderList(tabActive) {
|
|
393
400
|
})
|
394
401
|
})]
|
395
402
|
}), /*#__PURE__*/_jsx("main", {
|
396
|
-
className:
|
403
|
+
className: "custom_box_main",
|
397
404
|
children: orderList.length ? orderList.map(function (item) {
|
398
405
|
return ListOrderItem({
|
399
406
|
item: item,
|
@@ -403,7 +410,7 @@ var OrderList = function OrderList(tabActive) {
|
|
403
410
|
onTransfer: onTransfer
|
404
411
|
});
|
405
412
|
}) : /*#__PURE__*/_jsx("div", {
|
406
|
-
className:
|
413
|
+
className: "custom_box_main_empty",
|
407
414
|
children: /*#__PURE__*/_jsxs("div", {
|
408
415
|
children: [/*#__PURE__*/_jsx("img", {
|
409
416
|
src: emptyImg,
|
@@ -414,7 +421,7 @@ var OrderList = function OrderList(tabActive) {
|
|
414
421
|
})
|
415
422
|
})
|
416
423
|
}), /*#__PURE__*/_jsx("div", {
|
417
|
-
className:
|
424
|
+
className: "custom_box_page",
|
418
425
|
children: /*#__PURE__*/_jsx(Pagination, {
|
419
426
|
showSizeChanger: false,
|
420
427
|
showQuickJumper: true,
|
@@ -431,6 +438,24 @@ var OrderList = function OrderList(tabActive) {
|
|
431
438
|
}), /*#__PURE__*/_jsx(TransferOrderModal, {
|
432
439
|
ref: transferRef,
|
433
440
|
handleTransCustomer: transCustomer
|
441
|
+
}), /*#__PURE__*/_jsx(CustomizeFormModal, {
|
442
|
+
ref: customizeFormRef,
|
443
|
+
shopList: shopList,
|
444
|
+
onSuccess: function onSuccess(_ref2) {
|
445
|
+
var type = _ref2.type;
|
446
|
+
onSearch();
|
447
|
+
|
448
|
+
if (type === 'ADD') {
|
449
|
+
dispatch({
|
450
|
+
type: 'global/setState',
|
451
|
+
payload: {
|
452
|
+
platformInfo: _objectSpread(_objectSpread({}, platformInfo), {}, {
|
453
|
+
orderNo: ''
|
454
|
+
})
|
455
|
+
}
|
456
|
+
});
|
457
|
+
}
|
458
|
+
}
|
434
459
|
})]
|
435
460
|
});
|
436
461
|
}; //打款工单列表
|
@@ -458,6 +483,7 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
458
483
|
var buyerNick = platformInfo.buyerNick,
|
459
484
|
buyerId = platformInfo.buyerId;
|
460
485
|
var logRef = useRef();
|
486
|
+
var payOrderRef = useRef();
|
461
487
|
var PAY_STATUS = [{
|
462
488
|
value: '',
|
463
489
|
label: '全部'
|
@@ -512,7 +538,7 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
512
538
|
};
|
513
539
|
|
514
540
|
var handleOpenModify = function handleOpenModify(record, type) {
|
515
|
-
|
541
|
+
payOrderRef.current.openModal(record, type);
|
516
542
|
}; //记录
|
517
543
|
|
518
544
|
|
@@ -522,33 +548,33 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
522
548
|
|
523
549
|
|
524
550
|
var upDateState = function upDateState(type, value) {
|
525
|
-
|
526
|
-
|
527
|
-
// }
|
551
|
+
var _objectSpread3;
|
552
|
+
|
528
553
|
dispatch({
|
529
554
|
type: 'workOrder/setState',
|
530
555
|
payload: {
|
531
|
-
paySearch: _objectSpread(_objectSpread({}, paySearch), {},
|
556
|
+
paySearch: _objectSpread(_objectSpread({}, paySearch), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, type, value), _defineProperty(_objectSpread3, "pageNo", 1), _objectSpread3))
|
532
557
|
}
|
533
558
|
});
|
534
559
|
};
|
535
560
|
|
536
561
|
return /*#__PURE__*/_jsxs("div", {
|
537
|
-
className:
|
562
|
+
className: "custom_box",
|
538
563
|
style: {
|
539
564
|
display: tabActive === 'payment' ? 'block' : 'none'
|
540
565
|
},
|
541
566
|
children: [/*#__PURE__*/_jsx("div", {
|
542
|
-
className:
|
567
|
+
className: "custom_box_header",
|
543
568
|
children: /*#__PURE__*/_jsx(Space, {
|
544
569
|
size: [8, 8],
|
545
570
|
wrap: true,
|
546
571
|
children: /*#__PURE__*/_jsx("span", {
|
547
|
-
className:
|
572
|
+
className: "custom_temp_list_button",
|
548
573
|
onClick: function onClick() {
|
549
574
|
var _shopList$find;
|
550
575
|
|
551
576
|
return handleOpenModify({
|
577
|
+
buyerNick: platformInfo.buyerNick,
|
552
578
|
buyerOpenUid: platformInfo.buyerId,
|
553
579
|
shopId: platformInfo.shopId,
|
554
580
|
shopName: (_shopList$find = shopList.find(function (item) {
|
@@ -561,11 +587,11 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
561
587
|
})
|
562
588
|
})
|
563
589
|
}), /*#__PURE__*/_jsxs("div", {
|
564
|
-
className: "
|
590
|
+
className: "custom_box_search pay_search",
|
565
591
|
children: [/*#__PURE__*/_jsxs("div", {
|
566
|
-
className: "
|
592
|
+
className: "custom_box_search_box pay_search_box",
|
567
593
|
children: [/*#__PURE__*/_jsxs(Select, {
|
568
|
-
className:
|
594
|
+
className: "custom_box_search_date",
|
569
595
|
value: paySearch.timeType,
|
570
596
|
onChange: function onChange(val) {
|
571
597
|
return upDateState('timeType', val);
|
@@ -581,7 +607,7 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
581
607
|
children: "\u6253\u6B3E\u65F6\u95F4"
|
582
608
|
})]
|
583
609
|
}), /*#__PURE__*/_jsx(Select, {
|
584
|
-
className:
|
610
|
+
className: "custom_box_search_cascader",
|
585
611
|
value: paySearch.workPayStatus,
|
586
612
|
onChange: function onChange(val) {
|
587
613
|
return upDateState('workPayStatus', val);
|
@@ -593,10 +619,14 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
593
619
|
}, item.value);
|
594
620
|
})
|
595
621
|
}), /*#__PURE__*/_jsx(Checkbox, {
|
596
|
-
className:
|
622
|
+
className: "custom_box_search_buyer",
|
597
623
|
checked: paySearch.isBuyer,
|
598
624
|
onChange: function onChange(e) {
|
599
|
-
|
625
|
+
if (!platformInfo.buyerId) {
|
626
|
+
return message.warning('请先选择买家,再查询工单!');
|
627
|
+
}
|
628
|
+
|
629
|
+
upDateState('isBuyer', e.target.checked);
|
600
630
|
},
|
601
631
|
children: "\u5F53\u524D\u4E70\u5BB6"
|
602
632
|
}), /*#__PURE__*/_jsx(RangePicker, {
|
@@ -608,7 +638,7 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
608
638
|
}
|
609
639
|
})]
|
610
640
|
}), /*#__PURE__*/_jsx("div", {
|
611
|
-
className:
|
641
|
+
className: "custom_box_search_refresh",
|
612
642
|
onClick: function onClick() {
|
613
643
|
return onSearch();
|
614
644
|
},
|
@@ -618,7 +648,7 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
618
648
|
})
|
619
649
|
})]
|
620
650
|
}), /*#__PURE__*/_jsx("main", {
|
621
|
-
className:
|
651
|
+
className: "payment_box_main",
|
622
652
|
children: payOrderList.length ? payOrderList.map(function (item) {
|
623
653
|
return PayListOrderItem({
|
624
654
|
record: item,
|
@@ -633,7 +663,7 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
633
663
|
onLog: handleOpenLog
|
634
664
|
});
|
635
665
|
}) : /*#__PURE__*/_jsx("div", {
|
636
|
-
className:
|
666
|
+
className: "custom_box_main_empty",
|
637
667
|
children: /*#__PURE__*/_jsxs("div", {
|
638
668
|
children: [/*#__PURE__*/_jsx("img", {
|
639
669
|
src: emptyImg,
|
@@ -644,7 +674,7 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
644
674
|
})
|
645
675
|
})
|
646
676
|
}), /*#__PURE__*/_jsx("div", {
|
647
|
-
className:
|
677
|
+
className: "custom_box_page",
|
648
678
|
children: /*#__PURE__*/_jsx(Pagination, {
|
649
679
|
showQuickJumper: true,
|
650
680
|
showSizeChanger: false,
|
@@ -658,6 +688,9 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
658
688
|
})
|
659
689
|
}), /*#__PURE__*/_jsx(RecordModal, {
|
660
690
|
ref: logRef
|
691
|
+
}), /*#__PURE__*/_jsx(PayOrderModal, {
|
692
|
+
ref: payOrderRef,
|
693
|
+
afterSuccessUpdateWorkOrder: onSearch
|
661
694
|
})]
|
662
695
|
});
|
663
696
|
};
|
@@ -10,6 +10,7 @@ export interface WorkOrderState {
|
|
10
10
|
customSearch: any;
|
11
11
|
paySearch: any;
|
12
12
|
templateDetails: any;
|
13
|
+
loading: boolean;
|
13
14
|
}
|
14
15
|
export declare const fetchQueryCurrentCompanyUser: any;
|
15
16
|
export declare const fetchQueryGroupCustomTemplate: any;
|
@@ -20,6 +21,10 @@ export declare const workOrderSlice: import("@reduxjs/toolkit").Slice<any, {
|
|
20
21
|
payload: any;
|
21
22
|
type: string;
|
22
23
|
}) => any;
|
24
|
+
setIsBuyer: (state: import("immer/dist/internal").WritableDraft<WorkOrderState>, action: {
|
25
|
+
payload: any;
|
26
|
+
type: string;
|
27
|
+
}) => void;
|
23
28
|
}, "workOrder">;
|
24
29
|
export declare const setState: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>;
|
25
30
|
declare const _default: import("redux").Reducer<any, import("redux").AnyAction>;
|
@@ -28,8 +28,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
|
|
28
28
|
* @Description:
|
29
29
|
* @Author: litian
|
30
30
|
* @Date: 2022-09-06 17:44:56
|
31
|
-
* @LastEditors:
|
32
|
-
* @LastEditTime: 2022-
|
31
|
+
* @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
|
32
|
+
* @LastEditTime: 2022-10-11 16:40:30
|
33
33
|
*/
|
34
34
|
import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
|
35
35
|
import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList } from "../model/servers/api";
|
@@ -51,13 +51,14 @@ var initialState = {
|
|
51
51
|
//打款工单列表数量
|
52
52
|
userInfo: {},
|
53
53
|
//用户信息
|
54
|
+
loading: false,
|
54
55
|
customSearch: {
|
55
56
|
//自定义工单搜索条件
|
56
57
|
pageNo: 1,
|
57
58
|
pageSize: 20,
|
58
59
|
tempSelect: [],
|
59
60
|
filterDay: 29,
|
60
|
-
isBuyer:
|
61
|
+
isBuyer: false
|
61
62
|
},
|
62
63
|
paySearch: {
|
63
64
|
//打款工单搜索条件
|
@@ -66,7 +67,7 @@ var initialState = {
|
|
66
67
|
time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
|
67
68
|
workPayStatus: '',
|
68
69
|
timeType: 'submitTime',
|
69
|
-
isBuyer:
|
70
|
+
isBuyer: false
|
70
71
|
},
|
71
72
|
templateDetails: {} //打开的模版
|
72
73
|
|
@@ -143,7 +144,7 @@ export var fetchQueryWorkOrder = createAsyncThunk('workOrder/queryWorkOrder', /*
|
|
143
144
|
};
|
144
145
|
|
145
146
|
if (isBuyer) {
|
146
|
-
params.buyerNick = global.platformInfo.buyerNick;
|
147
|
+
// params.buyerNick = global.platformInfo.buyerNick;
|
147
148
|
params.buyerOpenUid = global.platformInfo.buyerId;
|
148
149
|
}
|
149
150
|
|
@@ -199,7 +200,7 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
|
|
199
200
|
}
|
200
201
|
|
201
202
|
if (isBuyer) {
|
202
|
-
params.buyerNick = global.platformInfo.buyerNick;
|
203
|
+
// params.buyerNick = global.platformInfo.buyerNick;
|
203
204
|
params.buyerOpenUid = global.platformInfo.buyerId;
|
204
205
|
}
|
205
206
|
|
@@ -229,6 +230,10 @@ export var workOrderSlice = createSlice({
|
|
229
230
|
reducers: {
|
230
231
|
setState: function setState(state, action) {
|
231
232
|
return _objectSpread(_objectSpread({}, state), action.payload);
|
233
|
+
},
|
234
|
+
setIsBuyer: function setIsBuyer(state, action) {
|
235
|
+
state.customSearch.isBuyer = action.payload;
|
236
|
+
state.paySearch.isBuyer = action.payload;
|
232
237
|
}
|
233
238
|
},
|
234
239
|
extraReducers: function extraReducers(builder) {
|
@@ -265,18 +270,28 @@ export var workOrderSlice = createSlice({
|
|
265
270
|
});
|
266
271
|
state.groupAllList = groupAllList;
|
267
272
|
state.customSearch.tempSelect = (groupAllList === null || groupAllList === void 0 ? void 0 : groupAllList.length) && [(_groupAllList$ = groupAllList[0]) === null || _groupAllList$ === void 0 ? void 0 : _groupAllList$.value, (_groupAllList$2 = groupAllList[0]) === null || _groupAllList$2 === void 0 ? void 0 : (_groupAllList$2$child = _groupAllList$2.children[0]) === null || _groupAllList$2$child === void 0 ? void 0 : _groupAllList$2$child.value];
|
268
|
-
}), builder.addCase(fetchQueryWorkOrder.
|
273
|
+
}), builder.addCase(fetchQueryWorkOrder.pending, function (state) {
|
274
|
+
state.loading = true;
|
275
|
+
}).addCase(fetchQueryWorkOrder.fulfilled, function (state, action) {
|
269
276
|
var _action$payload = action.payload,
|
270
277
|
list = _action$payload.list,
|
271
278
|
total = _action$payload.total;
|
272
279
|
state.orderList = list || [];
|
273
280
|
state.orderListTotal = total;
|
274
|
-
|
281
|
+
state.loading = false;
|
282
|
+
}).addCase(fetchQueryWorkOrder.rejected, function (state) {
|
283
|
+
state.loading = false;
|
284
|
+
}), builder.addCase(fetchQueryPaymentWorkOrderList.pending, function (state) {
|
285
|
+
state.loading = true;
|
286
|
+
}).addCase(fetchQueryPaymentWorkOrderList.fulfilled, function (state, action) {
|
275
287
|
var _action$payload2 = action.payload,
|
276
288
|
list = _action$payload2.list,
|
277
289
|
total = _action$payload2.total;
|
278
290
|
state.payOrderList = list || [];
|
279
291
|
state.payOrderListTotal = total;
|
292
|
+
state.loading = false;
|
293
|
+
}).addCase(fetchQueryPaymentWorkOrderList.rejected, function (state) {
|
294
|
+
state.loading = false;
|
280
295
|
}), builder.addCase(fetchQueryCurrentCompanyUser.fulfilled, function (state, action) {
|
281
296
|
var newData = action.payload;
|
282
297
|
newData.shopList.forEach(function (item) {
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "kmkf-work-order-service-component",
|
3
|
-
"version": "0.0.1
|
3
|
+
"version": "0.0.1",
|
4
4
|
"scripts": {
|
5
5
|
"start": "dumi dev",
|
6
6
|
"docs:build": "dumi build",
|
@@ -37,7 +37,7 @@
|
|
37
37
|
"react-dom": "^17.0.2"
|
38
38
|
},
|
39
39
|
"dependencies": {
|
40
|
-
"@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.
|
40
|
+
"@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.22-alpha.6",
|
41
41
|
"@reduxjs/toolkit": "^1.8.5",
|
42
42
|
"react-redux": "^7.2.8",
|
43
43
|
"store2": "^2.14.2",
|
File without changes
|