kmkf-work-order-service-component 0.0.1-alpha.16 → 0.0.1-alpha.18
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.
@@ -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: wangzhenggui jianjia.wzg@raycloud.com
|
31
|
-
* @LastEditTime: 2022-10-10
|
31
|
+
* @LastEditTime: 2022-10-10 11:27:26
|
32
32
|
* @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
|
33
33
|
* @Description:
|
34
34
|
*
|
@@ -39,7 +39,8 @@ import Wrapper from "./components/Wrapper";
|
|
39
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,7 +48,6 @@ 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";
|
@@ -160,26 +160,9 @@ var OrderList = function OrderList(tabActive) {
|
|
160
160
|
var buyerNick = platformInfo.buyerNick,
|
161
161
|
buyerId = platformInfo.buyerId;
|
162
162
|
var isFirst = useRef(false);
|
163
|
-
var openCustomizeWOrkOrderModal = openCustomizeWOrkOrder({
|
164
|
-
shopList: shopList,
|
165
|
-
onSuccess: function onSuccess(_ref) {
|
166
|
-
var type = _ref.type;
|
167
|
-
onSearch();
|
168
|
-
|
169
|
-
if (type === 'ADD') {
|
170
|
-
dispatch({
|
171
|
-
type: 'global/setState',
|
172
|
-
payload: {
|
173
|
-
platformInfo: _objectSpread(_objectSpread({}, platformInfo), {}, {
|
174
|
-
orderNo: ''
|
175
|
-
})
|
176
|
-
}
|
177
|
-
});
|
178
|
-
}
|
179
|
-
}
|
180
|
-
});
|
181
163
|
var recordLogRef = useRef();
|
182
164
|
var transferRef = useRef();
|
165
|
+
var customizeFormRef = useRef();
|
183
166
|
var dayList = [{
|
184
167
|
name: '今日',
|
185
168
|
value: 0
|
@@ -235,7 +218,7 @@ var OrderList = function OrderList(tabActive) {
|
|
235
218
|
|
236
219
|
|
237
220
|
var openCustomForm = function openCustomForm(id) {
|
238
|
-
|
221
|
+
customizeFormRef.current.openModal({
|
239
222
|
templateId: id,
|
240
223
|
shopId: platformInfo.shopId + '',
|
241
224
|
orderNo: platformInfo.orderNo,
|
@@ -246,7 +229,7 @@ var OrderList = function OrderList(tabActive) {
|
|
246
229
|
|
247
230
|
|
248
231
|
var onEdit = function onEdit(item) {
|
249
|
-
|
232
|
+
customizeFormRef.current.openModal({
|
250
233
|
templateId: item.templateDetailDto.uniqueKey,
|
251
234
|
record: item,
|
252
235
|
shopId: item.shopId,
|
@@ -266,7 +249,7 @@ var OrderList = function OrderList(tabActive) {
|
|
266
249
|
|
267
250
|
|
268
251
|
var transCustomer = /*#__PURE__*/function () {
|
269
|
-
var
|
252
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, currentCustomer) {
|
270
253
|
var id, jsonMap, _record$templateDetai, componentDtoList, uniqueKey, params, workOrderStatusKey;
|
271
254
|
|
272
255
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
@@ -308,7 +291,7 @@ var OrderList = function OrderList(tabActive) {
|
|
308
291
|
}));
|
309
292
|
|
310
293
|
return function transCustomer(_x, _x2) {
|
311
|
-
return
|
294
|
+
return _ref.apply(this, arguments);
|
312
295
|
};
|
313
296
|
}();
|
314
297
|
|
@@ -436,6 +419,24 @@ var OrderList = function OrderList(tabActive) {
|
|
436
419
|
}), /*#__PURE__*/_jsx(TransferOrderModal, {
|
437
420
|
ref: transferRef,
|
438
421
|
handleTransCustomer: transCustomer
|
422
|
+
}), /*#__PURE__*/_jsx(CustomizeFormModal, {
|
423
|
+
ref: customizeFormRef,
|
424
|
+
shopList: shopList,
|
425
|
+
onSuccess: function onSuccess(_ref2) {
|
426
|
+
var type = _ref2.type;
|
427
|
+
onSearch();
|
428
|
+
|
429
|
+
if (type === 'ADD') {
|
430
|
+
dispatch({
|
431
|
+
type: 'global/setState',
|
432
|
+
payload: {
|
433
|
+
platformInfo: _objectSpread(_objectSpread({}, platformInfo), {}, {
|
434
|
+
orderNo: ''
|
435
|
+
})
|
436
|
+
}
|
437
|
+
});
|
438
|
+
}
|
439
|
+
}
|
439
440
|
})]
|
440
441
|
});
|
441
442
|
}; //打款工单列表
|
@@ -463,6 +464,7 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
463
464
|
var buyerNick = platformInfo.buyerNick,
|
464
465
|
buyerId = platformInfo.buyerId;
|
465
466
|
var logRef = useRef();
|
467
|
+
var payOrderRef = useRef();
|
466
468
|
var PAY_STATUS = [{
|
467
469
|
value: '',
|
468
470
|
label: '全部'
|
@@ -517,7 +519,7 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
517
519
|
};
|
518
520
|
|
519
521
|
var handleOpenModify = function handleOpenModify(record, type) {
|
520
|
-
|
522
|
+
payOrderRef.current.openModal(record, type);
|
521
523
|
}; //记录
|
522
524
|
|
523
525
|
|
@@ -664,6 +666,9 @@ var PayOrderList = function PayOrderList(tabActive) {
|
|
664
666
|
})
|
665
667
|
}), /*#__PURE__*/_jsx(RecordModal, {
|
666
668
|
ref: logRef
|
669
|
+
}), /*#__PURE__*/_jsx(PayOrderModal, {
|
670
|
+
ref: payOrderRef,
|
671
|
+
afterSuccessUpdateWorkOrder: onSearch
|
667
672
|
})]
|
668
673
|
});
|
669
674
|
};
|
@@ -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-10
|
32
|
+
* @LastEditTime: 2022-10-10 15:41:22
|
33
33
|
*/
|
34
34
|
import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
|
35
35
|
import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList } from "../model/servers/api";
|
@@ -144,7 +144,7 @@ export var fetchQueryWorkOrder = createAsyncThunk('workOrder/queryWorkOrder', /*
|
|
144
144
|
};
|
145
145
|
|
146
146
|
if (isBuyer) {
|
147
|
-
params.buyerNick = global.platformInfo.buyerNick;
|
147
|
+
// params.buyerNick = global.platformInfo.buyerNick;
|
148
148
|
params.buyerOpenUid = global.platformInfo.buyerId;
|
149
149
|
}
|
150
150
|
|
@@ -200,7 +200,7 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
|
|
200
200
|
}
|
201
201
|
|
202
202
|
if (isBuyer) {
|
203
|
-
params.buyerNick = global.platformInfo.buyerNick;
|
203
|
+
// params.buyerNick = global.platformInfo.buyerNick;
|
204
204
|
params.buyerOpenUid = global.platformInfo.buyerId;
|
205
205
|
}
|
206
206
|
|