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

src/App.vue

@@ -113,7 +113,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_te20a5sctn.css";
+  @import "//at.alicdn.com/t/font_635492_dxcl6yumgsq.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1412,9 +1412,12 @@ export default {
           that.Description="旅客名单：";
           that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
           console.log("that.describeList",that.describeList)
-          that.describeList.forEach(item=>{
-              that.Description+=item.GuestName+" ";
-          })
+          if(that.describeList){
+              that.describeList.forEach(item=>{
+                that.Description+=item.GuestName+" ";
+            })
+          }
+          
         }
     },mounted(){
         let userInfo = this.getLocalStorage();
@@ -1446,7 +1449,7 @@ export default {
             this.BillSonName = this.$route.query.Name;
             this.FinancialFlowTemplate_post_GetProcessList(this.$route.query.id);
             this.Financial_post_Get(0,parseInt(this.$route.query.id));
-            let TCID = (this.orderObj && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
+            let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
             this.financeinfo_post_GetList(TCID);
         }
         if(this.$route.query.Conditon){

src/components/SalesModule/enrollTotal.vue

@@ -185,7 +185,9 @@
         <tr>
           <td rowspan="2">
             <p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
-            <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
+            <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
+               <el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
+            </p>
             <p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName"
               @click="goUrlX('产品查询', 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>

src/components/SalesModule/groupTourOrder.vue

@@ -1513,9 +1513,11 @@
         <tbody v-for="(item,index) in list" :key="index">
           <tr>
             <td rowspan="3">
+              
               <p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
               <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId"
-                @click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
+                @click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
+                <el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip></p>
               <p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
                 :title="item.alName" @click="goUrlX('产品查询','productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
               <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1520,7 +1520,9 @@
             <td rowspan="3" style="position:relative;">
               <p v-if="item.isUnionOrder==1" class="GO_union">联</p>
               <p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
-              <p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
+              <p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}
+                <el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
+              </p>
               <div>
                 {{item.createBy}}<br/><span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span>
               </div>
@@ -1883,7 +1885,9 @@
           <tr>
             <td rowspan="2" style="position:relative;">
               <p v-if="item.isUnionOrder==1" class="GO_union">联</p>
-              <p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
+              <p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}
+                 <el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
+              </p>
               <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
               <p>下单时间：{{item.createDate}}</p>
             </td>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1572,6 +1572,7 @@
               <!-- @click="goUrlX('groupTourOrderByTuan',item.TCID,item.TCNUM)"-->
               <div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="item.OrderId">
                 {{item.OrderId}}
+                 <el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.OrderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
               </div>
               <div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''"
                   style="color:red">({{item.LeaveStr}})</span></div>
@@ -1772,6 +1773,7 @@
                 <p v-if="childItem.IsChargeLossOrders==1" style="color:red">损</p>
                 <div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="childItem.OrderId">
                   {{childItem.OrderId}}
+                   <el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="childItem.OrderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
                 </div>
                 <div class="RL_CreatInfo">{{childItem.CreateBy}}<span v-if="childItem.LeaveStr!=''"
                     style="color:red">({{childItem.LeaveStr}})</span></div>
@@ -2082,7 +2084,9 @@
             <td rowspan="3">
               <div>
                 <p class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="item.OrderId"
-                  @click="goUrlX('groupTourOrderByTuan',item.TCID,item.TCNUM)">{{item.OrderId}}</p>
+                  @click="goUrlX('groupTourOrderByTuan',item.TCID,item.TCNUM)">{{item.OrderId}}
+                   <el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.OrderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
+                  </p>
                 <p v-if="item.IsLeaderOrder==1">(领队)</p>
                 <p v-else-if="item.IsLeaderOrder!=1&&item.GroupType==1">(散拼跟团)</p>
                 <p v-else-if="item.IsLeaderOrder!=1&&item.GroupType==2">(小包团)</p>