diff --git a/src/api/ss/bonus.js b/src/api/ss/bonus.js new file mode 100644 index 0000000..f9d7119 --- /dev/null +++ b/src/api/ss/bonus.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询分成明细列表 +export function listBonus(query) { + return request({ + url: '/ss/bonus/list', + method: 'get', + params: query + }) +} + +// 查询分成明细详细 +export function getBonus(id) { + return request({ + url: '/ss/bonus/' + id, + method: 'get' + }) +} + +// 新增分成明细 +export function addBonus(data) { + return request({ + url: '/ss/bonus', + method: 'post', + data: data + }) +} + +// 修改分成明细 +export function updateBonus(data) { + return request({ + url: '/ss/bonus', + method: 'put', + data: data + }) +} + +// 删除分成明细 +export function delBonus(id) { + return request({ + url: '/ss/bonus/' + id, + method: 'delete' + }) +} diff --git a/src/api/ss/storeInvestor.js b/src/api/ss/storeInvestor.js new file mode 100644 index 0000000..8c759a1 --- /dev/null +++ b/src/api/ss/storeInvestor.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询经营场所投资人关联列表 +export function listStoreInvestor(query) { + return request({ + url: '/ss/storeInvestor/list', + method: 'get', + params: query + }) +} + +// 查询经营场所投资人关联详细 +export function getStoreInvestor(id) { + return request({ + url: '/ss/storeInvestor/' + id, + method: 'get' + }) +} + +// 新增经营场所投资人关联 +export function addStoreInvestor(data) { + return request({ + url: '/ss/storeInvestor', + method: 'post', + data: data + }) +} + +// 修改经营场所投资人关联 +export function updateStoreInvestor(data) { + return request({ + url: '/ss/storeInvestor', + method: 'put', + data: data + }) +} + +// 删除经营场所投资人关联 +export function delStoreInvestor(id) { + return request({ + url: '/ss/storeInvestor/' + id, + method: 'delete' + }) +} diff --git a/src/components/Business/SmUser/UserInput.vue b/src/components/Business/SmUser/UserInput.vue index 50cdcd3..d2d4ff4 100644 --- a/src/components/Business/SmUser/UserInput.vue +++ b/src/components/Business/SmUser/UserInput.vue @@ -11,7 +11,11 @@ :size="size" :disabled="disabled" readonly - :placeholder="placeholder"/> + :placeholder="placeholder"> + + @@ -43,6 +47,7 @@ import SmUserDialog from '@/components/Business/SmUser/smUserDialog.vue' export default { name: 'UserInput', + dicts: ['user_type'], components: { SmUserDialog }, props:{ // 标题 @@ -110,6 +115,11 @@ export default { return JSON.stringify(obj); } }, + // 是否展示用户角色 + showType: { + type: Boolean, + default: true + } }, data() { return { diff --git a/src/components/Business/SmUser/smUserDialog.vue b/src/components/Business/SmUser/smUserDialog.vue index 0727f43..32b3950 100644 --- a/src/components/Business/SmUser/smUserDialog.vue +++ b/src/components/Business/SmUser/smUserDialog.vue @@ -27,11 +27,14 @@ - + + + + { + mchListStore(this.searchForm).then(response => { this.tableData = response.rows; this.total = response.total; // 刷新表格状态 @@ -119,7 +118,7 @@ export default { this.loadTable = false; }) } else { - listStore.then(response => { + listStore(this.searchForm).then(response => { this.tableData = response.rows; this.total = response.total; // 刷新表格状态 diff --git a/src/utils/constants.js b/src/utils/constants.js index 23b345d..7ae77aa 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -114,7 +114,7 @@ export const PayBillStatus = { // 用户类型 export const SmUserType = { NORMAL: "1", // 普通用户 - SALE: "2", // 分销商 + SALE: "2", // 代理商 BIZ: "3", // 业务员 INVESTOR: "4", // 投资人 BUSINESS_PLACE: "5", // 经营场所 diff --git a/src/views/ss/bonus/index.vue b/src/views/ss/bonus/index.vue new file mode 100644 index 0000000..22406fe --- /dev/null +++ b/src/views/ss/bonus/index.vue @@ -0,0 +1,416 @@ + + + diff --git a/src/views/ss/shareCode/index.vue b/src/views/ss/shareCode/index.vue index 47e6e6d..1e89869 100644 --- a/src/views/ss/shareCode/index.vue +++ b/src/views/ss/shareCode/index.vue @@ -52,17 +52,6 @@ v-hasPermi="['ss:shareCode:add']" >新增 - - 修改 - - - + + - - - - - + + - - + + - - - - - - - - - - - - - - - - + + %
@@ -201,6 +171,8 @@ diff --git a/src/views/ss/suit/index.vue b/src/views/ss/suit/index.vue index 400f229..c5819d8 100644 --- a/src/views/ss/suit/index.vue +++ b/src/views/ss/suit/index.vue @@ -87,21 +87,27 @@ - - - - - - - - + + + + + + + + + + + + + +