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

src/components/Hotel/reservation/OrderList.vue

@@ -1279,6 +1279,7 @@ export default {
       let copyText = item.OrderId;
       const save = function(e) {
           e.clipboardData.setData('text/plain', copyText)
+          e.preventDefault() // 阻止默认行为
         }
       document.addEventListener('copy', save) // 添加一个copy事件
       let x = document.execCommand('copy') // 执行copy方法

src/components/Hotel/singleProduct/components/OrderList.vue

@@ -1090,6 +1090,7 @@ export default {
       let copyText = item.OrderId;
       const save = function(e) {
           e.clipboardData.setData('text/plain', copyText)
+          e.preventDefault() // 阻止默认行为
         }
       document.addEventListener('copy', save) // 添加一个copy事件
       let x = document.execCommand('copy') // 执行copy方法

src/components/SalesModule/productQuery.vue

@@ -1057,7 +1057,7 @@
             <el-input v-model="msg.TCID" class="w150"></el-input>
           </span>
         </li>
-           <li>
+        <li>
           <span>
             <em>团名</em>
             <el-input v-model="msg.Title" class="w150" clearable></el-input>
@@ -1240,14 +1240,12 @@
                     {{ item.Title }}
                   </p>
                 </el-tooltip>
-                <p v-if="item.CustomerName&&item.CustomerName!=''"
-                  style="font-size: 11px;font-weight:bold;color:red">
+                <p v-if="item.CustomerName&&item.CustomerName!=''" style="font-size: 11px;font-weight:bold;color:red">
                   <span v-if="item.CustomerName">客户名称：{{item.CustomerName}}
                   </span>
                 </p>
                 <p v-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
-                   <a style="color:blue;" :href="item.PriceOfferUrl" v-if="item.PriceOfferUrl"
-                      target="_blank">下载报价单</a>
+                  <a style="color:blue;" :href="item.PriceOfferUrl" v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
                 </p>
               </div>
             </div>
@@ -1843,7 +1841,7 @@
           SonControlID: "-1",
           IsShowMessagesMoney: "2",
           QuotationUrl: "", //单团附件
-          LureEmpId: 0,//引流id
+          LureEmpId: 0, //引流id
           CRMGuestId: 0, //客人ID
         },
         uploadLloading: false,
@@ -1921,7 +1919,7 @@
           WarningQuery: "-1",
           RateOnDay: "-1",
           RateOn: "-1",
-          Title:"",//团名
+          Title: "", //团名
         },
         defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
         list: [],
@@ -3643,11 +3641,11 @@
     },
     mounted() {
       // crm自动登陆传过来的参数
-      if(this.$route.query.crmOrderObj){
-           this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
-           this.addMsg.LureEmpId = this.crmOrderObj.LureEmpId//引流id
-           this.addMsg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
-       }
+      if (this.$route.query.crmOrderObj) {
+        this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+        this.addMsg.LureEmpId = this.crmOrderObj.LureEmpId //引流id
+        this.addMsg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
+      }
       let userInfo = this.getLocalStorage();
       this.userInfo = this.getLocalStorage();
       this.GetSupperOrderEditAuth();

src/components/SalesVisa/components/visaOrderList.vue

@@ -612,7 +612,7 @@
           </el-table-column>
           <template slot="append" >
             <div class="row justify-sb" style="padding:10px;">
-              <div class="cF1416C flex-g" style="min-width: 150px;" >
+              <div class="cF1416C flex-g" style="min-width: 300px;" >
                 <div class="row flex-wrap mb"v-if="item.guestList&&item.guestList.length>0">
                   <span class="flex-s">旅客名单：</span>
                   <div class="row wrap orderNo fz12 ml">
@@ -620,9 +620,9 @@
                       @click="goUrl2('VisapassengerList',item.id,'旅客名单')">{{ x.userName }}</span>
                   </div>
                 </div>
-                <div v-if="item.remark">
+                <div v-if="(pagesTitle=='OP'&&!item.remark)||item.remark">
                 {{$t('pub.pubRemark')}}：{{ item.remark }}
-                  <el-tooltip  class="item" effect="dark" :content="$t('salesModule.UpRemarks')"
+                  <el-tooltip v-if="pagesTitle=='OP'"  class="item" effect="dark" :content="$t('salesModule.UpRemarks')"
                    placement="top-start">
                     <i class="el-icon-edit cursor-pointer c059FF6 mx" @click='getDetail(item,true)'></i>
                   </el-tooltip>
@@ -630,7 +630,7 @@
               </div>
                   
               <div class="row justify-sb">
-                <div class="row-c justify-sb px15 bgf5 radius5 flex-g pa relative" style="min-width: 150px;max-width: 300px;">
+                <div class="row-c justify-sb px15 bgf5 radius5 flex-g pa relative" style="min-width: 200px;max-width: 400px;">
                   <div class="row-c">
                   <div class="fz12 flex-s">收款单据</div>
                   <div class="row wrap orderNo fz12 ml">
@@ -648,7 +648,7 @@
                       @click="makeAdocument(item, index, 1)"></i>
                   </el-tooltip>
                 </div>
-                <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width: 300px;">
+                <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 200px;max-width: 400px;">
                   <div class="row-c">
                   <div class="fz12 flex-s">退款单据</div>
                   <div class="row wrap orderNo fz12 ml">
@@ -666,7 +666,7 @@
                       @click="makeAdocument(item, index, 2)"></i>
                   </el-tooltip>
                 </div>
-                <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width: 300px;">
+                <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 200px;max-width: 400px;">
                   <div class="row-c">
                   <div class="fz12 flex-s">成本单据</div>
                   <div class="row wrap orderNo fz12 ml">
@@ -1347,6 +1347,7 @@ export default {
       let copyText = item.id;
       const save = function(e) {
           e.clipboardData.setData('text/plain', copyText)
+          e.preventDefault() // 阻止默认行为
         }
       document.addEventListener('copy', save) // 添加一个copy事件
       let x = document.execCommand('copy') // 执行copy方法

src/components/SingleAirTicket/components/OrderList.vue

@@ -1388,6 +1388,7 @@
           let copyText = item.OrderId;
           const save = function(e) {
               e.clipboardData.setData('text/plain', copyText)
+              e.preventDefault() // 阻止默认行为
             }
           document.addEventListener('copy', save) // 添加一个copy事件
           let x = document.execCommand('copy') // 执行copy方法

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -172,6 +172,12 @@
                 :placeholder="$t('pub.pleaseImport')" @keyup.native="checkInteger(queryMsg,'TCID')"></el-input>
             </span>
           </li>
+          <li>
+            <span>
+              <em>团名</em>
+              <el-input v-model="queryMsg.Title" class="w150" clearable></el-input>
+            </span>
+          </li>
           <li>
             <span>
               <em>{{$t('scen.sc_ftTime')}}</em>
@@ -1369,6 +1375,7 @@
           HotelUseTime: "", //酒店使用时间
           QBusNumber: "",
           PriceTeamType: "", //团队类型
+          Title:"",//团名
         },
         TeamListArr: [], //团队类型
         //报价单查询条件

src/components/busManagement/BookAcar/components/orderList.vue

@@ -1328,6 +1328,7 @@
           let copyText = item.OrderId;
           const save = function(e) {
               e.clipboardData.setData('text/plain', copyText)
+              e.preventDefault() // 阻止默认行为
             }
           document.addEventListener('copy', save) // 添加一个copy事件
           let x = document.execCommand('copy') // 执行copy方法

src/components/busManagement/BookAcar/components/tripBusOrderList.vue

@@ -1543,6 +1543,7 @@
           let copyText = item.Id;
           const save = function(e) {
               e.clipboardData.setData('text/plain', copyText)
+              e.preventDefault() // 阻止默认行为
             }
           document.addEventListener('copy', save) // 添加一个copy事件
           let x = document.execCommand('copy') // 执行copy方法

src/components/scenicSpot/reservation/OrderList.vue

@@ -1494,6 +1494,7 @@ export default {
       let copyText = item.OrderId;
       const save = function(e) {
           e.clipboardData.setData('text/plain', copyText)
+          e.preventDefault() // 阻止默认行为
         }
       document.addEventListener('copy', save) // 添加一个copy事件
       let x = document.execCommand('copy') // 执行copy方法

src/components/scenicSpot/scenicSpotPackagePrice.vue

@@ -776,7 +776,6 @@ export default {
         "ticketcouponsprice_post_Set",
         this.addMsg,
         res => {
-          debugger
           if (res.data.resultCode == 1) {
             this.initDataTable();
             this.Success("保存成功！");
@@ -787,7 +786,6 @@ export default {
           }
         },
         e=>{
-          debugger;
           console.log(e.message)
         }
       );