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

src/components/FinancialModule/RecPayQuery.vue

@@ -903,7 +903,7 @@ export default {
             this.msg.AccountType=15;
             this.msg.TradeWay=4;
             this.getAccountList(this.msg.AccountType,this.msg.TradeWay)
-            this.msg.BankID=14;
+            this.msg.BankID=this.$route.query.BankID;
             this.transactionDate[0]=this.$route.query.StartDate;
             this.transactionDate[1]=this.$route.query.StartDate;
         }

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -522,8 +522,12 @@ tr._item_list td:last-child {
                 <el-option value="4" label="国内票务"></el-option>
                 <el-option value="5" v-if="isShowType" label="散卖机票"></el-option>
                 <el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
+                <el-option value="12" v-if="isShowType" label="日本地接部专户(人民币)"></el-option>
                 <el-option value="7" v-if="isShowType" label="老挝地接部专户"></el-option>
                 <el-option value="8" label="票务部专户"></el-option>
+                <el-option value="9" v-if="isShowType" label="酒店住宿"></el-option>
+                <el-option value="10" v-if="isShowType" label="景点门票"></el-option>
+                <el-option value="11" v-if="isShowType" label="餐厅美食"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -649,8 +653,11 @@ Vue.component("TCIDJump", {
     <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
-    <span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===6||rowData.DataType===7||rowData.DataType===12">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===8">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===9">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===10">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===11">{{rowData.TCID}}</span>
   </div>
   
   `,
@@ -689,7 +696,11 @@ Vue.component("TCNUMJump", {
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===12" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===8" @click="goAIR('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===9">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===10">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===11">{{rowData.TCNUM}}</span>
   </div>`,
   props: {
     rowData: {
@@ -712,6 +723,9 @@ Vue.component("TCNUMJump", {
       if(rowData.DataType===7){
         BankID=15;
       }
+      if(rowData.DataType===12){
+        BankID=19;
+      }
       if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){
         StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
       }