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

src/components/FinancialModule/RecPayQuery.vue

@@ -104,7 +104,7 @@
                 <el-row style="padding:15px 20px 0 0;">
                     <el-col :span="4">
                         <el-form-item label="单号：">
-                            <el-input placeholder="" class="" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')"></el-input>
+                            <el-input placeholder="" class="" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')" maxlength="8"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="4">

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -906,7 +906,7 @@
         }
         this.queryCommonData.loading = true
         this.apipost(
-          'travel_get_GetTravelPrciePageList',
+          'travel_get_GetTravelPrciePageList_V2',
           msg,
           res => {
             this.queryCommonData.loading = false
@@ -1172,6 +1172,7 @@
           query: {
             id: id,
             OutBranchId: OutBranchId,
+            IsHaveAuth: true,
             blank: 'y',
             tab: '团队收支明细'
           }

src/components/administrative/Survey.vue

@@ -341,6 +341,7 @@ export default {
             this.getList();
           } else {
             this.$message.error(res.data.message)
+            this.saveShow = false;
           }
         })
       },