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

src/components/FinancialModule/BasicDocuments.vue

@@ -1551,12 +1551,12 @@
                   </div>
                 </template>
               </p>
-              <!--
+              <!-- 出纳审核 -->
               <div v-if="GetDetail.Type==1&&isShowAttachment" style="display: flex;margin-top: 10px;">
                 <div style="display: flex;align-items: center;">
                   <span style="font-size: 14px;">类型：</span>
                   <div>
-                    <el-select filterable v-model="AuditOrRefundMsg.CourseId" placeholder="选择收款类型"
+                    <el-select v-model="AuditOrRefundMsg.CourseId" placeholder="选择收款类型" clearable
                     style="width: 100%;" @change="getCourseId">
                       <el-option v-for="item in PaymentMethodList" :key="item.Id" :label="item.Name"
                         :value="item.Id"></el-option>
@@ -1566,10 +1566,10 @@
                 <div style="display: flex;align-items: center;margin-left: 20px;flex-grow: 1;">
                   <span style="font-size: 14px;">卡号：</span>
                   <div style="display: flex;flex-grow: 1;">
-                    <el-input type="text" v-model="AuditOrRefundMsg.PayReceiptNo"></el-input>
+                    <el-input type="text" v-model="AuditOrRefundMsg.PayReceiptNo" style="width: 364px;" clearable></el-input>
                   </div>
                 </div>
-              </div> -->
+              </div>
               <textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea"
                 v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
               <!-- <textarea v-if="AuditOrRefundMsg.Status=='3'&&item.SpecialNode!=0" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea> -->
@@ -2049,6 +2049,7 @@
           emList: [],
           IsRefundAutoGoBack: 0,
           TradeDetailList: [],
+          CourseId: null,
           CourseName: '',//收款类型 银行卡/支付宝/微信
           PayReceiptNo: '',
         },
@@ -2183,7 +2184,11 @@
     },
     methods: {
       getCourseId(){
-        let list = this.PaymentMethodList.map(x=>{ return x.Id==this.AuditOrRefundMsg.CourseId })
+        if(!this.AuditOrRefundMsg.CourseId){
+          this.AuditOrRefundMsg.CourseName = ''
+          return
+        }
+        let list = this.PaymentMethodList.filter(x=>{ return x.Id==this.AuditOrRefundMsg.CourseId })
         this.AuditOrRefundMsg.CourseName = list[0].Name
       },
       getTemplate(GetDetail) {

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -428,7 +428,10 @@
                     v-if="item.ScoreNum >= 0"
                     @click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span>
                   {{$t('Operation.Op_TeamName')}}：</div>
-                <div class="TCL_Content" style="width:90%">{{item.Title}}</div>
+                <div class="TCL_Content" style="width:90%">
+                  {{item.Title}}
+                </div>
+
               </div>
             </div>
             <div>
@@ -952,6 +955,10 @@
                     <span>{{$t('visa.v_kptime')}}</span>
                     {{item.TicketDeadline}}
                   </p>
+                  <p>
+                    <span> 结团日期</span>
+                    {{item.OutGroupAuditDate}}
+                  </p>
                   <p v-if="item.LineID==2&&item.EuropeVisaType>0">
                     <span>
                       <span v-if="item.EuropeVisaType">{{$t('visa.v_EuropeanVisaType')}}</span>