Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_masterPlatform into dev

src/components/searchBoxNew.vue

@@ -237,6 +237,7 @@
             v-model="formData[item.prop]"
             :placeholder="item.placeholder"
             :size="size"
+            clearable
           >
             <el-option
               v-for="(items, indexs) in roleList"

src/views/financed/arap/index.vue

@@ -293,6 +293,13 @@ export default {
         openCheckMore: true,
         changeWidth: "240px",
         custom: false,
+        tableColor: true,
+        tableColorFunc: ({ row, rowIndex }) => {
+          if (row.oId) {
+            return "child-row";
+          }
+          return "";
+        },
       },
       formData: {
         pageSize: 10,
@@ -421,6 +428,11 @@ export default {
           prop: "tenantName",
           hidden: true,
         },
+        {
+          label: "角色名称",
+          prop: "roleName",
+          hidden: true,
+        },
         {
           label: "已付分成(元)",
           prop: "payMoney",
@@ -511,6 +523,11 @@ export default {
           prop: "tenantName",
           hidden: true,
         },
+        {
+          label: "角色名称",
+          prop: "roleName",
+          hidden: true,
+        },
         {
           label: "业务员",
           prop: "createUsername",
@@ -585,6 +602,11 @@ export default {
           prop: "tenantName",
           hidden: true,
         },
+        {
+          label: "角色名称",
+          prop: "roleName",
+          hidden: true,
+        },
         {
           label: "已付佣金(元)",
           prop: "payMoney",
@@ -743,7 +765,7 @@ export default {
         });
     },
     load(tree, treeNode, resolve) {
-      monthOrderList({ divideLogId: tree.id })
+      monthOrderList({ divideLogId: tree.id, roleId: this.formData.roleId })
         .then((res) => {
           // id冲突会报错
           res.data.forEach((e) => {
@@ -817,6 +839,9 @@ export default {
           month: [],
         };
       }
+      this.maps.forEach((value, id) => {
+        this.update(id);
+      });
       this.getDataList();
     },
     init() {
@@ -849,6 +874,11 @@ export default {
       ];
       if (this.type != 0) {
         data.push(
+          {
+            prop: "roleId",
+            scope: "roleList",
+            placeholder: "角色选择",
+          },
           {
             prop: "monthTime",
             scope: "moreMonth",
@@ -918,4 +948,14 @@ export default {
     content: "，";
   }
 }
+/deep/ {
+  .el-table {
+    .child-row {
+      background: #f0f9eb;
+      .el-table__cell {
+        background: #f0f9eb !important;
+      }
+    }
+  }
+}
 </style>