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

src/pages/main/advReleaseAppro/index.vue

@@ -144,7 +144,7 @@
                     <paper v-if="woTypeCode == 3" :titname='titname' :vision='vision' @backsum="backsum"
                         :infodatas="infodatas" :status="status" :allSumnum="allSum"></paper>
                     <outdoors v-if="woTypeCode == 4" :titname='titname' :vision='vision' @backsum="backsum"
-                        :taxRate="suppinfo.taxRate" :infodatas="infodatas" :status="status" :allSumnum="allSum"
+                        :taxRate="infolist.taxRate" :infodatas="infodatas" :status="status" :allSumnum="allSum"
                         :otherinfo="otherinfo"></outdoors>
 
                     <div class="info-line" style="clear: both;">

src/pages/main/advReleaseAppro/outdoors.vue

@@ -134,11 +134,11 @@
 				this.sumadd();
 			},
 			sumzkj(v) {
-                v.row.discountRate=v.row.discountRate.replace(/[^\d.]/g,'');
+                v.row.discountRate=(v.row.discountRate.toString()).replace(/[^\d.]/g,'');
 				let info = this.infodata[v.$index];
 				this.infodata[v.$index].discountPrice = info.pubPrice * info.discountRate / 100;
 				this.infodata[v.$index].discountPrice = Math.floor(this.infodata[v.$index].discountPrice * 100) / 100;
-				this.sumadd();
+				this.sumadd();				
 			},
 			sumadd(){
 				this.advPriceSum = 0;
@@ -153,7 +153,7 @@
 						type: 'error'
 					});
 					return
-				}
+				}				
 				this.contractAdvCost = (this.advDiscountSum - this.otherDiscount) / (this.taxRate.split("%")[0]*1 + 100) * 100;
 				this.contractAdvTax = this.contractAdvCost*(this.taxRate.split("%")[0]*1)/100;
 				this.contractAdvCost = Math.round(this.contractAdvCost * 100) / 100;

src/pages/main/demandCollection/index.vue

@@ -638,6 +638,7 @@
                 };
                 this.infodata = [{}];
                 this.dialogStatus = false;
+                this.dialogStatusadd = false;
             },
             //获取列表
             getList(v, n) {
@@ -682,13 +683,16 @@
             },
             //申请
             dialogCheck(v, n) {
-                this.appBtnSts=n.appBtnSts;
+                console.log(n);
+                if(n != undefined){
+                    this.appBtnSts=n.appBtnSts;
+                }
                 this.stsdown=v;
                 let url = '/market/cWorkDemand/queryDemandDetailList';
                 let params = {}
                 if (v != 3) {
                     params = {
-                        demandId: n.id
+                        id: n.id
                     }
                 }
                 if (v === 1) {

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;
                 });