@kmkf-fe-packages/kmkf-work-order-service-component 2.10.2 → 2.10.4
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/CustomerServiceToDoList/index.js +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js +4 -3
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/component-dependency-finder.js +2 -0
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/constants.js +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +83 -78
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.js +8 -6
- package/dist/esm/FlowTemplateDetailV2/components/Header/index.js +3 -1
- package/dist/esm/FlowTemplateDetailV2/components/Item/index.js +10 -8
- package/dist/esm/FlowTemplateDetailV2/components/JumpBuyer/index.js +1 -0
- package/dist/esm/FlowTemplateDetailV2/components/OrderRemark/index.js +3 -1
- package/dist/esm/FlowTemplateDetailV2/components/RejectedModal/index.js +4 -3
- package/dist/esm/FlowTemplateDetailV2/components/RemarkModal/index.js +3 -2
- package/dist/esm/FlowTemplateDetailV2/components/XiaozhiConversation/index.js +1 -0
- package/dist/esm/FlowTemplateDetailV2/index.js +60 -33
- package/dist/esm/FlowTemplateDetailV2/index.less +1 -1
- package/dist/esm/FlowTemplateDetailV2/pollOperationResult.js +2 -0
- package/dist/esm/FlowTemplateDetailV2/store/reducers.js +34 -28
- package/dist/esm/FormRender/index.js +29 -21
- package/dist/esm/FormRenderTemplateId/index.js +26 -21
- package/dist/esm/GlobalContext/hook/dist/useGetHasErpData.js +3 -0
- package/dist/esm/LBOrderDetail/detail/OrderInfo.js +2 -0
- package/dist/esm/LBOrderDetail/detail/ServiceProgress.js +1 -1
- package/dist/esm/Login/index.js +4 -2
- package/dist/esm/SingleShopWorkOrder/components/CustomizeFormModal/index.js +28 -21
- package/dist/esm/SingleShopWorkOrder/components/DeleteCustomizeOrderModal/index.js +3 -2
- package/dist/esm/SingleShopWorkOrder/index.js +1 -0
- package/dist/esm/TradeList/components/TradeList.js +1 -0
- package/dist/esm/WdtTradeList/components/OrderForm/ReissueItems.js +1 -1
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/DeletePaymentWorkOrderModal/index.js +3 -2
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/ExamineModal/index.js +3 -2
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/FlagPayModal/index.js +3 -2
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentFormModal/index.js +3 -2
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/UnExamineModal/index.js +3 -2
- package/dist/esm/WorkOrder/components/WorkOrderList/index.js +3 -1
- package/dist/esm/WorkOrder/index.js +17 -0
- package/dist/esm/common/constant.js +12 -0
- package/dist/esm/common/styles/iconfont/iconfont.js +1 -1
- package/dist/esm/common/utils/arithmetic.js +2 -0
- package/dist/esm/common/utils/constant.js +3 -2
- package/dist/esm/common/utils/dist/submitDataTransOldFormat.js +1 -0
- package/dist/esm/common/utils/dist/tools.js +20 -2
- package/dist/esm/common/utils/dist/transformWorkOrderData.js +7 -0
- package/dist/esm/common/utils/submitDataTransOldFormat.js +3 -1
- package/dist/esm/common/utils/tools.js +84 -48
- package/dist/esm/common/utils/tools_constants.js +1 -1
- package/dist/esm/common/utils/transformWorkOrderData.js +1 -1
- package/dist/esm/common/utils/xzSDK.js +20 -7
- package/dist/esm/model/customizeWorkOrder/dist/index.js +5 -0
- package/dist/esm/model/customizeWorkOrder/index.js +15 -9
- package/dist/esm/model/logicFlow/dist/index.js +1 -0
- package/dist/esm/model/logicFlow/index.js +3 -2
- package/dist/esm/model/login.js +5 -3
- package/dist/esm/model/servers/dist/request.js +4 -1
- package/dist/esm/model/servers/request.js +4 -1
- package/dist/esm/model/singleShopWorkOrder/dist/index.js +1 -0
- package/dist/esm/model/singleShopWorkOrder/index.js +3 -2
- package/package.json +5 -5
|
@@ -150,9 +150,11 @@ var FormRender = function FormRender(props, ref) {
|
|
|
150
150
|
return form.validateFields();
|
|
151
151
|
case 6:
|
|
152
152
|
data = _context.sent;
|
|
153
|
+
console.debug('表单内容', data);
|
|
154
|
+
console.debug('templateDetail内容', templateDetail);
|
|
153
155
|
res = verifyHandle(data, templateDetail);
|
|
154
156
|
if (res.success) {
|
|
155
|
-
_context.next =
|
|
157
|
+
_context.next = 14;
|
|
156
158
|
break;
|
|
157
159
|
}
|
|
158
160
|
onFormSubmitSuccess === null || onFormSubmitSuccess === void 0 ? void 0 : onFormSubmitSuccess({
|
|
@@ -160,9 +162,9 @@ var FormRender = function FormRender(props, ref) {
|
|
|
160
162
|
});
|
|
161
163
|
message.error(res.message);
|
|
162
164
|
return _context.abrupt("return");
|
|
163
|
-
case
|
|
165
|
+
case 14:
|
|
164
166
|
if (!workOrderId) {
|
|
165
|
-
_context.next =
|
|
167
|
+
_context.next = 30;
|
|
166
168
|
break;
|
|
167
169
|
}
|
|
168
170
|
params = {
|
|
@@ -190,9 +192,9 @@ var FormRender = function FormRender(props, ref) {
|
|
|
190
192
|
params.workOrderUpdateKeyVos.workOrderUpdateKeySupVos = submitData.reduce(function (nex, cur) {
|
|
191
193
|
return nex.concat(cur === null || cur === void 0 ? void 0 : cur.contentVoList);
|
|
192
194
|
}, []);
|
|
193
|
-
_context.next =
|
|
195
|
+
_context.next = 24;
|
|
194
196
|
return updateWorkOrder(params);
|
|
195
|
-
case
|
|
197
|
+
case 24:
|
|
196
198
|
_yield$updateWorkOrde = _context.sent;
|
|
197
199
|
success = _yield$updateWorkOrde.success;
|
|
198
200
|
result = _yield$updateWorkOrde.data;
|
|
@@ -204,9 +206,9 @@ var FormRender = function FormRender(props, ref) {
|
|
|
204
206
|
id: workOrderId
|
|
205
207
|
});
|
|
206
208
|
}
|
|
207
|
-
_context.next =
|
|
209
|
+
_context.next = 42;
|
|
208
210
|
break;
|
|
209
|
-
case
|
|
211
|
+
case 30:
|
|
210
212
|
_params = {
|
|
211
213
|
apiName: 'addWorkOrder',
|
|
212
214
|
shopId: shopId,
|
|
@@ -225,6 +227,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
225
227
|
hasEnterPrisePayment = some(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, function (item) {
|
|
226
228
|
return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
|
|
227
229
|
});
|
|
230
|
+
console.debug('是否有打款组件', hasEnterPrisePayment);
|
|
228
231
|
if (hasEnterPrisePayment) {
|
|
229
232
|
getEnterPrisePaymentData = find(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, function (item) {
|
|
230
233
|
return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
|
|
@@ -244,9 +247,9 @@ var FormRender = function FormRender(props, ref) {
|
|
|
244
247
|
}
|
|
245
248
|
// console.debug('增加数据参数', params);
|
|
246
249
|
// return;
|
|
247
|
-
_context.next =
|
|
250
|
+
_context.next = 38;
|
|
248
251
|
return addWorkOrder(_params);
|
|
249
|
-
case
|
|
252
|
+
case 38:
|
|
250
253
|
_yield$addWorkOrder = _context.sent;
|
|
251
254
|
_success = _yield$addWorkOrder.success;
|
|
252
255
|
_result = _yield$addWorkOrder.data;
|
|
@@ -257,11 +260,12 @@ var FormRender = function FormRender(props, ref) {
|
|
|
257
260
|
result: _result === null || _result === void 0 ? void 0 : _result.data
|
|
258
261
|
});
|
|
259
262
|
}
|
|
260
|
-
case
|
|
261
|
-
|
|
263
|
+
case 42:
|
|
264
|
+
console.groupEnd();
|
|
265
|
+
_context.next = 49;
|
|
262
266
|
break;
|
|
263
|
-
case
|
|
264
|
-
_context.prev =
|
|
267
|
+
case 45:
|
|
268
|
+
_context.prev = 45;
|
|
265
269
|
_context.t0 = _context["catch"](0);
|
|
266
270
|
onFormSubmitSuccess === null || onFormSubmitSuccess === void 0 ? void 0 : onFormSubmitSuccess({
|
|
267
271
|
type: ''
|
|
@@ -277,11 +281,11 @@ var FormRender = function FormRender(props, ref) {
|
|
|
277
281
|
});
|
|
278
282
|
}, 0);
|
|
279
283
|
}
|
|
280
|
-
case
|
|
284
|
+
case 49:
|
|
281
285
|
case "end":
|
|
282
286
|
return _context.stop();
|
|
283
287
|
}
|
|
284
|
-
}, _callee, null, [[0,
|
|
288
|
+
}, _callee, null, [[0, 45]]);
|
|
285
289
|
}));
|
|
286
290
|
return function asyncDoSave(_x2, _x3) {
|
|
287
291
|
return _ref2.apply(this, arguments);
|
|
@@ -459,20 +463,21 @@ var FormRender = function FormRender(props, ref) {
|
|
|
459
463
|
}
|
|
460
464
|
antFormEl = document.getElementsByClassName('ant-form');
|
|
461
465
|
(antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
|
|
462
|
-
_context3.next =
|
|
466
|
+
_context3.next = 23;
|
|
463
467
|
break;
|
|
464
468
|
case 20:
|
|
465
469
|
_context3.prev = 20;
|
|
466
470
|
_context3.t0 = _context3["catch"](2);
|
|
467
|
-
|
|
468
|
-
|
|
471
|
+
console.error('获取模板信息错误', _context3.t0);
|
|
472
|
+
case 23:
|
|
473
|
+
_context3.prev = 23;
|
|
469
474
|
setLoading(false);
|
|
470
|
-
return _context3.finish(
|
|
471
|
-
case
|
|
475
|
+
return _context3.finish(23);
|
|
476
|
+
case 26:
|
|
472
477
|
case "end":
|
|
473
478
|
return _context3.stop();
|
|
474
479
|
}
|
|
475
|
-
}, _callee3, null, [[2, 20,
|
|
480
|
+
}, _callee3, null, [[2, 20, 23, 26]]);
|
|
476
481
|
}));
|
|
477
482
|
return function queryDetail(_x6) {
|
|
478
483
|
return _ref5.apply(this, arguments);
|
|
@@ -18,6 +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("state--useSelector", state);
|
|
21
22
|
/**
|
|
22
23
|
* pc main
|
|
23
24
|
* 端 workOrder
|
|
@@ -30,6 +31,7 @@ function useGetHasErpData() {
|
|
|
30
31
|
try {
|
|
31
32
|
companyUserConfig = JSON.parse(companyUserConfig);
|
|
32
33
|
} catch (e) {
|
|
34
|
+
console.error("companyUserConfig转换异常", companyUserConfig);
|
|
33
35
|
companyUserConfig = {};
|
|
34
36
|
}
|
|
35
37
|
}
|
|
@@ -40,6 +42,7 @@ function useGetHasErpData() {
|
|
|
40
42
|
setHasErpDataJson = _a[1];
|
|
41
43
|
react_1.useEffect(function () {
|
|
42
44
|
setHasErpDataJson(getTemplate(companyUserConfig));
|
|
45
|
+
console.log("companyUserConfig---", companyUserConfig);
|
|
43
46
|
}, [companyUserConfig]);
|
|
44
47
|
var hasErpData = react_1.useMemo(function () {
|
|
45
48
|
return JSON.parse(hasErpDataJson);
|
|
@@ -582,11 +582,13 @@ function fetchAndCacheColumns() {
|
|
|
582
582
|
});
|
|
583
583
|
return newColumns;
|
|
584
584
|
} catch (err) {
|
|
585
|
+
console.debug('parse Error: ', err);
|
|
585
586
|
return DETAIL_ITEM_LIST;
|
|
586
587
|
}
|
|
587
588
|
}
|
|
588
589
|
return DETAIL_ITEM_LIST;
|
|
589
590
|
}).catch(function (err) {
|
|
591
|
+
console.debug(err);
|
|
590
592
|
return DETAIL_ITEM_LIST;
|
|
591
593
|
}).then(function (columns) {
|
|
592
594
|
sharedTableColumnsCache = {
|
|
@@ -423,7 +423,7 @@ var ServiceProgress = function ServiceProgress(props) {
|
|
|
423
423
|
message.error('服务进度为空');
|
|
424
424
|
setServiceProgressList([]);
|
|
425
425
|
}
|
|
426
|
-
}).catch(
|
|
426
|
+
}).catch(console.log);
|
|
427
427
|
}
|
|
428
428
|
}, [props.id]);
|
|
429
429
|
return /*#__PURE__*/React.createElement(Timeline, {
|
package/dist/esm/Login/index.js
CHANGED
|
@@ -186,6 +186,7 @@ var Login = function Login(props) {
|
|
|
186
186
|
});
|
|
187
187
|
} catch (err) {
|
|
188
188
|
setLoading(false);
|
|
189
|
+
console.error(err);
|
|
189
190
|
}
|
|
190
191
|
case 12:
|
|
191
192
|
case "end":
|
|
@@ -222,12 +223,13 @@ var Login = function Login(props) {
|
|
|
222
223
|
cache.setHost(HD_HOST);
|
|
223
224
|
}
|
|
224
225
|
handleLoginClick(isHdWhiteList, isDirectProcess);
|
|
225
|
-
_context3.next =
|
|
226
|
+
_context3.next = 14;
|
|
226
227
|
break;
|
|
227
228
|
case 11:
|
|
228
229
|
_context3.prev = 11;
|
|
229
230
|
_context3.t0 = _context3["catch"](0);
|
|
230
|
-
|
|
231
|
+
console.error(_context3.t0);
|
|
232
|
+
case 14:
|
|
231
233
|
case "end":
|
|
232
234
|
return _context3.stop();
|
|
233
235
|
}
|
|
@@ -95,16 +95,18 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
|
|
|
95
95
|
return form.validateFields();
|
|
96
96
|
case 3:
|
|
97
97
|
data = _context.sent;
|
|
98
|
+
console.debug('表单内容', data);
|
|
99
|
+
console.debug('templateDetail内容', templateDetail);
|
|
98
100
|
res = verifyHandle(data, templateDetail);
|
|
99
101
|
if (res.success) {
|
|
100
|
-
_context.next =
|
|
102
|
+
_context.next = 10;
|
|
101
103
|
break;
|
|
102
104
|
}
|
|
103
105
|
message.error(res.message);
|
|
104
106
|
return _context.abrupt("return");
|
|
105
|
-
case
|
|
107
|
+
case 10:
|
|
106
108
|
if (!workOrderId) {
|
|
107
|
-
_context.next =
|
|
109
|
+
_context.next = 22;
|
|
108
110
|
break;
|
|
109
111
|
}
|
|
110
112
|
params = {
|
|
@@ -119,9 +121,9 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
|
|
|
119
121
|
params.workOrderUpdateKeyVos.workOrderUpdateKeySupVos = submitData.reduce(function (nex, cur) {
|
|
120
122
|
return nex.concat(cur === null || cur === void 0 ? void 0 : cur.contentVoList);
|
|
121
123
|
}, []);
|
|
122
|
-
_context.next =
|
|
124
|
+
_context.next = 16;
|
|
123
125
|
return updateSingleShopWorkOrder(params);
|
|
124
|
-
case
|
|
126
|
+
case 16:
|
|
125
127
|
_yield$updateSingleSh = _context.sent;
|
|
126
128
|
success = _yield$updateSingleSh.success;
|
|
127
129
|
result = _yield$updateSingleSh.data;
|
|
@@ -135,9 +137,9 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
|
|
|
135
137
|
id: workOrderId
|
|
136
138
|
});
|
|
137
139
|
}
|
|
138
|
-
_context.next =
|
|
140
|
+
_context.next = 34;
|
|
139
141
|
break;
|
|
140
|
-
case
|
|
142
|
+
case 22:
|
|
141
143
|
_params = {
|
|
142
144
|
apiName: 'addWorkOrder',
|
|
143
145
|
shopId: currentShopId,
|
|
@@ -152,6 +154,7 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
|
|
|
152
154
|
hasEnterPrisePayment = some(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, function (item) {
|
|
153
155
|
return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
|
|
154
156
|
});
|
|
157
|
+
console.debug('是否有打款组件', hasEnterPrisePayment);
|
|
155
158
|
if (hasEnterPrisePayment) {
|
|
156
159
|
getEnterPrisePaymentData = find(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, function (item) {
|
|
157
160
|
return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
|
|
@@ -169,9 +172,10 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
|
|
|
169
172
|
required: get(componentConfig, 'required')
|
|
170
173
|
};
|
|
171
174
|
}
|
|
172
|
-
|
|
175
|
+
console.debug('增加数据参数', _params);
|
|
176
|
+
_context.next = 30;
|
|
173
177
|
return addSingleShopWorkOrder(_params);
|
|
174
|
-
case
|
|
178
|
+
case 30:
|
|
175
179
|
_yield$addSingleShopW = _context.sent;
|
|
176
180
|
_success = _yield$addSingleShopW.success;
|
|
177
181
|
_result = _yield$addSingleShopW.data;
|
|
@@ -184,11 +188,12 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
|
|
|
184
188
|
result: _result === null || _result === void 0 ? void 0 : _result.data
|
|
185
189
|
});
|
|
186
190
|
}
|
|
187
|
-
case
|
|
188
|
-
|
|
191
|
+
case 34:
|
|
192
|
+
console.groupEnd();
|
|
193
|
+
_context.next = 40;
|
|
189
194
|
break;
|
|
190
|
-
case
|
|
191
|
-
_context.prev =
|
|
195
|
+
case 37:
|
|
196
|
+
_context.prev = 37;
|
|
192
197
|
_context.t0 = _context["catch"](0);
|
|
193
198
|
// 表单校验失败错误时,将错误第一项滚动到可视区域
|
|
194
199
|
if (get(_context.t0, 'errorFields.length') > 0) {
|
|
@@ -201,11 +206,11 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
|
|
|
201
206
|
});
|
|
202
207
|
}, 0);
|
|
203
208
|
}
|
|
204
|
-
case
|
|
209
|
+
case 40:
|
|
205
210
|
case "end":
|
|
206
211
|
return _context.stop();
|
|
207
212
|
}
|
|
208
|
-
}, _callee, null, [[0,
|
|
213
|
+
}, _callee, null, [[0, 37]]);
|
|
209
214
|
}));
|
|
210
215
|
return function asyncDoSave(_x2, _x3) {
|
|
211
216
|
return _ref.apply(this, arguments);
|
|
@@ -431,6 +436,7 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
|
|
|
431
436
|
setWorkOrderDetail(_workOrderDetail.data);
|
|
432
437
|
if (workOrderId) {
|
|
433
438
|
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);
|
|
439
|
+
console.log(transData);
|
|
434
440
|
form.setFieldsValue(_objectSpread(_objectSpread({}, get(transData, '0', {})), {}, {
|
|
435
441
|
shopId: shopId,
|
|
436
442
|
shopName: record.shopName,
|
|
@@ -471,20 +477,21 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
|
|
|
471
477
|
}
|
|
472
478
|
antFormEl = document.getElementsByClassName('ant-form');
|
|
473
479
|
(antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
|
|
474
|
-
_context4.next =
|
|
480
|
+
_context4.next = 23;
|
|
475
481
|
break;
|
|
476
482
|
case 20:
|
|
477
483
|
_context4.prev = 20;
|
|
478
484
|
_context4.t0 = _context4["catch"](2);
|
|
479
|
-
|
|
480
|
-
|
|
485
|
+
console.error('获取模板信息错误', _context4.t0);
|
|
486
|
+
case 23:
|
|
487
|
+
_context4.prev = 23;
|
|
481
488
|
setLoading(false);
|
|
482
|
-
return _context4.finish(
|
|
483
|
-
case
|
|
489
|
+
return _context4.finish(23);
|
|
490
|
+
case 26:
|
|
484
491
|
case "end":
|
|
485
492
|
return _context4.stop();
|
|
486
493
|
}
|
|
487
|
-
}, _callee4, null, [[2, 20,
|
|
494
|
+
}, _callee4, null, [[2, 20, 23, 26]]);
|
|
488
495
|
}));
|
|
489
496
|
return function queryDetail(_x7) {
|
|
490
497
|
return _ref5.apply(this, arguments);
|
|
@@ -44,12 +44,13 @@ var DeleteCustomizeOrderModal = function DeleteCustomizeOrderModal(_ref) {
|
|
|
44
44
|
case 3:
|
|
45
45
|
submit();
|
|
46
46
|
handleCancel();
|
|
47
|
-
_context.next =
|
|
47
|
+
_context.next = 10;
|
|
48
48
|
break;
|
|
49
49
|
case 7:
|
|
50
50
|
_context.prev = 7;
|
|
51
51
|
_context.t0 = _context["catch"](0);
|
|
52
|
-
|
|
52
|
+
console.log('e', _context.t0);
|
|
53
|
+
case 10:
|
|
53
54
|
case "end":
|
|
54
55
|
return _context.stop();
|
|
55
56
|
}
|
|
@@ -62,6 +62,7 @@ var SingleShopWorkOrder = function SingleShopWorkOrder() {
|
|
|
62
62
|
var submit = search.submit;
|
|
63
63
|
var dataSource = tableProps.dataSource,
|
|
64
64
|
pagination = tableProps.pagination;
|
|
65
|
+
console.log('pagination', pagination);
|
|
65
66
|
useEffect(function () {
|
|
66
67
|
dispatch(fetchTemplateList);
|
|
67
68
|
}, []);
|
|
@@ -39,7 +39,7 @@ var ReissueItems = function ReissueItems(props, ref) {
|
|
|
39
39
|
delete submitData.afterSaleType;
|
|
40
40
|
createWdtReissueOrder(submitData).then(function () {
|
|
41
41
|
onCreate === null || onCreate === void 0 ? void 0 : onCreate();
|
|
42
|
-
}).catch(
|
|
42
|
+
}).catch(console.log);
|
|
43
43
|
}
|
|
44
44
|
};
|
|
45
45
|
});
|
|
@@ -58,12 +58,13 @@ var DeletePaymentWorkOrderModal = function DeletePaymentWorkOrderModal(props) {
|
|
|
58
58
|
onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
|
|
59
59
|
handleCancel();
|
|
60
60
|
}
|
|
61
|
-
_context.next =
|
|
61
|
+
_context.next = 11;
|
|
62
62
|
break;
|
|
63
63
|
case 8:
|
|
64
64
|
_context.prev = 8;
|
|
65
65
|
_context.t0 = _context["catch"](0);
|
|
66
|
-
|
|
66
|
+
console.error('e', _context.t0);
|
|
67
|
+
case 11:
|
|
67
68
|
case "end":
|
|
68
69
|
return _context.stop();
|
|
69
70
|
}
|
|
@@ -46,12 +46,13 @@ var ExamineModal = function ExamineModal(props) {
|
|
|
46
46
|
onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
|
|
47
47
|
handleCancel();
|
|
48
48
|
}
|
|
49
|
-
_context.next =
|
|
49
|
+
_context.next = 11;
|
|
50
50
|
break;
|
|
51
51
|
case 8:
|
|
52
52
|
_context.prev = 8;
|
|
53
53
|
_context.t0 = _context["catch"](0);
|
|
54
|
-
|
|
54
|
+
console.error('e', _context.t0);
|
|
55
|
+
case 11:
|
|
55
56
|
case "end":
|
|
56
57
|
return _context.stop();
|
|
57
58
|
}
|
|
@@ -45,12 +45,13 @@ var FlagPayModal = function FlagPayModal(props) {
|
|
|
45
45
|
onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
|
|
46
46
|
handleCancel();
|
|
47
47
|
}
|
|
48
|
-
_context.next =
|
|
48
|
+
_context.next = 11;
|
|
49
49
|
break;
|
|
50
50
|
case 8:
|
|
51
51
|
_context.prev = 8;
|
|
52
52
|
_context.t0 = _context["catch"](0);
|
|
53
|
-
|
|
53
|
+
console.error('e', _context.t0);
|
|
54
|
+
case 11:
|
|
54
55
|
case "end":
|
|
55
56
|
return _context.stop();
|
|
56
57
|
}
|
package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentFormModal/index.js
CHANGED
|
@@ -259,12 +259,13 @@ function ModifyModal(props) {
|
|
|
259
259
|
_yield$getThirdOpenUi2 = _yield$getThirdOpenUi.data;
|
|
260
260
|
data = _yield$getThirdOpenUi2 === void 0 ? {} : _yield$getThirdOpenUi2;
|
|
261
261
|
form.setFieldsValue(_objectSpread({}, data));
|
|
262
|
-
_context4.next =
|
|
262
|
+
_context4.next = 12;
|
|
263
263
|
break;
|
|
264
264
|
case 9:
|
|
265
265
|
_context4.prev = 9;
|
|
266
266
|
_context4.t0 = _context4["catch"](0);
|
|
267
|
-
|
|
267
|
+
console.error(_context4.t0);
|
|
268
|
+
case 12:
|
|
268
269
|
case "end":
|
|
269
270
|
return _context4.stop();
|
|
270
271
|
}
|
package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/UnExamineModal/index.js
CHANGED
|
@@ -45,12 +45,13 @@ var UnExamineModal = function UnExamineModal(props) {
|
|
|
45
45
|
onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
|
|
46
46
|
handleCancel();
|
|
47
47
|
}
|
|
48
|
-
_context.next =
|
|
48
|
+
_context.next = 11;
|
|
49
49
|
break;
|
|
50
50
|
case 8:
|
|
51
51
|
_context.prev = 8;
|
|
52
52
|
_context.t0 = _context["catch"](0);
|
|
53
|
-
|
|
53
|
+
console.error('e', _context.t0);
|
|
54
|
+
case 11:
|
|
54
55
|
case "end":
|
|
55
56
|
return _context.stop();
|
|
56
57
|
}
|
|
@@ -322,7 +322,9 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
|
|
|
322
322
|
}));
|
|
323
323
|
}
|
|
324
324
|
}
|
|
325
|
-
}).catch(function (e) {
|
|
325
|
+
}).catch(function (e) {
|
|
326
|
+
console.log(e);
|
|
327
|
+
});
|
|
326
328
|
};
|
|
327
329
|
var listHeight = useMemo(function () {
|
|
328
330
|
var _platFormHeightMap;
|
|
@@ -101,6 +101,7 @@ var WorkOrder = function WorkOrder(props) {
|
|
|
101
101
|
try {
|
|
102
102
|
companyUserConfig = JSON.parse(companyUserConfig || '{}');
|
|
103
103
|
} catch (e) {
|
|
104
|
+
console.error('companyUserConfig转换异常', companyUserConfig);
|
|
104
105
|
companyUserConfig = null;
|
|
105
106
|
}
|
|
106
107
|
// TODO: 修改key(isShowWdt)
|
|
@@ -140,7 +141,9 @@ var WorkOrder = function WorkOrder(props) {
|
|
|
140
141
|
initHandle();
|
|
141
142
|
}, []);
|
|
142
143
|
useEffect(function () {
|
|
144
|
+
console.log('工单模块加载');
|
|
143
145
|
return function () {
|
|
146
|
+
console.log('工单模块卸载');
|
|
144
147
|
dispatch({
|
|
145
148
|
type: 'customizeWorkOrder/closeAllModal'
|
|
146
149
|
});
|
|
@@ -149,6 +152,20 @@ var WorkOrder = function WorkOrder(props) {
|
|
|
149
152
|
});
|
|
150
153
|
};
|
|
151
154
|
}, []);
|
|
155
|
+
|
|
156
|
+
// 阻止浏览器默认拖拽行为(防止外部图片拖入时覆盖整个页面)
|
|
157
|
+
useEffect(function () {
|
|
158
|
+
var preventDefaults = function preventDefaults(e) {
|
|
159
|
+
e.preventDefault();
|
|
160
|
+
e.stopPropagation();
|
|
161
|
+
};
|
|
162
|
+
document.addEventListener('dragover', preventDefaults);
|
|
163
|
+
document.addEventListener('drop', preventDefaults);
|
|
164
|
+
return function () {
|
|
165
|
+
document.removeEventListener('dragover', preventDefaults);
|
|
166
|
+
document.removeEventListener('drop', preventDefaults);
|
|
167
|
+
};
|
|
168
|
+
}, []);
|
|
152
169
|
useLayoutEffect(function () {
|
|
153
170
|
var _document$getElementB;
|
|
154
171
|
var el = (_document$getElementB = document.getElementById('customize-work-order-component')) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.getBoundingClientRect();
|
|
@@ -110,6 +110,18 @@ export var SKIP_NODE_TYPES_CONFIG = {
|
|
|
110
110
|
name: '补发(聚水潭)',
|
|
111
111
|
tips: '补发单id'
|
|
112
112
|
},
|
|
113
|
+
JST_RETURN_EXCHANGE: {
|
|
114
|
+
name: '换货(聚水潭接口)',
|
|
115
|
+
tips: '聚水潭换货单id'
|
|
116
|
+
},
|
|
117
|
+
JST_OBTAIN_REISSUE_LOGISTICS: {
|
|
118
|
+
name: '获取补发物流单号(聚水潭接口)',
|
|
119
|
+
tips: '补发物流信息'
|
|
120
|
+
},
|
|
121
|
+
JST_REISSUE_NEW: {
|
|
122
|
+
name: '补发(聚水潭接口)',
|
|
123
|
+
tips: '聚水潭补发单id'
|
|
124
|
+
},
|
|
113
125
|
KM_ERP_REISSUE_WORK_ORDER: {
|
|
114
126
|
name: '补发(快麦ERP)',
|
|
115
127
|
tips: '补发单id'
|
|
@@ -16,7 +16,7 @@ window._iconfont_svg_string_4268558 = '<svg><symbol id="icon-qizhi" viewBox="0 0
|
|
|
16
16
|
try {
|
|
17
17
|
document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>");
|
|
18
18
|
} catch (t) {
|
|
19
|
-
console &&
|
|
19
|
+
console && console.log(t);
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
i = function i() {
|
|
@@ -127,7 +127,9 @@ export var getCalculationComponentValue = function getCalculationComponentValue(
|
|
|
127
127
|
value = parseExpression(express);
|
|
128
128
|
//TODO: 针对0.1+0.2的问题,这里对浮点类型的小数截取小数点后2位
|
|
129
129
|
value = parseFloat((_value = value) === null || _value === void 0 ? void 0 : _value.toFixed(2));
|
|
130
|
+
console.debug('计算组件计算结果', value, express);
|
|
130
131
|
} catch (error) {
|
|
132
|
+
console.error('计算组件计算异常', express);
|
|
131
133
|
value = 0;
|
|
132
134
|
}
|
|
133
135
|
cur[componentInstance.id] = isValidNumber(value) ? value : 0;
|
|
@@ -384,9 +384,10 @@ export var SUBMIT_COMPONENT_REISSUE_MAP = {
|
|
|
384
384
|
type: 'jstReturnType',
|
|
385
385
|
goods: 'jstReturnGoods',
|
|
386
386
|
shopCode: 'shopCode',
|
|
387
|
-
systemOrderNo: 'jstSystemOrderNo'
|
|
388
|
-
systemOrderBillType: 'jstSystemOrderBillType'
|
|
387
|
+
systemOrderNo: 'jstSystemOrderNo'
|
|
388
|
+
// systemOrderBillType: 'jstSystemOrderBillType',
|
|
389
389
|
},
|
|
390
|
+
|
|
390
391
|
KM_REISSUE_GOODS: {
|
|
391
392
|
type: 'kmReissueType',
|
|
392
393
|
goods: 'kmReissueGoods',
|
|
@@ -530,6 +530,7 @@ var handleSystemOrder = function handleSystemOrder(_a) {
|
|
|
530
530
|
getNowData = _a.getNowData;
|
|
531
531
|
return function (item) {
|
|
532
532
|
var selectIds = getNowData(item.uniqueKey + ".selectIds", '');
|
|
533
|
+
console.log('触发---getGyOrderList--5');
|
|
533
534
|
var showOrderInfo = getNowData(item.uniqueKey + ".showOrderInfo", []);
|
|
534
535
|
var type = item.workOrderComponentType;
|
|
535
536
|
addContent(constant_1.SUBMIT_COMPONENT_SYSTEM_ORDER_MAP[type].no, getNowData(item.uniqueKey + ".orderNo", ''));
|
|
@@ -328,7 +328,16 @@ exports.orderBack = function (_a) {
|
|
|
328
328
|
case 2:
|
|
329
329
|
_f = _4.sent(), data = _f[0], jstOrder = _f[1], bsOrder = _f[2], wlnOrder = _f[3], wdtOrder = _f[4], bsE3Order = _f[5], kmOrder = _f[6], gyOrder = _f[7];
|
|
330
330
|
// TODO: 针对订单支付方式是微信还是支付宝,后端接口返回一个message用来提示使用
|
|
331
|
-
|
|
331
|
+
console.log('--订单反填数据--', {
|
|
332
|
+
data: data,
|
|
333
|
+
jstOrder: jstOrder,
|
|
334
|
+
bsOrder: bsOrder,
|
|
335
|
+
wlnOrder: wlnOrder,
|
|
336
|
+
wdtOrder: wdtOrder,
|
|
337
|
+
bsE3Order: bsE3Order,
|
|
338
|
+
kmOrder: kmOrder,
|
|
339
|
+
gyOrder: gyOrder
|
|
340
|
+
});
|
|
332
341
|
if ((_l = data === null || data === void 0 ? void 0 : data.value) === null || _l === void 0 ? void 0 : _l.message) {
|
|
333
342
|
antd_1.message.warning((_m = data === null || data === void 0 ? void 0 : data.value) === null || _m === void 0 ? void 0 : _m.message);
|
|
334
343
|
}
|
|
@@ -425,6 +434,7 @@ exports.orderBack = function (_a) {
|
|
|
425
434
|
}
|
|
426
435
|
|
|
427
436
|
if (((_1 = gyOrders === null || gyOrders === void 0 ? void 0 : gyOrders.trades) === null || _1 === void 0 ? void 0 : _1.length) > 1) {
|
|
437
|
+
console.log('触发---orders--2');
|
|
428
438
|
gyInfo.gyGoods = __assign(__assign({}, gyInfo.gyGoods), {
|
|
429
439
|
gyGoods: [],
|
|
430
440
|
orders: []
|
|
@@ -492,6 +502,7 @@ exports.orderBack = function (_a) {
|
|
|
492
502
|
return [3 /*break*/, 6];
|
|
493
503
|
case 5:
|
|
494
504
|
e_1 = _4.sent();
|
|
505
|
+
console.error('调用erp获取宝贝编码错误', e_1);
|
|
495
506
|
return [3 /*break*/, 6];
|
|
496
507
|
case 6:
|
|
497
508
|
values = kmkf_utils_1.orderBackFormValues({
|
|
@@ -502,6 +513,8 @@ exports.orderBack = function (_a) {
|
|
|
502
513
|
type: type,
|
|
503
514
|
fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo
|
|
504
515
|
});
|
|
516
|
+
console.log('formValue', formValue);
|
|
517
|
+
console.log('values', values);
|
|
505
518
|
//新建的情况下订单返填不能清空打款信息
|
|
506
519
|
if (type !== 'edit') {
|
|
507
520
|
paymentUniqueKey = exports.findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'ENTERPRISE_PAYMENT');
|
|
@@ -525,6 +538,7 @@ exports.orderBack = function (_a) {
|
|
|
525
538
|
return [3 /*break*/, 8];
|
|
526
539
|
case 7:
|
|
527
540
|
e_2 = _4.sent();
|
|
541
|
+
console.error(e_2);
|
|
528
542
|
return [3 /*break*/, 8];
|
|
529
543
|
case 8:
|
|
530
544
|
return [2 /*return*/];
|
|
@@ -693,7 +707,9 @@ exports.submitParams = function (_a) {
|
|
|
693
707
|
if (kmkf_utils_1.unTransField(item.uniqueKey)) {
|
|
694
708
|
try {
|
|
695
709
|
newOldContent = JSON.parse(newOldContent);
|
|
696
|
-
} catch (e) {
|
|
710
|
+
} catch (e) {
|
|
711
|
+
console.error('error');
|
|
712
|
+
}
|
|
697
713
|
}
|
|
698
714
|
if (kmkf_utils_1.isNull(newOldContent) && kmkf_utils_1.isNull(item.content)) return;
|
|
699
715
|
if (newOldContent == item.content) return;
|
|
@@ -948,6 +964,7 @@ exports.bsE3SystemOrderBackValues = function (_a) {
|
|
|
948
964
|
var values = kmkf_utils_1.bsE3OrderBackFormValues(orderInfo, {
|
|
949
965
|
componentDtoList: bsE3GoodsComponent
|
|
950
966
|
});
|
|
967
|
+
console.log('values', values);
|
|
951
968
|
form.setFieldsValue(values);
|
|
952
969
|
};
|
|
953
970
|
//wln商品信息返填
|
|
@@ -1052,6 +1069,7 @@ exports.gySystemOrderBackValues = function (_a) {
|
|
|
1052
1069
|
var values = kmkf_utils_1.gyOrderBackFormValues(orderInfo, {
|
|
1053
1070
|
componentDtoList: gyGoodsComponent
|
|
1054
1071
|
});
|
|
1072
|
+
console.log('values', values);
|
|
1055
1073
|
form.setFieldsValue(values);
|
|
1056
1074
|
};
|
|
1057
1075
|
//获取多级下拉最后的值
|