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

src/assets/css/tripIndexNew2.css

@@ -209,7 +209,7 @@ html, body{
   height: 0px;
   border-bottom: 2px dashed red;
   left: 0;
-  top: 1754px;
+  top: 1744px;
   right: 0;
 }
 .UpgradedVersion2Line span{
@@ -493,7 +493,7 @@ html, body{
 }
 .travelDaysdetails-tsText{
   width: 100%;
-  padding: 28px 47px;
+  padding: 36px 47px 28px 47px;
   border-radius: 20px;
   -webkit-border-radius: 20px;
   -moz-border-radius: 20px;
@@ -873,7 +873,7 @@ html, body{
   line-height: 54px;
 }
 .travelDaysMasterMap2-box{
-  padding: 50px 35px 39px 35px;
+  padding: 50px 35px 40px 35px;
 }
 .travelDaysMasterMap2{
   height: 643px;

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -609,6 +609,7 @@ tr._item_list td:last-child {
                 <el-input v-model="msg.DMCNUM" class></el-input>
               </el-form-item>
             </el-col>
+            
             <el-col :span="4">
               <el-form-item label="领队类型：">
                 <el-select v-model="msg.LeaderType" filterable class="w150" @change="GetLeaderList()">
@@ -1359,6 +1360,16 @@ export default {
           isFrozen: true,
           componentName: "clumpingStatus"
         },
+        {
+          field: "OpName",
+          title: "操作OP",
+          width: 75,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true,
+          isFrozen: true,
+          // isFrozen: true,
+        },
         {
           field: "LeaderName",
           title: "领队",

src/components/SalesModule/customerTransfer.vue

@@ -21,17 +21,17 @@
               :label="item.name"
               :value="item.empId"
               :key="item.empId"
-            >  <div>  
-               <span>{{`${item.name}`}}</span>  
+            >  <div>
+               <span>{{`${item.name}`}}</span>
                  <span style="margin-left: 15px;">
-                      <el-tag size="mini" v-if="item.isLeave==1">离职</el-tag> 
+                      <el-tag size="mini" v-if="item.isLeave==1">离职</el-tag>
                     </span>
                     </div>
                   </el-option>
           </el-select>
         </li>
-        
-        
+
+
         <li>
           <span>
             <em>{{$t('salesModule.keyWords')}}</em>
@@ -71,7 +71,7 @@
                 <el-option label="已审核" :value="2"></el-option>
                 <el-option label="已拒绝" :value="3"></el-option>
                 <el-option label="黑名单" :value="4"></el-option>
-								
+
 							  </el-select>
         </li>
         <li>
@@ -111,7 +111,8 @@
             :value="$t('pub.searchBtn')"
             @click="resetPageIndex(),getList()"
           >
-          <el-popover width="280" v-model="layerShow" popper-class="pd20" trigger="click">
+          <el-popover width="280" v-model="layerShow" popper-class="pd20" trigger="click"
+          @show="employeeMsg.KeyWord=''"  @hide="employeeMsg.KeyWord=''">
             <div>
               <p class="fz12 fbold mt10 color333">{{$t('fnc.zhuanjiao')}}</p>
               <p class="fz12 mt30 color666">
@@ -129,10 +130,10 @@
                     :label="item.name"
                     :value="item.empId"
                     :key="item.empId"
-                  ><div>  
-               <span>{{`${item.name}`}}</span>  
+                  ><div>
+               <span>{{`${item.name}`}}</span>
                  <span style="margin-left: 15px;">
-                      <el-tag size="mini" v-if="item.isLeave==1">离职</el-tag> 
+                      <el-tag size="mini" v-if="item.isLeave==1">离职</el-tag>
                     </span>
                     </div></el-option>
                 </el-select>
@@ -253,11 +254,12 @@
           </td>
 
           <td>{{item.Remark}}</td>
-          
+
           <td>
             <el-button-group>
               <el-tooltip effect="dark" :content="$t('fnc.zhuanjiao')" placement="top-start">
-                <el-popover width="280" popper-class="pd20" trigger="click">
+                <el-popover width="280" popper-class="pd20" trigger="click"
+                @show="employeeMsg.KeyWord=''"  @hide="employeeMsg.KeyWord=''">
                   <div>
                     <p class="fz12 fbold mt10 color333">{{$t('fnc.zhuanjiao')}}</p>
                     <p class="fz12 mt30 color666">
@@ -281,10 +283,10 @@
                           :label="item.name"
                           :value="item.empId"
                           :key="item.empId"
-                        ><div>  
-               <span>{{`${item.name}`}}</span>  
+                        ><div>
+               <span>{{`${item.name}`}}</span>
                  <span style="margin-left: 15px;">
-                      <el-tag size="mini" v-if="item.isLeave==1">离职</el-tag> 
+                      <el-tag size="mini" v-if="item.isLeave==1">离职</el-tag>
                     </span>
                     </div></el-option>
                       </el-select>
@@ -723,7 +725,7 @@ export default {
       if (type == 1) {
         this.msg.jySort = this.msg.jySort === '' ? 'desc' : this.msg.jySort === 'desc' ? 'asc' : ''
         this.msg.rtsSort = ''
-        this.msg.orderBy = this.msg.jySort == '' ? '' : name + ' '+ this.msg.jySort 
+        this.msg.orderBy = this.msg.jySort == '' ? '' : name + ' '+ this.msg.jySort
       } else {
         this.msg.jySort = ''
         this.msg.rtsSort = this.msg.rtsSort = this.msg.rtsSort === '' ? 'desc' : this.msg.rtsSort === 'desc' ? 'asc' : ''
@@ -1080,6 +1082,7 @@ export default {
     },
     ckeckedOne() {
       //单选
+      this.employeeMsg.KeyWord = ''
       if (this.customerList.length > 0) {
         let dpId = this.customerList[0].split("|")[2];
         this.employeeMsg.departmentId = dpId;
@@ -1202,7 +1205,9 @@ export default {
       this.employeeMsg.RB_Branch_id = -1;
       this.employeeList2 = [];
       this.employeeMsg.IsLeave=-1;
-     
+      if(this.employeeMsg.KeyWord==''){
+        return
+      }
       this.apipost(
         "app_get_company_employee",
         this.employeeMsg,
@@ -1366,7 +1371,7 @@ console.log("query",query)
       }
     }
   },
-  
+
   mounted() {
     let userInfo = this.getLocalStorage();
     let ActionMenuCode=userInfo.ActionMenuCode;

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

@@ -795,7 +795,7 @@
               v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
               <div :id="'WarmTip_'+index" class="travelDaysdetails-tsText row relative"
                 :style="{'background':'#EFECEC'}">
-                <span class='travelDaysdetails-text0 absolute' style='line-height:32px;top: 26px;'>温馨提示：</span>
+                <span class='travelDaysdetails-text0 absolute' style='line-height:32px;top: 33px;'>温馨提示：</span>
                 <div v-html="item.WarmTipObj.Description" class="travelDaysdetails-text0-r"></div>
               </div>
             </div>
@@ -862,10 +862,10 @@
         <div style="height: 40px;"></div>
       </div>
       <div class="UpgradedVersion2Line absolute z-index3 row-ajc">
-        <span>{{pageHeight>1754?'超出内容分割到下一页':'底线'}}</span>
+        <span>{{pageHeight>1744?'超出内容分割到下一页':'底线'}}</span>
       </div>
-      <div v-if="pageHeight>(1754+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc"
-        :style="{'top': pageHeight>1754&&pageHeight<3508?pageHeight+'px':'3508px'}">
+      <div v-if="pageHeight>(1744+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc"
+        :style="{'top': pageHeight>1744&&pageHeight<3498?pageHeight+'px':'3498px'}">
         <span>底线</span>
       </div>
     </div>