Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/assets/utils/commonUtils.js

@@ -5,12 +5,18 @@ var commonUtils = {
     arr.forEach(item => {
       if (item.hasOwnProperty(filed)) {
         sum += Number(item[filed]);
-      }else{
-        sum += Number(item);
       }
     });
     return sum.toFixed(num);
   },
+  CaluJsonArraySum2: function (arr, num) {
+    var sum = 0;
+    arr.forEach(item => {
+      sum += Number(item);
+
+    });
+    return sum.toFixed(num);
+  },
   //截取阿里返回文件路径
   GetALiFileUrl: function (str) {
     var newStr = str;

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1084,7 +1084,7 @@
           let numToCAN = 0
           let numToCE = 0
           let numToMEN = 0
-
+          let states = true
           this.msg.detailList.forEach((x, index) => {
             let obj = x
             if (x.CostTypeName.indexOf('房') != -1 ||
@@ -1105,8 +1105,20 @@
                   y.show = true, numToMEN += Number(obj.Number), y.Num = numToMEN
                 }
               })
+              states = false
             }
           })
+          if(states){
+            this.msg.detailList.forEach((x, index) => {
+              this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => {
+                let obj = x
+                if ( y.Type == 3) {
+                  y.show = true, numToCE += Number(obj.Number), y.Num = numToCE
+                  states = false
+                }
+              })
+            })
+          }
         } else {
           this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => {
             y.show = false
@@ -1369,6 +1381,10 @@
               this.msg.HandFeeList.push(JSON.parse(JSON.stringify(obj)))
             }
           })
+          if(this.msg.HandFeeList.length==0){
+            this.Error('暂无可配置的手配费项,请关闭手配费')
+            return
+          }
         }
         if (z) {
           this.msg.Status = 0;

src/components/sale/ExpectedCommission.vue

@@ -587,7 +587,6 @@
               // 年终奖
               this.AnnualBonus.AvfOrderNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0
               this.AnnualBonus.Commission = this.CommissionInfor.BonusPeriods?this.CommissionInfor.BonusPeriods:0
-              console.log(this.CommissionInfor,'----')
             }else {
               this.Error(res.data.message);
             }
@@ -642,9 +641,8 @@
       },
       //计算总成本
       CalculatePrice(arr1,num) {
-        var CoastPrice = this.$commonUtils.CaluJsonArraySum(
+        var CoastPrice = this.$commonUtils.CaluJsonArraySum2(
           arr1,
-          "",
           num
         );
         return CoastPrice