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

src/App.vue

@@ -243,4 +243,18 @@
       Noto Color Emoji, MicrosoftJhengHeiBoldFix, "\5FAE\8EDF\6B63\9ED1\9AD4",
       Microsoft JhengHei;
   }
+  .groupTourOrderByTuan_ico {
+    margin: 0 10px 0 0;
+  }
+  .groupTourOrderByTuan_ico i {
+    display: inline-block;
+    margin: 0 2px 0 0;
+    width: 8px;
+    height: 8px;
+    border-radius: 2px;
+    vertical-align: middle;
+  }
+  .groupTourOrderByTuan_ico>span {
+    vertical-align: middle;
+  }
 </style>
\ No newline at end of file

src/components/SalesVisa/salesOrderToday.vue

@@ -350,13 +350,15 @@
       <tr>
         <th width="7%">单号/团号</th>
         <th width="7%">签证类型</th>
-        <th width="10%">业务员</th>
+        <th width="5%">公司</th>
+        <th width="7%">签证产品</th>
+        <th width="5%">业务员</th>
         <th width="5%">人数</th>
         <th width="10%">出发日期</th>
         <th width="9%">报名日期</th>
-        <th width="15%">备注</th>
+        <th width="10%">备注</th>
         <th width="8%">应收金额</th>
-        <th width="7%">订单状态</th>
+        <th width="5%">订单状态</th>
         <th width="10%">操作</th>
       </tr>
       <tr v-for='(item,index) in dataList' :key="index">
@@ -367,6 +369,8 @@
         <td>
           <span class="fz14">{{item.VisaType===1?'个体签证':'团队签证'}}</span>
         </td>
+        <td>{{item.BranchName}}</td>
+        <td>{{item.VisaName}}</td>
         <td>
           <img v-if='!item.CreatePhoto' src="../../assets/img/litheader.png" />
           <img v-if='item.CreatePhoto' :onerror="defaultImg" :src='item.CreatePhoto' />