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

src/components/TravelManager/Lxy/directorOrderList.vue

@@ -213,7 +213,7 @@
                         v-if="TenantId==1">
                         <el-dropdown trigger="click" style="margin-left: 50px">
                           <span class="el-dropdown-link">{{$t('objFill.preparedocument')}}</span>
-                          <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                          <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                             <el-dropdown-item @click.native="goCollection(item,list)">
                               {{$t('objFill.v101.shouruzhid')}}
                             </el-dropdown-item>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1436,7 +1436,7 @@
                       <span class="el-dropdown-link">{{ $t("pub.updateMsg") }}
                         <i class="el-icon-arrow-down el-icon--right"></i>
                       </span>
-                      <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                      <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                         <template v-if="
                             item.RelationPriceList && item.RelationPriceList.length > 0
                           ">
@@ -1516,7 +1516,7 @@
                     <span class="el-dropdown-link">{{ $t("Operation.Op_moreOperation") }}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <el-dropdown-item @click.native="SetGroupRecommendType(item, 1)" v-if="
                           item.b2b &&
                           item.GroupRecommendType == 0 &&

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1042,7 +1042,7 @@
                     <span class="el-dropdown-link">{{$t('pub.updateMsg')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
                         <el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
                           {{$t('Operation.Op_xilieModyfi')}}</el-dropdown-item>
@@ -1112,7 +1112,7 @@
                     <span class="el-dropdown-link">{{$t('Operation.Op_moreOperation')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
                         {{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item>
                       <el-dropdown-item @click.native="goUrlR(item)">

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -739,7 +739,7 @@
                     <span class="el-dropdown-link">{{$t('pub.updateMsg')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
                         <el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
                           {{$t('Operation.Op_xilieModyfi')}}
@@ -812,7 +812,7 @@
                     <span class="el-dropdown-link">{{$t('Operation.Op_moreOperation')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
                         {{$t('Operation.Op_shouzhiDetail')}}
                       </el-dropdown-item>

src/components/administrative/ViittoCommission.vue

@@ -27,6 +27,10 @@
                   <el-button size="mini" type="danger" style="border-radius:14px" 
                       @click="exportExcel">{{$t('objFill.v101.administrative.daochuygztc')}}</el-button>
               </li>
+              <li >
+                  <el-button size="mini" type="danger" style="border-radius:14px" 
+                      @click="exportExcel2">导出财务单驳回记录</el-button>
+              </li>
       </ul>
     </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
@@ -100,6 +104,23 @@
           this.Error(this.$t('objFill.v101.administrative.qingxuanzqis'));
         }
  
+    },
+    exportExcel2: function () {
+        if(this.Periods&&this.Periods!=''&&this.Periods!=null&&this.Periods!=undefined){
+          let msg = {
+            RB_Group_Id: this.getLocalStorage().RB_Group_id,
+            Periods: this.Periods,
+      }
+      let text ='财务单驳回记录'+this.Periods+".xls"
+      this.GetLocalFile(
+        "Commission_get_GetMarkPenaltyToExcel",
+        msg,
+        text
+      );
+        }else{
+          this.Error(this.$t('objFill.v101.administrative.qingxuanzqis'));
+        }
+ 
     },
       goUrlZD(){
         let orderObj = {

src/plug/index.js

@@ -124,6 +124,7 @@ export default {
         let ocrUrl = "http://192.168.5.46:8888";
         // domainUrl = "http://192.168.5.214";
         domainUrl = "http://192.168.5.39:8083"
+        // domainUrl = "http://192.168.5.204:8030"
         // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";