zhangjie 1 年之前
父節點
當前提交
8d81f79bf2
共有 34 個文件被更改,包括 33 次插入83 次删除
  1. 1 1
      src/constants/enumerate.js
  2. 1 0
      src/modules/analysis/components/ModifyAnalysisBatchPaper.vue
  3. 1 0
      src/modules/analysis/components/SelectAnalysisPaper.vue
  4. 1 0
      src/modules/analysis/views/AnalysisBatchManage.vue
  5. 0 58
      src/modules/base/components/ModifyCourse.vue
  6. 1 0
      src/modules/base/components/course-simple/AddClazzSimpleDialog.vue
  7. 1 0
      src/modules/base/components/course-simple/ClazzSimpleManage.vue
  8. 1 0
      src/modules/base/components/course-simple/SelectSimpleCourse.vue
  9. 1 0
      src/modules/base/components/course-simple/SelectSimpleStudent.vue
  10. 1 0
      src/modules/base/components/course-simple/SelectSimpleTeacher.vue
  11. 1 0
      src/modules/base/components/course-simple/StudentSimpleManage.vue
  12. 1 0
      src/modules/base/components/course-simple/TeacherSimpleManage.vue
  13. 1 22
      src/modules/base/views/ApproveRecordManage.vue
  14. 1 0
      src/modules/base/views/ClazzManage.vue
  15. 1 0
      src/modules/base/views/CollegeManage.vue
  16. 1 0
      src/modules/base/views/CourseManage.vue
  17. 1 0
      src/modules/base/views/ExamStudentManage.vue
  18. 1 0
      src/modules/base/views/MajorManage.vue
  19. 1 1
      src/modules/base/views/PrintPlanPushManage.vue
  20. 1 0
      src/modules/base/views/StudentManage.vue
  21. 1 0
      src/modules/exam/views/DownloadManage.vue
  22. 1 0
      src/modules/exam/views/StatisticsManage.vue
  23. 1 0
      src/modules/exam/views/TaskReviewManage.vue
  24. 1 0
      src/modules/mark/components/ScoreCheckDetail.vue
  25. 1 0
      src/modules/mark/components/markDetail/MarkDetailArbitration.vue
  26. 1 0
      src/modules/mark/components/markDetail/MarkDetailIssue.vue
  27. 1 0
      src/modules/mark/components/markDetail/MarkDetailMarker.vue
  28. 1 0
      src/modules/mark/components/markDetail/MarkDetailQuality.vue
  29. 1 1
      src/modules/mark/components/markParam/MarkParamObjectiveAnswer.vue
  30. 1 0
      src/modules/mark/views/MarkManage.vue
  31. 1 0
      src/modules/mark/views/MarkSetting.vue
  32. 1 0
      src/modules/mark/views/ScoreCheck.vue
  33. 1 0
      src/modules/print/components/PrintPlanBkDetail.vue
  34. 1 0
      src/modules/print/views/PrintTaskManage.vue

+ 1 - 1
src/constants/enumerate.js

@@ -360,7 +360,7 @@ export const QUESTION_TYPE_LIST = [
 
 export const QUESTION_SCORE_TYPE = {
   NONE: "全对给分",
-  ALL: "任选给分",
+  ALL: "任选给分",
   LEAK_HALF: "漏选给半分",
   LEAK: "漏选给分",
 };

+ 1 - 0
src/modules/analysis/components/ModifyAnalysisBatchPaper.vue

@@ -43,6 +43,7 @@
         >
           <el-table-column
             type="selection"
+            fixed="left"
             width="55"
             align="center"
           ></el-table-column>

+ 1 - 0
src/modules/analysis/components/SelectAnalysisPaper.vue

@@ -86,6 +86,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/analysis/views/AnalysisBatchManage.vue

@@ -61,6 +61,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 0 - 58
src/modules/base/components/ModifyCourse.vue

@@ -40,26 +40,6 @@
             placeholder="开课学院"
           ></org-select>
         </el-form-item>
-        <el-form-item label="授课班级:">
-          <clazz-select
-            v-model="modalForm.clazzIdSet"
-            placeholder="请选择授课班级"
-            multiple
-            clearable
-            style="width: 100%"
-          ></clazz-select>
-        </el-form-item>
-      </el-form>
-      <el-form>
-        <el-form-item label="授课老师:">
-          <el-button type="primary" size="mini" @click="toSelectTeacher"
-            >选择</el-button
-          >
-          <br />
-          <el-tag v-for="item in teachList" :key="item.id">
-            {{ item.name }}({{ item.orgName }})
-          </el-tag>
-        </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button type="primary" :disabled="isSubmit" @click="submit"
@@ -68,34 +48,21 @@
         <el-button @click="cancel">取消</el-button>
       </div>
     </el-dialog>
-
-    <SelectTypeUser
-      ref="SelectTypeUser"
-      special-privilege="TEACHER"
-      dialog-title="选择授课老师"
-      :user-ids="modalForm.teachIdSet"
-      :user-limit-count="0"
-      @confirm="userSelected"
-    />
   </div>
 </template>
 
 <script>
 import { updateCourse, getCode } from "../api";
-import SelectTypeUser from "../../stmms/components/SelectTypeUser.vue";
 
 const initModalForm = {
   id: null,
   courseName: "",
   courseCode: "",
   teachingRoomId: "",
-  clazzIdSet: "",
-  teachIdSet: [],
 };
 
 export default {
   name: "modify-course",
-  components: { SelectTypeUser },
   props: {
     instance: {
       type: Object,
@@ -143,33 +110,15 @@ export default {
             trigger: "change",
           },
         ],
-        clazzIdSet: [
-          {
-            required: true,
-            validator: (rule, value, callback) => {
-              if (!value || !value.length) {
-                return callback(new Error("请选择授课班级"));
-              }
-
-              callback();
-            },
-            trigger: "change",
-          },
-        ],
       },
-      teachList: [],
     };
   },
   methods: {
     initData(val) {
       if (val.id) {
         this.modalForm = this.$objAssign(initModalForm, val);
-        this.modalForm.clazzIdSet = val.clazzList.map((item) => item.id);
-        this.modalForm.teachIdSet = val.teachList.map((item) => item.id);
-        this.teachList = val.teachList;
       } else {
         this.modalForm = { ...initModalForm };
-        this.teachList = [];
         this.createCode();
       }
     },
@@ -185,13 +134,6 @@ export default {
     open() {
       this.modalIsShow = true;
     },
-    toSelectTeacher() {
-      this.$refs.SelectTypeUser.open();
-    },
-    userSelected(users) {
-      this.teachList = users;
-      this.modalForm.teachIdSet = users.map((item) => item.id);
-    },
     async submit() {
       const valid = await this.$refs.modalFormComp.validate().catch(() => {});
       if (!valid) return;

+ 1 - 0
src/modules/base/components/course-simple/AddClazzSimpleDialog.vue

@@ -39,6 +39,7 @@
     >
       <el-table-column
         type="selection"
+        fixed="left"
         width="55"
         align="center"
       ></el-table-column>

+ 1 - 0
src/modules/base/components/course-simple/ClazzSimpleManage.vue

@@ -27,6 +27,7 @@
         <el-table-column
           v-if="editable"
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/base/components/course-simple/SelectSimpleCourse.vue

@@ -33,6 +33,7 @@
     >
       <el-table-column
         type="selection"
+        fixed="left"
         width="55"
         align="center"
       ></el-table-column>

+ 1 - 0
src/modules/base/components/course-simple/SelectSimpleStudent.vue

@@ -37,6 +37,7 @@
     >
       <el-table-column
         type="selection"
+        fixed="left"
         width="55"
         align="center"
       ></el-table-column>

+ 1 - 0
src/modules/base/components/course-simple/SelectSimpleTeacher.vue

@@ -30,6 +30,7 @@
     >
       <el-table-column
         type="selection"
+        fixed="left"
         width="55"
         align="center"
       ></el-table-column>

+ 1 - 0
src/modules/base/components/course-simple/StudentSimpleManage.vue

@@ -54,6 +54,7 @@
         >
           <el-table-column
             type="selection"
+            fixed="left"
             width="55"
             align="center"
           ></el-table-column>

+ 1 - 0
src/modules/base/components/course-simple/TeacherSimpleManage.vue

@@ -27,6 +27,7 @@
         <el-table-column
           v-if="editable"
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 22
src/modules/base/views/ApproveRecordManage.vue

@@ -132,13 +132,6 @@
               @click="toPreview(scope.row)"
               >查看</el-button
             >
-            <el-button
-              v-if="checkPrivilege('link', 'delete')"
-              class="btn-danger"
-              type="text"
-              @click="toDelete(scope.row)"
-              >删除</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
@@ -168,7 +161,7 @@
 </template>
 
 <script>
-import { approveRecordListPage, deleteApproveRecord } from "../api";
+import { approveRecordListPage } from "../api";
 import { examTaskGetOne } from "../../exam/api";
 import { AUDITING_STATUS } from "@/constants/enumerate";
 import pickerOptions from "@/constants/datePickerOptions";
@@ -239,20 +232,6 @@ export default {
       this.curExamTask = await examTaskGetOne(data.objectId);
       this.$refs.ModifyTaskApply.open();
     },
-    toDelete(row) {
-      this.$confirm(`确定要删除当前记录吗?`, "提示", {
-        type: "warning",
-      })
-        .then(async () => {
-          await deleteApproveRecord({
-            id: row.id,
-            enable: 0,
-          });
-          this.$message.success("操作成功!");
-          this.getList();
-        })
-        .catch(() => {});
-    },
   },
 };
 </script>

+ 1 - 0
src/modules/base/views/ClazzManage.vue

@@ -46,6 +46,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/base/views/CollegeManage.vue

@@ -45,6 +45,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/base/views/CourseManage.vue

@@ -89,6 +89,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/base/views/ExamStudentManage.vue

@@ -109,6 +109,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/base/views/MajorManage.vue

@@ -45,6 +45,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 1
src/modules/base/views/PrintPlanPushManage.vue

@@ -128,9 +128,9 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
-          fixed="left"
         ></el-table-column>
         <el-table-column prop="name" label="课程名称(代码)" min-width="180">
           <span slot-scope="scope"

+ 1 - 0
src/modules/base/views/StudentManage.vue

@@ -92,6 +92,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/exam/views/DownloadManage.vue

@@ -56,6 +56,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/exam/views/StatisticsManage.vue

@@ -125,6 +125,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/exam/views/TaskReviewManage.vue

@@ -122,6 +122,7 @@
         <el-table-column
           v-if="!AUDITED"
           type="selection"
+          fixed="left"
           width="55"
           align="center"
           :selectable="checkAbleSelected"

+ 1 - 0
src/modules/mark/components/ScoreCheckDetail.vue

@@ -169,6 +169,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/mark/components/markDetail/MarkDetailArbitration.vue

@@ -48,6 +48,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
           @selectable="rowSelectable"

+ 1 - 0
src/modules/mark/components/markDetail/MarkDetailIssue.vue

@@ -62,6 +62,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/mark/components/markDetail/MarkDetailMarker.vue

@@ -63,6 +63,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/mark/components/markDetail/MarkDetailQuality.vue

@@ -42,6 +42,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 1
src/modules/mark/components/markParam/MarkParamObjectiveAnswer.vue

@@ -173,7 +173,7 @@ export default {
       abc: "abcdefghijklmnopqrstuvwxyz".toUpperCase(),
       QUESTION_SCORE_TYPE_SIMPLE: {
         NONE: "全对给分",
-        ALL: "任选给分",
+        ALL: "任选给分",
       },
     };
   },

+ 1 - 0
src/modules/mark/views/MarkManage.vue

@@ -66,6 +66,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/mark/views/MarkSetting.vue

@@ -49,6 +49,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/mark/views/ScoreCheck.vue

@@ -29,6 +29,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>

+ 1 - 0
src/modules/print/components/PrintPlanBkDetail.vue

@@ -85,6 +85,7 @@
         >
           <el-table-column
             type="selection"
+            fixed="left"
             width="55"
             align="center"
             :selectable="rowSelectable"

+ 1 - 0
src/modules/print/views/PrintTaskManage.vue

@@ -224,6 +224,7 @@
       >
         <el-table-column
           type="selection"
+          fixed="left"
           width="55"
           align="center"
         ></el-table-column>