Commit a6e6641b by caoyanzhi

Merge branch 'feature/4月-菜单和权限'

parents e2e1c4f2 f2beac37
...@@ -285,6 +285,7 @@ export default { ...@@ -285,6 +285,7 @@ export default {
that.loadingBtn = true; that.loadingBtn = true;
let para = { let para = {
type: 999,
search: that.conditionObj.searchInput || '', // 搜索字段 search: that.conditionObj.searchInput || '', // 搜索字段
gicEnterpriseId: that.activeBrand, // 品牌 id gicEnterpriseId: that.activeBrand, // 品牌 id
startDate: that.conditionObj.dateRange[0] || '', startDate: that.conditionObj.dateRange[0] || '',
...@@ -375,6 +376,7 @@ export default { ...@@ -375,6 +376,7 @@ export default {
let that = this; let that = this;
that.loading = true; that.loading = true;
let para = { let para = {
type: 999,
startDate: that.conditionObj.dateRange[0] || '', startDate: that.conditionObj.dateRange[0] || '',
endDate: that.conditionObj.dateRange[1] || '', endDate: that.conditionObj.dateRange[1] || '',
search: that.conditionObj.searchInput || '', // 搜索字段 search: that.conditionObj.searchInput || '', // 搜索字段
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment