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

src/components/FinancialModule/ReportForm/MonthReport.vue

@@ -629,7 +629,7 @@ export default {
     let userInfo = this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
     this.userId = userInfo.EmployeeId;
-    this.msg.OutBranchId=-1;
+    this.msg.OutBranchId=0;
     this.msg.LineId=14;
 
     this.getCompanyList();

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -508,7 +508,8 @@ tr._item_list td:last-child {
                 <el-option value="2" label="国际机票"></el-option>
                 <el-option value="4" label="国内票务"></el-option>
                 <el-option value="5" label="散卖机票"></el-option>
-                <el-option value="6" label="地接部专户"></el-option>
+                <el-option value="6" label="日本地接部专户"></el-option>
+                <el-option value="7" label="老挝地接部专户"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -645,6 +646,7 @@ Vue.component("TCNUMJump", {
   <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer" v-if="rowData.DataType===7">{{rowData.TCNUM}}</span>
   </div>`,
   props: {
     rowData: {

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1023,7 +1023,7 @@ export default {
                     }
                     if (x.Type===4){
                       AccList.forEach(y=>{
-                        if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池' || y.Name=='地接部专户'){
+                        if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池' || y.Name=='地接部专户'||y.Name=='老挝购物店资金池'){
                           newAccList.push(y)
                         }
                       })