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

src/components/SalesModule/groupTourOrder.vue

@@ -1358,10 +1358,10 @@
               <tr>
                 <td>报名日期</td>
                 <td colspan="3">
-                  <el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd"
+                  <el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w170' value-format="yyyy-MM-dd"
                     type="date"></el-date-picker>
                   -
-                  <el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd"
+                  <el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w170' value-format="yyyy-MM-dd"
                     type="date"></el-date-picker>
                 </td>
               </tr>
@@ -1390,8 +1390,7 @@
                 </td>
                 <td width="70">报名类型</td>
                 <td>
-                  <el-select v-model='msg.GroupTypeArray' filterable multiple :placeholder="$t('pub.pleaseSel')">
-                    <el-option label="不限" value='-1'></el-option>
+                  <el-select v-model='msg.GroupTypeArray' filterable multiple class="multiple_input" :placeholder="$t('pub.pleaseSel')">
                     <el-option v-for="item in ctlxList" :label='item.Name' :value='item.Id' :key='item.Id'>
                     </el-option>
                   </el-select>