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

src/components/Complaints/ComplaintsDetail.vue

@@ -464,7 +464,7 @@
           this.loading = false
           this.isGetData = true
           if (res.data.resultCode == 1) {
-            this.PriceInfo = res.data.data.PriceInfo
+            this.PriceInfo = res.data.data.PriceInfo;
             this.ComplainInfo = res.data.data.ComplainInfo
             this.ComplainDetial = res.data.data.ComplainDetial
             this.DealEmpName = this.ComplainDetial[this.ComplainDetial.length - 1].EmpName
@@ -762,7 +762,7 @@
     },
     mounted () {
       this.queryMsg.ID = this.$route.query.id
-      this.queryMsg.OrderId = this.$route.query.orderId
+      this.queryMsg.OrderId = this.$route.query.OrderId
       this.getEnumeration()
       this.getEmployeeList()
       this.getDetial()

src/components/FinancialModule/BasicDocuments.vue

@@ -315,7 +315,8 @@
                 <my-DJ-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-DJ-Bill>
             </template>
             <div class="_explain">
-                <p>附加说明：</p>
+                
+                <p>附加说明：<span class="fr" v-if="GetDetail.ComplainID > 0" @click="goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</span>  <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span></p>
                 <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
                     <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
                         <td :colspan="4">{{o.TCNUM}}（{{o.TCID}}）</td>
@@ -2239,6 +2240,7 @@ export default {
                     }
                     this.chongJudge(data)
                     this.GetDetail = data;
+                    console.log(this.GetDetail,'GetDetail.OrderId');
                     this.ChongDiMsg.Types = ''
                     this.ChongDiMsg.ClientType = data.Type === 2 ? data.ClientType : ''
                     this.ChongDiMsg.ClientID = data.Type === 2 ? data.ClientID : ''
@@ -2416,6 +2418,16 @@ export default {
         },
         headCall: function (msg) { //回调方法，接收子组件传的参数
             this.currentMoney = msg;
+        },
+        goUrl(path, id,OrderId) {
+            this.$router.push({
+                name: path,
+                query: {
+                    id: id,
+                    OrderId:OrderId,
+                    blank: "y"
+                }
+            });
         }
     },created(){
         if(this.$route.query.pageIndex){

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -366,7 +366,7 @@
                 <my-RVB-Bill v-else-if="GetDetail.Type===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
                 <my-GZ-Bill v-else-if="GetDetail.Type===7" :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-GZ-Bill>
                 <div class="_explain">
-                    <p>附加说明：  <span class="fr" v-if="GetDetail.ComplainID > 0" @click="goUrl('ComplaintsDetail', GetDetail.ComplainID)"> <span style="color:#000">投诉单号：</span>  <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span> </p>
+                    <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> </p>
                     <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
                         <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
                             <td :colspan="4" v-if="GetDetail.Is_Merge===1">单据号：{{o.FinanceId}}</td>
@@ -909,6 +909,16 @@ export default {
             }
         });
       },
+      goComplain(path, id,OrderId){
+        this.$router.push({
+            name: path,
+            query: {
+                id: id,
+                OrderId:OrderId,
+                blank: "y"
+            }
+        });
+      },
     inited (viewer){
       this.$viewer = viewer
     },

src/components/Hotel/roomReservationsDetails.vue

@@ -207,9 +207,10 @@
               </td>
               <!--返佣-->
               <td>
-                <p class="pHouseStyle link" @input="calculationPrice(subItem)">
-                  <span v-if='childItem.RebateRatio>0'>{{childItem.RebateRatio}} %</span>
-                  <span class="spanlink" v-else @click="goUrl('HotelInfo',childItem,'酒店管理')">设置</span>
+                <p class="pHouseStyle link"  >
+                  <el-input  class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
+                  v-model='childItem.RebateRatio' @input="calculationPrice(subItem)"></el-input> %
+                  <span style="display:none;" class="spanlink" @click="goUrl('HotelInfo',childItem,'酒店管理')">设置</span> 
                 </p>
               </td>
               <!-- 金额总计 -->
@@ -668,6 +669,10 @@
               if (y.BookNum == "") {
                 y.BookNum = 0;
               }
+              if(y.RebateRatio=="")
+              {
+                y.RebateRatio=0;
+              }
             })
           });
         })
@@ -707,6 +712,10 @@
               if (y.BookNum == "") {
                 y.BookNum = 0;
               }
+              if(y.RebateRatio=="")
+              {
+                y.RebateRatio=0;
+              }
             })
           });
         })

src/components/SupplierIndex.vue

@@ -13,7 +13,7 @@
           </li>
         </ul>
       </div>
-      <div class="Supplier_nav_right">
+      <div class="Supplier_nav_rightList">
         <ul>
           <li class="user_head" @click='hideIM'>
             <el-dropdown trigger="click">
@@ -4721,4 +4721,32 @@
   color:#fff;
   line-height: 15px;
 }
+.Supplier_nav_rightList{
+  position: absolute;
+  right: 0;
+}
+.Supplier_nav_rightList ul li {
+    height: 50px;
+    margin-right: 20px;
+    text-align: center;
+    -webkit-box-pack: end;
+    -ms-flex-pack: end;
+    float:left;
+    line-height: 50px;
+    justify-content: flex-end;
+    cursor: pointer;
+}
+.Supplier_nav_rightList ul li.user_head img{
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    margin-top: 13px;
+}
+.Supplier_nav_rightList ul li i{
+  color:#fff;
+}
+.Supplier_nav_rightList .SupplierName{
+  position: relative;
+  top:-6px;
+}
 </style>