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

src/components/FinancialModule/DataAnalysis/components/waitpay.vue

 <template>
   <div style="margin-bottom: 20px; ">
-    
+    <p>合计待付人民币：{{GetRMBMoney()}}</p>
     <el-table
     :data="BranchAnalysisData"
     style="width: 100%;"
@@ -29,6 +29,14 @@
               {{scope.row.TotalMoney}}
           </template>
         </el-table-column>
+        <el-table-column
+          prop="RMBMoney"
+          label="转人民币"
+          min-width="120" align="center" sortable>
+          <template slot-scope="scope">
+              {{scope.row.RMBMoney}}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="团队">
         <el-table-column
           prop="CurrentMoney"
@@ -127,6 +135,13 @@ export default {
             blank: 'y'
           }
         });
+    },
+    GetRMBMoney(){
+      let RMBMoney=0;
+      this.BranchAnalysisData.forEach(x=>{
+        RMBMoney+=x.RMBMoney;
+      });
+      return RMBMoney.toFixed(2);
     }
   },
   watch: {

src/components/FinancialModule/DataAnalysis/index.vue

@@ -77,7 +77,7 @@
               </el-form-item>
             </el-col>
           </template>
-          <el-col :span="4" v-if="activeName!=5">
+          <el-col :span="4" v-if="activeName!=5 && activeName!=8">
             <el-form-item :label="$t('fnc.bweibi')">
               <el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId"  @change="getChange">
                 <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>