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

src/App.vue

@@ -9,6 +9,10 @@
       <img v-for="src in images" :src="src" :key="src">
     </viewer>
     <chosen-open-mode v-if="haveOpenMode" :settingSys="settingSys"></chosen-open-mode>
+    <!--  -->
+    <!-- <div class="downzip">
+      下载包
+    </div> -->
   </div>
 </template>
 
@@ -119,4 +123,8 @@ export default {
   .BMap_cpyCtrl {display: none;}
   .anchorBL {display: none;}
   .viewer{display: none !important;}
+  /* .downzip{
+    width: 100%;
+    height: 
+  } */
 </style>

src/components/SalesModule/groupInquiry.vue

@@ -490,7 +490,7 @@
                                   <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==2" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjindu')}}</el-button>
                                   <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==3" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjieguo')}}</el-button>
                                 </div>
-                                <el-button v-if="item.LineID!=14" @click="goUrlT('visaList2',item.TCID)" type="primary" style='background:#F16C3C; border-color:#F16C3C'>签证列表</el-button>
+                                <el-button v-if="item.LineID==14" @click="goUrlT('visaList2',item.TCID)" type="primary" style='background:#F16C3C; border-color:#F16C3C'>签证列表</el-button>
                                 <!-- <el-button @click="goTeamBalance(item.TCID,item.OutBranchId)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>团队支出</el-button> -->
                                 <el-button @click="goUrl('VisaFinancialDocuments',item.TCID,item.OutBranchId,item.TCNUM,'签证财务单据')" type="primary" style='background:#F16C3C; border-color:#F16C3C'>费用明细</el-button>
                                 <el-button @click='openEdit(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>送签日期</el-button>
@@ -810,7 +810,7 @@ export default {
         //航班配置
         FlightState:0,
         TCVisaStatus: '-1',
-        IsShowUnion:1,
+        IsShowUnion:0,
         QueryType:1,//查询类型 1:签证
       },
       remarkMsg: {