...
|
...
|
@@ -91,6 +91,7 @@ |
91
|
91
|
pendingTotalList.value = list;
|
92
|
92
|
return unref(pendingTotalList);
|
93
|
93
|
},
|
|
94
|
+ pagination: { hideOnSinglePage: false },
|
94
|
95
|
rowSelection: {
|
95
|
96
|
type: 'checkbox',
|
96
|
97
|
getCheckboxProps: (record: DeviceModel) => {
|
...
|
...
|
@@ -132,7 +133,8 @@ |
132
|
133
|
const { name = '', deviceType = '' } = params || {};
|
133
|
134
|
const items = unref(selectedTotalList).filter((item) => {
|
134
|
135
|
return (
|
135
|
|
- item.name.toUpperCase().includes(name.toUpperCase()) &&
|
|
136
|
+ (item.name.toUpperCase().includes(name.toUpperCase()) ||
|
|
137
|
+ item.alias?.toUpperCase().includes(name.toUpperCase())) &&
|
136
|
138
|
item.deviceType.toUpperCase().includes(deviceType.toUpperCase())
|
137
|
139
|
);
|
138
|
140
|
});
|
...
|
...
|
@@ -186,7 +188,13 @@ |
186
|
188
|
const handleRemoveSelected = () => {
|
187
|
189
|
const { primaryKey } = props;
|
188
|
190
|
const selectedIds = unref(selectedConfirmQueue).map((selected) => selected[primaryKey]);
|
189
|
|
- remove(unref(selectedTotalList), (item) => selectedIds.includes(item[primaryKey]));
|
|
191
|
+ remove(unref(selectedTotalList), (item) => {
|
|
192
|
+ const flag = selectedIds.includes(item[primaryKey]);
|
|
193
|
+ if (flag) {
|
|
194
|
+ pendingTableActionType.deleteSelectRowByKey(item[primaryKey]);
|
|
195
|
+ }
|
|
196
|
+ return flag;
|
|
197
|
+ });
|
190
|
198
|
|
191
|
199
|
handleTriggerUpdateValue();
|
192
|
200
|
|
...
|
...
|
@@ -195,9 +203,15 @@ |
195
|
203
|
selectedTableActionType.reload();
|
196
|
204
|
};
|
197
|
205
|
|
198
|
|
- const handleCheckoutPanel = async () => {
|
199
|
|
- await nextTick();
|
200
|
|
- selectedTableActionType.reload();
|
|
206
|
+ const handleCheckoutPanel = async (key: Active) => {
|
|
207
|
+ if (key === Active.PENDING) {
|
|
208
|
+ pendingTableActionType.setTableData([]);
|
|
209
|
+ await nextTick();
|
|
210
|
+ pendingTableActionType.setTableData(unref(pendingTotalList));
|
|
211
|
+ } else {
|
|
212
|
+ await nextTick();
|
|
213
|
+ selectedTableActionType.reload();
|
|
214
|
+ }
|
201
|
215
|
};
|
202
|
216
|
|
203
|
217
|
const handleOpenModal = async () => {
|
...
|
...
|
@@ -327,15 +341,8 @@ |
327
|
341
|
background-color: #fff;
|
328
|
342
|
}
|
329
|
343
|
|
330
|
|
- .transfer-table-disabled-row {
|
331
|
|
- :deep(.ant-checkbox) {
|
332
|
|
- cursor: not-allowed;
|
333
|
|
-
|
334
|
|
- .ant-checkbox-inner {
|
335
|
|
- background-color: #f5f5f5;
|
336
|
|
- border-color: #d9d9d9 !important;
|
337
|
|
- }
|
338
|
|
- }
|
|
344
|
+ .ant-table-placeholder {
|
|
345
|
+ height: auto !important;
|
339
|
346
|
}
|
340
|
347
|
}
|
341
|
348
|
</style> |
...
|
...
|
|