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

src/components/FinancialModule/BasicDocuments.vue

@@ -841,7 +841,7 @@
       </template>
       <div class="_explain">
         <div class="illustrate-text">
-          <p class="illustrate-left">{{$t('fnc.fjshuoming')}}：
+          <p class="illustrate-left">{{$t('fnc.fjshuoming')}}：<el-tag size="mini" type="danger" v-if="GetDetail.RejectMark==1">被驳回重新提交！</el-tag>
             <span class="fr" v-if="isReceivablesAccount&&GetDetail.Course_Name">
               {{$t('objFill.sklx')}}：{{GetDetail.Course_Name}}/{{GetDetail.PayReceipt_No}}
             </span>

src/components/FinancialModule/DataAnalysis/components/MemberRebate.vue

@@ -2,6 +2,7 @@
   <div style="margin-bottom: 20px; ">
     <div style="display: flex;align-items: center;">
       <h3 class="text-center" style="margin-bottom: 5px;">{{$t('objFill.v101.FinancialModule.gongstj')}}</h3>
+      <h5 class="text-center" style="margin-left:10px">注*: 幸福存折与积分均由出团公司返</h5>
     </div>
 
     <el-table
@@ -105,6 +106,7 @@
 
     <div style="display: flex;align-items: center;margin-top: 30px;">
       <h3 class="text-center" style="margin-bottom: 5px;">同行统计（仅展示Top50）</h3>
+      <h5 class="text-center" style="margin-left:10px">注*: 此处同行统计公司下所有的同行排名，包含联运返的部分。单公司查询时与上面公司统计返幸福存折金额因散拼联运会有不一致情况。</h5>
     </div>
 
     <el-table

src/components/FinancialModule/FinancialDocuments.vue

@@ -1296,6 +1296,7 @@
                     @click="Financial_post_GetFinancLogList(scope.row.FrID)">{{scope.row.StatusStr}}</span>
                 </el-popover>
               </div>
+              <div><el-tag size="mini" type="danger" v-if="scope.row.RejectMark==1 && msg.Conditon==3">被驳回重新提交！</el-tag></div>
             </template>
           </el-table-column>
           <el-table-column :label="$t('system.table_operation')">

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -836,7 +836,7 @@
         </my-GZ-Bill>
         <div class="_explain">
           <div class="illustrate-text">
-            <p class="illustrate-left">{{$t('fnc.fjshuoming')}}：
+            <p class="illustrate-left">{{$t('fnc.fjshuoming')}}：<el-tag size="mini" type="danger" v-if="GetDetail.RejectMark==1">被驳回重新提交！</el-tag>
               <span class="fr" v-if="GetDetail.TemplateId==27&&GetDetail.Course_Name&&GetDetail.PayReceipt_No">
                 {{$t('objFill.sklx')}}：{{GetDetail.Course_Name}}/{{GetDetail.PayReceipt_No}}
               </span>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1099,12 +1099,6 @@
                         v-if="item.OrderLeaderGuestNum >= 1">+{{ item.OrderLeaderGuestNum }}</span>{{ $t("Operation.Op_people") }}
                     </i>
                   </p>
-                  <p>
-                    <span>已收订</span>
-                    <i>
-                      <span class="TCL-redType">{{ item.DJNum }}</span> {{ $t("Operation.Op_people") }}
-                    </i>
-                  </p>
                   <p v-if="item.SingleDMNum > 0">
                     <span>{{ $t("salesModule.SingleJ") }}</span>
                     <i>{{ item.SingleDMNum }}</i>
@@ -1112,6 +1106,12 @@
                   <p>
                     <span>{{ $t("Operation.Op_takeSeat") }}</span>
                     <i>{{ item.Occupied }}</i>{{ $t("Operation.Op_people") }}
+                  </p>
+                   <p>
+                    <span>已收订</span>
+                    <i>
+                      <span class="TCL-greenType">{{ item.DJNum }}</span> {{ $t("Operation.Op_people") }}
+                    </i>
                   </p>
                   <p class="travelnowrap">
                     <span>{{ $t("visa.v_houbu") }}</span>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -718,16 +718,16 @@
                         v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('hotel.hotel_people')}}
                     </i>
                   </p>
+                  <p>
+                    <span>{{$t('Operation.Op_takeSeat')}}</span>
+                    <i>{{item.Occupied}}</i>{{$t('hotel.hotel_people')}}
+                  </p>
                   <p>
                     <span>已收订</span>
                     <i>
-                      <span class="TCL-redType">{{ item.DJNum }}</span> {{ $t("Operation.Op_people") }}
+                      <span class="TCL-greenType">{{ item.DJNum }}</span> {{ $t("Operation.Op_people") }}
                     </i>
                   </p>
-                  <p>
-                    <span>{{$t('Operation.Op_takeSeat')}}</span>
-                    <i>{{item.Occupied}}</i>{{$t('hotel.hotel_people')}}
-                  </p>
                   <p class="travelnowrap">
                     <span>{{$t('visa.v_houbu')}}</span>
                     <span v-if="item.IsSubstitution==1" class="TCL-greenType">{{$t('visa.v_yxhoubu')}}</span>