1

src/components/FinancialModule/HelpBranch/index.vue

@@ -227,6 +227,21 @@
               </li>
           </ul>
       </div>
+      <div style="display: flex;flex-wrap: nowrap; padding: 10px;">
+        <div style="display: flex;flex-wrap: wrap;color:red;" v-if="allotDataList.length>0">
+            <span>调拨单总额：</span>
+            <template >
+              <span size="mini" closable
+              style="margin-right: 5px;margin-bottom: 5px;"
+              v-for="(x,index) in allotDataList"
+              :key="x.FrID" 
+              :type="x.Type==2?'danger':'success'">
+            {{x.Money}}（{{x.CurrencyName}}），已冲抵金额：{{x.UseMoney}}，剩余金额：{{x.SurplusMoney}}
+            </span>
+            </template>
+          
+          </div>
+      </div>
       <div style="display: flex;flex-wrap: nowrap; padding: 10px;">
           <div style="display: flex;flex-wrap: wrap;">
             <span>已选数据：</span>
@@ -250,20 +265,9 @@
             总金额：{{getMoney()}}
           </div>
 
-          <div style="display: flex;flex-wrap: wrap;margin-left:10px;color:red;" v-if="allotDataList.length>0">
-            <span>调拨单：</span>
-            <template >
-              <span size="mini" closable
-              style="margin-right: 5px;margin-bottom: 5px;"
-              v-for="(x,index) in allotDataList"
-              :key="x.FrID" 
-              :type="x.Type==2?'danger':'success'">
-              {{x.FrID}}，币种：{{x.CurrencyName}}，总金额：{{x.Money}}，剩余金额：{{x.SurplusMoney}}
-            </span>
-            </template>
           
       </div>
-      </div>
+      
       <div class="_fnDm_content" v-loading='loading'>
         <el-table
           ref="multipleTable"
@@ -812,7 +816,8 @@ export default {
                             Money:data.Money,
                             CurrencyName:data.CurrencyName,
                             SurplusMoney:data.SurplusMoney,
-                            NowMoney:0
+                            NowMoney:0,
+                            UseMoney:data.UseMoney
                           }
                           this.allotDataList.push(obj);
                         }