no message

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -184,7 +184,7 @@
                     <th>{{$t('fnc.a_hkrfkduixiang')}}</th>
                     <th>{{$t('fnc.a_hkfkshijian')}}</th>
                     <th>{{$t('fnc.jylshuihao')}}</th>
-                    <th>原币币种</th>
+                    <th>原币种</th>
                     <th>原币收款</th>
                     <th>原币付款</th>
                     <th>本位币收款

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -144,12 +144,21 @@
                     <th>{{$t('fnc.zhidanren')}}</th>
                     <th>{{$t('fnc.a_hkfkshijian')}}</th>
                     <th>{{$t('fnc.jylshuihao')}}</th>
-                    <th>{{$t('fnc.skjine')}}</th>
-                    <th>{{$t('fnc.fkjine')}}</th>
+                    <th>原币种</th>
+                    <th>原币收款</th>
+                    <th>原币付款</th>
+                    <th>本位币收款
+                      <!-- {{$t('fnc.skjine')}} -->
+                    </th>
+                    <th>本位币付款
+                      <!-- {{$t('fnc.fkjine')}} -->
+                    </th>
                     <th>{{$t('fnc.yueacc')}}</th>
                 </tr>
                 <tr>
-                    <td :colspan="7">{{$t('fnc.a_qcyue')}}：</td>
+                    <td :colspan="8">{{$t('fnc.a_qcyue')}}：</td>
+                    <td></td>
+                    <td></td>
                     <td></td>
                     <td></td>
                     <td>{{moneyFormat(StartMoney)}}</td>
@@ -180,6 +189,9 @@
                     <td>
                         {{ item.AccountNumber }}
                     </td>
+                    <td> {{item.CurrencyName}} </td>
+                    <td>{{ item.Type == 1 ? moneyFormat(item.OriginalMoney) : '' }}</td>
+                    <td>{{ item.Type == 2 ? moneyFormat(item.OriginalMoney) : '' }}</td>
                     <td>{{ item.Type == 1 ? moneyFormat(item.Money) : '' }}</td>
                     <td>
                       <span v-if="item.Type == 1 && item.IsPlatformMergeBank==1">{{moneyFormat(item.Money)}}</span>
@@ -189,10 +201,19 @@
                     <td>{{ moneyFormat(item.EndMoney) }}</td>
                 </tr>
                 <tr>
-                    <td :colspan="7">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}）</td>
+                    <td :colspan="8">{{$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) }}</span>
+                      <span>
+                        <!-- {{ OutMoney == 0 ? moneyFormat(InMoney) : moneyFormat(OutMoney) }} -->
+                        {{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}
+                      </span>
                     </td>
                     <td>
                       <span v-if="OutMoney == 0">0</span>
@@ -397,6 +418,8 @@ export default {
             allMoney:0,
             OutMoney:0,
             InMoney:0,
+            OutMoneyB:0,
+            InMoneyB:0,
           BillType:1, //1 收 2 支  ,
           addChuNa:false,
           allLoading:false,
@@ -588,32 +611,39 @@ export default {
                  if(res.data.resultCode==1){
                     let data = res.data.data;
                     if(data.length){
-                        this.StartMoney = data[0].StartMoney?data[0].StartMoney:0;
+                      this.StartMoney = data[0].StartMoney?data[0].StartMoney:0;
                         let Money = data[0].StartMoney?data[0].StartMoney:0,
                             InMoney = 0,
-                            OutMoney = 0;
+                            OutMoney = 0,
+                            InMoneyB = 0,
+                            OutMoneyB = 0;
                         data.forEach( ( x , i ) => {
                             if(x.Type==1){
                               if(x. IsPlatformMergeBank==1){
                                   x.EndMoney = Money - x.Money;
                                   Money = x.EndMoney;
                                   OutMoney = OutMoney + x.Money;
+                                  OutMoneyB = OutMoneyB + x.OriginalMoney;
                                 }
                                 // else{
                                   x.EndMoney = Money + x.Money;
                                   Money = x.EndMoney;
                                   InMoney = InMoney + x.Money;
+                                  InMoneyB = InMoneyB + x.OriginalMoney;
                                 // }
                             }else{
                                 x.EndMoney = Money - x.Money;
                                 Money = x.EndMoney;
                                 OutMoney = OutMoney + x.Money;
+                                OutMoneyB = OutMoneyB + x.OriginalMoney;
                             }
                             //  if(x.Type==2)
                         });
                         this.allMoney = Money;
                         this.InMoney = InMoney;
                         this.OutMoney = OutMoney;
+                        this.InMoneyB = InMoneyB;
+                        this.OutMoneyB = OutMoneyB;
                     }
                     this.DataList = data
                     this.loading = false;

src/components/Hotel/singleProduct/components/hotelDetails.vue

@@ -256,7 +256,7 @@
         flex-grow: 1;
     }
     .hotelDetails-Img>div:nth-child(2){
-        width: 50%;
+        width: 100%;
         margin-left: 10px;
         display: flex;
         flex-direction: column;

src/components/busManagement/BookAcar/components/Details.vue

@@ -263,7 +263,7 @@
         flex-grow: 1;
     }
     .hotelDetails-Img>div:nth-child(2){
-        width: 50%;
+        width: 100%;
         margin-left: 10px;
         display: flex;
         flex-direction: column;

src/components/scenicSpot/Singleticket/components/OrderDetails.vue

@@ -271,7 +271,7 @@
         flex-grow: 1;
     }
     .hotelDetails-Img>div:nth-child(2){
-        width: 50%;
+        width: 100%;
         margin-left: 10px;
         display: flex;
         flex-direction: column;