Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/views/followup/plan-manage/dialog/set-time-form.vue

@@ -8,16 +8,8 @@
               v-model="timeForm.timeNo"
               type="number"
               size="small"
-              placeholder="请输入天数"
+              placeholder="请输入"
               clearable />
-            <!--<el-select v-model="timeForm.timeNo" placeholder="请选择">-->
-              <!--<el-option-->
-                <!--v-for="item in indexOptions"-->
-                <!--:key="item.no"-->
-                <!--:label="item.value"-->
-                <!--:value="item.no">-->
-              <!--</el-option>-->
-            <!--</el-select>-->
           </el-form-item>
           <el-form-item prop="timeUnit" class="ml20">
             <el-select v-model="timeForm.timeUnit" placeholder="请选择" :disabled="timeForm.isDisabled">