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

src/components/FinancialModule/editCapitalAllocationDetail.vue

@@ -16,7 +16,7 @@
 <template>
   <div>
     <el-dialog title="修改汇率" :visible.sync="isShow" @closed="clickcancel" width="900px">
-      <div class="editCapitalAllocationDetail">
+      <div class="editCapitalAllocationDetail" v-loading="loading">
         <span class="Ca_Span">收款</span>
         <el-table
         :data="dataList.SBankList"
@@ -126,7 +126,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="clickcancel">取 消</el-button>
-        <el-button size="mini" @click="submit">保 存</el-button>
+        <el-button class="normalBtn" size="mini" @click="submit">保 存</el-button>
       </span>
     </el-dialog>
   </div>
@@ -148,7 +148,8 @@ export default {
       dataList:[],
       Rate: 0,
       index: 0,
-      isShow: false
+      isShow: false,
+      loading: true
     }
   },
   watch: {
@@ -224,6 +225,7 @@ export default {
         }else{
           this.Error(res.data.message);
         }
+        this.loading = false
       }, err => {})
     },
   },