Merge branch 'iteration_0802' into test

src/views/app/entryOperation.vue

@@ -37,6 +37,7 @@
                           :picker-options="{
                             firstDayOfWeek:1
                           }"
+                          :default-time="['00:00:00', '23:59:59']"
                           align="right"
                           unlink-panels
                           value-format="yyyy-MM-dd HH:mm:ss"

src/views/buildVip/index.vue

@@ -130,7 +130,6 @@
               clearable
               placeholder="请输入上课学员"
               remote
-              reserve-keyword
               @change="changeStudent"
               filterable
               :multiple-limit="studentLimit"

src/views/categroyManager/vipActiveList.vue

@@ -329,6 +329,7 @@
               type="datetimerange"
               range-separator="至"
               value-format="yyyy-MM-dd HH:mm:ss"
+              :default-time="['00:00:00', '23:59:59']"
               :picker-options="{
                 firstDayOfWeek: 1,
               }"
@@ -341,6 +342,7 @@
               v-model.trim="resetForm.courseTime"
               style="width: 100%"
               type="datetimerange"
+              :default-time="['00:00:00', '23:59:59']"
               :picker-options="{
                 firstDayOfWeek: 1,
               }"

src/views/categroyManager/vipNewActive.vue

@@ -94,6 +94,7 @@
           <el-date-picker
             v-model.trim="vipform.activeTime"
             type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"
@@ -107,6 +108,7 @@
           <el-date-picker
             v-model.trim="vipform.courseTime"
             type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"

src/views/contentManager/contentOperation.vue

@@ -81,6 +81,7 @@
                         v-model="form.actionTime"
                         :clearable="false"
                         type="datetimerange"
+                        :default-time="['00:00:00', '23:59:59']"
                         range-separator="至"
                         :picker-options="{ firstDayOfWeek: 1 }"
                         start-placeholder="上架开始日期"

src/views/luckyDraw/lotteryManager.vue

@@ -69,6 +69,7 @@
                         v-model="form.time"
                         :picker-options="{ firstDayOfWeek: 1 }"
                         type="datetimerange"
+                        :default-time="['00:00:00', '23:59:59']"
                         range-separator="至"
                         start-placeholder="活动开始日期"
                         end-placeholder="活动结束日期">

src/views/setQuestions/operation.vue

@@ -10,6 +10,12 @@
                     <el-form-item label="问卷名称" prop="title" :rules="[{ required: true, message: '请输入问卷名称', trigger: 'blur' }]">
                         <el-input v-model="form.title" placeholder="请输入问卷名称" :disabled="disabled"></el-input>
                     </el-form-item>
+                    <el-form-item label="重复提交" prop="againCommitFlag" :rules="[{ required: true, message: '请选择是否重复提交', trigger: 'change' }]">
+                        <el-select v-model="form.againCommitFlag" placeholder="请选择是否重复提交" :disabled="disabled" style="width: 100% !important;">
+                            <el-option label="是" :value="1"></el-option>
+                            <el-option label="否" :value="0"></el-option>
+                        </el-select>
+                    </el-form-item>
                 </el-form>
             </el-col>
         </el-row>
@@ -103,6 +109,7 @@ export default {
             activeName: [],
             form: {
                 title: null,
+                againCommitFlag: 1,
                 questionnaireQuestionList: [{questionnaireQuestionItemList: [{ }]}],
             },
             disabled: query.type == 'look' ? true : false,