刘洋 1 рік тому
батько
коміт
422eb29700
1 змінених файлів з 16 додано та 14 видалено
  1. 16 14
      src/modules/questions/views/OrgProperty.vue

+ 16 - 14
src/modules/questions/views/OrgProperty.vue

@@ -307,7 +307,7 @@
         <template v-if="form.properties.GEN_PAPER_QUESTION_ENABLE == 'true'">
           <el-form-item label="试题创建时间">
             <el-date-picker
-              v-model="form.properties.timeRange"
+              v-model="timeRange"
               type="daterange"
               range-separator="-"
               start-placeholder="开始时间"
@@ -341,7 +341,6 @@
 import { mapState } from "vuex";
 import { QUESTION_API } from "@/constants/constants.js";
 import { orgAiTransactionSaveApi, orgAiTransactionListApi } from "../api";
-import { omit } from "lodash";
 
 export default {
   name: "OrgProperty",
@@ -410,10 +409,12 @@ export default {
           AI_QUESTION_REMAINDER: 0,
           USE_AI_QUESTION: "false",
           GEN_PAPER_QUESTION_ENABLE: "true",
-          timeRange: [],
           GEN_PAPER_QUESTION_COUNT: "",
+          GEN_PAPER_QUESTION_START: "",
+          GEN_PAPER_QUESTION_END: "",
         },
       },
+      timeRange: [],
       roleCode: "",
       roleList: [],
       rules: {
@@ -486,13 +487,14 @@ export default {
           //   );
           // }
 
-          this.form.properties = this.$objAssign(this.form.properties, {
-            ...response.data,
-            timeRange: [
-              response.data.GEN_PAPER_QUESTION_START,
-              response.data.GEN_PAPER_QUESTION_END,
-            ],
-          });
+          this.form.properties = this.$objAssign(
+            this.form.properties,
+            response.data
+          );
+          this.timeRange = [
+            response.data.GEN_PAPER_QUESTION_START || "",
+            response.data.GEN_PAPER_QUESTION_END || "",
+          ];
         }
       });
     },
@@ -545,15 +547,15 @@ export default {
       // this.setParams();
       let url = QUESTION_API + "/org/saveOrgProperties";
       if (this.form.properties.GEN_PAPER_QUESTION_ENABLE == "false") {
-        this.form.properties.timeRange = [];
+        this.timeRange = [];
         this.form.properties.GEN_PAPER_QUESTION_COUNT = "";
       }
-      let GEN_PAPER_QUESTION_START = this.form.properties.timeRange[0];
-      let GEN_PAPER_QUESTION_END = this.form.properties.timeRange[1];
+      let GEN_PAPER_QUESTION_START = this.timeRange[0] || "";
+      let GEN_PAPER_QUESTION_END = this.timeRange[1] || "";
       let params = {
         orgId: this.form.orgId,
         properties: {
-          ...omit(this.form.properties, "timeRange"),
+          ...this.form.properties,
           GEN_PAPER_QUESTION_START,
           GEN_PAPER_QUESTION_END,
         },