所有查询优化完成

src/components/base/CourseSelect.vue

@@ -30,7 +30,7 @@ export default {
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },
-    printPlanId: { type: String, default: "" }
+    printPlanId: { type: [String, Array], default: "" }
   },
   data() {
     return {

src/components/base/PaperNumberSelect.vue

@@ -25,7 +25,7 @@ export default {
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },
-    printPlanId: { type: String, default: "" }
+    printPlanId: { type: [String, Array], default: "" }
   },
   data() {
     return {

src/components/base/PlaceSelect.vue

@@ -29,7 +29,7 @@ export default {
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },
-    printPlanId: { type: String, default: "" }
+    printPlanId: { type: [String, Array], default: "" }
   },
   data() {
     return {

src/components/base/PrintPlanSelect.vue

@@ -5,6 +5,7 @@
     placeholder="请选择"
     :style="styles"
     filterable
+    :multiple="multiple"
     :clearable="clearable"
     :disabled="disabled"
     @change="select"
@@ -26,9 +27,10 @@ export default {
   name: "print-plan-select",
   props: {
     disabled: { type: Boolean, default: false },
-    value: { type: [Number, String], default: "" },
+    value: { type: [Number, String, Array], default: "" },
     styles: { type: String, default: "" },
-    clearable: { type: Boolean, default: true }
+    clearable: { type: Boolean, default: true },
+    multiple: { type: Boolean, default: false }
   },
   data() {
     return {

src/components/base/RoomSelect.vue

@@ -29,7 +29,7 @@ export default {
     value: { type: [Number, String], default: "" },
     styles: { type: String, default: "" },
     clearable: { type: Boolean, default: true },
-    printPlanId: { type: String, default: "" }
+    printPlanId: { type: [String, Array], default: "" }
   },
   data() {
     return {

src/modules/base/views/CourseManage.vue

@@ -17,8 +17,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels

src/modules/base/views/TemplateManage.vue

@@ -17,8 +17,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels

src/modules/base/views/UserManage.vue

@@ -11,6 +11,14 @@
               clearable
             ></el-input>
           </el-form-item>
+          <el-form-item label="姓名：" label-width="75px">
+            <el-input
+              style="width: 142px;"
+              v-model.trim="filter.realName"
+              placeholder="请输入内容"
+              clearable
+            ></el-input>
+          </el-form-item>
           <el-form-item label="角色：" label-width="55px">
             <el-select
               v-model="filter.roleId"
@@ -187,6 +195,7 @@ export default {
     return {
       filter: {
         loginName: "",
+        realName: "",
         roleId: "",
         enable: ""
       },

src/modules/customer/views/CustomerCard.vue

@@ -42,8 +42,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
@@ -56,8 +56,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels

src/modules/exam/components/BatchAddExamTask.vue

@@ -37,8 +37,8 @@
             v-model="createTime"
             type="datetimerange"
             range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
             value-format="timestamp"
             align="right"
             unlink-panels
@@ -69,15 +69,6 @@
                 {{ scope.row.paperNumber | defaultFieldFilter }}
               </template>
             </el-table-column>
-            <el-table-column prop="specialty" label="适用专业（方向）">
-              <template slot-scope="scope">
-                <el-input
-                  v-model.trim="scope.row.specialty"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </template>
-            </el-table-column>
             <el-table-column label="命题老师" width="180px">
               <template slot-scope="scope">
                 <el-select

src/modules/exam/components/ModifyExamTask.vue

@@ -45,8 +45,8 @@
             v-model="createTime"
             type="datetimerange"
             range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
             value-format="timestamp"
             align="right"
             unlink-panels

src/modules/exam/components/ModifyTaskApply.vue

@@ -158,7 +158,10 @@ const initModalForm = {
   userName: "",
   auditStatus: "",
   reviewStatus: "",
-  source: ""
+  source: "",
+  teachingRoomName: "",
+  teacherName: "",
+  lecturerName: ""
 };
 
 export default {

src/modules/exam/components/PublishPrintTask.vue

@@ -26,8 +26,8 @@
             :picker-options="pickerOptions"
             :disabled="timeDisabled"
             range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
             value-format="timestamp"
             align="right"
             unlink-panels

src/modules/exam/views/ExamTaskManage.vue

@@ -35,13 +35,19 @@
             ></course-select>
           </el-form-item>
           <el-form-item label="命题老师：">
-            <question-teacher-user-select
-              v-model="filter.teacherId"
-              :course-code="filter.courseCode"
-              placeholder="请选择"
-            ></question-teacher-user-select>
+            <el-input
+              v-model="filter.userName"
+              placeholder="请输入"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="创建人：">
+            <el-input
+              v-model="filter.createName"
+              placeholder="请输入"
+              clearable
+            ></el-input>
           </el-form-item>
-          <!-- TODO:创建人--查询条件 -->
           <el-form-item label="试卷编号：">
             <paper-number-select
               ref="PaperNumberSelect"
@@ -56,8 +62,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
@@ -250,7 +256,8 @@ export default {
         cardRuleId: "",
         courseCode: "",
         paperNumber: "",
-        teacherId: "",
+        userName: "",
+        createName: "",
         startTime: null,
         endTime: null,
         enable: null

src/modules/exam/views/TaskApplyManage.vue

@@ -50,11 +50,11 @@
             ></course-select>
           </el-form-item>
           <el-form-item label="命题老师：">
-            <question-teacher-user-select
-              v-model="filter.teacherId"
-              :course-code="filter.courseCode"
-              placeholder="请选择"
-            ></question-teacher-user-select>
+            <el-input
+              v-model="filter.userName"
+              placeholder="请输入"
+              clearable
+            ></el-input>
           </el-form-item>
           <el-form-item label="试卷编号：">
             <paper-number-select
@@ -70,8 +70,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
@@ -249,7 +249,7 @@ export default {
         reviewStatus: "",
         cardRuleId: "",
         courseCode: "",
-        teacherId: "",
+        userName: "",
         paperNumber: "",
         startTime: "",
         endTime: ""

src/modules/exam/views/TaskPaperManage.vue

@@ -47,15 +47,14 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
             >
             </el-date-picker>
           </el-form-item>
-          <!-- TODO:申请时间-创建人--查询条件 -->
         </template>
         <el-form-item label-width="0px">
           <el-button

src/modules/exam/views/TaskReviewManage.vue

@@ -49,14 +49,35 @@
               placeholder="请选择"
             ></question-teacher-select>
           </el-form-item>
+          <el-form-item label="创建人：">
+            <el-input
+              v-model="filter.createName"
+              placeholder="请输入"
+              clearable
+            ></el-input>
+          </el-form-item>
           <el-form-item label="命题时间：">
             <el-date-picker
               v-model="createTime"
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              value-format="timestamp"
+              align="right"
+              unlink-panels
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="申请时间：">
+            <el-date-picker
+              v-model="applyTime"
+              type="datetimerange"
+              :picker-options="pickerOptions"
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
@@ -277,7 +298,10 @@ export default {
         courseCode: "",
         paperNumber: "",
         startTime: null,
-        endTime: null
+        endTime: null,
+        startCreateTime: null,
+        endCreateTime: null,
+        createName: ""
       },
       current: 1,
       size: this.GLOBAL.pageSize,
@@ -301,6 +325,7 @@ export default {
       },
       // date-picker
       createTime: [],
+      applyTime: [],
       pickerOptions
     };
   },
@@ -329,6 +354,10 @@ export default {
         datas.startTime = this.createTime[0];
         datas.endTime = this.createTime[1];
       }
+      if (this.applyTime) {
+        datas.startCreateTime = this.applyTime[0];
+        datas.endCreateTime = this.applyTime[1];
+      }
       const func = this.AUDITED
         ? taskReviewAuditedListPage
         : taskReviewUnauditedListPage;

src/modules/print/components/ModifyPlanPaper.vue

@@ -27,9 +27,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="适用专业（方向）：">
+            <!-- <el-form-item label="适用专业（方向）：">
               <span>{{ instance.specialty | defaultFieldFilter }}</span>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
         <el-row>

src/modules/print/components/ModifyPrintPlan.vue

@@ -31,8 +31,8 @@
             v-model="createTime"
             type="datetimerange"
             range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
             value-format="timestamp"
             align="right"
             unlink-panels

src/modules/print/components/PreviewBusinessDetail.vue

@@ -74,8 +74,6 @@
           ></el-table-column>
           <el-table-column prop="courseNameCode" label="课程（代码）">
           </el-table-column>
-          <!-- <el-table-column prop="specialty" label="适用专业（方向）">
-        </el-table-column> -->
           <el-table-column
             prop="paperNumber"
             label="试卷编码"

src/modules/print/views/BusinessDataDetail.vue

@@ -5,16 +5,17 @@
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="印刷计划：">
             <print-plan-select
-              v-model.trim="filter.printPlanId"
+              v-model.trim="filter.printPlanIdList"
               placeholder="请选择"
               clearable
+              multiple
               @change="printPlanChange"
             ></print-plan-select>
           </el-form-item>
           <el-form-item label="课程（代码）：" label-width="110px">
             <course-select
               v-model.trim="filter.courseCode"
-              :print-plan-id="filter.printPlanId"
+              :print-plan-id="filter.printPlanIdList"
               placeholder="请选择"
               clearable
             ></course-select>
@@ -23,7 +24,7 @@
             <paper-number-select
               ref="PaperNumberSelect"
               v-model="filter.paperNumber"
-              :print-plan-id="filter.printPlanId"
+              :print-plan-id="filter.printPlanIdList"
               placeholder="请选择"
               clearable
             ></paper-number-select>
@@ -31,7 +32,7 @@
           <el-form-item label="考点：" label-width="55px">
             <place-select
               v-model.trim="filter.examPlace"
-              :print-plan-id="filter.printPlanId"
+              :print-plan-id="filter.printPlanIdList"
               placeholder="请选择"
               clearable
             ></place-select>
@@ -39,11 +40,25 @@
           <el-form-item label="考场：" label-width="55px">
             <room-select
               v-model.trim="filter.examRoom"
-              :print-plan-id="filter.printPlanId"
+              :print-plan-id="filter.printPlanIdList"
               placeholder="请选择"
               clearable
             ></room-select>
           </el-form-item>
+          <el-form-item label="考试日期：">
+            <el-date-picker
+              v-model="createTime"
+              type="daterange"
+              :picker-options="pickerOptions"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="timestamp"
+              align="right"
+              unlink-panels
+            >
+            </el-date-picker>
+          </el-form-item>
           <el-form-item label="考生：" label-width="70px">
             <el-input
               v-model="filter.studentParams"
@@ -79,9 +94,7 @@
         ></el-table-column>
         <el-table-column prop="courseNameCode" label="课程（代码）">
         </el-table-column>
-        <el-table-column prop="specialty" label="适用专业（方向）">
-        </el-table-column>
-        <el-table-column prop="paperNumber" label="试卷编码"></el-table-column>
+        <el-table-column prop="paperNumber" label="试卷编号"></el-table-column>
         <el-table-column prop="examDate" label="考试日期"> </el-table-column>
         <el-table-column prop="examTime" label="考试时间"> </el-table-column>
         <el-table-column prop="examPlace" label="考点"> </el-table-column>
@@ -135,6 +148,7 @@
 import { businessDataDetailListPage } from "../api";
 import { parseTimeRangeDateAndTime } from "@/plugins/utils";
 import PreviewBusinessStudentDetail from "../components/PreviewBusinessStudentDetail";
+import pickerOptions from "@/constants/datePickerOptions";
 
 export default {
   name: "business-data-detail",
@@ -142,18 +156,23 @@ export default {
   data() {
     return {
       filter: {
-        printPlanId: "",
+        printPlanIdList: [],
         courseCode: "",
         paperNumber: "",
         examPlace: "",
         examRoom: "",
-        studentParams: ""
+        studentParams: "",
+        startDate: "",
+        endDate: ""
       },
       current: 1,
       size: this.GLOBAL.pageSize,
       total: 0,
       dataList: [],
-      curRow: {}
+      curRow: {},
+      // date-picker
+      createTime: [],
+      pickerOptions
     };
   },
   mounted() {
@@ -168,6 +187,10 @@ export default {
         pageNumber: this.current,
         pageSize: this.size
       };
+      if (this.createTime) {
+        datas.startDate = this.createTime[0];
+        datas.endDate = this.createTime[1];
+      }
       const data = await businessDataDetailListPage(datas);
       this.dataList = data.records.map(item => {
         const { date, time } = parseTimeRangeDateAndTime(

src/modules/print/views/BusinessDataExport.vue

@@ -5,16 +5,17 @@
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="印刷计划：">
             <print-plan-select
-              v-model.trim="filter.printPlanId"
+              v-model.trim="filter.printPlanIdList"
               placeholder="请选择"
               clearable
+              multiple
               @change="printPlanChange"
             ></print-plan-select>
           </el-form-item>
           <el-form-item label="课程（代码）：" label-width="110px">
             <course-select
               v-model.trim="filter.courseCode"
-              :print-plan-id="filter.printPlanId"
+              :print-plan-id="filter.printPlanIdList"
               placeholder="请选择"
               clearable
             ></course-select>
@@ -23,7 +24,7 @@
             <paper-number-select
               ref="PaperNumberSelect"
               v-model="filter.paperNumber"
-              :print-plan-id="filter.printPlanId"
+              :print-plan-id="filter.printPlanIdList"
               placeholder="请选择"
               clearable
             ></paper-number-select>
@@ -31,7 +32,7 @@
           <el-form-item label="考点：" label-width="55px">
             <place-select
               v-model.trim="filter.examPlace"
-              :print-plan-id="filter.printPlanId"
+              :print-plan-id="filter.printPlanIdList"
               placeholder="请选择"
               clearable
             ></place-select>
@@ -39,7 +40,7 @@
           <el-form-item label="考场：" label-width="55px">
             <room-select
               v-model.trim="filter.examRoom"
-              :print-plan-id="filter.printPlanId"
+              :print-plan-id="filter.printPlanIdList"
               placeholder="请选择"
               clearable
             ></room-select>
@@ -51,6 +52,20 @@
               clearable
             ></el-input>
           </el-form-item>
+          <el-form-item label="考试日期：">
+            <el-date-picker
+              v-model="createTime"
+              type="daterange"
+              :picker-options="pickerOptions"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="timestamp"
+              align="right"
+              unlink-panels
+            >
+            </el-date-picker>
+          </el-form-item>
         </template>
         <el-form-item label-width="0px">
           <el-button
@@ -111,7 +126,7 @@
         <el-table-column prop="packageCode" label="卷袋号"> </el-table-column>
         <el-table-column prop="courseNameCode" label="课程（代码）">
         </el-table-column>
-        <el-table-column prop="paperNumber" label="试卷编码"></el-table-column>
+        <el-table-column prop="paperNumber" label="试卷编号"></el-table-column>
         <el-table-column prop="totalSubjects" label="科次" width="80">
         </el-table-column>
         <el-table-column
@@ -180,6 +195,7 @@ import {
 import PreviewBusinessDetail from "../components/PreviewBusinessDetail";
 import UploadBusinessDataDialog from "../components/UploadBusinessDataDialog";
 import { downloadBlob, parseTimeRangeDateAndTime } from "@/plugins/utils";
+import pickerOptions from "@/constants/datePickerOptions";
 
 export default {
   name: "business-data-export",
@@ -187,12 +203,14 @@ export default {
   data() {
     return {
       filter: {
-        printPlanId: "",
+        printPlanIdList: "",
         courseCode: "",
         paperNumber: "",
         examPlace: "",
         examRoom: "",
-        packageCode: ""
+        packageCode: "",
+        startDate: "",
+        endDate: ""
       },
       current: 1,
       size: this.GLOBAL.pageSize,
@@ -202,7 +220,11 @@ export default {
       totalData: {},
       curPrintPlan: {},
       loading: false,
+      // date-picker
+      createTime: [],
+      pickerOptions,
       // import
+      // TODO:
       uploadUrl: "/api/admin/exam/print/data_import",
       uploadData: {
         type: "FILE",
@@ -229,6 +251,10 @@ export default {
         pageNumber: this.current,
         pageSize: this.size
       };
+      if (this.createTime) {
+        datas.startDate = this.createTime[0];
+        datas.endDate = this.createTime[1];
+      }
       const data = await businessDataListPage(datas);
       this.dataList = data.records.map(item => {
         const { date, time } = parseTimeRangeDateAndTime(
@@ -242,7 +268,14 @@ export default {
       this.total = data.total;
     },
     async getTotalData() {
-      this.totalData = await businessTotalData(this.filter);
+      const datas = {
+        ...this.filter
+      };
+      if (this.createTime) {
+        datas.startDate = this.createTime[0];
+        datas.endDate = this.createTime[1];
+      }
+      this.totalData = await businessTotalData(datas);
     },
     toPage(page) {
       this.current = page;
@@ -266,7 +299,14 @@ export default {
       if (this.loading) return;
 
       this.loading = true;
-      const res = await businessDataExport({ ...this.filter }).catch(() => {});
+      const datas = {
+        ...this.filter
+      };
+      if (this.createTime) {
+        datas.startDate = this.createTime[0];
+        datas.endDate = this.createTime[1];
+      }
+      const res = await businessDataExport(datas).catch(() => {});
       this.loading = false;
 
       if (res) {

src/modules/print/views/PlanLinkPaper.vue

@@ -20,16 +20,17 @@
           </el-form-item>
           <el-form-item label="印刷计划：">
             <print-plan-select
-              v-model.trim="filter.printPlanId"
+              v-model.trim="filter.printPlanIdList"
               placeholder="请选择"
               clearable
+              multiple
               @change="printPlanChange"
             ></print-plan-select>
           </el-form-item>
           <el-form-item label="课程（代码）：" label-width="110px">
             <course-select
               v-model.trim="filter.courseCode"
-              :print-plan-id="filter.printPlanId"
+              :print-plan-id="filter.printPlanIdList"
               placeholder="请选择"
               clearable
             ></course-select>
@@ -38,11 +39,26 @@
             <paper-number-select
               ref="PaperNumberSelect"
               v-model="filter.paperNumber"
-              :print-plan-id="filter.printPlanId"
+              :print-plan-id="filter.printPlanIdList"
               placeholder="请选择"
               clearable
             ></paper-number-select>
           </el-form-item>
+          <el-form-item label="题卡规则：">
+            <card-rule-select
+              ref="CardRuleSelect"
+              v-model.trim="filter.cardRuleId"
+              placeholder="请选择"
+              clearable
+            ></card-rule-select>
+          </el-form-item>
+          <el-form-item label="命题老师：">
+            <el-input
+              v-model="filter.userName"
+              placeholder="请输入"
+              clearable
+            ></el-input>
+          </el-form-item>
         </template>
         <el-form-item label-width="0px">
           <el-button
@@ -75,8 +91,6 @@
             >{{ scope.row.courseName }}（{{ scope.row.courseCode }}）</span
           >
         </el-table-column>
-        <el-table-column prop="specialty" label="适用专业（方向）">
-        </el-table-column>
         <el-table-column prop="cardRuleName" label="题卡规则">
         </el-table-column>
         <el-table-column prop="userName" label="命题老师" width="100">
@@ -153,10 +167,12 @@ export default {
   data() {
     return {
       filter: {
-        printPlanId: "",
+        printPlanIdList: [],
         courseCode: "",
         paperNumber: "",
-        relateType: ""
+        relateType: "",
+        cardRuleId: "",
+        userName: ""
       },
       current: 1,
       size: this.GLOBAL.pageSize,

src/modules/print/views/PrintPlanManage.vue

@@ -5,12 +5,13 @@
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="印刷计划：">
             <print-plan-select
-              v-model.trim="filter.printPlanId"
+              v-model.trim="filter.printPlanIdList"
               placeholder="请选择"
+              multiple
               clearable
             ></print-plan-select>
           </el-form-item>
-          <el-form-item label="当前状态：">
+          <el-form-item label="计划状态：">
             <el-select
               v-model="filter.status"
               style="width: 142px;"
@@ -31,8 +32,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels
@@ -176,7 +177,7 @@ export default {
   data() {
     return {
       filter: {
-        printPlanId: "",
+        printPlanIdList: [],
         status: "",
         startTime: "",
         endTime: ""

src/modules/print/views/PrintTaskManage.vue

@@ -62,7 +62,7 @@
           <el-form-item label="考试日期：">
             <el-date-picker
               v-model="createTime"
-              type="datetimerange"
+              type="daterange"
               :picker-options="pickerOptions"
               range-separator="至"
               start-placeholder="开始日期"
@@ -79,8 +79,8 @@
               type="datetimerange"
               :picker-options="pickerOptions"
               range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="timestamp"
               align="right"
               unlink-panels