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

src/components/LeaderManagement/leaderTaskBoard.vue

@@ -344,8 +344,8 @@
            </div>
            <div class="leaderInfo clearfix" v-for="item in dataList" :key="item.subCode" @drop="drop($event,item.TCID,item.Id)" @dragover="allowDrop($event)">
               <el-row :gutter="10">
-                <el-col :span="1">
-                  <div class="leadersList">
+                <el-col :span="3">
+                  <div class="leadersList" style="min-width:230px;height:70px;">
                       <div v-if="item.LeaderType==1">
                           <div class="cirList" v-if="item.LeaderName!=''">
                               <div class="circleHeader">
@@ -398,10 +398,10 @@
                   <div class="forSaling notStart" v-if="item.TCType==2">{{$t('leader.leader_noStart')}}</div>
                   <div class="forSaling worked" v-if="item.TCType==3">{{$t('leader.leader_HasCompleted')}}</div>
                 </el-col>
-                <el-col :span="2">
+                <el-col :span="1">
                   <div class="createName">{{$t('hotel.table_operater')}}</div>
                 </el-col>
-                <el-col :span="2">
+                <el-col :span="3">
                 <div>
                       <div class="litCircle">
                           <img v-if="!item.CreateUrl" src="../../assets/img/default_head_img.jpg" alt="">

src/router/config.js

@@ -1256,6 +1256,14 @@ export default {
                                 title: '票券订单'
                             },
                         },
+                        {
+                            path: '/scenOrderDetails', //票券订单
+                            name: 'scenOrderDetails',
+                            component: resolve => require(['@/components/scenicSpot/scenOrderDetails'], resolve),
+                            meta: {
+                                title: '票券订单详情'
+                            },
+                        },
                         {
                             path: '/admissionStatisticsDetails', //门票统计详情
                             name: 'admissionStatisticsDetails',