Merge branch 'test' of https://git.agilestar.cn/spfm-group/spfm-market-front into test

src/pages/main/memberFamily/haveInHand.vue

@@ -202,7 +202,7 @@
                     param.time ? param.endTime = this.$formatDate(param.time[1], "YYYY-MM-DD") : '';
                     param.dutyList = [];
                     for (let i = 0; i < this.treeListp.length; i++) {
-                        
+
                         if(this.treeListp[i].loginNoStr){
                             param.dutyList.push({
                                 dutyNo: this.treeListp[i].loginNoStr,
@@ -372,6 +372,7 @@
                 this.setabList("填报进度跟踪", "/reportProgress?woNo=" + v.woNo);
             },
             jumpjd(v) {
+                console.log(v.receiverGroupName)
                 this.$router.push({
                     path: "/speedOfProgress",
                     query: {

src/pages/main/memberFamily/speedOfProgress.vue

@@ -118,9 +118,9 @@
                 this.tableData = [];
                 let url = '';
                 if(this.companyFlag == 0){
-                    url = '/market/cMemberWo/queryProgressByRegionPage';
+                    url = '/market/cMemberWo/queryProgressByRegion';
                 }else if(this.companyFlag == 1){
-                    url = '/market/cMemberWo/queryProgressByAreaPage';
+                    url = '/market/cMemberWo/queryProgressByArea';
                     v.regionName = this.$route.query.receiverGroupName;
                 }
                 this.$http({
@@ -128,11 +128,11 @@
                     method: "post",
                     headers: {
                         "Content-Type": "application/json",
-                        "page": '{"pageNo":"' + n + '","pageSize":"10"}'
+                        //"page": '{"pageNo":"' + n + '","pageSize":"10"}'
                     },
                     data: v,
                 }).then((res) => {
-                    this.tableData = res.data.data;
+                    this.tableData = res.data;
                     this.total = res.data.totalRecord;
                     this.loading = false;
                 });