From 513882a845100035ecb374a46ea6a85081ec16f6 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 17 五月 2024 15:50:04 +0800
Subject: [PATCH] 取消重复判断

---
 src/views/exam/personalRandomTemplate/edit.vue |   72 +++++++++++++++++++++++++++++++++---
 src/views/exam/paper/edit.vue                  |    4 -
 2 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index ab7d623..65d47b1 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -175,7 +175,7 @@
       studentDialog: false,
       student: {
         pageIndex: 1,
-        pageSize: 100,
+        pageSize: 5,
         listLoading: true,
         multipleSelection: []
       },
@@ -423,9 +423,7 @@
     },
     confirmStudentSelect () {
       this.student.multipleSelection.forEach(q => {
-        if(this.form.menuIds.some(obj => obj !== q.id)) {
           this.form.menuIds.push(q.id)
-        }
       })
       this.studentDialog = false
     },
diff --git a/src/views/exam/personalRandomTemplate/edit.vue b/src/views/exam/personalRandomTemplate/edit.vue
index b662d7b..a2144cd 100644
--- a/src/views/exam/personalRandomTemplate/edit.vue
+++ b/src/views/exam/personalRandomTemplate/edit.vue
@@ -2,12 +2,7 @@
   <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" @change="cascaderChangeFun" :props="props" clearable collapse-tags>-->
-<!--        </el-cascader>-->
-        <all-cascader :options="options"
-                      :optionsData = "optionsData"
-                      @change="cascaderChangeFun"
-                      :width="200"></all-cascader>
+        <el-select v-model="form.menuIds" :collapse-tags="true" multiple placeholder="璇烽�夋嫨" @focus="selectStudent"></el-select>
       </el-form-item>
       <el-form-item label="璇剧洰锛�" prop="subjectId" required >
         <el-select ref="subjectIdRef" v-model="form.subjectId" placeholder="璇剧洰" multiple
@@ -130,6 +125,35 @@
           <el-button type="primary" @click="confirmQuestionSelect">纭畾</el-button>
      </span>
     </el-dialog>
+
+    <el-dialog :visible.sync="studentDialog"  width="70%">
+      <el-form :model="student" ref="queryForm" :inline="true">
+        <el-form-item label="鏍囩锛�">
+          <el-select v-model="student.tagId" clearable>
+            <el-option v-for="item in tags" :key="item.id" :value="item.id" :label="item.name"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="閮ㄩ棬锛�">
+          <el-select v-model="student.deptId" clearable>
+            <el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="selectStudent">鏌ヨ</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="student.listLoading" :data="tableData" border fit highlight-current-row style="width: 100%" @selection-change="handleSelection">
+        <el-table-column type="selection"></el-table-column>
+        <el-table-column prop="realName" label="鐢ㄦ埛"/>
+      </el-table>
+      <pagination v-show="total > 0" :total="total"
+                  :page.sync="student.pageIndex" :limit.sync="student.pageSize"
+                  @pagination="selectStudent"/>
+      <span slot="footer" class="dialog-footer">
+          <el-button @click="studentDialog = false">鍙� 娑�</el-button>
+          <el-button type="primary" @click="confirmStudentSelect">纭畾</el-button>
+     </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -139,6 +163,7 @@
 import Pagination from '@/components/Pagination'
 import QuestionShow from '../question/components/Show'
 import examPaperApi from '@/api/examPaper'
+import userApi from '@/api/user'
 import questionApi from '@/api/question'
 import departmentApi from '@/api/department'
 import allCascader from '@/components/Cascader'
@@ -147,6 +172,18 @@
 
   data () {
     return {
+      tags: [],
+      depts: [],
+      student: {},
+      studentDialog: false,
+      student: {
+        pageIndex: 1,
+        pageSize: 5,
+        listLoading: true,
+        multipleSelection: []
+      },
+      tableData: [],
+      total: 0,
       props: {
         multiple: true
         // lazy: true,
@@ -262,6 +299,29 @@
      // this.subjectIdEvent(false)
    },
   methods: {
+    handleSelection (val) {
+      this.student.multipleSelection = val
+    },
+    confirmStudentSelect () {
+      this.student.multipleSelection.forEach(q => {
+          this.form.menuIds.push(q.id)
+      })
+      this.studentDialog = false
+    },
+    getTags () {
+      userApi.tagList(null).then(data => {
+        this.tags = data.response
+      })
+    },
+    selectStudent() {
+     this.getTags();
+      this.studentDialog = true;
+      examPaperApi.selectStudent(this.student).then(res => {
+        this.tableData = res.response.list
+        this.total = res.response.total
+        this.student.listLoading = false
+      })
+    },
     cascaderChangeFun(event){
       console.log(event)
       this.form.menuIds = event

--
Gitblit v1.8.0