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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1791,6 +1791,16 @@
               tab: "同业提成详情"
             }
           });
+        } else if (GetDetail.OtherType == 73) {//OP提成详情
+          this.$router.push({
+            name: 'OpComPersonDetails',
+            query: {
+              PeriodId: GetDetail.ReFinanceId,
+              OutBranchId: GetDetail.RB_Branch_Id,
+              blank: "y",
+              tab: "同业提成明细"
+            }
+          });
         } else {
           this.$router.push({
             name: 'CommissionDetail',

src/components/FinancialModule/OPExtraReward/CommissionRule.vue

@@ -114,14 +114,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="团签奖励" prop="TravelVisaMoney">
-                <div class="Impression-ratio-box">
-                  <el-input type="Number" v-model="form.TravelVisaMoney" clearable></el-input>
-                  <span class="Impression-ratio-right">/人</span>
-                </div>
-              </el-form-item>
-            </el-col>
             <el-col :span="8" v-if="form.SingleVisaWay">
               <el-form-item :label="form.SingleVisaWay==1?'人头奖金':'提成比例'" prop="SingleVisaRate"
               :rules="form.SingleVisaWay==1?rules.SingleVisaRate2:rules.SingleVisaRate">
@@ -132,7 +124,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="签证奖励" prop="TravelVisaZLMoney">
+              <el-form-item label="团签奖励" prop="TravelVisaMoney">
+                <div class="Impression-ratio-box">
+                  <el-input type="Number" v-model="form.TravelVisaMoney" clearable></el-input>
+                  <span class="Impression-ratio-right">/人</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="助理奖励" prop="TravelVisaZLMoney">
                 <div class="Impression-ratio-box">
                   <el-input type="Number" v-model="form.TravelVisaZLMoney" clearable></el-input>
                   <span class="Impression-ratio-right">/人</span>
@@ -424,7 +424,7 @@
           SingleVisaRate: item.SingleVisaRate,
           TravelVisaMoney: item.TravelVisaMoney,
           TravelVisaZLMoney: item.TravelVisaZLMoney,
-          CountryId: item.CountryId>0?item.CountryId:null,
+          CountryId: item.CountryId>0||item.CountryId==0?item.CountryId:null,
           ProfitList: item.ProfitList,
           ExtraList: item.ExtraList,
         }
@@ -452,7 +452,7 @@
       // 点击确定
       RulesOk(formName) {
         this.form.LineIds = this.form.LineIdList.join(',')
-        this.form.CountryId = this.form.CountryId?this.form.CountryId:-1
+        // this.form.CountryId = this.form.CountryId||this.form.CountryId==0?this.form.CountryId:-1
         this.$refs[formName].validate((valid) => {
           if (valid) {
             this.ruleLoading = true
@@ -538,8 +538,8 @@
       },
     // 线路
     getLineList() {
-        this.apipost("line_post_GetAllList_V2", {
-          LineDirection: 0
+        this.apipost("line_post_GetAllList_V3", {
+          IsShow: -1
         }, res => {
           if (res.data.resultCode == 1) {
             this.LineList = res.data.data;

src/components/FinancialModule/OPRules.vue

@@ -116,14 +116,15 @@
         <el-form-item label="描述">
           <el-input class="w220" v-model="form.Description"></el-input>
         </el-form-item>
-
-        <el-form-item label="线控" prop="XKEmployeeIdList">
+        <!-- XKEmployeeIdList -->
+        <el-form-item label="线控" prop="">
           <el-select class="multiple_input" filterable multiple collapse-tags v-model="form.XKEmployeeIdList">
             <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
               :key="item.EmployeeId"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="助理" prop="ZLEmployeeIdList">
+        <!-- ZLEmployeeIdList -->
+        <el-form-item label="助理" prop="">
           <el-select class="multiple_input" filterable multiple collapse-tags v-model="form.ZLEmployeeIdList">
             <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
               :key="item.EmployeeId"></el-option>

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -151,7 +151,7 @@
           <th style="width: 100px;">线路</th>
           <th style="width: 100px;">是否欧洲</th>
           
-          <th style="width: 100px;">订单人数</th>
+          <th style="width: 100px;">订单利润</th>
           <th style="width: 100px;">团队总人数</th>
           <th style="width: 100px;">团队利润</th>
           <th style="width: 100px;">提成方式</th>

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1049,6 +1049,7 @@ export default {
            e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
        },
        AddFinancial(z){  //保存
+        
            //    手配费参数
             if(this.is_HandFee){
                 if(!this.HandFee.BranchId){
@@ -1225,6 +1226,7 @@ export default {
            this.msg.ReTCID=this.czmsg.ReTCID;
        }
        
+            // console.log(this.orderObj.OtherType,this.commissionObj,this.tradeObj,this.crmOrderObj,this.msg,'---')
            this.apipost('Financial_post_Set',this.msg,res=>{
                if(res.data.resultCode==1){
                  //清除旅客名单数据
@@ -1984,7 +1986,6 @@ export default {
            this.tradeObj = JSON.parse(this.$route.query.tradeObj);
        } else{
            this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
-           
        }
        this.isFrompassenger = this.orderObj ? this.orderObj.isFromPassenger : undefined;
        let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0

src/router/config.js

@@ -5072,7 +5072,7 @@ export default {
             {
               path: '/OPcommissionPeriods',
               name: 'OPcommissionPeriods',
-              component: resolve => require(['@/components/FinancialModule/OPcommissionPeriods'], resolve),
+              component: resolve => require(['@/components/FinancialModule/OpCommission/OPcommissionPeriods'], resolve),
               meta: {
                 title: 'op提成'
               }
@@ -5153,7 +5153,7 @@ export default {
             {
               path: '/OPCommissionDetail',
               name: 'OPCommissionDetail',
-              component: resolve => require(['@/components/FinancialModule/OPCommissionDetail'], resolve),
+              component: resolve => require(['@/components/FinancialModule/OpCommission/OPCommissionDetail'], resolve),
               meta: {
                 title: 'op提成详情'
               }
@@ -5161,7 +5161,7 @@ export default {
             {
               path: '/OpComPersonDetails',
               name: 'OpComPersonDetails',
-              component: resolve => require(['@/components/FinancialModule/OpComPersonDetails'], resolve),
+              component: resolve => require(['@/components/FinancialModule/OpCommission/OpComPersonDetails'], resolve),
               meta: {
                 title: 'op提成明细'
               }