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

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -124,7 +124,12 @@
                 if(x.Type==1){
                   this.collectList.push(x);
                 }else{
-                  this.payList.push(x);
+                  if(this.active===2){
+                     if(x.Id!=11){
+                       this.payList.push(x);
+                     }
+                  }else{
+                  this.payList.push(x);}
                 }
               });
             }

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -117,12 +117,12 @@
 </style>
 
 <template>
-  <div class="flexOne TeamBalancePayment" v-if="isShow" v-loading="loading">
+  <div class="flexOne TeamBalancePayment" v-loading="loading">
     <div id="print">
       <div class="Team_Details">
         <div class="TB_comtitle">团队收支明细</div>
-        <div class="Team_Content">
-          <el-row :gutter="12">
+        <div class="Team_Content" v-loading="loading">
+          <el-row :gutter="12" v-if="DataList&&DataList.TeamBalance">
             <el-col :span="4">
               <div class="Team_DList">
                 <div class="Team_firstTitle">收客情况</div>
@@ -189,7 +189,7 @@
           </el-row>
         </div>
       </div>
-      <div class="Team_collection">
+      <div class="Team_collection" v-loading="loading">
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">收入</div>
           <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddIncomeDetail" />
@@ -459,7 +459,7 @@
           </template>
         </table>
       </div>
-      <div class="Team_collection">
+      <div class="Team_collection" v-loading="loading">
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">成本</div>
           <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
@@ -573,7 +573,8 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FinicePayList">
-            <tr v-if='item.OrderSource===4'>
+            <!-- <tr v-if='item.OrderSource===4 || isExists(item.CostTypeList,'国际段机票')'> -->
+            <tr v-if="isExists(item.CostTypeList,'国际段机票') || item.OrderSource===4">
               <td>
                 <el-checkbox v-model="item.checked"></el-checkbox>
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
@@ -839,7 +840,7 @@
               </td>
             </tr>
           </template>
-        </table>        
+        </table>
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">其他：</div>
         </div>
@@ -855,7 +856,7 @@
             <th width="200">当前审核人</th>
           </tr>
           <template v-for="item in DataList.FinicePayList">
-            <tr v-if="NotExists(item.CostTypeList,'签证费') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')">
+            <tr v-if="NotExists(item.CostTypeList,'签证费') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 &&  NotExists(item.CostTypeList,'国际段机票') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')">
               <td>
                 <el-checkbox v-model="item.checked"></el-checkbox>
                 <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
@@ -888,8 +889,7 @@
           </template>
         </table>
       </div>
-
-     <div class="Team_collection">
+      <div class="Team_collection" v-loading="loading">
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">非成本</div>
           <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
@@ -989,17 +989,15 @@
           </template>
         </table>
       </div>
-
     </div>
     <div class="Team_BtnList">
       <input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" />
-      <input type="button" v-if="!CloseIncomeBtn" @click="UpdateBrakeAccountStatus" :value="DataList.TeamBalance.BrakeAccountStatus === 0 ? '关闭收支操作' : '开启收支操作'"
+      <input type="button" v-if="!CloseIncomeBtn" @click="UpdateBrakeAccountStatus" :value="(DataList&&DataList.TeamBalance&&DataList.TeamBalance.BrakeAccountStatus === 0) ? '关闭收支操作' : '开启收支操作'"
         class="hollowFixedBtn" />
       <input type="button" value="导出" @click="ExportExcle" class="normalBtn" />
       <input type="button" value="打印" @click.prevent="doPrint" class="normalBtn" />
     </div>
     <el-dialog custom-class='w350' title="合并单据" :visible.sync="zhuanLoading" center :before-close="initZhuanMsg">
-      <!--zhaunMsg.TCNUM-->
       <el-form label-width="110px">
         <el-form-item label="转出团号：" class="w280">
           <el-input v-model="zhuanMsg.TCNUM"></el-input>
@@ -1019,7 +1017,6 @@
         TCID: 0,
         //数据列表
         DataList: "",
-        isShow: false,
         OutBranchId: 0,
         ishowBtn: true,
         CloseIncomeBtn: false,
@@ -1034,26 +1031,22 @@
     },
     methods: {
       //判断数组包含字符串
-      isExists(array,str)
-      {
-         var flag=false;
-           array.forEach(item=>{
-           if(item==str && !flag)
-           {
-              flag=true;
-           }
+      isExists(array, str) {
+        var flag = false;
+        array.forEach(item => {
+          if (item == str && !flag) {
+            flag = true;
+          }
         });
         return flag;
       },
       //判断数组不包含字符串
-      NotExists(array,str)
-      {
-         var flag=true;
-           array.forEach(item=>{
-           if(item==str && flag)
-           {
-              flag=false;
-           }
+      NotExists(array, str) {
+        var flag = true;
+        array.forEach(item => {
+          if (item == str && flag) {
+            flag = false;
+          }
         });
         return flag;
       },
@@ -1119,7 +1112,6 @@
         this.apipost("travel_get_GetTeamBalanceSheet", msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
-            this.isShow = true;
             let data = res.data.data;
             data.FiniceReciveList.forEach(x => {
               x.checked = false;
@@ -1169,7 +1161,8 @@
       //导出EXCEL
       ExportExcle() {
         let msg = {
-          TCID: this.TCID
+          TCID: this.TCID,
+          uid:this.getLocalStorage().EmployeeId
         };
         this.GetLocalFile(
           "travel_get_GetTeamBalanceSheetExport",
@@ -1208,5 +1201,4 @@
       this.getList();
     }
   };
-
-</script>
+</script>
\ No newline at end of file