1

src/components/FinancialModule/ConsolidationOfAccounts/index.vue

@@ -103,7 +103,7 @@
         </div>
 
         <div style="display: flex;flex-wrap: nowrap; padding: 10px;">
-            <!-- <div style="display: flex;flex-wrap: wrap;">
+            <div style="display: flex;flex-wrap: wrap;">
               <span>已选数据：</span>
               <template v-if="multipleSelection.length>0">
                 <el-tag size="mini" closable
@@ -123,7 +123,7 @@
             </div>
             <div style="margin-left: 20px;flex-shrink: 0;">
               总金额：{{getMoney()}}
-            </div> -->
+            </div>
         </div>
         <div class="_fnDm_content" v-loading='loading'>
           <el-table
@@ -134,12 +134,12 @@
             row-key="FrID"
             @selection-change="handleSelectionChange"
            >
-            <!-- <el-table-column
+            <el-table-column
               type="selection"
               :selectable="selectable"
               width="55"
               :reserve-selection="true">
-            </el-table-column> -->
+            </el-table-column>
             <el-table-column
               label="单号"
               width="120">
@@ -258,7 +258,15 @@
               label="原币金额"
               show-overflow-tooltip width="150">
               <template slot-scope="scope">
-                {{scope.row.WBMoney?scope.row.WBMoney+'/'+scope.row.CurrencyName:''}}
+                {{scope.row.WBMoney}}
+              </template>
+              </el-table-column>
+              <el-table-column
+              prop=""
+              label="原币币种"
+              show-overflow-tooltip width="150">
+              <template slot-scope="scope">
+                {{scope.row.CurrencyName}}
               </template>
               </el-table-column>
               <el-table-column
@@ -874,9 +882,9 @@
           let Money = 0
           this.multipleSelection.forEach(x=>{
             x.DetailList.forEach(y=>{
-              if(y.CostTypeId!=114){
+              //if(y.CostTypeId!=114){
                 Money += (y.OriginalMoney*100)
-              }
+              //}
             })
 
           })