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

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1897,7 +1897,8 @@
               <td>
                 <div @click="goOpenUrl('confirmationOrder',childItem.OrderId)" style="cursor:pointer;">电子确认函</div>
                 <span v-if='childItem.ConfirmFileList.length>0'
-                  @click="downLoadFile(childItem.ConfirmFileList)">确认函下载</span>
+                  @click="downLoadFile(childItem.ConfirmFileList)" style="color:blue;text-decoration:underline;font-size:12px;">已上传</span>
+                <span v-else style="color:gray;font-size:12px;">未上传</span>
               </td>
               <td class="RL-BTNlist" rowspan="2">
                 <el-button-group>