zhangjie 3 роки тому
батько
коміт
45577c910f

+ 8 - 1
src/modules/base/components/SelectUserDialog.vue

@@ -205,7 +205,14 @@ export default {
     visibleChange() {
       this.filterLabel = "";
       this.labelChange();
-      this.selectedUsers = this.users;
+      this.selectedUsers = this.users.map(user => {
+        const luser = this.userList.find(item => item.id === user.id);
+        return {
+          id: user.id,
+          name: user.name,
+          label: `${user.name}(${luser.orgName})`
+        };
+      });
       this.selectedUserIds = this.users.map(item => item.id);
       this.$refs.UserTree.setCheckedKeys(this.selectedUserIds);
       this.checkValid();

+ 4 - 1
src/modules/exam/components/ModifyTaskApply.vue

@@ -29,7 +29,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="使用学期:">
-              <span>{{ modalForm.paperName || "--" }}</span>
+              <span>{{ modalForm.semesterName || "--" }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -104,6 +104,9 @@ import { parseTimeRangeDateAndTime } from "@/plugins/utils";
 const initModalForm = {
   id: null,
   examId: "",
+  examName: "",
+  semesterId: "",
+  semesterName: "",
   courseCode: "",
   courseName: "",
   specialty: "",

+ 2 - 3
src/modules/exam/components/createExamAndPrintTask/InfoExamTask.vue

@@ -52,6 +52,7 @@
                 placeholder="请选择"
                 filterable
                 class="width-full"
+                :disabled="!examTask.examId"
                 @change="courseChange"
               >
                 <el-option
@@ -345,11 +346,9 @@ export default {
       });
     },
     async getCardList() {
-      if (!this.examTask.courseCode) return;
+      if (!this.examTask.courseCode || !this.examTask.examId) return;
       const data = await cardForSelectList({
         courseCode: this.examTask.courseCode,
-        paperType: this.paperAttachments.map(item => item.name).join(","),
-        cardRuleId: this.examTask.cardRuleId,
         examId: this.examTask.examId
       });
       this.cards = data || [];