1

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -795,6 +795,8 @@
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 留学销售提成:{{GetDetail.ReFinanceId}}</span>
           <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==47 "
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 投稿销售提成:{{GetDetail.ReFinanceId}}</span>
+          <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==50 "
+              @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 业绩销售提成:{{GetDetail.ReFinanceId}}</span>   
           <template v-if="GetDetail.RelevanceFrId">
             <span class="fr" style="margin-right:10px;">
               相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)" style="text-decoration:underline;cursor:pointer;margin-right:5px;">
@@ -3452,6 +3454,8 @@
           tempStr = '/financial/studyabroad/sBuserCommissionDetails?preriodId='+ID;
         }else if(OtherType==47){
           tempStr = '/financial/contribution/CommissionUserDetailList?TeacherIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;
+        }else if(OtherType==50){
+          tempStr = '/financial/market/AchievementsUserDetailList?UserIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;
         }
           
           this.$router.push({

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

@@ -838,6 +838,8 @@
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 留学销售提成:{{GetDetail.ReFinanceId}}</span>
             <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==47 "
               @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 投稿销售提成:{{GetDetail.ReFinanceId}}</span>
+            <span class="fr" style="text-decoration: underline;cursor:  pointer;" v-if="GetDetail.OtherType==50 "
+              @click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 业绩销售提成:{{GetDetail.ReFinanceId}}</span>
             <template v-if="GetDetail.RelevanceFrId">
               <span class="fr" style="margin-right:10px;">
                 相关单据：<span @click="goFinancal(sItem)" v-for="(sItem,sIndex) in getRelevanArr(GetDetail.RelevanceFrId)" style="text-decoration:underline;cursor:pointer;margin-right:5px;">
@@ -2205,6 +2207,8 @@
           tempStr = '/financial/studyabroad/sBuserCommissionDetails?preriodId='+ID;
         }else if(OtherType==47){
           tempStr = '/financial/contribution/CommissionUserDetailList?TeacherIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;
+        }else if(OtherType==50){
+          tempStr = '/financial/market/AchievementsUserDetailList?UserIds='+this.GetDetail.EduCommissionEmp+'&preriodId='+ID;
         }
           
           this.$router.push({

src/pages/financial/market/AchievementsUserDetailList.vue

@@ -310,34 +310,35 @@ export default {
       }
       this.tableData.forEach((x) => {
         if (x.YFMoney) {
-          obj.YFMoney = this.accAdd(x.YFMoney, obj.YFMoney)
+          obj.YFMoney = this.accAdd(obj.YFMoney,x.YFMoney)
         };
 
 
       })
+      console.log(obj)
       this.tableData.push(obj)
 
     },
-    accAdd(arg1, arg2) { //js 加法精确计算
-      var r1, r2, m;
-      try {
-        r1 = arg1.toString().split(".")[1].length;
+    // accAdd(arg1, arg2) { //js 加法精确计算
+    //   var r1, r2, m;
+    //   try {
+    //     r1 = arg1.toString().split(".")[1].length;
 
-      } catch (e) {
-        r1 = 0;
-      }
+    //   } catch (e) {
+    //     r1 = 0;
+    //   }
 
-      try {
-        r2 = arg2.toString().split(".")[1].length;
+    //   try {
+    //     r2 = arg2.toString().split(".")[1].length;
 
-      } catch (e) {
-        r2 = 0;
+    //   } catch (e) {
+    //     r2 = 0;
 
-      }
-      m = Math.pow(10, Math.max(r1, r2));
-      return (arg1 * m + arg2 * m) / m;
+    //   }
+    //   m = Math.pow(10, Math.max(r1, r2));
+    //   return (arg1 * m + arg2 * m) / m;
 
-    },
+    // },
     //选择班级
     setClass(item) {
       this.isShowClass = true;

src/pages/financial/market/achievementPeriodsList.vue

@@ -301,7 +301,11 @@
               id:143,
               orderObj: JSON.stringify(obj)
             }
-             this.OpenNewUrl("/financial/financalDocument/addFinancialDocuments", query)
+            //  this.OpenNewUrl("/financial/financalDocument/addFinancialDocuments", query)
+             this.$router.push({
+              path: "/financial/financalDocument/addFinancialDocuments",
+              query
+            });
         },
         tishi(Money,Id){
           let that = this