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

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -302,8 +302,16 @@
         <td>
           {{detail.CreateDateStr}}
         </td>
-        <td>{{$t('ios.dzriqi')}}</td>
-        <td>
+        <td>已开票金额</td>
+        <td><el-tooltip class="item" effect="dark" content="财务审核通过的发票总额" placement="top">
+     <span> {{detail.PassMoney}}</span>
+    </el-tooltip>
+        </td>
+      </tr>
+      <tr>
+        
+        <td >{{$t('ios.dzriqi')}}</td>
+        <td colspan="3">
           {{orderList.TradeDateStr}}
         </td>
       </tr>
@@ -326,7 +334,7 @@
         <td colspan="3" class="w600 text-align-left font-weight cursorpointer">
           <template v-for="(item,index) in orderList.FrIDs">
             <span :key="index+10000"
-              @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', detail.OrderId, detail.TCNUM, detail.TCID)">{{item}}</span>
+              @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', detail.OrderId, detail.TCNUM, detail.TCID)">{{item+(index<(orderList.FrIDs.length-1)?",":"")}}</span>
           </template>
           <span v-if="orderList.FrIDs && orderList.FrIDs.length<1">{{$t('ios.zanwu')}}</span>
         </td>