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

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -224,25 +224,12 @@
                     <th>{{$t('fnc.yueacc')}}</th>
                 </tr>
                 <tr>
-                    <td :colspan="11">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}）</td>
-                    <td>
-                      {{ InMoneyB == 0 ? '-' : moneyFormat(InMoneyB) }}
-                    </td>
-                    <td>
-                      {{ OutMoneyB == 0 ? '-' : moneyFormat(OutMoneyB) }}
-                    </td>
-                    <td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
-                    <td>
-                      <span>
-                        <!-- {{ OutMoney == 0 ? moneyFormat(InMoney) : moneyFormat(OutMoney) }} -->
-                        {{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}
-                      </span>
-                    </td>
-                    <td>
-                      <span v-if="OutMoney == 0">0</span>
-                      <span v-else>{{ moneyFormat(allMoney) }}</span>
-
-                    </td>
+                    <td :colspan="11">{{$t('fnc.a_qcyue')}}：</td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td>{{moneyFormat(StartMoney)}}</td>
                 </tr>
                 <tr v-for=" ( item , index ) in DataList ">
                   <td>
@@ -287,14 +274,28 @@
                     <td>{{ moneyFormat(item.EndMoney) }}</td>
                 </tr>
                 <tr>
-                    <td :colspan="11">{{$t('fnc.a_qcyue')}}：</td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td>{{moneyFormat(StartMoney)}}</td>
+                    <td :colspan="11">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}）</td>
+                    <td>
+                      {{ InMoneyB == 0 ? '-' : moneyFormat(InMoneyB) }}
+                    </td>
+                    <td>
+                      {{ OutMoneyB == 0 ? '-' : moneyFormat(OutMoneyB) }}
+                    </td>
+                    <td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
+                    <td>
+                      <span>
+                        <!-- {{ OutMoney == 0 ? moneyFormat(InMoney) : moneyFormat(OutMoney) }} -->
+                        {{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}
+                      </span>
+                    </td>
+                    <td>
+                      <span v-if="OutMoney == 0">0</span>
+                      <span v-else>{{ moneyFormat(allMoney) }}</span>
+
+                    </td>
                 </tr>
                
+                
             </table>
         </div>
       <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
@@ -799,12 +800,12 @@ export default {
                         this.InMoneyB = InMoneyB;
                         this.OutMoneyB = OutMoneyB;
                     }
-                   // this.DataList = data
+                    this.DataList = data
 
-                    this.DataList =data.reduceRight(function(acc, cur) {
-  acc.push(cur);
-  return acc;
-}, []);
+//                     this.DataList =data.reduceRight(function(acc, cur) {
+//   acc.push(cur);
+//   return acc;
+// }, []);
                     this.loading = false;
                     if( this.msg.ClientID == 0 ){
                         this.msg.ClientID = '';