diff --git a/src/api/lb-buyer-shopping.js b/src/api/lb-buyer-shopping.js
index aed42ba..b8fb244 100644
--- a/src/api/lb-buyer-shopping.js
+++ b/src/api/lb-buyer-shopping.js
@@ -4,7 +4,8 @@ export function getLbBuyerShoppingList(params) {
return request({
url: '/lbBuyerShopping/list',
method: 'get',
- params
+ params,
+ tenantId: params.tenantId
})
}
diff --git a/src/views/lb-business/shopping-manage/index.vue b/src/views/lb-business/shopping-manage/index.vue
index 40101a1..6e8fac1 100644
--- a/src/views/lb-business/shopping-manage/index.vue
+++ b/src/views/lb-business/shopping-manage/index.vue
@@ -2,6 +2,11 @@
+
+
+
+
+
@@ -116,6 +121,7 @@
+
@@ -351,6 +357,7 @@ import {
updateLbBuyerShopping
} from '@/api/lb-buyer-shopping'
import { getBusinessHeaders } from '@/utils/business-headers'
+import { getAllTenantList } from '@/api/tenant'
function parseOptionalLong(value) {
if (value === undefined || value === null || value === '') return undefined
@@ -403,6 +410,7 @@ export default {
},
list: [],
total: 0,
+ tenantOptions: [],
createdAtRange: [],
buyTimeRange: [],
confirmTimeRange: [],
@@ -412,6 +420,7 @@ export default {
queryParams: {
current: 1,
size: 10,
+ tenantId: '',
sellerId: '',
merchandiseId: '',
buyerId: '',
@@ -435,6 +444,7 @@ export default {
}
},
created() {
+ this.fetchTenantOptions()
this.fetchList()
},
methods: {
@@ -443,6 +453,18 @@ export default {
const value = headers && headers['X-Tenant-Id']
return value ? String(value).trim() : ''
},
+ fetchTenantOptions() {
+ getAllTenantList().then((res) => {
+ if (res && (res.code === 20000 || res.code === 200 || res.success === true)) {
+ const data = res.data || []
+ this.tenantOptions = Array.isArray(data) ? data : (data.records || [])
+ } else {
+ this.tenantOptions = []
+ }
+ }).catch(() => {
+ this.tenantOptions = []
+ })
+ },
openPullOrderDialog() {
this.pullDialogVisible = true
this.$nextTick(() => {
@@ -570,6 +592,7 @@ export default {
const params = {
current: this.queryParams.current,
size: this.queryParams.size,
+ tenantId: parseOptionalLong(this.queryParams.tenantId),
sellerId: parseOptionalLong(this.queryParams.sellerId),
merchandiseId: parseOptionalLong(this.queryParams.merchandiseId),
buyerId: parseOptionalLong(this.queryParams.buyerId),
@@ -603,6 +626,7 @@ export default {
this.queryParams = {
current: 1,
size: 10,
+ tenantId: '',
sellerId: '',
merchandiseId: '',
buyerId: '',