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

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -58,7 +58,7 @@
   }
 
   .groupTourOrderSearchTable tr th {
-    background: #e6e6e6;
+    background-color: #e6e6e6;
     height: 30px;
     font-size: 12px;
     text-align: left;
@@ -68,7 +68,7 @@
   }
 
   .groupTourOrderSearchTable tr {
-    background: #fff;
+    background-color: #fff;
     text-align: left;
   }
 
@@ -207,7 +207,7 @@
     display: inline-block;
     min-width: 122px;
     padding: 10px 0;
-    background: #fff;
+    background-color: #fff;
     margin: 10px 0;
     height: 56px;
     border-radius: 4px;
@@ -492,7 +492,7 @@
     font-size: 14px;
     color: #e95252;
     border: 1px solid #e95252;
-    background: #fff;
+    background-color: #fff;
     border-radius: 15px;
     cursor: pointer;
     vertical-align: top;
@@ -507,7 +507,7 @@
     font-size: 14px;
     color: #fff;
     border: 1px solid #e95252;
-    background: #e95252;
+    background-color: #e95252;
     border-radius: 15px;
     cursor: pointer;
     vertical-align: top;
@@ -719,7 +719,7 @@
     z-index: 10000;
     top: 0;
     width: 700px;
-    background: #fff;
+    background-color: #fff;
     box-shadow: 0 0 8px #888;
     padding: 10px;
     box-sizing: border-box;
@@ -1380,7 +1380,7 @@
               <el-input v-model="addMsg.PreferPrice" :disabled="!IsUpdateOrderMoney"></el-input>
             </el-form-item>
             <button @click="Yszefz" type="button" class="Ysze-button el-button--primary" style="
-                background: rgb(0, 198, 255);
+                background-color: rgb(0, 198, 255);
                 border-color: rgb(0, 198, 255);
               ">
               <i class="iconfont icon-nav-hangzheng" style="font-size: 12px"></i>
@@ -1715,7 +1715,7 @@
         padding: 0 10px;
         height: 34px;
         line-height: 34px;
-        background: #d2d2d2;
+        background-color: #d2d2d2;
         font-size: 14px;
         color: #333;
         font-weight: bold;
@@ -1725,7 +1725,7 @@
       }}&nbsp;&nbsp;<span style="
           padding: 2px 5px;
           font-weight: normal;
-          background: #297bef;
+          background-color: #297bef;
           border-radius: 4px;
           color: #fff;
         ">
@@ -2132,19 +2132,26 @@
                           item.isHaveFinance != '1' &&
                           item.orderState != '1' &&
                           item.orderState != '4')
-                      " type="primary" style="background: #00c6ff; border-color: #00c6ff"
+                      " type="primary" style="background-color: #00c6ff !important; border-color: #00c6ff"
                       icon="iconfont icon-bianji-smal" @click="getDetail(item)"></el-button>
                   </el-tooltip>
                   <el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
                     <el-button v-if="IsSupperOrderEdit || item.isOwn == 1" type="primary"
-                      style="background: #a55eea; border-color: #a55eea" icon="iconfont icon-beizhu"
+                      style="background-color: #a55eea !important; border-color: #a55eea" icon="iconfont icon-beizhu"
                       @click="getRemarks(item)"></el-button>
                   </el-tooltip>
+                  <!-- <el-tooltip v-if="S_UpdateOrderMoney" class="item" effect="dark" content="编辑小费" placement="top-start" style="float: left">
+                    <el-button @click="
+                    clickEditTip(item)
+                      " type="primary" style="background-color: #00c6ff !important; border-color: #00c6ff !important" 
+                      icon="iconfont icon-bianji-smal">
+                    </el-button>
+                  </el-tooltip> -->
                   <el-tooltip effect="dark" content="日志" placement="top-start" style="float: left">
                     <el-popover width="230" trigger="click">
                       <div class="priceContentDiv">
                         <div class="AuditLog">日志</div>
-                        <div class="logContact" style="background: #f9f9f9; padding: 20px 10px 0">
+                        <div class="logContact" style="background-color: #f9f9f9; padding: 20px 10px 0">
                           <div v-if="logList.length > 0" v-for="(item, index) in logList" :key="index">
                             <div class="clearfix">
                               <div class="Auditcircle" style="left: 6px !important"></div>
@@ -2161,7 +2168,7 @@
                         </div>
                       </div>
                       <el-button slot="reference" @click="getLogDetail(item)" type="primary" style="
-                          background: #47bf8c;
+                          background-color: #47bf8c !important;
                           border-color: #47bf8c;
                           border-top-right-radius: 0;
                           border-bottom-right-radius: 0;
@@ -2171,6 +2178,9 @@
                   <el-tooltip effect="dark" content="更多" placement="top-start" style="float: left">
                     <el-popover width="100" trigger="hover">
                       <div class="groupTourOrder_more">
+                        <div v-if="S_UpdateOrderMoney" @click="clickEditTip(item)">
+                          编辑小费
+                        </div>
                         <div @click="goUrlT('confirmationOrder', item.orderId)">
                           确认函
                           {{
@@ -2307,7 +2317,7 @@
                         </div>
                       </div>
                       <el-button slot="reference" type="primary" style="
-                          background: #297bef;
+                          background-color: #297bef !important;
                           border-color: #297bef;
                           border-top-left-radius: 0;
                           border-bottom-left-radius: 0;
@@ -3161,6 +3171,11 @@
         </button>
       </div>
     </el-dialog>
+    <el-dialog width="350px" title="编辑小费" :visible.sync="isShowTip" 
+    center :before-close="closeChangeMachie">
+      <EditTip :TipObj="TipObj" @close="isShowTip=false" @success="isShowTip=false,getList()"></EditTip>
+    </el-dialog>
+    
   </div>
 </template>
 <script>
@@ -3169,9 +3184,13 @@
   import payURL1 from "../commonPage/payURL1.vue";
   import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
   import updateSalesMan from "../commonPage/updateSalesMan.vue";
+  import EditTip from "./Common/EditTip.vue";
   export default {
     data() {
       return {
+        S_UpdateOrderMoney: false,
+        isShowTip: false,
+        TipObj: {},
         userInfo: {},
         qjGroupId: -1,
         F_Finance_Create: false, //制单权限
@@ -3545,6 +3564,7 @@
       };
     },
     components: {
+      EditTip,
       payurlItem: payURL,
       payurlItem1: payURL1,
       tripDownLoadCommon: tripDownLoadCommon,
@@ -3570,6 +3590,13 @@
       },
     },
     methods: {
+      clickEditTip(item){
+        this.isShowTip = true
+        this.TipObj = JSON.parse(JSON.stringify(item))
+        this.TipObj.guestNum =  item.guestNum
+        this.TipObj.TipMoney = item.preferTipAmount
+        this.TipObj.OrderId = item.orderId
+      },
       SQPhoto() {
         let checkID = [];
         this.SQguestList.map((x) => {
@@ -5872,6 +5899,10 @@
         userMenuCode.indexOf(",Sale_TurnGroup,") != -1 ? true : false;
       this.userId = this.getLocalStorage().EmployeeId;
 
+      let ActionMenuCode = this.userInfo.ActionMenuCode;
+      if (ActionMenuCode.indexOf('S_UpdateOrderMoney') != -1 ){
+          this.S_UpdateOrderMoney = true
+      }
       this.getEmployee();
       this.getList();
       this.getLineList();