pak返佣

src/assets/common/lang/EN/fill.js

@@ -8127,6 +8127,10 @@ export const obj = {
     yijihuo: ' Activated ',
     weijihuo: ' Not activated ',
     shilingpi: 'Number of issuances by embassies and consulates',
+    zuixiaors: 'Minimum number of people ',
+    qingsrzxrs: 'Please enter minimum number of people ',
+    qingsrzdrs: 'Please enter maximum number of people ',
+    chakpakfy: 'View pak rebate information ',
   },
   //#endregion
 }

src/assets/common/lang/Japan/fill.js

@@ -8127,6 +8127,10 @@ export const obj = {
     yijihuo: 'アクティブ化されています',
     weijihuo: '非アクティブ',
     shilingpi: '領事館への発行回数',
+    zuixiaors: '最小人数',
+    qingsrzxrs: '最小人数を入力してください',
+    qingsrzdrs: '最大人数を入力してください',
+    chakpakfy: '査看pak帰行情報',
   },
   //#endregion
 }

src/assets/common/lang/zhCN/fill.js

@@ -8127,6 +8127,10 @@ export const obj = {
     yijihuo: '已激活',
     weijihuo: '未激活',
     shilingpi: '使领馆签发次数',
+    zuixiaors: '最小人数',
+    qingsrzxrs: '请输入最小人数',
+    qingsrzdrs: '请输入最大人数',
+    chakpakfy: '查看pak返佣信息',
   },
   //#endregion
 }

src/assets/common/lang/zhTW/fill.js

@@ -8127,6 +8127,10 @@ export const obj = {
     yijihuo: '已激活',
     weijihuo: '未激活',
     shilingpi: '使領館簽發次數',
+    zuixiaors: '最小人數',
+    qingsrzxrs: '請輸入最小人數',
+    qingsrzdrs: '請輸入最大人數',
+    chakpakfy: '查看pak返傭信息',
   },
   //#endregion
 }

src/components/FinancialModule/refundQuery.vue

@@ -104,7 +104,7 @@
                     <th>{{$t('objFill.zffs')}}</th>
                     <th>{{$t('objFill.zfrq')}}</th>
                     <th>{{$t('hotel.hotel_status')}}</th>
-                    <th>{{$t('objFill.tkjine')}}</th>
+                    <th>{{$t('fnc.tkjine')}}</th>
                 </tr>
                 <tr v-for="item in dataList">
                     <td>{{item.Trade_Order}}</td>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1510,7 +1510,7 @@
                           <td class="_color_666">{{$t('visaT.jdname')}}</td>
                           <td class="_color_666">{{$t('op.opszje')}}</td>
                           <td class="_color_666">{{$t('admin.admin_personNumber')}}</td>
-                          <td class="_color_666">{{$t('objFill.tkjine')}}</td>
+                          <td class="_color_666">{{$t('fnc.tkjine')}}</td>
                         </tr>
                         <tr v-for="item in ScenicRefundList">
                           <td>
@@ -2397,7 +2397,7 @@
                       <tr class="_color_666" style="text-align: center">
                         <th width="150">{{$t('visaT.jdname')}}</th>
                         <th width="60">{{$t('admin.admin_personNumber')}}</th>
-                        <th width="60">{{$t('objFill.tkjine')}}</th>
+                        <th width="60">{{$t('fnc.tkjine')}}</th>
                       </tr>
                       <tr v-for="fItem in item.orderBackScenicList" style="text-align: center">
                         <td style="text-align: left">

src/components/SingleAirTicket/douyinOrder.vue

@@ -264,7 +264,7 @@
           <th>{{$t('objFill.v101.dindanshis')}}</th>
           <th>{{$t('hotel.hotel_OrderStates')}}</th>
           <th>{{$t('objFill.zhifushij')}}</th>
-          <th>{{$t('objFill.tkjine')}}</th>
+          <th>{{$t('fnc.tkjine')}}</th>
           <th>{{$t('objFill.v101.tuikuansj')}}</th>
           <th>{{$t('objFill.v101.gendanreny')}}</th>
           <th>{{$t('objFill.v101.gendanjilv')}}</th>

src/components/SingleAirTicket/douyinSellOrder.vue

@@ -297,7 +297,7 @@
           <th>{{$t('objFill.v101.dindanshis')}}</th>
           <th>{{$t('hotel.hotel_OrderStates')}}</th>
           <th>{{$t('objFill.zhifushij')}}</th>
-          <th>{{$t('objFill.tkjine')}}</th>
+          <th>{{$t('fnc.tkjine')}}</th>
           <th>{{$t('objFill.v101.tuikuansj')}}</th>
           <th>{{$t('objFill.v101.gendanreny')}}</th>
           <th>{{$t('objFill.v101.gendanjilv')}}</th>

src/components/TravelManager/TravelGroupControl/QuotationDetails.vue

@@ -405,7 +405,7 @@
             <tr>
               <th width="400">{{$t('objFill.v101.LeaderManagement.jindianm')}}</th>
               <th>{{$t('objFill.v101.menpiaomin')}}</th>
-              <th width="200">{{$t('objFill.tkjine')}}</th>
+              <th width="200">{{$t('fnc.tkjine')}}</th>
               <th width="150">{{$t('objFill.v101.shifoutuik')}}</th>
             </tr>
             <tr v-for="scienItem in QuoItem.QuotationPrice.QuotationScenicList">

src/components/TravelManager/TravelQuotationCenter/DirectQuotation.vue

@@ -392,7 +392,7 @@
             <tr>
               <th width="400">{{$t('objFill.v101.LeaderManagement.jindianm')}}</th>
               <th>{{$t('objFill.v101.menpiaomin')}}</th>
-              <th width="200">{{$t('objFill.tkjine')}}</th>
+              <th width="200">{{$t('fnc.tkjine')}}</th>
               <th width="150">{{$t('objFill.v101.shifoutuik')}}</th>
             </tr>
             <tr v-for="item in currentOffer.QuotationPrice.QuotationScenicList" :key="item.subCode">

src/components/TravelManager/TravelTeam/chooseCustomer.vue

@@ -25,7 +25,7 @@
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55">
         </el-table-column>
-        <el-table-column fixed :label="$t('objFill.101.Buying.tonghangmc')" min-width="180">
+        <el-table-column fixed :label="$t('objFill.v101.Buying.tonghangmc')" min-width="180">
           <template slot-scope="scope">
             {{scope.row.CustomerName}}
           </template>

src/components/TravelManager/TravelTeam/editTeamInfo.vue

-<style>
+<style scoped>
+.ImpressionTicketing-msgbox{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    margin-bottom: 20px;
+  }
+  .ImpressionTicketing-msgbox.bottom0{
+    margin-bottom: 0;
+  }
+  .ImpressionTicketing-msgbox div{
+    flex: 1;
+  }
+  .ImpressionTicketing-msgbox div.ImpressionTicketing-msg-but{
+    flex: 0 0 80px;
+  }
+  .itc-delete{
+    color: #E95252;
+    font-size: 16px;
+    cursor: pointer;
+    display: inline-block;
+    padding: 10px;
+  }
+  .itc-outline{
+    color: #409EFF;
+    font-size: 16px;
+    cursor: pointer;
+    display: inline-block;
+    padding: 10px;
+  }
   .travelTeamInfo {
     width: 100%;
     background: #fff;
@@ -199,11 +228,18 @@
       <div class="edit_form_box">
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('objFill.101.yewuminc')" prop="GTeamName">
+            <el-form-item :label="$t('objFill.v101.yewuminc')" prop="GTeamName">
               <el-input v-model="editForm.GTeamName" maxlength="300"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('sm.chufadi')" prop="StartAddress">
+              <el-input v-model="editForm.StartAddress"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('salesModule.FlighInfo')">
@@ -439,7 +475,7 @@
               <el-input v-model="editForm.YSeat"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item :label="$t('Airticket.Air_businessClass')" prop="CSeat">
               <el-input v-model="editForm.CSeat"></el-input>
             </el-form-item>
@@ -448,7 +484,7 @@
             <el-form-item :label="$t('Airticket.Air_firstClass')" prop="FSeat">
               <el-input v-model="editForm.FSeat"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -521,7 +557,58 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="合作伙伴">
+            <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
+              <div>
+                <span class="ImpressionTicketing-title">PAK{{$t('hotel.hotel_commission')}}</span>
+                <span @click="addRule()" class="el-icon-circle-plus-outline itc-outline"></span>
+              </div>
+              
+              <div class="ImpressionTicketing-msgbox"
+              v-for="(item,index) in editForm.RakeBackList" :key="index">
+                <div>
+                  <el-form-item
+                  :label="editForm.RakeBackList.length>0?`${$t('objFill.v102.zuixiaors')} ${index+1} `:` ` "
+                  :prop="`RakeBackList.${index}.MinGuest`"
+                  :rules="rules.MinGuest"
+                  label-width="100px"
+                  label-position="left">
+                  <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
+                  v-model="item.MinGuest" clearable></el-input>
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item
+                  :label="editForm.RakeBackList.length>0?`${$t('objFill.v101.zuidarenshu')} ${index+1} `:` ` "
+                  :prop="`RakeBackList.${index}.MaxGuest`"
+                  :rules="rules.MaxGuest"
+                  label-width="100px"
+                  label-position="left">
+                  <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
+                  v-model="item.MaxGuest" clearable :controls="false"></el-input>
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item
+                  :label="editForm.RakeBackList.length>0?`${$t('objFill.fanyongje')} ${index+1} `:` ` "
+                  :prop="`RakeBackList.${index}.Ratio`"
+                  :rules="rules.Ratio"
+                  label-width="100px"
+                  label-position="left">
+                  <el-input type="number" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
+                  v-model="item.Ratio"></el-input>
+                  </el-form-item>
+                </div>
+                <div class="ImpressionTicketing-msg-but">
+                  <span @click="addRule()" class="el-icon-circle-plus-outline itc-outline"></span>
+                  <span @click="deleteRule(item,index)" class="el-icon-delete itc-delete"></span>
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('objFill.v101.hezuohuoban')">
               <template v-for="(subItem,subIndex) in friendList">
                 <el-tag :key="subIndex+10000" style="margin-right:10px;" closable
                   @close="deleteCustomer(subItem,subIndex)">
@@ -531,6 +618,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+        
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('pub.pubRemark')">
@@ -609,6 +697,25 @@
             message: this.$t('objFill.v101.qingsrzxjge'),
             trigger: "blur",
           }, ],
+          StartAddress: [{
+            required: true,
+            message: this.$t('objFill.qingshurcfddian'),
+            trigger: "blur",
+          }, ],
+          MinGuest: [{  
+            required: true,  
+            message: this.$t('objFill.v102.qingsrzxrs'),  
+            trigger: "blur"
+          }],
+          MaxGuest: [{  
+            required: true,  
+            message: this.$t('objFill.v102.qingsrzdrs'),  
+            trigger: "blur"
+          }],
+          Ratio: [{  
+            required: true,  message: this.$t('objFill.qinshurfyje'),  
+            trigger: "blur"
+          }],
         },
         //合作伙伴
         friendList: [],
@@ -645,6 +752,13 @@
           TicketNum: 0, //绑定机票数量
           PurchaseId: 0, //采购机票编号
           BackVisaPrice: 0, //退签证费
+          StartAddress: '',
+          RakeBackList: [],
+        },
+        RakeBackObj:{
+          MinGuest: null,
+          MaxGuest: null,
+          Ratio: null,
         },
         //去程
         addGoFlight: {
@@ -701,6 +815,13 @@
       }
     },
     methods: {
+      // 添加规则
+      addRule(){
+        this.editForm.RakeBackList.push(JSON.parse(JSON.stringify(this.RakeBackObj)))
+      },
+      deleteRule(row,index){
+          this.editForm.RakeBackList.splice(index,1)
+      },
       //查询航班列表
       getSelectFilght() {
         let fqMsg = {
@@ -819,6 +940,7 @@
             if (res.data.resultCode == 1) {
               var tempObj = res.data.data;
               this.editForm = tempObj;
+              console.log(tempObj,'--------');
               //判断是否是虚拟航班
               if (tempObj.TicketId > 0) {
                 this.isVirtuallyFlight = 1;

src/components/TravelManager/TravelTeam/travelPayList.vue

@@ -56,7 +56,7 @@
     <div class="col-1">{{$t('objFill.v101.yirumdrens')}}</div>
     <div class="col-1">{{$t('objFill.v101.baomzrens')}}</div>
     <div class="col-1">{{$t('objFill.yisouzje')}}</div>
-    <div class="col-1">{{$t('objFill.tkjine')}}</div>
+    <div class="col-1">{{$t('fnc.tkjine')}}</div>
     <div class="col-1">{{$t('fnc.ptshuijin')}}</div>
     <div class="col-1">{{$t('fnc.shishou')}}</div>
     <div class="col-1">{{$t('fnc.ztjine')}}</div>

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -122,6 +122,13 @@
                 @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
+          <li>
+            <span>
+              <em>{{$t('sm.chufadi')}}:</em>
+              <el-input v-model="queryMsg.StartAddress" class="permiss-input w150" clearable
+                @keyup.native.enter="resetQuery" :placeholder="$t('objFill.qingshurcfddian')"></el-input>
+            </span>
+          </li>
           <li>
             <button class="hollowFixedBtn" @click="editTeam(null)">{{$t('pub.addBtn')}}</button>
             <button class="hollowFixedBtn" @click="resetQuery">{{$t('pub.searchBtn')}}</button>
@@ -261,11 +268,8 @@
                   font-weight: bold;
                   margin: 5px 0;
                 ">
-                {{ $t("Operation.Op_tradePrice") }}:￥{{
+                {{ $t("objFill.v101.zhongxinjge") }}:￥{{
                   item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
-                }}<br />
-                {{ $t("Operation.Op_directPrice") }}:￥{{
-                  item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
                 }}
               </p>
               <p>
@@ -420,6 +424,28 @@
                   }}</span>
                 </el-popover>
               </p>
+              <p>
+                <el-popover width="300" trigger="click">
+                  <table class="PQ_detail">
+                    <tr>
+                      <td colspan="5" style="text-align: left; padding-left: 10px">
+                        PAK{{ $t("hotel.hotel_commission") }}
+                      </td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t('admin.admin_personNumber') }}</th>
+                      <th>{{ $t('objFill.fanyongje') }}</th>
+                    </tr>
+                    <tr v-for="(item,index) in item.RakeBackList">
+                      <td>{{ item.MinGuest }}~{{ item.MaxGuest }}</td>
+                      <td>{{ item.Ratio }}~{{ item.MaxGuest }}</td>
+                    </tr>
+                  </table>
+                  <span slot="reference" class="price">{{
+                    $t("objFill.v102.chakpakfy")
+                  }}</span>
+                </el-popover>
+              </p>
             </div>
                 </div>
               </div>
@@ -518,6 +544,7 @@
           QAirlineCompany: "", //航空公司名称
           QFlightNum: "", //航班号
           QCustomerName: "", //合作伙伴名称
+          StartAddress: "",//出发地
         },
         queryDataObj: {
           LineList: [], //线路列表

src/components/TravelManager/customizedcar/travelOrders.vue

@@ -653,7 +653,7 @@
     <el-dialog custom-class="app-send" :title="pendMgs.Type==1?$t('salesModule.Agree'):$t('visa.v_jujue')" :visible.sync="pendD" width="20%" class="tyi">
       <div style="width:100%;height:15px"></div>
       <div v-if="pendMgs.Type==1 && pendMgs.OrderType!=5">
-        <span>{{$t('objFill.tkjine')}}</span>
+        <span>{{$t('fnc.tkjine')}}</span>
         <el-input type="text" size="small" v-model="pendMgs.RefundMoney" :placeholder="$t('fnc.tkjine')"></el-input>
       </div>
 

src/components/administrative/ElectronicAudit.vue

@@ -584,7 +584,7 @@
       getDate(date) {
         return moment(date).format("YYYY-MM-DD");
       },
-      // 单项、一日游、境内旅游合同 驳回原有
+      // 单项、一日游、境内旅游合同 驳回原因
       showBoHui(item, status) {
         this.BoHuiObj = JSON.parse(JSON.stringify(item));
         this.auditMsg.AuditContract = status;
@@ -608,7 +608,10 @@
             this.apipost('travelcontract_post_UpdateTravelContractStatusService', {
               ID: item.ID,
               Status: status,
-              AuditContractReason: this.auditMsg.AuditContractReason,
+              AuditContractReason: status==3?this.auditMsg.AuditContractReason:'',
+              C_DayNum: status!=3?item.C_DayNum:'',
+              C_StartDate: status!=3?item.StartDateStr:'',
+              C_EndDate: status!=3?item.EndDateStr:'',
             }, res => {
               if (res.data.resultCode == 1) {
                   that.Success(res.data.message);

src/components/orderCommon/edit-orderform.vue

@@ -405,7 +405,7 @@
                         <td class="_color_666">{{$t('visaT.jdname')}}</td>
                         <td class="_color_666">{{$t('op.opszje')}}</td>
                         <td class="_color_666">{{$t('admin.admin_personNumber')}}</td>
-                        <td class="_color_666">{{$t('objFill.tkjine')}}</td>
+                        <td class="_color_666">{{$t('fnc.tkjine')}}</td>
                       </tr>
                       <tr v-for="item in ScenicRefundList">
                         <td>

src/components/orderCommon/orderlist.vue

@@ -559,7 +559,7 @@
                     <tr class="_color_666" style="text-align: center">
                       <th width="150">{{$t('visaT.jdname')}}</th>
                       <th width="60">{{$t('admin.admin_personNumber')}}</th>
-                      <th width="60">{{$t('objFill.tkjine')}}</th>
+                      <th width="60">{{$t('fnc.tkjine')}}</th>
                     </tr>
                     <tr v-for="fItem in item.orderBackScenicList" style="text-align: center">
                       <td style="text-align: left">

src/plug/index.js

@@ -122,9 +122,11 @@ export default {
         let locationName = window.location.hostname;
         let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.5.46:8888";
-        domainUrl = "http://192.168.5.39:8083";
-        domainUrl = "http://192.168.5.46:8501";
+        // domainUrl = "http://192.168.5.39:8083";
+        // domainUrl = "http://192.168.5.46:8501";
+        domainUrl = "http://192.168.5.204:8030";
         // domainUrl = "http://reborn.oytour.com";
+        // domainUrl = "http://192.168.5.214";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
         let javaUrldo = "";
@@ -134,6 +136,7 @@ export default {
         lxymallUrl = "http://192.168.20.13:8088";
         // crmUrl = "http://192.168.5.46:5003"
         crmUrl = "http://192.168.5.56:8032"
+        // crmUrl = "http://crm.oytour.com";
         erpSiteUrl = "http://localhost:8080/#/";
         if (locationName.indexOf('testerp.oytour') !== -1) {
           domainUrl = "http://testapi.oytour.com";
@@ -1316,6 +1319,7 @@ export default {
         poise = 'm_h'
       }
       var newpath = path.replace('http://192.168.5.214:8130', '').replace('https://imgfile.oytour.com', '').replace('https://imgfile.oytour.com', '').split('?')[0];
+      console.log(url + '/image/index?filePath=' + newpath + '&process=resize,' + poise + ',w_' + w + ',h_' + h,'------------------')
       return url + '/image/index?filePath=' + newpath + '&process=resize,' + poise + ',w_' + w + ',h_' + h;
     }