|
@@ -277,6 +277,9 @@ export default {
|
|
openCheckMore: true,
|
|
openCheckMore: true,
|
|
changeWidth: "240px",
|
|
changeWidth: "240px",
|
|
custom: false,
|
|
custom: false,
|
|
|
|
+ tableColor: ({ row, rowIndex }) => {
|
|
|
|
+ console.log(row, 987);
|
|
|
|
+ },
|
|
},
|
|
},
|
|
formData: {
|
|
formData: {
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
@@ -405,6 +408,11 @@ export default {
|
|
prop: "tenantName",
|
|
prop: "tenantName",
|
|
hidden: true,
|
|
hidden: true,
|
|
},
|
|
},
|
|
|
|
+ {
|
|
|
|
+ label: "角色名称",
|
|
|
|
+ prop: "roleName",
|
|
|
|
+ hidden: true,
|
|
|
|
+ },
|
|
{
|
|
{
|
|
label: "已付分成(元)",
|
|
label: "已付分成(元)",
|
|
prop: "payMoney",
|
|
prop: "payMoney",
|
|
@@ -495,6 +503,11 @@ export default {
|
|
prop: "tenantName",
|
|
prop: "tenantName",
|
|
hidden: true,
|
|
hidden: true,
|
|
},
|
|
},
|
|
|
|
+ {
|
|
|
|
+ label: "角色名称",
|
|
|
|
+ prop: "roleName",
|
|
|
|
+ hidden: true,
|
|
|
|
+ },
|
|
{
|
|
{
|
|
label: "业务员",
|
|
label: "业务员",
|
|
prop: "createUsername",
|
|
prop: "createUsername",
|
|
@@ -569,6 +582,11 @@ export default {
|
|
prop: "tenantName",
|
|
prop: "tenantName",
|
|
hidden: true,
|
|
hidden: true,
|
|
},
|
|
},
|
|
|
|
+ {
|
|
|
|
+ label: "角色名称",
|
|
|
|
+ prop: "roleName",
|
|
|
|
+ hidden: true,
|
|
|
|
+ },
|
|
{
|
|
{
|
|
label: "已付佣金(元)",
|
|
label: "已付佣金(元)",
|
|
prop: "payMoney",
|
|
prop: "payMoney",
|
|
@@ -727,7 +745,7 @@ export default {
|
|
});
|
|
});
|
|
},
|
|
},
|
|
load(tree, treeNode, resolve) {
|
|
load(tree, treeNode, resolve) {
|
|
- monthOrderList({ divideLogId: tree.id })
|
|
|
|
|
|
+ monthOrderList({ divideLogId: tree.id, roleId: this.formData.roleId })
|
|
.then((res) => {
|
|
.then((res) => {
|
|
// id冲突会报错
|
|
// id冲突会报错
|
|
res.data.forEach((e) => {
|
|
res.data.forEach((e) => {
|
|
@@ -833,6 +851,11 @@ export default {
|
|
];
|
|
];
|
|
if (this.type != 0) {
|
|
if (this.type != 0) {
|
|
data.push(
|
|
data.push(
|
|
|
|
+ {
|
|
|
|
+ prop: "roleId",
|
|
|
|
+ scope: "roleList",
|
|
|
|
+ placeholder: "角色选择",
|
|
|
|
+ },
|
|
{
|
|
{
|
|
prop: "monthTime",
|
|
prop: "monthTime",
|
|
scope: "moreMonth",
|
|
scope: "moreMonth",
|