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

src/components/FinancialModule/BasicDocuments.vue

@@ -1506,7 +1506,8 @@ export default {
                 let fee = this.payMsgList[index].Fee,
                     Rate = this.payMsgList[index].Rate==0?1:this.payMsgList[index].Rate,
                     Money = this.payMsgList[index].OriginalMoney;
-                this.payMsgList[index].allMoney = Math.round(((Money*Rate)+fee) * 100) / 100;
+                    Rate=Rate*100;                    
+                this.payMsgList[index].allMoney = Math.round(((Money*Rate)+fee) * 100) / 100 / 100;
             } else {
                 this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee))?0:parseFloat(this.payMsg.Fee);
                 this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate))?0:parseFloat(this.payMsg.Rate);
@@ -1514,7 +1515,8 @@ export default {
                 let fee = this.payMsg.Fee,
                     Rate = this.payMsg.Rate==0?1:this.payMsg.Rate,
                     Money = this.payMsg.OriginalMoney;
-                this.payMsg.allMoney = Math.round(((Money*Rate)+fee) * 100) / 100;
+                    Rate=Rate*100;                                        
+                this.payMsg.allMoney = Math.round(((Money*Rate)+fee) * 100) / 100 / 100;
 
             }
         },

src/components/LeaderManagement/leaderReimbursement.vue

@@ -59,7 +59,7 @@
           <span v-if='index==list.BusList.length-1'>送机</span>
         </td>
         <td>
-          {{ item.PayType === 1 ? moneyFormat(item.CostPrice) : 0}}
+          {{item.CostPrice >= 0 && item.CostPrice !== null && item.PayType > 0 ? (item.PayType === 1 ? moneyFormat(item.CostPrice) : 0) : ''}}
         </td>
         <td>
           <span v-if="item.PayType === 1">现付</span>
@@ -71,7 +71,7 @@
           <span v-show="item.PayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
         </td>
         <td>
-          {{item.HighSpeedPayType === 1 ? moneyFormat(item.HighSpeedPrice) : 0}}
+          {{item.HighSpeedPrice >= 0 && item.HighSpeedPrice !== null && item.HighSpeedPayType > 0 ? (item.HighSpeedPayType === 1 ? moneyFormat(item.HighSpeedPrice) : 0) : ''}}
         </td>
         <td>
           <span v-if="item.HighSpeedPayType === 1">现付</span>
@@ -83,10 +83,10 @@
           <span v-show="item.HighSpeedPayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
         </td>
         <td>
-          {{item.PayType === 1 ? moneyFormat(item.StopPrice) : 0}}
+          {{item.StopPrice >= 0 && item.StopPrice !== null && item.PayType > 0 ? (item.PayType === 1 ? moneyFormat(item.StopPrice) : 0): ''}}
         </td>
         <td>
-          {{moneyFormat((item.PayType === 1 ? (item.HighSpeedPayType === 1 ? item.HighSpeedPrice + Number(item.CostPrice) : Number(item.CostPrice)) : 0) + Number(item.StopPrice))}}
+          {{Number(moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))) <= 0 ? '' : moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))}}
         </td>
         <td v-if='index==0' :rowspan='list.BusList.length'>
           {{busTotalPrice(list.BusList)}}
@@ -104,7 +104,7 @@
       </tr>
       <tr v-if="TotalNav.reimburseTotalPrice">
         <td>总金额</td>
-        <td colspan="13">
+        <td colspan="14">
           {{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
         </td>
         <!-- <td>签单/预付/抵扣总金额</td>

src/components/Login.vue

@@ -317,16 +317,10 @@ export default {
             if (previousPathInfo) {
               let path = previousPathInfo.path.indexOf('login') === -1 ? previousPathInfo.path : 'index'
               let query = previousPathInfo.query ? previousPathInfo.query : {} 
-              if (path!== 'index') {
               this.$router.push({ path: "/"+ path, query: query });
-              } else {
-                this.$router.push({ path: "/index" });
-              }
             }else {
               this.$router.push({ path: "/index" });
             }
-            
-            
             //登录成功后跳转页面
             // this.$notify.success({
             //   title:'提示',