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

src/components/FinancialModule/ConsolidationOfAccounts/index.vue

@@ -135,6 +135,11 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="2">
+                        <el-form-item :label="$t('objFill.caiwubz')">
+                          <el-checkbox v-model="msg.IsAirTicketSelect" true-label="1" false-label="0"></el-checkbox>
+                        </el-form-item>
+                    </el-col>
               </template>
               <el-col :span="8">
                         <span style="margin-left: 20px; font-size: 12px;">{{$t('objFill.hebingjsbzts')}}</span>
@@ -390,6 +395,17 @@
                 <span slot="reference" class="text_d _font_init">{{scope.row.StatusStr}}</span>
               </template>
               </el-table-column>
+              <el-table-column v-if="msg.IsAirTicketSelect=='1'"
+              prop=""
+              :label="$t('objFill.caiwubz')"
+              show-overflow-tooltip width="120">
+              <template slot-scope="scope">                
+                <div>{{scope.row.Remark}}</div>
+                <template v-if="scope.row.vorcherInos">
+                  <div v-for="(vitem,index) in scope.row.vorcherInos">{{vitem.Content}}</div>
+                </template>
+              </template>
+              </el-table-column>
           </el-table>
             <div style="padding-bottom:15px">
                 <el-pagination background
@@ -630,7 +646,8 @@
             Status:'-1',
             IsSelectNormal: '1',//0不限 1只看未计算 2只看已结算
             sTradeDate:'',
-            eTradeDate:''
+            eTradeDate:'',
+            IsAirTicketSelect:'0'
         },
         getCompanyMsg:{  // 公司
             RB_Group_Id:'0',