WANG há 6 anos atrás
pai
commit
cdcafa6346

+ 9 - 24
src/modules/examwork/view/offlineExamOrgSettings.vue

@@ -77,7 +77,7 @@
           <el-table-column width="80" label="上传附件">
             <span slot-scope="scope"> {{ getCanUpload(scope.row) }} </span>
           </el-table-column>
-          <el-table-column label="操作" width="80">
+          <el-table-column label="操作" width="100">
             <template slot-scope="scope">
               <div>
                 <el-button
@@ -233,7 +233,6 @@
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                   value-format="yyyy-MM-dd HH:mm:ss"
-                  :clearable="false"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -269,18 +268,6 @@
 import { CORE_API, EXAM_WORK_API } from "@/constants/constants.js";
 import LinkTitlesCustom from "@/components/LinkTitlesCustom.vue";
 
-let _this = null;
-
-let validateOrgSettingDatetimeRange = (rule, value, callback) => {
-  let examDatetimeRange = _this.orgSettingDatetimeRange;
-  if (!examDatetimeRange || 0 == examDatetimeRange.length) {
-    callback(new Error("请输入考试时间"));
-    _this.activeName = "tab1";
-  } else {
-    callback();
-  }
-};
-
 export default {
   components: { LinkTitlesCustom },
   data() {
@@ -316,13 +303,6 @@ export default {
       orgSettingRules: {
         orgId: [
           { required: true, message: "请选择学习中心", trigger: "blur,change" }
-        ],
-        orgSettingDatetimeRange: [
-          {
-            required: true,
-            validator: validateOrgSettingDatetimeRange,
-            trigger: "blur"
-          }
         ]
       }
     };
@@ -357,8 +337,14 @@ export default {
         });
     },
     updateOrgSetting() {
-      this.orgSetting.beginTime = this.orgSettingDatetimeRange[0];
-      this.orgSetting.endTime = this.orgSettingDatetimeRange[1];
+      if (!this.orgSettingDatetimeRange) {
+        this.orgSetting.beginTime = null;
+        this.orgSetting.endTime = null;
+      } else {
+        this.orgSetting.beginTime = this.orgSettingDatetimeRange[0];
+        this.orgSetting.endTime = this.orgSettingDatetimeRange[1];
+      }
+
       this.$refs.updateOrgSettingForm.validate(valid => {
         if (valid) {
           let url = EXAM_WORK_API + "/exam/examOrgSettings";
@@ -477,7 +463,6 @@ export default {
     }
   },
   created() {
-    _this = this;
     this.examId = this.$route.params.id;
     this.formSearch.examId = this.examId;
     this.init();

+ 7 - 3
src/modules/examwork/view/onlineExamOrgSettings.vue

@@ -176,7 +176,6 @@
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                   value-format="yyyy-MM-dd HH:mm:ss"
-                  :clearable="false"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -376,8 +375,13 @@ export default {
       });
     },
     addOrgSetting() {
-      this.orgSetting.beginTime = this.orgSettingDatetimeRange[0];
-      this.orgSetting.endTime = this.orgSettingDatetimeRange[1];
+      if (!this.orgSettingDatetimeRange) {
+        this.orgSetting.beginTime = null;
+        this.orgSetting.endTime = null;
+      } else {
+        this.orgSetting.beginTime = this.orgSettingDatetimeRange[0];
+        this.orgSetting.endTime = this.orgSettingDatetimeRange[1];
+      }
       this.$refs.addOrgSettingForm.validate(valid => {
         if (valid) {
           let url = EXAM_WORK_API + "/exam/examOrgSettings";