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

src/components/FinancialModule/BasicDocuments.vue

@@ -1696,8 +1696,9 @@ export default {
             }, err => {})
         },
         AuditOrRefund(){  // 保存
-        // console.log("保存")
-         let that=this;
+        let that=this;
+        that.benMoney=Math.round(that.benMoney * 100) / 100;
+         
         if(that.Ststus==1){
             if(this.AuditOrRefundMsg.Status=='5'){
                 if(that.GetDetail.AccountNumber.indexOf("东航平台")!=-1){
@@ -1706,13 +1707,13 @@ export default {
                         return;
                     }else{
                         if(this.allMoney>parseFloat(that.benMoney) + 5 || this.allMoney<parseFloat(that.benMoney) - 5){
-                            this.Error("请检查实付金额！")
+                            this.Error("请检查实付金额是否在范围内！")
                             return;
                         }
                     }
                 }else{
                     if(this.allMoney!=parseFloat(that.benMoney)){
-                        this.Error("请检查实付金额！")
+                        this.Error("请检查金额是否一致！")
                         return;
                     }
                 }

src/components/activity/Rotationchart.vue

@@ -155,6 +155,7 @@
                 <el-option label="签证" :value="2"></el-option>
                 <el-option label="机票" :value="3"></el-option>
                 <el-option label="自由行" :value="4"></el-option>
+                <el-option label="当地游" :value="5"></el-option>
             </el-select>
         </el-form-item>
         <el-form-item>
@@ -232,6 +233,7 @@
                     <el-option label="签证" :value="2"></el-option>
                     <el-option label="机票" :value="3"></el-option>
                     <el-option label="自由行" :value="4"></el-option>
+                    <el-option label="当地游" :value="5"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="排序">

src/router/config.js

@@ -3232,6 +3232,14 @@ export default {
                                 title: '会员特权'
                             }
                         },
+                        {
+                            path: '/LocaltourMan',
+                            name: 'LocaltourMan',
+                            component: resolve => require(['@/components/activity/LocaltourMan'], resolve),
+                            meta: {
+                                title: '当地游'
+                            }
+                        },
                     ]
                 },
                 {