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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -392,7 +392,7 @@
                 <div class="_explain">
                     <p>附加说明：  <span class="fr" v-if="GetDetail.ComplainID > 0" @click="goComplain('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> 
                         <span style="color:#000">投诉单号：</span>  <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span> 
-                        <span v-if="GetDetail.TemplateId==28 || GetDetail.TemplateId==30" @click="Gourl" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
+                        <span v-if="GetDetail.TemplateId==28 || GetDetail.TemplateId==30" @click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
                         <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
                         <span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
                     </p>
@@ -949,12 +949,14 @@ export default {
             
 
             },
-        Gourl(){
+        Gourl(GetDetail){
             this.$router.push({
-                name: 'CommissionManagement',
+                name: 'CommissionDetail',
                 query: { 
+                    periods:GetDetail.Periods,
+                    companyID:GetDetail.RB_Branch_Id,
                     blank: "y", 
-                    tab: "提成管理" 
+                    tab: "提成详情" 
                 }
             });
 

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1838,7 +1838,7 @@
             <td>{{item.Refund}}</td>
             <td>{{item.PlatformTax}}</td>
             <td>{{item.ZaiTuMoney}}</td>
-            <td><span :class="{color_red_order:item.DueInMoney!==item.PreferPrice}">{{item.DueInMoney}}</span></td>
+            <td><span :class="{color_red_order:item.DueInMoney&&item.DueInMoney>0}">{{item.DueInMoney}}</span></td>
             <td class="fz12"><span :class="{'RL-redType':item.statsstr=='候补'}">{{item.statsstr}}</span></td>
             <td>
             </td>
@@ -2134,7 +2134,7 @@
               <td class="nowrap">{{childItem.PlatformTax}}</td>
               <td class="nowrap">{{childItem.ZaiTuMoney}}</td>
               <td class="nowrap"><span
-                  :class="{color_red_order:childItem.DueInMoney!==childItem.PreferPrice}">{{childItem.DueInMoney}}</span>
+                  :class="{color_red_order:childItem.DueInMoney&&childItem.DueInMoney>0}">{{childItem.DueInMoney}}</span>
               </td>
               <td v-if="childItem.IsChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td>
               <td v-else class="fz12"><span
@@ -2531,7 +2531,7 @@
             <td>{{item.Refund}}</td>
             <td>{{item.PlatformTax}}</td>
             <td>{{item.ZaiTuMoney}}</td>
-            <td><span :class="{color_red_order:item.DueInMoney!==item.PreferPrice}">{{item.DueInMoney}}</span></td>
+            <td><span :class="{color_red_order:item.DueInMoney&&item.DueInMoney>0}">{{item.DueInMoney}}</span></td>
             <td class="fz12" colspan="2">
               <span class="RL-redType">{{item.statsstr}}</span>
               <br />

src/components/activity/CouponList.vue

@@ -135,6 +135,7 @@
         <th>使用范围</th>
         <th>{{$t('admin.admin_status')}}</th>
         <th>{{$t('active.cl_addPp')}}</th>
+        <th>换购价</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
       <tr v-for="(item,index) in DataList" v-loading="loading">
@@ -174,6 +175,7 @@
           <span v-if="item.couponStatus == 3" style="color: red">{{$t('system.ph_shanchu')}}</span>
         </td>
         <td>{{item.createUserName}}</td>
+        <td>{{item.redemptionPrice}}</td>
         <td class="text_al_left">
           <!-- <el-button-group> -->
             <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
@@ -376,6 +378,11 @@
                 </el-select>
               </el-form-item>
             </td>
+             <td>
+              <el-form-item label="换购价">
+                <el-input v-model="addMsg.redemptionPrice" class="w217" placeholder="请输入"/>
+              </el-form-item>
+            </td>
           </tr>
         </table>
       </el-form>
@@ -441,6 +448,7 @@ export default {
         lineteamId: 0,
         couponsUseScope: 1,
         couponStatus: 1,
+        redemptionPrice:'',
       },
       pwdMsg: {
         Id: "",
@@ -588,6 +596,8 @@ export default {
       this.addMsg.lineteamId = item.lineteamId
       this.addMsg.couponsUseScope = item.couponsUseScope
       this.addMsg.couponStatus = item.couponStatus
+      this.addMsg.redemptionPrice = item.redemptionPrice
+      
       this.isleaveBtn = true;
     },
     // 删除
@@ -669,6 +679,7 @@ export default {
         lineteamId: 0,
         couponsUseScope: 1,
         couponStatus: 1,
+        redemptionPrice:'',
       }
     }
   }

src/components/administrative/CommissionDetail.vue

@@ -44,7 +44,8 @@ export default {
         ParentId: 0,
         OrderStr: "RB_Branch_Id asc",
         BName:-1,
-        RB_Branch_Id:-1
+        RB_Branch_Id:-1,
+        Periods: ''
       },
       total: 0,
       currentPage: 1,
@@ -425,6 +426,7 @@ export default {
     if(this.$route.query.companyID) {
       this.companyID = this.$route.query.companyID;
       this.msg.RB_Branch_Id = this.$route.query.companyID;
+      this.msg.Periods = this.$route.query.periods;
       this.disabledCPSelect = true
     }
     let dt=new Date()

src/plug/index.js

@@ -111,7 +111,8 @@ export default {
       //域名管理对象
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
-        domainUrl = "http://192.168.2.214:8082";
+      domainUrl = "http://192.168.2.214:8082";
+      domainUrl = "http://reborn.oytour.com";
         let locationName = window.location.hostname;
 
         let javaUrldo="";