kmkf-work-order-service-component 0.5.0-alpha.9 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/esm/FormRender/index.js +6 -5
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.js +23 -14
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.less +16 -12
- package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.js +3 -0
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/RepeatWorkOrderListModal/index.js +22 -13
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/RepeatWorkOrderListModal/index.less +12 -7
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/index.js +4 -4
- package/dist/esm/WorkOrder/components/PaymentWorkOrderList/index.less +7 -2
- package/dist/esm/WorkOrder/components/Widget/third/Payment/index.js +1 -3
- package/dist/esm/common/utils/tools.js +12 -11
- package/dist/esm/model/workOrder.js +2 -2
- package/package.json +1 -1
@@ -434,17 +434,18 @@ var FormRender = function FormRender(props, ref) {
|
|
434
434
|
|
435
435
|
|
436
436
|
var orderBackReplace = function orderBackReplace(value, templateDetail) {
|
437
|
-
var
|
438
|
-
|
437
|
+
var orderNo = value.orderNo,
|
438
|
+
buyerNick = value.buyerNick,
|
439
439
|
receiveMobile = value.receiveMobile,
|
440
440
|
alipayAccount = value.alipayAccount,
|
441
441
|
expressLogisticsCode = value.expressLogisticsCode;
|
442
442
|
queryReplaceCount({
|
443
|
-
tradeId:
|
444
|
-
buyerNick:
|
443
|
+
tradeId: orderNo,
|
444
|
+
buyerNick: buyerNick,
|
445
445
|
receiveMobile: receiveMobile,
|
446
446
|
alipayAccount: alipayAccount,
|
447
|
-
expressLogisticsCode: expressLogisticsCode
|
447
|
+
expressLogisticsCode: expressLogisticsCode,
|
448
|
+
enterprisePaymentTid: orderNo
|
448
449
|
}, templateDetail);
|
449
450
|
}; // 切换模板
|
450
451
|
|
@@ -48,17 +48,20 @@ var RepeatWorkOrder = function RepeatWorkOrder(_ref) {
|
|
48
48
|
children: /*#__PURE__*/_jsx("ol", {
|
49
49
|
className: "customize-repeat-workOrder",
|
50
50
|
children: repeatWorkOrderList === null || repeatWorkOrderList === void 0 ? void 0 : repeatWorkOrderList.map(function (item) {
|
51
|
-
return /*#__PURE__*/
|
52
|
-
children:
|
53
|
-
className: "
|
54
|
-
children:
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
51
|
+
return /*#__PURE__*/_jsx("li", {
|
52
|
+
children: /*#__PURE__*/_jsxs("div", {
|
53
|
+
className: "workOrderIdWrap",
|
54
|
+
children: [/*#__PURE__*/_jsx("span", {
|
55
|
+
className: "workOrderId",
|
56
|
+
children: item
|
57
|
+
}), /*#__PURE__*/_jsx(Button, {
|
58
|
+
type: "link",
|
59
|
+
onClick: function onClick() {
|
60
|
+
return copyHandle(item);
|
61
|
+
},
|
62
|
+
children: "\u590D\u5236"
|
63
|
+
})]
|
64
|
+
})
|
62
65
|
});
|
63
66
|
})
|
64
67
|
})
|
@@ -136,14 +139,20 @@ var RepeatWorkOrderListModal = function RepeatWorkOrderListModal() {
|
|
136
139
|
};
|
137
140
|
|
138
141
|
return /*#__PURE__*/_jsx(Modal, {
|
139
|
-
title: "
|
142
|
+
title: /*#__PURE__*/_jsx("span", {
|
143
|
+
style: {
|
144
|
+
fontWeight: 600
|
145
|
+
},
|
146
|
+
children: "\u91CD\u590D\u63D0\u4EA4\u5DE5\u5355\u7F16\u53F7"
|
147
|
+
}),
|
140
148
|
visible: visible,
|
141
149
|
onCancel: handleCancel,
|
142
150
|
footer: null,
|
143
151
|
bodyStyle: {
|
144
|
-
maxHeight: '
|
152
|
+
maxHeight: '400px',
|
145
153
|
overflowY: 'auto'
|
146
154
|
},
|
155
|
+
destroyOnClose: true,
|
147
156
|
children: /*#__PURE__*/_jsx(Spin, {
|
148
157
|
spinning: loading,
|
149
158
|
children: /*#__PURE__*/_jsx("div", {
|
@@ -155,7 +164,7 @@ var RepeatWorkOrderListModal = function RepeatWorkOrderListModal() {
|
|
155
164
|
|
156
165
|
if (item !== null && item !== void 0 && (_item$repeatField = item.repeatField) !== null && _item$repeatField !== void 0 && _item$repeatField.endsWith('_tradeId')) {
|
157
166
|
return /*#__PURE__*/_jsx(RepeatWorkOrder, {
|
158
|
-
title: "\u8BA2\u5355\u91CD\u590D",
|
167
|
+
title: "\u8BA2\u5355\u53F7\u91CD\u590D",
|
159
168
|
repeatWorkOrderList: item.workOrderIds
|
160
169
|
});
|
161
170
|
}
|
@@ -1,10 +1,10 @@
|
|
1
1
|
.item-wrap {
|
2
2
|
display: flex;
|
3
|
-
flex-direction:
|
3
|
+
flex-direction: column;
|
4
4
|
margin-bottom: 4px;
|
5
5
|
background: #fff;
|
6
6
|
.item-main-item {
|
7
|
-
flex-basis: 100px;
|
7
|
+
// flex-basis: 100px;
|
8
8
|
font-weight: 600;
|
9
9
|
font-size: 14px;
|
10
10
|
line-height: 32px;
|
@@ -15,16 +15,20 @@
|
|
15
15
|
li {
|
16
16
|
margin-bottom: 4px;
|
17
17
|
list-style: decimal;
|
18
|
-
.
|
19
|
-
display:
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
18
|
+
.workOrderIdWrap {
|
19
|
+
display: flex;
|
20
|
+
align-content: center;
|
21
|
+
.workOrderId {
|
22
|
+
display: inline-block;
|
23
|
+
width: 240px;
|
24
|
+
margin-right: 16px;
|
25
|
+
overflow: hidden;
|
26
|
+
white-space: nowrap;
|
27
|
+
text-overflow: ellipsis;
|
28
|
+
}
|
29
|
+
.text-repeat {
|
30
|
+
cursor: pointer;
|
31
|
+
}
|
28
32
|
}
|
29
33
|
}
|
30
34
|
}
|
@@ -246,6 +246,9 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
|
|
246
246
|
};
|
247
247
|
|
248
248
|
var searchForm = /*#__PURE__*/_jsxs("div", {
|
249
|
+
style: {
|
250
|
+
marginTop: '8px'
|
251
|
+
},
|
249
252
|
children: [/*#__PURE__*/_jsx(Form, {
|
250
253
|
form: form,
|
251
254
|
className: "customizeSearch ".concat(open ? 'open' : 'close'),
|
@@ -25,14 +25,20 @@ var RepeatWorkOrderListModal = function RepeatWorkOrderListModal() {
|
|
25
25
|
};
|
26
26
|
|
27
27
|
return /*#__PURE__*/_jsx(Modal, {
|
28
|
-
title: "
|
28
|
+
title: /*#__PURE__*/_jsx("span", {
|
29
|
+
style: {
|
30
|
+
fontWeight: 600
|
31
|
+
},
|
32
|
+
children: "\u91CD\u590D\u63D0\u4EA4\u5DE5\u5355\u7F16\u53F7"
|
33
|
+
}),
|
29
34
|
visible: visible,
|
30
35
|
onCancel: handleCancel,
|
31
36
|
footer: null,
|
32
37
|
bodyStyle: {
|
33
|
-
maxHeight: '
|
38
|
+
maxHeight: '400px',
|
34
39
|
overflowY: 'auto'
|
35
40
|
},
|
41
|
+
destroyOnClose: true,
|
36
42
|
children: /*#__PURE__*/_jsxs(_Fragment, {
|
37
43
|
children: [/*#__PURE__*/_jsx("span", {
|
38
44
|
className: "repeat-trade-id",
|
@@ -40,17 +46,20 @@ var RepeatWorkOrderListModal = function RepeatWorkOrderListModal() {
|
|
40
46
|
}), /*#__PURE__*/_jsx("ol", {
|
41
47
|
className: "repeat-workOrder",
|
42
48
|
children: repeatWorkOrderList === null || repeatWorkOrderList === void 0 ? void 0 : repeatWorkOrderList.map(function (item) {
|
43
|
-
return /*#__PURE__*/
|
44
|
-
children:
|
45
|
-
className: "
|
46
|
-
children:
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
49
|
+
return /*#__PURE__*/_jsx("li", {
|
50
|
+
children: /*#__PURE__*/_jsxs("div", {
|
51
|
+
className: "workOrderIdWrap",
|
52
|
+
children: [/*#__PURE__*/_jsx("span", {
|
53
|
+
className: "workOrderId",
|
54
|
+
children: item
|
55
|
+
}), /*#__PURE__*/_jsx(Button, {
|
56
|
+
type: "link",
|
57
|
+
onClick: function onClick() {
|
58
|
+
return copyHandle(item);
|
59
|
+
},
|
60
|
+
children: "\u590D\u5236"
|
61
|
+
})]
|
62
|
+
})
|
54
63
|
});
|
55
64
|
})
|
56
65
|
})]
|
@@ -6,14 +6,19 @@
|
|
6
6
|
li {
|
7
7
|
padding: 4px 0px;
|
8
8
|
list-style: decimal;
|
9
|
-
.
|
10
|
-
display:
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
9
|
+
.workOrderIdWrap {
|
10
|
+
display: flex;
|
11
|
+
align-items: center;
|
12
|
+
.workOrderId {
|
13
|
+
display: inline-block;
|
14
|
+
width: 240px;
|
15
|
+
margin-right: 16px;
|
16
|
+
overflow: hidden;
|
17
|
+
white-space: nowrap;
|
18
|
+
text-overflow: ellipsis;
|
19
|
+
}
|
16
20
|
}
|
21
|
+
|
17
22
|
.text-repeat {
|
18
23
|
cursor: pointer;
|
19
24
|
}
|
@@ -128,19 +128,19 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
|
|
128
128
|
paySearch: {
|
129
129
|
pageNo: 1,
|
130
130
|
pageSize: 20,
|
131
|
-
time: [moment().subtract(
|
131
|
+
time: [moment().subtract(30, 'day').startOf('day'), moment().endOf('day')],
|
132
132
|
workPayStatus: '',
|
133
133
|
tid: '',
|
134
|
-
|
134
|
+
paymentMixUk: '',
|
135
135
|
isBuyer: false
|
136
136
|
}
|
137
137
|
}
|
138
138
|
});
|
139
139
|
form.setFieldsValue({
|
140
|
-
time: [moment().subtract(
|
140
|
+
time: [moment().subtract(30, 'day').startOf('day'), moment().endOf('day')],
|
141
141
|
workPayStatus: '',
|
142
142
|
tid: '',
|
143
|
-
|
143
|
+
paymentMixUk: ''
|
144
144
|
});
|
145
145
|
};
|
146
146
|
|
@@ -122,17 +122,22 @@
|
|
122
122
|
}
|
123
123
|
|
124
124
|
.payment_box_main {
|
125
|
-
overflow: auto;
|
126
|
-
background-color: #fafafa;
|
127
125
|
display: flex;
|
128
126
|
flex: 1 1 auto;
|
129
127
|
flex-direction: column;
|
130
128
|
justify-content: space-between;
|
129
|
+
margin-top: 8px;
|
130
|
+
margin-bottom: 40px;
|
131
|
+
overflow: auto;
|
131
132
|
overflow: auto;
|
133
|
+
background-color: #fafafa;
|
132
134
|
}
|
133
135
|
|
134
136
|
.payment_box_page {
|
137
|
+
position: absolute;
|
138
|
+
bottom: 0;
|
135
139
|
display: flex;
|
140
|
+
align-items: center;
|
136
141
|
justify-content: flex-end;
|
137
142
|
width: 100%;
|
138
143
|
height: 40px;
|
@@ -127,9 +127,7 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
|
|
127
127
|
rules: _this.customRules(_this.componentConfig),
|
128
128
|
required: (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.required,
|
129
129
|
component: /*#__PURE__*/_jsx(ApaasPayment, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
|
130
|
-
onSearch
|
131
|
-
return _this.changeHandle(e.target.value);
|
132
|
-
},
|
130
|
+
// onSearch={(e) => this.changeHandle(e.target.value)}
|
133
131
|
onBlur: onBlur
|
134
132
|
}))
|
135
133
|
}, value));
|
@@ -846,8 +846,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
846
846
|
formValue = form.getFieldsValue();
|
847
847
|
detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
|
848
848
|
jstItemList: jstInfo
|
849
|
-
});
|
850
|
-
console.log(detail); //抖音数据特殊处理
|
849
|
+
}); //抖音数据特殊处理
|
851
850
|
|
852
851
|
if (shopSourceStr === 'FXG') {
|
853
852
|
detail = updateDYDetails(detail);
|
@@ -982,24 +981,24 @@ export var orderBack = /*#__PURE__*/function () {
|
|
982
981
|
enterprisePaymentTid: order_no
|
983
982
|
});
|
984
983
|
}
|
985
|
-
}
|
984
|
+
} // console.log(values, detail);
|
985
|
+
|
986
986
|
|
987
|
-
console.log(values);
|
988
987
|
form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
|
989
988
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
990
|
-
_context.next =
|
989
|
+
_context.next = 28;
|
991
990
|
break;
|
992
991
|
|
993
|
-
case
|
994
|
-
_context.prev =
|
992
|
+
case 26:
|
993
|
+
_context.prev = 26;
|
995
994
|
_context.t0 = _context["catch"](5);
|
996
995
|
|
997
|
-
case
|
996
|
+
case 28:
|
998
997
|
case "end":
|
999
998
|
return _context.stop();
|
1000
999
|
}
|
1001
1000
|
}
|
1002
|
-
}, _callee, null, [[5,
|
1001
|
+
}, _callee, null, [[5, 26]]);
|
1003
1002
|
}));
|
1004
1003
|
|
1005
1004
|
return function orderBack(_x) {
|
@@ -1062,14 +1061,16 @@ export var COMPONENT_MAP = {
|
|
1062
1061
|
buyerNick: 'BUYER_NICK_INPUT',
|
1063
1062
|
receiveMobile: 'RECEIVER_MOBILE_INPUT',
|
1064
1063
|
alipayAccount: 'ALI_PAY_INPUT',
|
1065
|
-
expressLogisticsCode: 'EXPRESS_LOGISTICS_SELECT'
|
1064
|
+
expressLogisticsCode: 'EXPRESS_LOGISTICS_SELECT',
|
1065
|
+
enterprisePaymentTid: 'ENTERPRISE_PAYMENT'
|
1066
1066
|
};
|
1067
1067
|
export var COMPONENT_MAP_NAME = {
|
1068
1068
|
tradeId: '订单号',
|
1069
1069
|
buyerNick: '买家昵称',
|
1070
1070
|
receiveMobile: '收件人手机号',
|
1071
1071
|
alipayAccount: '支付宝账号',
|
1072
|
-
expressLogisticsCode: '快递物流单号'
|
1072
|
+
expressLogisticsCode: '快递物流单号',
|
1073
|
+
enterprisePaymentTid: '打款订单号'
|
1073
1074
|
}; //数据唯一性校验提交数据组装
|
1074
1075
|
|
1075
1076
|
export var getReplaceWarnValues = function getReplaceWarnValues(templateDetail, keyValues) {
|
@@ -57,7 +57,7 @@ var initialState = {
|
|
57
57
|
time: [moment().subtract(30, 'day').startOf('day'), moment().endOf('day')],
|
58
58
|
workPayStatus: '',
|
59
59
|
tid: '',
|
60
|
-
|
60
|
+
paymentMixUk: '',
|
61
61
|
isBuyer: false
|
62
62
|
},
|
63
63
|
templateDetails: {} //打开的模版
|
@@ -180,7 +180,7 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
|
|
180
180
|
workPayStatus && (params.workPayStatus = workPayStatus);
|
181
181
|
paymentMixUk && (params.paymentMixUk = paymentMixUk);
|
182
182
|
|
183
|
-
if (time.length) {
|
183
|
+
if (time !== null && time !== void 0 && time.length) {
|
184
184
|
params.operateStartTime = moment(time[0]).format('YYYY-MM-DD HH:mm:ss');
|
185
185
|
params.operateEndTime = moment(time[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss');
|
186
186
|
}
|