From 4f39d2d3ee69813f106e06fc8a8d168ecccc941c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 15 三月 2024 15:32:17 +0800
Subject: [PATCH] 成绩统计详情增加时间查询

---
 src/views/exam/personalRandomTemplate/edit.vue |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/views/exam/personalRandomTemplate/edit.vue b/src/views/exam/personalRandomTemplate/edit.vue
index e95830c..3009191 100644
--- a/src/views/exam/personalRandomTemplate/edit.vue
+++ b/src/views/exam/personalRandomTemplate/edit.vue
@@ -2,8 +2,12 @@
   <div class="app-container">
     <el-form :model="form" ref="form" label-width="200px" v-loading="formLoading" :rules="rules">
       <el-form-item label="鑰冪敓锛�" prop="menuIds" required>
-        <el-cascader v-model="form.menuIds" :options="options" :props="props" clearable collapse-tags>
-        </el-cascader>
+<!--        <el-cascader v-model="form.menuIds"   :options="options" @change="cascaderChangeFun" :props="props" clearable collapse-tags>-->
+<!--        </el-cascader>-->
+        <all-cascader :options="options"
+                      :optionsData = "optionsData"
+                      @change="cascaderChangeFun"
+                      :width="200"></all-cascader>
       </el-form-item>
       <el-form-item label="璇剧洰锛�" prop="subjectId" required >
         <el-select ref="subjectIdRef" v-model="form.subjectId" placeholder="璇剧洰" multiple
@@ -17,7 +21,8 @@
           <el-option v-for="item in paperTypeEnum" :key="item.key" :value="item.key" :label="item.value" ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="鏃堕棿闄愬埗锛�" required v-show="form.paperType===4">
+
+      <el-form-item label="鏃堕棿闄愬埗锛�">
         <el-date-picker v-model="form.limitDateTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
                         range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
         </el-date-picker>
@@ -85,6 +90,7 @@
       <el-form-item label="寤鸿鏃堕暱锛�" prop="suggestTime" required>
         <el-input v-model="form.suggestTime" placeholder="鍒嗛挓"/>
       </el-form-item>
+
       <el-form-item>
         <el-button type="primary" @click="submitForm">鎻愪氦</el-button>
         <el-button @click="resetForm">閲嶇疆</el-button>
@@ -130,9 +136,9 @@
 import examPaperApi from '@/api/examPaper'
 import questionApi from '@/api/question'
 import departmentApi from '@/api/department'
-
+import allCascader from '@/components/Cascader'
 export default {
-  components: { Pagination, QuestionShow },
+  components: { Pagination, QuestionShow ,allCascader},
 
   data () {
     return {
@@ -152,15 +158,16 @@
         // }
       },
       options: [],
+      optionsData:[],
       departCascaderProps:{
         multiple: true
       },
       subjectIdList:[],
       form: {
-        aggregateSource:'',
+        aggregateSource:'100',
         id: null,
         departmentIds: [],
-
+        menuIds:[],
         subjectId: [],
         paperType: 7,
         limitDateTime: [],
@@ -223,7 +230,9 @@
        await examPaperApi.selfselect(id).then(re => {
          _this.form = re.response
          _this.form.menuIds = JSON.parse(re.response.menuIds)
+         _this.optionsData = _this.form.menuIds
          console.log(_this.form)
+
          _this.formLoading = false
        })
      }
@@ -242,6 +251,10 @@
      // this.subjectIdEvent(false)
    },
   methods: {
+    cascaderChangeFun(event){
+      console.log(event)
+      this.form.menuIds = event
+    },
     titlejs(val){
       console.log(val)
       let str = ''
@@ -318,6 +331,13 @@
           if (this.subjectIdList.length == 1){
             this.form.subjectId= this.form.subjectId
           };
+
+          let lastHasAll = this.form.menuIds.find(arr => {
+            return arr[0] === 'all';
+          });
+          if (lastHasAll){
+            this.form.menuIds = this.form.menuIds.slice(1)
+          }
           let op = [];
           for(var ele of this.form.menuIds){
             op.push(ele[1])

--
Gitblit v1.8.0