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

src/components/Complaints/ComplaintsDetail.vue

@@ -323,7 +323,7 @@
         <tr v-if="isShowMoney">
           <td>赔偿金额：</td>
           <td>
-            <el-input type="text" v-model="EditMsg.CompensateMoney" class="w160"></el-input>
+            <el-input type="text" v-model="EditMsg.CompensateMoney" class="w160"  @keyup.native="checkPrice(EditMsg,'CompensateMoney')"></el-input>
           </td>
         </tr>
         <tr v-if="isShowNextPersion">
@@ -363,7 +363,7 @@
         <tr>
           <td>赔偿金额：</td>
           <td>
-            <el-input type="text" v-model="CompensateMoney" class="w160"></el-input>
+            <el-input type="text" v-model="ZuiMsg.CompensateMoney" class="w160"  @keyup.native="checkPrice(ZuiMsg,'CompensateMoney')"></el-input>
           </td>
         </tr>
       </table>
@@ -452,7 +452,9 @@
         DealEmpName: '',
         ishowBtn: true,
         showAppendMoney: false,
-        CompensateMoney: 0,//赔偿金额
+        ZuiMsg:{
+           CompensateMoney: 0,//赔偿金额
+        },
         ComplainCompensation: [],//赔款列表
         authority: [],
       }
@@ -691,16 +693,16 @@
       },
       //追加赔偿金额
       appendCompensateMoney () {
-        if (!(this.CompensateMoney > 0)) {
+        if (!(this.ZuiMsg.CompensateMoney > 0)) {
           this.Error('赔偿金额必须大于0')
           return false
         }
-        let msg = {ID: this.queryMsg.ID, CompensateMoney: this.CompensateMoney}
+        let msg = {ID: this.queryMsg.ID, CompensateMoney: this.ZuiMsg.CompensateMoney}
         this.apipost('conplain_post_AppendCompensateMoney', msg, res => {
           if (res.data.resultCode == 1) {
             this.Success('追加赔偿成功')
             this.showAppendMoney = false
-            this.CompensateMoney = 0
+            this.ZuiMsg.CompensateMoney = 0
             this.getDetial()
           } else {
             this.Error(res.data.message)
@@ -729,7 +731,7 @@
         this.ComplainCompensation.forEach(x => {
           money += x.CompensateMoney
         })
-        return money
+        return money.toFixed(2);
       },
       //已赔金额
       getBackMoney () {

src/components/leaderPay2.vue

@@ -690,16 +690,16 @@
             <!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhiS')">明细</span> -->
           </td>
         </tr>
-        <tr v-show="(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0">
+        <!-- <tr v-show="(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0">
           <td>其他费用</td>
           <td>0</td>
           <td>
             {{moneyFormat(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)}}
           </td>
           <td>
-            <!-- <span class="cursorpointer text-decoratio" @click="godetailAll('qitaF')">明细</span> -->
+            
           </td>
-        </tr>
+        </tr> -->
         <tr v-for="item in planPriceList">
           <td>
             <span v-if="item.UserType==3">景点门票</span>
@@ -1140,7 +1140,7 @@
     methods: {
       getOrderType(type) {
         // 1-其他订单，2-小费收入，3-团费小计，4-自费收入，5-自费支出
-        if (type == 1) return '其他订单'
+        if (type == 1) return '其他费用'
         else if (type == 2) return '小费收入'
         else if (type == 3) return '团费小计'
         else if (type == 4) return '自费收入'