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

src/App.vue

@@ -331,4 +331,7 @@
   .width100-float-l+.width100-float-l{
     margin-left: 10px;
   }
+  .c059FF6 {
+      color: #059ff6;
+    }
 </style>

src/components/FinancialModule/domestic/OPsalesCommissionUser.vue

@@ -26,7 +26,14 @@
     <div class="flexOne domesticCommissionUser">
         <div>
             <ul class="opUl">
-
+              <li>
+                <em>期数</em>
+                <el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)">
+                  <el-option label="不限" :value="0"></el-option>
+                  <el-option v-for="(item,index) in PeriodsList" :key="item.index" :label="item.Name" :value="item.Id">
+                  </el-option>
+                </el-select>
+              </li>
                 <li>
                     <em>人员</em>
                     <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
@@ -143,7 +150,7 @@
             }
             this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
             this.getList();
-            // this.getqishilist()
+            this.getqishilist()
             this.getCompanyList()//获取公司
             this.getEmployee()//人员
             this.getDerpartMent()//部门
@@ -209,7 +216,7 @@
                         if (res.data.resultCode == 1) {
                             this.PeriodsList = res.data.data;
                             if (this.PeriodsList && this.PeriodsList.length > 0) {
-                                // this.msg.Periods = Number(this.PeriodsList[0].Id)
+                                this.msg.PeriodId = Number(this.PeriodsList[0].Id)
                             }
 
                         } else {
@@ -229,7 +236,7 @@
                 this.$router.push({
                     path: path,
                     query: {
-                        PeriodId: this.$route.query.PeriodId,
+                        PeriodId: this.msg.PeriodId,
                         UserId:item.UserId,
                         RB_Branch_Id:item.RB_Branch_Id,
                         RB_Department_Id:item.RB_Department_Id,

src/components/FinancialModule/domestic/OPsalesCommissiondetails.vue

@@ -282,13 +282,14 @@
           );
         },
         getqishilist() {
+          // opcommission_GetGNOPCommissionPeriodsList
           this.apipost(
-            "opcommission_GetGNOPCommissionPeriodsList", {},
+            "sellcommission_GetGNCommissionPeriodsList", {},
             res => {
               if (res.data.resultCode == 1) {
                 this.PeriodsList = res.data.data;
-                if (this.PeriodsList && this.PeriodsList.length > 0) {
-                  // this.msg.Periods = Number(this.PeriodsList[0].Id)
+                if (!this.msg.PeriodId&&this.PeriodsList && this.PeriodsList.length > 0) {
+                  this.msg.PeriodId = Number(this.PeriodsList[0].Id)
                 }
 
               } else {

src/components/SalesModule/Common/productOrderList.vue

@@ -485,7 +485,9 @@
   <div class="productQueryList" v-loading="loading">
     <div style="margin-bottom: 10px">
       <el-checkbox v-model="allCheck" @change="changeSelect">全选</el-checkbox>
-      <el-button style="margin-left: 10px" type="primary" size="small" @click="eidtItems">批量操作</el-button>
+      <el-button class="normalBtn" style="margin-left: 10px" type="primary" size="small" @click="eidtItems">批量操作</el-button>
+      <el-button class="hollowFixedBtn" style="margin-left: 10px" type="" size="small" @click="setDefaultOp"
+      :loading="loadingOP">设置默认OP</el-button>
     </div>
     <ul v-if="list.length != 0">
       <li v-for="(item, index) in list" :key="index">
@@ -608,9 +610,10 @@
 </template>
 <script>
 export default {
-  props: ["loading", "list", "pagesTitle", "isVisa"],
+  props: ["msg","loading", "list", "pagesTitle", "isVisa"],
   data() {
     return {
+      loadingOP: false,
       editNum: false,
       showDialog: false,
       queryData: {},
@@ -682,6 +685,34 @@ export default {
     },
   },
   methods: {
+    setDefaultOp(){
+        this.dataDui()
+        if(!this.msg.StartTime||!this.msg.EndTime){
+          this.$message.info('请选择出发日期开始时间、结束时间！')
+          return
+        }
+        this.loadingOP = true
+        this.apipost(
+          "travel_post_UpdateTravelPriceOPInfo",
+          this.msg,
+          (res) => {
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
+              this.loadingOP = false
+            }else{
+              this.Error(res.data.message)
+              this.loadingOP = false
+            }
+          },err=>{this.loadingOP = false})
+      },
+      // 结束日期不能大于开始日期
+      dataDui() {
+              if (this.msg.StartTime > this.msg.EndTime && this.msg.EndTime !== "") {
+          this.$message.error("结束日期不能大于开始日期");
+          this.msg.EndTime = "";
+          return
+        }
+      },
     changeSelect() {
       this.list.forEach((element) => {
         element.check = this.allCheck;

src/components/SalesModule/productOrderList.vue

@@ -311,6 +311,7 @@
               resetPageIndex();
             "
           />
+
         </li>
       </ul>
     </div>
@@ -318,7 +319,7 @@
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
     <!-- 产品列表 -->
-    <productOrderList :loading="loading" :list="list" :isVisa="isVisa" @success="reSearchPage" :pagesTitle="pagesTitle"></productOrderList>
+    <productOrderList :msg="msg" :loading="loading" :list="list" :isVisa="isVisa" @success="reSearchPage" :pagesTitle="pagesTitle"></productOrderList>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -1753,7 +1753,6 @@
       }
       this.CurrentUserInfo = userInfo
 
-      this.$route.query.tcmun = this.$route.query.tcmun
       if (this.$route.query.tcmun) {
         this.queryMsg.TCNUM = this.$route.query.tcmun
       }

src/components/sale/ExpectedCommission.vue

@@ -35,6 +35,10 @@
   }
   .CommissionLadder.Line{
     margin: 0 0 10px 0;
+
+  }
+  .border-bottom{
+    border-bottom: 1px dashed #BDBDBD;
   }
   .CommissionLadder .title{
     font-size: 16px;
@@ -164,7 +168,7 @@
             </div>
           </div>
           <div style="display: flex;">
-            <div class="CommissionLadder Line" style="margin: 0 0 0 0;">
+            <div class="CommissionLadder Line border-bottom" style="margin: 0 0 0 0;">
               <div class="title">
                 <span>日本线小包团、落地团以及单项提成</span>
               </div>
@@ -190,7 +194,7 @@
                 <progressComm :commissionratioList="JapaneseProfit"></progressComm>
               </div>
             </div>
-            <div class="CommissionLadder Line" style="margin: 0 10px 0 10px;">
+            <div class="CommissionLadder Line border-bottom" style="margin: 0 10px 0 10px;">
               <div class="title">
                 <span>欧洲线小包团、落地团以及单项提成</span>
               </div>
@@ -216,7 +220,7 @@
                 <progressComm :commissionratioList="EuropeProfit"></progressComm>
               </div>
             </div>
-            <div class="CommissionLadder Line" style="margin: 0 0 0 0;">
+            <div class="CommissionLadder Line border-bottom" style="margin: 0 0 0 0;">
               <div class="title">
                 <span>其他线小包团、落地团以及单项提成</span>
               </div>

src/components/sale/components/OrderList.vue

@@ -6,7 +6,7 @@
           <el-table-column width="200" prop="CreateTimeStr" label="订单Id" show-overflow-tooltip>
             <template slot-scope="scope">
               <div>
-                <p class="cursor-pointer c059FF6 fz18 row-c" @click="goDetails(scope.row)">
+                <p class="cursor-p c059FF6 fz18 row-c" @click="goDetails(scope.row,1)">
                   <el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag>
                   <span>{{scope.row.OrderId}}</span>
                 </p>
@@ -17,8 +17,9 @@
           <el-table-column width="200" prop="CreateTimeStr" label="团号" show-overflow-tooltip>
             <template slot-scope="scope">
               <div>
-                <p class=" fz14" :class="{'cursor-pointer c059FF6':scope.row.OrderType==2}"
-                  @click="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}</p>
+                <p class=" fz14" :style="{'color': scope.row.OrderType==2?'#059FF6':'',
+                'cursor': scope.row.OrderType==2?'pointer':''}"
+                  @click="scope.row.OrderType==2?goDetails(scope.row,2):''">{{scope.row.TCNUM}}</p>
                 <p>出发日期：{{scope.row.StartDate}}</p>
               </div>
             </template>
@@ -106,7 +107,35 @@
 
     },
     methods: {
+      goDetails(row,type){
+        let name
+        if(type==1) {
+          name = 'erpCustomerOrderDay'
+          this.$router.push({
+          path: name,
+          query: {
+            OrderId: row.OrderId,
+              blank: 'y',
+              tab: ''
+            }
+          });
+        }else if(type==2){
+          if (row.IsOneDayOrder == 1) {
+            name = 'groupTourOrderByTuanOne'
+          } else {
+            name = 'groupTourOrderByTuan'
+          }
+          this.$router.push({
+            name: name,
+            query: {
+              id: row.TCID,
+              tcmun: row.TCNUM,
+              blank: "y",
+            }
+          });
+        }
 
+      }
     }
   };
 

src/components/temp/components/OrderList.vue

@@ -3,35 +3,26 @@
       <el-table border ref="multipleTable" :data="OrderList"
         :default-sort="{prop: 'null', order: 'null'}"
         :sort-by="['Money','Income','PreferTipAmount','PlatformTax','Refund','CostMoney','OrderProfit','DueInMoney']">
-          <el-table-column prop="Title" label="团名">
-          </el-table-column>
-          <el-table-column width="200" prop="CreateTimeStr" label="团号" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <div>
-                <p class=" fz14" :class="{'cursor-pointer c059FF6':scope.row.OrderType==2}"
-                  @click="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}({{scope.row.TCID}})</p>
-                <p>出团日期：{{scope.row.StartDate}}</p>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="GuestNum" label="收客人数">
-          </el-table-column>
-          <el-table-column label="类型">
-            <template slot-scope="scope">
-              {{scope.row.TeamTypeName}}/{{scope.row.PriceTeamTypeName}}
-            </template>
-          </el-table-column>
-          <el-table-column label="线路/系列" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.LineName}}/{{scope.row.LtName}}
-            </template>
-          </el-table-column>
-          <el-table-column prop="StateName" label="状态" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span>{{scope.row.Status}}</span>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-table-column width="200" prop="CreateTimeStr" label="团号" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div>
+              <p class="cursor-pointer fz14" style="color: #059FF6;cursor: pointer;"
+                @click="goDetails(scope.row)">{{scope.row.TCNUM}}({{scope.row.TCID}})</p>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="StartDate" label="出团日期"></el-table-column>
+        <el-table-column label="类型">
+          <template slot-scope="scope">
+            {{scope.row.TeamTypeName}}/{{scope.row.PriceTeamTypeName}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="LineName" label="线路" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="LtName" label="系列" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="Title" label="团名"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="GuestNum" label="收客人数"></el-table-column>
+        <el-table-column prop="Status" label="状态"></el-table-column>
+      </el-table>
     </div>
 </template>
 <script>
@@ -63,7 +54,26 @@
 
     },
     methods: {
-
+      goDetails(row){
+        let name
+        if(row.TeamType==0){
+          name = 'TravelControlList'
+        }else if(row.TeamType==1){
+          name = 'TravelControlListSale'
+        }else if(row.TeamType==2){
+          name = 'oneDayTrip'
+        }
+        this.$router.push({
+          path: name,
+          query: {
+            TCID: row.TCID,
+            id: row.TCID,
+            tcmun: row.TCNUM,
+                blank: 'y',
+                tab: ''
+              }
+          });
+      }
     }
   };
 

src/components/temp/components/progressComm.vue

@@ -136,7 +136,7 @@
             }
           }else if(this.type==1){
             return () => {
-              return `${row.EndValue>999?'>'+row.StartValue:row.StartValue+' - '+row.EndValue}人`
+              return `${row.EndValue>999?'>'+row.StartValue:row.StartValue+' - '+row.EndValue}团`
             }
           }
 

src/components/temp/operation.vue

@@ -193,6 +193,7 @@
   .ladder-list{
     flex: 1;
     min-width: 460px;
+    max-width: 460px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
@@ -225,12 +226,12 @@
                 <el-col :span="12" style="padding-right: 0;">
                   <div class="el-col-div ownScrollbarStyle PersonalData_l" style="height: auto;background: #fff;">
                     <div class="l_top" style="position: relative;">
-                      <img v-if="data.icon !=null && data.icon !='' " :src="data.icon" alt="" class="tx_img"
+                      <img v-if="userInfo.Icon !=null && userInfo.Icon !='' " :src="userInfo.Icon" alt="" class="tx_img"
                         :onerror='defaultHeadImg'>
                       <img v-else src="../../assets/img/default_head_img.jpg" alt="" alt="" class="tx_img">
                       <div class="p_name" style="margin-top:20px">
-                        <span>{{data.emName}}</span>
-                        <span>{{data.postName}}</span>
+                        <span>{{userInfo.emName}}</span>
+                        <span>{{userInfo.PostName}}</span>
                       </div>
                       <div style="display: flex;justify-content: space-between;">
                         <div style="cursor: pointer;cursor: pointer;position: relative;" class="royalty" @click="goAnticipate(1)">
@@ -278,7 +279,8 @@
                   </div>
                 </el-col>
                 <el-col :span="12" style="padding-right: 0;">
-                  <div class="el-col-div ownScrollbarStyle PersonalData_l" style="height: 158px;background: #fff;">
+                  <div class="el-col-div ownScrollbarStyle PersonalData_l"
+                  style="height: 158px;background: #fff;position: relative;">
                     <div class="title-Month">
                       <template v-for="(item ,index) in MonthList">
                         <input type="button" :key="index"
@@ -295,7 +297,8 @@
                         <p><span>总预期奖金：</span><span>{{CommissionJJ}}</span></p>
                         <p><span>总预期提成：</span><span>{{CommissionTC}}</span></p>
                     </div>
-                    <p style="color: red;font-size: 14px;text-align: right;">注:操作提成需已结团后方可发放提成，以下预期提成均为已结团统计</p>
+                    <p style="color: red;font-size: 14px;text-align: right;position: absolute;bottom: 10px;
+                    right: 20px;">注:操作提成需已结团后方可发放提成，以下预期提成均为已结团统计</p>
                   </div>
                   </div>
                 </el-col>
@@ -328,18 +331,19 @@
                   </div>
                 </template>
                 <div class="border-bottom" v-if="isVisa">
-                <p style="font-size: 16px;font-weight: bold;color: black;padding: 10px 0 0 0;">小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p>
+                <p style="font-size: 16px;font-weight: bold;color: black;padding: 10px 0 0 0;"
+                v-if="item.BranchList[0].GradeRuleList.length>0">小包团{{!isBranchCompany?'、落地团':''}}以及单项提成</p>
                   <div class="ladder-form" style="margin-top: 3px;">
                     <div class="ladder-form-box">
-                      <template v-for="(s,indexs) in item.BranchList">
-                      <div class="ladder-list">
+                      <template v-if="item.BranchList[0].GradeRuleList.length>0">
+                      <div class="ladder-list" v-for="(s,indexs) in item.BranchList">
                         <div class="ladder-title">{{s.BranchName}}</div>
                         <div class="CommissionInfor">
                           <span>
-                            当月团数：<span>{{s.TravelNum}}</span>
+                            团数：<span>{{s.TravelNum}}</span>
                           </span>
                           <span>
-                          单项订单数：<span>{{s.SingleOrderNum}}</span>
+                          单项单数：<span>{{s.SingleOrderNum}}</span>
                           </span>
                           <span>
                             预期利润：<span>{{s.Profit}}</span>
@@ -356,10 +360,10 @@
                       </div>
                       </template>
                       <div class="ladder-list">
-                        <div class="ladder-title">额外奖励 (不含落地团)</div>
+                        <div class="ladder-title">额外奖励 {{isBranchCompany?'(需独立成团、不含落地团)':''}}</div>
                         <div class="CommissionInfor">
                           <span>
-                            当月团数：<span>{{item.TravelAward.TravelNum}}</span>
+                            团数：<span>{{item.TravelAward.TravelNum}}</span>
                           </span>
                           <span>
                             奖励：<span>{{item.TravelAward.AwardMoney}}</span>
@@ -402,7 +406,7 @@
                   </div>
                 </div>
                 <div class="commissionProject" style="display: flex;flex-wrap: wrap;border: 0;"
-                v-if="(isVisa||!isBranchCompany)&&!index">
+                v-if="(isVisa&&!isBranchCompany)&&!index">
                   <div>
                     <div style="display: flex;">
                       <div>
@@ -410,7 +414,7 @@
                         <span class="ProjectTitle">助理奖励
                           </span>
                         </div>
-                        <p>系列团助理op人头提成</p>
+                        <p>系列团、小包团助理op人头奖励</p>
                         <div class="groupTourOrder">
                             <span>报名人数：<span>{{ZLOPAward.TravelPeopleNum}}</span></span>
                             <span>单价：<span>{{ZLOPAward.TravelUnitPrice}}元/人</span></span>
@@ -435,7 +439,7 @@
               </div>
             </div>
             </template>
-            <div style="display: flex;margin: 10px 0 10px 0;">
+            <div style="display: flex;margin: 10px 0 10px 0;" v-if="isVisa">
               <div class="CommissionLadder Line" style="width: 100%;margin: 0 0 0 0;padding: 16px 20px 0 20px;flex-shrink: 0;">
                 <div style="display: flex;justify-content: space-between;">
                   <span style="font-weight: bold;font-size: 16px;">国内提成
@@ -554,6 +558,7 @@
 	export default {
 		data (){
 			return{
+        userInfo: {},
         isBranchCompany: false,
         isVisa: false,
         jianjin: 0,
@@ -740,7 +745,7 @@
         this.apipost('opcommission_GetOPNotGroupOutTravelList', {},
           res => {
             if (res.data.resultCode == 1) {
-              let data = res.data.data.pageData?res.data.data.pageData:[]
+              let data = res.data.data?res.data.data:[]
               if(data&&data.length>5){
                 for(let i=0;i<5;i++){
                   this.OrderList.push(data[i])
@@ -758,24 +763,9 @@
       },
       // 近期提成
       iWorkbench() {
-        let Info
-        this.apipost('customerIndex_post_GetMySelfSellInfo', {}, res => {
+        this.apipost('opcommission_GetLatelyOPCommission', {}, res => {
           if (res.data.resultCode == 1) {
             this.data = res.data.data;
-            Info = res.data.data
-            if(Info.postName.indexOf('签证')==-1){
-              this.isVisa = true
-            }
-            this.apipost('opcommission_GetLatelyOPCommission', {}, res => {
-              if (res.data.resultCode == 1) {
-                this.data = res.data.data;
-                this.data.icon = Info.icon
-                this.data.emName = Info.emName
-                this.data.postName = Info.postName
-              } else {
-                this.$message.error(res.data.message)
-              }
-            }, err => {})
           } else {
             this.$message.error(res.data.message)
           }
@@ -814,6 +804,10 @@
       }
 
       let userInfo = this.getLocalStorage();
+      this.userInfo = userInfo
+      if(userInfo.PostName.indexOf('签证')==-1){
+        this.isVisa = true
+      }
       if(userInfo.RB_Branch_id>0){
         this.isBranchCompany = true
       }