1

src/pages/financial/market/achievementPeriodsList.vue

@@ -126,7 +126,7 @@
           <el-table-column type="selection"  width="55" :selectable="checkSelectable"></el-table-column>
           <el-table-column  prop="UserName" label="用户" > </el-table-column>
           <el-table-column  prop="StudentCount" label="客人数量" > </el-table-column>
-          <el-table-column  prop="CommissionMoney" label="应发提成金额" > </el-table-column>
+          <el-table-column  prop="CurrentPeriodMoney" label="应发提成金额" > </el-table-column>
           <el-table-column  prop="IsGiveOut" label="是否已发放" > 
             <template slot-scope="scope">
               <span v-if='scope.row.IsGiveOut==1'>已发放</span>
@@ -287,7 +287,7 @@
               CurrencyId: 21,
               XSTC: 1,
               School_Id:this.msg.SchoolId == -1?0:this.msg.SchoolId,
-              OtherType:44,//留学销售提成
+              OtherType:50,//业绩提成
               ReFinanceId:Id,
               ReFinanceId2:this.msg.SchoolId,
               EduCommissionEmp:EmpIds
@@ -301,11 +301,7 @@
               id:143,
               orderObj: JSON.stringify(obj)
             }
-        
-            this.$router.push({
-              path: "/financial/financalDocument/addFinancialDocuments",
-              query
-            });
+             this.OpenNewUrl("/financial/financalDocument/addFinancialDocuments", query)
         },
         tishi(Money,Id){
           let that = this
@@ -345,7 +341,7 @@
           this.multipleSelection = val;
           let zong = 0
           this.multipleSelection.forEach(x=>{
-            zong +=x.CommissionMoney
+            zong = this.accAdd(zong,x.CurrentPeriodMoney)
           })
           this.totalAmount = zong
         },

src/utils/erpindex.js

@@ -81,12 +81,12 @@ export default {
       //域名管理对象
       Vue.prototype.domainManager = function () {
         // let domainUrl = 'http://192.168.20.24';
-        let domainUrl = 'http://192.168.20.8:8085';
-        let viewFileUrl = 'http://192.168.20.214:8120';
-        let mallUrl = "http://192.168.20.6:8088";
+        let domainUrl = 'http://192.168.10.65:8083';
+        let viewFileUrl = 'http://192.168.10.214:8120';
+        let mallUrl = "http://192.168.10.65:8088";
         // let vtUploadUrl = "http://192.168.20.214:8120";
         let vtUploadUrl = "http://upload.oytour.com";
-        let vtViewUrl = "http://192.168.20.214:8130";
+        let vtViewUrl = "http://192.168.10.214:8130";
         let locationName = window.location.hostname;
         if (locationName.indexOf('testerp.oytour') !== -1) {
           domainUrl = "http://testapi.oytour.com";
@@ -641,6 +641,61 @@ export default {
           .then(res => {
             successCall(res);
           })
+      },
+      Vue.prototype.accAdd = function (arg1, arg2) {//加法精密计算
+        var r1, r2, m;
+        try {
+            r1 = arg1.toString().split(".")[1].length;
+        }
+        catch (e) {
+            r1 = 0;
+        }
+        try {
+            r2 = arg2.toString().split(".")[1].length;
+        }
+        catch (e) {
+            r2 = 0;
+        }
+        m = Math.pow(10, Math.max(r1, r2));
+        return (arg1 * m + arg2 * m) / m;
+
+      },
+      // 减法
+      Vue.prototype.subtr = function(arg1, arg2) {
+        var r1, r2, m, n;
+        try {
+            r1 = arg1.toString().split(".")[1].length;
+        }
+        catch (e) {
+            r1 = 0;
+        }
+        try {
+            r2 = arg2.toString().split(".")[1].length;
+        }
+        catch (e) {
+            r2 = 0;
+        }
+        m = Math.pow(10, Math.max(r1, r2));
+        //last modify by deeka
+        //动态控制精度长度
+        n = (r1 >= r2) ? r1 : r2;
+        return ((arg1 * m - arg2 * m) / m).toFixed(n);
+      }
+      // 乘法获取准确值
+      Vue.prototype.accMul = function(arg1,arg2){
+        var m=0,s1=arg1.toString(),s2=arg2.toString();
+        try{m+=s1.split(".")[1].length}catch(e){}
+        try{m+=s2.split(".")[1].length}catch(e){}
+        return Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,m)
+      }
+      // 除法获取精确值
+      Vue.prototype.accDiv = function(arg1, arg2) {
+        var t1 = 0, t2 = 0, r1, r2;
+        try { t1 = arg1.toString().split(".")[1].length } catch (e) { }
+        try { t2 = arg2.toString().split(".")[1].length } catch (e) { }
+        Math.r1 = Number(arg1.toString().replace(".", ""))
+        Math.r2 = Number(arg2.toString().replace(".", ""))
+        return (Math.r1 / Math.r2) * Math.pow(10, t2 - t1);
       }
   }
 }