Merge remote-tracking branch 'origin/dev_v4.0.1' into dev_v4.0.1

src/modules/examwork/view/stageSpecialSettings.vue

@@ -252,7 +252,7 @@
         <!-- 添加场次弹出框 -->
         <el-dialog
           title="场次新增"
-          width="650px"
+          width="670px"
           :visible.sync="addStageVisible"
         >
           <el-form
@@ -337,35 +337,59 @@
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    value-format="yyyy-MM-dd"
                   ></el-date-picker>
                 </el-form-item>
               </el-row>
               <el-row>
-                <el-form-item label="每日场次数量">
-                  <el-input-number
-                    @change="handleDailyNumChange"
-                    v-model="addStageForm.num"
-                    :min="1"
-                    :max="20"
-                    label="描述文字"
-                  ></el-input-number>
-                </el-form-item>
+                <el-col :span="14">
+                  <el-form-item label="每日场次数量">
+                    <el-input-number
+                      v-model="addStageForm.num"
+                      :controls="false"
+                      :min="1"
+                      :max="20"
+                      label="每日场次数量"
+                    ></el-input-number>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="10" style="line-height: 48px;height: 40px;">
+                  <i
+                    class="el-icon-circle-plus"
+                    style="color:#00A4FF;font-size:24px;"
+                    @click="addTimeRange"
+                  ></i>
+                </el-col>
               </el-row>
 
               <el-row
                 v-for="(item, index) in addStageForm.addTimeRangeArr2"
-                :key="'tr' + index"
+                :key="'tr2' + index"
               >
-                <el-form-item :label="index + '.'">
-                  <el-time-picker
-                    is-range
-                    v-model="item.timeRange"
-                    range-separator="至"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间"
-                    placeholder="选择时间范围"
-                  ></el-time-picker>
-                </el-form-item>
+                <el-col :span="22">
+                  <el-form-item :label="index + 1 + '.'">
+                    <el-time-picker
+                      is-range
+                      v-model="item.timeRange"
+                      range-separator="至"
+                      start-placeholder="开始时间"
+                      end-placeholder="结束时间"
+                      placeholder="选择时间范围"
+                      value-format="HH:mm:ss"
+                      format="HH:mm:ss"
+                      :picker-options="{
+                        selectableRange: '00:00:00 - 23:59:00'
+                      }"
+                    ></el-time-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="2" style="line-height: 48px;height: 40px;">
+                  <i
+                    class="el-icon-remove"
+                    style="color:#00A4FF;font-size:24px;"
+                    @click="removeTimeRange(index)"
+                  ></i>
+                </el-col>
               </el-row>
             </template>
             <el-row class="d-flex justify-content-center">
@@ -565,7 +589,14 @@ export default {
         num: 1,
         addTimeRangeArr: [{ timeRange: [] }],
         num2: 1,
-        addTimeRangeArr2: [{ timeRange: [] }]
+        addTimeRangeArr2: [
+          {
+            timeRange: [
+              new Date(2020, 9, 10, 8, 40),
+              new Date(2020, 9, 10, 10, 40)
+            ]
+          }
+        ]
       },
       editStageForm: {
         id: null,
@@ -574,13 +605,13 @@ export default {
         endTime: null,
         specialSetting: false,
         submitType: "NORMAL",
-        submitDuration: null
+        submitDuration: 0
       },
       editStageCommonSettingForm: {
         id: null,
         examId: null,
         submitType: "NORMAL",
-        submitDuration: null
+        submitDuration: 0
       },
       addStageRules: {
         startTime: [
@@ -634,13 +665,17 @@ export default {
         num: 1,
         addTimeRangeArr: [{ timeRange: [] }],
         num2: 1,
-        addTimeRangeArr2: [{ timeRange: [] }]
+        addTimeRangeArr2: [
+          {
+            timeRange: [new Date(2020, 9, 0, 0, 0), new Date(2020, 9, 0, 0, 0)]
+          }
+        ]
       };
     },
     handleCommonSetting() {
       this.editStageCommonSettingForm.examId = this.formSearch.examId;
       this.editStageCommonSettingForm.submitType = "NORMAL";
-      this.editStageCommonSettingForm.submitDuration = "";
+      this.editStageCommonSettingForm.submitDuration = 0;
       var url = EXAM_WORK_API + "/examStage/getExamStageSetting";
       this.$httpWithMsg
         .get(url, { params: this.formSearch })
@@ -821,7 +856,6 @@ export default {
       });
     },
     editStage(row) {
-      debugger;
       this.editStageForm.id = row.id;
       this.startExamDatetimeRange2Edit = [row.startTime, row.endTime];
       this.editStageForm.startTime = row.startTime;
@@ -829,7 +863,8 @@ export default {
       this.editStageForm.stageOrder = row.stageOrder;
       this.editStageForm.specialSetting = row.specialSetting;
       this.editStageForm.submitType = row.submitType;
-      this.editStageForm.submitDuration = row.submitDuration;
+      this.editStageForm.submitDuration =
+        row.submitDuration == null ? 0 : row.submitDuration;
       this.editStageVisible = true;
     },
     saveAddStage() {
@@ -847,17 +882,18 @@ export default {
           });
         }
       } else {
+        debugger;
         //按天创建
         let st0 = this.addStageForm.timeRange0[0];
         let et0 = this.addStageForm.timeRange0[1];
         let days = this.getDays(st0, et0) + 1;
         let order = 0;
-        for (let i = 0; i < days; i++) {
+        for (var j = 0; j < days; j++) {
           //日期
-          let dt = this.addDays(st0, i);
-          for (let tr of this.addStageForm.addTimeRangeArr) {
+          let dt = this.addDays(st0, j);
+          for (let tr of this.addStageForm.addTimeRangeArr2) {
             let st = dt + " " + tr.timeRange[0];
-            let et = dt + " " + tr.timeRange[0];
+            let et = dt + " " + tr.timeRange[1];
             order++;
             examStages.push({
               examId: this.formSearch.examId,
@@ -903,7 +939,8 @@ export default {
               type: "success",
               message: "保存成功"
             });
-            this.editStageCommonSettingVisible = false;
+            this.editStageVisible = false;
+            this.searchForm();
           });
         } else {
           return false;
@@ -917,7 +954,7 @@ export default {
           type: "success",
           message: "保存成功"
         });
-        this.handleSearchBtn();
+        this.searchForm();
         this.editStageCommonSettingVisible = false;
       });
     },
@@ -979,7 +1016,7 @@ export default {
     addDays(date, days) {
       let dt = new Date(date);
       dt.setDate(dt.getDate() + days);
-      return dt.getFullYear() + "-" + dt.getMonth() + "-" + dt.getDate();
+      return dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-" + dt.getDate();
     }
   },
   //初始化查询