页面修改

src/components/index.vue

@@ -214,7 +214,8 @@
                   CRM系统
                   <i class="iconfont icon-right1"></i>
                 </el-dropdown-item>
-                <el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true" v-if="userInfo&&userInfo.DepartName&&userInfo.DepartName.indexOf('操作部')!=-1 ||(userInfo.RB_Branch_id == 1245
+                <el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true"
+                v-if="userInfo&&userInfo.DepartName&&(userInfo.DepartName.indexOf('操作部')!=-1 || userInfo.DepartName.indexOf('总部财务部')!=-1) ||(userInfo.RB_Branch_id == 1245
                 && userInfo.DepartName.indexOf('引流')==-1
                 && userInfo.DepartName.indexOf('市场')==-1)">
                   <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
@@ -1195,8 +1196,8 @@
     <!-- 投票 -->
     <Voting v-show="VotingShow" :NowVoteData="NowVoteData" :NowVoteType="NowVoteType"></Voting>
     <!-- 机票未绑团提示 -->
-    <unbundlingMessage v-if="unbundlingVisible" :UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false">
-    </unbundlingMessage>
+    <unbundlingMessage v-if="unbundlingVisible"
+    :UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false"></unbundlingMessage>
   </div>
 </template>
 
@@ -1235,7 +1236,7 @@
     data() {
       return {
         UnboundDate: {},
-        unbundlingVisible: false, //未绑团提醒
+        unbundlingVisible: false,//未绑团提醒
         b2bDomain: "",
         useRed: false,
         //提成账单弹窗
@@ -1840,17 +1841,17 @@
       this.GetSupperOrderEditAuth();
 
       // 获取未绑定团的数据
-      if (!localStorage.getItem("UnboundDateTime") ||
-        (localStorage.getItem("UnboundDateTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))) {
+      if(!localStorage.getItem("UnboundDateTime")||
+      (localStorage.getItem("UnboundDateTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
         this.GetTravelAirNotBind()
-      } else {
-        if (localStorage.getItem("UnboundDate")) {
-          if (this.userInfo.DepartName.indexOf("操作部") != -1 ||
-            (this.userInfo.RB_Branch_id == 1245 &&
-              this.userInfo.DepartName.indexOf("引流") == -1 &&
-              this.userInfo.DepartName.indexOf("市场") == -1)) {
+      }else{
+        if(localStorage.getItem("UnboundDate")){
+          if(this.userInfo.DepartName.indexOf("操作部")!=-1 || this.userInfo.DepartName.indexOf("总部财务部")!=-1 ||
+            (this.userInfo.RB_Branch_id == 1245
+            && this.userInfo.DepartName.indexOf("引流")==-1
+            && this.userInfo.DepartName.indexOf("市场")==-1)){
             this.UnboundDate = JSON.parse(localStorage.getItem("UnboundDate"))
-          } else {
+          }else{
             localStorage.removeItem("UnboundDate");
             localStorage.removeItem("UnboundDateTime");
           }
@@ -1893,18 +1894,18 @@
     },
     methods: {
       // 获取未绑定团的数据
-      GetTravelAirNotBind() {
+      GetTravelAirNotBind(){
         this.UnboundDate = {}
-        if (this.userInfo.DepartName.indexOf("操作部") != -1 ||
-          (this.userInfo.RB_Branch_id == 1245 &&
-            this.userInfo.DepartName.indexOf("引流") == -1 &&
-            this.userInfo.DepartName.indexOf("市场") == -1)) {
+        if(this.userInfo.DepartName.indexOf("操作部")!=-1 || this.userInfo.DepartName.indexOf("总部财务部")!=-1 ||
+        (this.userInfo.RB_Branch_id == 1245
+        && this.userInfo.DepartName.indexOf("引流")==-1
+        && this.userInfo.DepartName.indexOf("市场")==-1)){
           this.apipost(
             "opcommission_GetTravelAirNotBind", {},
             res => {
-              if (res.data.resultCode == 1) {
-                if ((res.data.data.TravelList && res.data.data.TravelList.length > 0) ||
-                  (res.data.data.AirList && res.data.data.AirList.length > 0)) {
+              if(res.data.resultCode==1){
+                if((res.data.data.TravelList&&res.data.data.TravelList.length>0)
+                ||(res.data.data.AirList&&res.data.data.AirList.length>0)){
                   localStorage.setItem("UnboundDate", JSON.stringify(res.data.data));
                   localStorage.setItem("UnboundDateTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
                   this.UnboundDate = res.data.data
@@ -1937,7 +1938,7 @@
       //测试方法
       testEmp() {
         var postMsg = {
-          EmPassword: "ae0ZVCcnM88kZ349OxsCAA=="
+          EmPassword: "jj+n0yVvDg2xM3nxu2v1oA=="
         };
         this.apipost(
           "admin_get_AnalysisPassword", postMsg,

src/components/sale/ExpectedCommission.vue

@@ -316,7 +316,7 @@
               <div style="display: flex;justify-content: space-between;">
                 <span style="font-weight: bold;font-size: 16px;">国内提成
                   <span style="font-size: 13px;color: red;margin-left: 20px;">
-                    注:国内提成需结团后方可发放提成，以实际结团为准，此处只提供参考</span>
+                    注:国内提成需结团后方可发放提成，以实际结团为准，此处只提供参考；（再次注意，人数奖励是分日本、欧洲、其他线三个模块独立计算）</span>
                 </span>
                 <div>
                   <detailsButtom :type="2" :obj="commissionMsg" :Month="Month"/>
@@ -423,8 +423,8 @@
         <div style="padding: 10px 0 0 0;color: #E95252;line-height: 30px;width: 50%;white-space: wrap;">
           <p style="font-weight: bold;">出境提成提醒：</p>
           1.日本线.韩国线.东南亚线.南亚线散拚.与单团提成保持1%提成不变</br>
-          2.增加境外散拚提成(日本线.欧洲线分别奖励计算)</br>
-          3.增加人头奖励(日本线与其他.欧洲线2种)</br>
+          2.增加境外散拚提成(日本线.欧洲线.其他线分别奖励计算)</br>
+          3.增加人头奖励(日本线.欧洲线.其他线3种)</br>
           4.所有业绩结算皆以出发日.尾款收齐为基准</br>
           5.人头奖励包不含门票、包车、国内游、小包团以及单团(独立成团)</br>
           6.人头奖励每月至少20条方可进行奖励!</br>