@bjsdistribution/dms-client-return 0.0.65 → 0.0.67
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/dms-client-return.cjs.development.js +17 -15
- package/dist/dms-client-return.cjs.development.js.map +1 -1
- package/dist/dms-client-return.cjs.production.min.js +1 -1
- package/dist/dms-client-return.cjs.production.min.js.map +1 -1
- package/dist/dms-client-return.esm.js +17 -15
- package/dist/dms-client-return.esm.js.map +1 -1
- package/package.json +1 -1
- package/src/components/order-daily-overview/return-after-table/table-filters/ReturnOrderFilter.tsx +8 -6
- package/src/components/order-view/index.tsx +9 -8
|
@@ -3351,6 +3351,12 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
|
|
|
3351
3351
|
payload: 1
|
|
3352
3352
|
});
|
|
3353
3353
|
};
|
|
3354
|
+
var assigneeOptions = assignData == null ? void 0 : assignData.map(function (client) {
|
|
3355
|
+
return {
|
|
3356
|
+
label: client.type,
|
|
3357
|
+
value: client.id
|
|
3358
|
+
};
|
|
3359
|
+
});
|
|
3354
3360
|
var handleAssigneeChange = function handleAssigneeChange(value) {
|
|
3355
3361
|
var _assignData$find;
|
|
3356
3362
|
var bjsDeliveryValue = (_assignData$find = assignData.find(function (client) {
|
|
@@ -3438,7 +3444,7 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
|
|
|
3438
3444
|
placeholder: "Status of Order",
|
|
3439
3445
|
onChange: handleStatusOfOrder,
|
|
3440
3446
|
style: {
|
|
3441
|
-
|
|
3447
|
+
width: '145px'
|
|
3442
3448
|
},
|
|
3443
3449
|
value: statusOrder,
|
|
3444
3450
|
onClear: handleClear,
|
|
@@ -3464,18 +3470,13 @@ var ReturnOrderFilter = function ReturnOrderFilter() {
|
|
|
3464
3470
|
}, React__default.createElement("div", {
|
|
3465
3471
|
className: "dateiconcontainer"
|
|
3466
3472
|
}, React__default.createElement(AssigneIcon, null)), React__default.createElement(StyledAntSelect$2, null, React__default.createElement(antd.Select, {
|
|
3467
|
-
options:
|
|
3468
|
-
return {
|
|
3469
|
-
label: client.type,
|
|
3470
|
-
value: client.id
|
|
3471
|
-
};
|
|
3472
|
-
}),
|
|
3473
|
+
options: assigneeOptions,
|
|
3473
3474
|
className: "custom-select",
|
|
3474
3475
|
placeholder: "Assignee",
|
|
3475
3476
|
onChange: handleAssigneeChange,
|
|
3476
3477
|
value: selectedAssignee,
|
|
3477
3478
|
style: {
|
|
3478
|
-
minWidth: '
|
|
3479
|
+
minWidth: '140px'
|
|
3479
3480
|
},
|
|
3480
3481
|
allowClear: true,
|
|
3481
3482
|
onClear: handleClearAssignee
|
|
@@ -11131,8 +11132,7 @@ function OrderView() {
|
|
|
11131
11132
|
var _useLiveRecalling = useLiveRecalling(),
|
|
11132
11133
|
liveRecalling = _useLiveRecalling[0];
|
|
11133
11134
|
var systemLogsData = useSystemLogs();
|
|
11134
|
-
|
|
11135
|
-
setAssignData = _useAssignData[1];
|
|
11135
|
+
// const [, setAssignData] = useAssignData();
|
|
11136
11136
|
// query param
|
|
11137
11137
|
var location = reactRouterDom.useLocation();
|
|
11138
11138
|
var _useState2 = React.useState([]),
|
|
@@ -11221,12 +11221,13 @@ function OrderView() {
|
|
|
11221
11221
|
React.useEffect(function () {
|
|
11222
11222
|
setLoading(staticDataLoading);
|
|
11223
11223
|
if (fetchedStaticData && fetchedStaticData.data) {
|
|
11224
|
-
var _fetchedStaticData$da;
|
|
11225
11224
|
var result = fetchedStaticData == null ? void 0 : fetchedStaticData.data;
|
|
11226
11225
|
setOrderStaticData(result[0]);
|
|
11227
|
-
setAssignData(
|
|
11228
|
-
|
|
11229
|
-
|
|
11226
|
+
// setAssignData(
|
|
11227
|
+
// fetchedStaticData?.data?.flatMap(
|
|
11228
|
+
// (i: any) => i?.resource_visibility_type
|
|
11229
|
+
// )
|
|
11230
|
+
// );
|
|
11230
11231
|
}
|
|
11231
11232
|
}, [staticDataLoading]);
|
|
11232
11233
|
React.useEffect(function () {
|
|
@@ -11264,9 +11265,10 @@ function OrderView() {
|
|
|
11264
11265
|
React.useEffect(function () {
|
|
11265
11266
|
setLoading(depotDataLoading);
|
|
11266
11267
|
if (fetchedDepotData && fetchedDepotData.data) {
|
|
11268
|
+
console.log(fetchedDepotData, 'fetchedDepotData');
|
|
11267
11269
|
var requiredData = fetchedDepotData == null ? void 0 : fetchedDepotData.data;
|
|
11268
11270
|
if (requiredData.length > 0) {
|
|
11269
|
-
var options = requiredData.map(function (x) {
|
|
11271
|
+
var options = requiredData == null ? void 0 : requiredData.map(function (x) {
|
|
11270
11272
|
return {
|
|
11271
11273
|
label: x.name,
|
|
11272
11274
|
value: x.id
|