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

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -203,7 +203,7 @@
         <th width="80">{{$t('Operation.Op_daishou')}}</th>
         <th width="60">{{$t('admin.admin_status')}}</th>
         <th width="60">{{$t('fnc.khxinxi')}}</th>
-        <th v-if="userId==1" width="130">{{$t('system.table_operation')}}</th>
+        <th v-if="isEditOrderCreate==1||userId==1" width="130">{{$t('system.table_operation')}}</th>
       </tr>
       <tr>
         <td v-show="OrderList.length==0" colspan="17" align="center">{{$t('system.content_noData')}}</td>
@@ -380,7 +380,7 @@
               </div>
             </div>
           </td>
-          <td :colspan="userId==1?9:8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;"
+          <td :colspan="(isEditOrderCreate==1||userId==1)?9:8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;"
             @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
             <div>
               <div style="white-space: nowrap">{{$t('fnc.skdanju')}}：<span v-if="item.financeList.length===0"