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

src/assets/css/UpgradedVersion.css

@@ -620,6 +620,7 @@ img {
   .UpgradedVersionDetails-Img-two p {
     left: 0;
     right: 0;
+    top: -31px;
     font-size: 24px;
     font-weight: 500;
   }

src/assets/css/tripIndexNew.css

@@ -252,6 +252,7 @@
   left: 0;
   top: 0;
   right: 0;
+  object-fit: cover;
   width: 100%;
   height: 100%;
 }

src/components/FinancialModule/HandFee/HandFeeStatistics.vue

@@ -88,7 +88,11 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
+          <el-col :span="4">
+            <el-form-item label="">
+              <el-checkbox :true-label="-1" :false-label="0" v-if="msg.HandFeeFrId<=0" v-model="msg.HandFeeFrId" style="margin-right:2px ;">只看未制单</el-checkbox>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <ul class="clearfix">
@@ -279,7 +283,7 @@
           ClientID: '', //付款对象ID
           Status: '-1', //状态
           KingdeeBranchId: 0, //当前登录人的公司
-          HandFeeFrId: 0
+          HandFeeFrId: 0,
         },
         isRB_Depart_Id: false,
         getCompanyMsg: { // 公司

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2095,13 +2095,13 @@
               <span class="RL-remarkTitle" v-if="item.GuestList.length > 0">{{ $t("salesModule.MD") }}:</span>
               <p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0">
                 <span style="color: blue !important" v-for="(childItem,childIndex) in item.GuestList" :key="childIndex"
-                  @click="goToPassenger(childItem, 2)">{{ childItem.userName }} <span style="color:#f56c6c">{{childItem.VisaType==1?'个签':''}}</span></span>
+                  @click="goToPassenger(childItem, 2)">{{ childItem.userName }}<span style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span></span>
               </p>
               <p v-if="item.CancelGuestList.length > 0">
                 <span class="">{{ $t("salesModule.CancelOrder") }}:</span>
                 <span class="RL-redType RL-remarkCon">
                   <span v-for="(childItem,childIndex) in item.CancelGuestList"
-                    :key="childIndex">{{ childItem.userName }} <span style="color:#f56c6c">{{childItem.VisaType==1?'个签':''}}</span> &nbsp;&nbsp;</span>
+                    :key="childIndex">{{ childItem.userName }}<span style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span> &nbsp;&nbsp;</span>
                 </span>
               </p>
               <span>{{ $t("salesModule.RoomInfo") }}：{{