diff --git a/src/views/car/CarGoodsAdminView.vue b/src/views/car/CarGoodsAdminView.vue index 1889306..10814fe 100644 --- a/src/views/car/CarGoodsAdminView.vue +++ b/src/views/car/CarGoodsAdminView.vue @@ -32,12 +32,13 @@ + +
-
- - -
- -
- - -
- -
+
+ +
+ +
+
+ +
+ +
@@ -1018,12 +1018,15 @@ export default { buildSelectOption( "#partitionId", null, - data.map((v) => { + [{ + value: '', + text: '全部', + }].concat(data.map((v) => { return { value: v.id, text: v.desc, }; - }) + })) ); }); }, diff --git a/src/views/infocard/InfocardManageView.vue b/src/views/infocard/InfocardManageView.vue index ba4c208..a405e95 100644 --- a/src/views/infocard/InfocardManageView.vue +++ b/src/views/infocard/InfocardManageView.vue @@ -583,12 +583,15 @@ export default { buildSelectOption( "#partitionId", null, - data.map((v) => { + [{ + value: '', + text: '全部', + }].concat(data.map((v) => { return { value: v.id, text: v.desc, }; - }) + })) ); }); }, diff --git a/src/views/nameplate/NameplateInfoView.vue b/src/views/nameplate/NameplateInfoView.vue index 792b95b..a10887e 100644 --- a/src/views/nameplate/NameplateInfoView.vue +++ b/src/views/nameplate/NameplateInfoView.vue @@ -705,12 +705,15 @@ export default { buildSelectOption( "#partitionId", null, - data.map((v) => { + [{ + value: '', + text: '全部', + }].concat(data.map((v) => { return { value: v.id, text: v.desc, }; - }) + })) ); }); }, diff --git a/src/views/room/RoomSearchAdminView.vue b/src/views/room/RoomSearchAdminView.vue index 8f03fcf..ee5e396 100644 --- a/src/views/room/RoomSearchAdminView.vue +++ b/src/views/room/RoomSearchAdminView.vue @@ -1047,12 +1047,15 @@ export default { buildSelectOption( "#partitionId", null, - data.map((v) => { + [{ + value: '', + text: '全部', + }].concat(data.map((v) => { return { value: v.id, text: v.desc, }; - }) + })) ); }); }, diff --git a/src/views/room/RoomTabHomeView.vue b/src/views/room/RoomTabHomeView.vue index a82949b..0ff74a2 100644 --- a/src/views/room/RoomTabHomeView.vue +++ b/src/views/room/RoomTabHomeView.vue @@ -413,12 +413,15 @@ export default { buildSelectOption( "#partitionId", null, - data.map((v) => { + [{ + value: '', + text: '全部', + }].concat(data.map((v) => { return { value: v.id, text: v.desc, }; - }) + })) ); }); }, diff --git a/src/views/room/RoomTabMapView.vue b/src/views/room/RoomTabMapView.vue index 5dd8cb6..3c42816 100644 --- a/src/views/room/RoomTabMapView.vue +++ b/src/views/room/RoomTabMapView.vue @@ -453,12 +453,15 @@ export default { buildSelectOption( "#partitionId", null, - data.map((v) => { + [{ + value: '', + text: '全部', + }].concat(data.map((v) => { return { value: v.id, text: v.desc, }; - }) + })) ); }); }, diff --git a/src/views/room/RoomtagAdminView.vue b/src/views/room/RoomtagAdminView.vue index 28d9632..b050fbb 100644 --- a/src/views/room/RoomtagAdminView.vue +++ b/src/views/room/RoomtagAdminView.vue @@ -541,12 +541,15 @@ export default { buildSelectOption( "#modal_partitionId", null, - data.map((v) => { + [{ + value: '', + text: '全部', + }].concat(data.map((v) => { return { value: v.id, text: v.desc, }; - }) + })) ); }); }, diff --git a/src/views/users/GiftManageView.vue b/src/views/users/GiftManageView.vue index 74944f5..5008c32 100644 --- a/src/views/users/GiftManageView.vue +++ b/src/views/users/GiftManageView.vue @@ -67,6 +67,10 @@ + +
+ +
@@ -575,6 +579,8 @@ import TableHelper from '@/utils/bootstrap-table-helper'; import ComboboxHelper from '@/assets/plugins/bootstrap-combobox/js/bootstrap-combobox-helper'; import { formatTime, showLoading, hideLoading, apiResult } from '@/utils/maintainer'; import { uploadGift } from '@/api/common/upload'; +import { getPartitionInfoList } from '@/api/partition/partitionInfo'; +import { buildSelectOption } from '@/utils/system-helper'; export default { name: "GiftManageView", @@ -1687,7 +1693,25 @@ export default { startDate: new Date() }); }); - } + }, + initPartition() { + getPartitionInfoList().then(res => { + let data = res.data; + buildSelectOption( + "#partitionId", + null, + [{ + value: '', + text: '全部', + }].concat(data.map((v) => { + return { + value: v.id, + text: v.desc, + }; + })) + ); + }); + }, }, };