Merge remote-tracking branch 'origin/master'

src/views/position/PositionList.vue

@@ -30,7 +30,7 @@
             </a-form-item>
           </a-col>
           </template>
-          <template v-if="queryParam.positionCategory==1&&queryParam.positionCategory!=''">
+          <template v-else-if="queryParam.positionCategory==1">
           <a-col :md="6" :sm="8">
             <a-form-item  label="兼职职位类别">
               <j-dict-select-tag v-model="queryParam.parttimePositionType" placeholder="请选择职位类别" dictCode="parttime_position_type"/>
@@ -44,13 +44,13 @@
 
 
             <a-col :md="6" :sm="8">
-              <a-form-item label="发布时间"  :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}"  >
+              <a-form-item label="发布时间"  :labelCol="{span: 10}" :wrapperCol="{span: 32, offset: 0}"  >
                 <j-date v-model="queryParam.createTime" :showTime="true" date-format="YYYY-MM-DD"  placeholder="请选择发布时间" ></j-date>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
-              <a-form-item label="更新时间"  :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-form-item label="更新时间"  :labelCol="{span: 10}" :wrapperCol="{span: 16, offset: 0}">
                 <j-date v-model="queryParam.updateTime" :showTime="true" date-format="YYYY-MM-DD"  placeholder="请选择更新时间" ></j-date>
               </a-form-item>
             </a-col>