Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/views/FinancialManagement/AcountWithdrawal/AcountBalance.vue

@@ -197,9 +197,9 @@ export default {
         { prop: "name", label: "姓名", minWidth: 80 },
         { prop: "deptId", label: "机构代码", minWidth: 160 },
         { prop: "deptName", label: "机构名称", minWidth: 100 },
-        { prop: "sumAmount", label: "总金额", minWidth: 100 },
-        { prop: "sumAmountWithdrawal", label: "提现总金额", minWidth: 100 },
-        { prop: "sumAmountAccount", label: "已到账总金额", minWidth: 100 },
+        { prop: "sumAmountWithdrawal", label: "总收益金额", minWidth: 100 },
+        { prop: "sumAmount", label: "可提现金额", minWidth: 100 },
+        { prop: "sumAmountAccount", label: "已提现金额", minWidth: 100 },
         { prop: "sumAmountPayment", label: "支付中总金额  ", minWidth: 100 },
         { prop: "zgCoin", label: "掌柜币", minWidth: 100 },
         { prop: "zgCoinAmountWithdrawal", label: "掌柜币提现总金额", minWidth: 100 },
@@ -433,11 +433,11 @@ export default {
         .then((res) => {
           if (res.code == 200) {
             let resData = {
-              content: res.data.records,
-              pageNum: res.data.current,
-              pageSize: res.data.size,
-              totalPages: res.data.pages,
-              totalSize: res.data.total,
+              content: res.data.content,
+              pageNum: res.data.pageNum,
+              pageSize: res.data.pageSize,
+              totalPages: res.data.totalPages,
+              totalSize: res.data.totalSize,
             }
             this.pageResult = resData;
           }

src/views/Sys/ChannelGrouping.vue

@@ -69,7 +69,7 @@
               show-checkbox
               node-key="id"
               :default-checked-keys="treekeys"
-              @check-change="treechange"
+              @check="treechange"
               :default-expand-all="expandshow"
               class="stafftree"
             >
@@ -304,6 +304,8 @@ export default {
       return label;
     },
     uthorizedAgency(row) {
+      this.treekeys = []
+      this.treedatatransfer = [];
       this.selectId = "";
       this.selectName = "";
       this.treeListFun({
@@ -311,8 +313,6 @@ export default {
         name: "",
       });
       this.rowId = row.id;
-
-      this.treedatatransfer = [];
       this.treeSeachId = "";
       this.treeSeachname = "";
       let data = {};
@@ -324,7 +324,6 @@ export default {
           setTimeout(() => {
             this.treedatatransfer = res.data;
             res.data.forEach((e) => {
-              
               this.treekeys.push(e.areaId);
               this.dept.push(e.areaId);
             });
@@ -464,6 +463,7 @@ export default {
             this.getList();
             this.dialogVisible = false;
             this.dept = [];
+           
           } else {
             this.$message.error(res.msg);
           }