bug fix

src/components/base/CollegeSelect.vue

@@ -76,11 +76,6 @@ export default {
         const res = await unitQueryByType({}, "COLLEGE");
         this.optionList = res;
       }
-      const defaultCollege = this.optionList.find(item => item.inUsed);
-      if (defaultCollege) {
-        this.selected = defaultCollege.id;
-        this.select();
-      }
     },
     select() {
       this.$emit("input", this.selected);

src/components/base/SemesterSelect.vue

@@ -52,6 +52,11 @@ export default {
 
       const res = await unitQueryByType({}, "SEMESTER");
       this.optionList = res;
+      const defaultCollege = this.optionList.find(item => item.inUsed);
+      if (defaultCollege) {
+        this.selected = defaultCollege.id;
+        this.select();
+      }
     },
     select() {
       this.$emit("input", this.selected);

src/modules/base/components/ModifyCourse.vue

@@ -31,11 +31,11 @@
           clearable
         ></el-input>
       </el-form-item>
-      <el-form-item prop="teachingRoomId" label="所属机构：">
+      <el-form-item prop="teachingRoomId" label="开课部门：">
         <org-select
           v-model="modalForm.teachingRoomId"
           style="width:100%;"
-          placeholder="所属机构"
+          placeholder="开课部门"
         ></org-select>
       </el-form-item>
       <el-form-item label="授课班级：">
@@ -113,7 +113,7 @@ export default {
         teachingRoomId: [
           {
             required: true,
-            message: "请选择所属机构",
+            message: "请选择开课部门",
             trigger: "change"
           }
         ],

src/modules/base/views/CourseManage.vue

@@ -3,10 +3,10 @@
     <div class="part-box part-box-filter part-box-flex">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
-          <el-form-item label="机构：">
+          <el-form-item label="开课部门：">
             <org-select
               v-model="filter.belongOrgId"
-              placeholder="机构"
+              placeholder="开课部门"
             ></org-select>
           </el-form-item>
           <el-form-item label="课程名称：">
@@ -96,7 +96,7 @@
         ></el-table-column>
         <el-table-column
           prop="teachingRoomName"
-          label="所属机构"
+          label="开课部门"
           min-width="120"
         ></el-table-column>
         <el-table-column prop="clazzList" label="授课班级" min-width="120">

src/modules/print/views/PrintTaskManage.vue

@@ -138,31 +138,41 @@
         >
         <span class="mr-4"
           >试卷总计：<i class="color-primary">{{ totalInfo.paperCount }}</i>
-          个</span
+          套</span
         >
         <span class="mr-4"
-          >卷袋数量总计：<i class="color-primary">{{
-            totalInfo.packageCount
-          }}</i>
+          >卷袋总计：<i class="color-primary">{{ totalInfo.packageCount }}</i>
           个</span
         >
-        <span class="mr-4"
-          >A3印量总计：<i class="color-primary">{{ totalInfo.pagesA3 }}</i>
+        <span
+          >总印量：<i class="color-primary">{{
+            totalInfo.paperPages + totalInfo.cardPages
+          }}</i>
           张</span
         >
-        <span class="mr-4"
-          >A4印量总计：<i class="color-primary">{{ totalInfo.pagesA4 }}</i>
-          张</span
+        <span
+          >（试卷：<i class="color-primary">{{ totalInfo.paperPages }}</i>
+          张，</span
+        >
+        <span
+          >题卡：<i class="color-primary">{{ totalInfo.cardPages }}</i>
+          张）</span
         >
       </p>
       <p>
-        <span class="mr-4"
-          >A3剩余印量：<i class="color-primary">{{ totalInfo.pagesA3Left }}</i>
+        <span
+          >剩余印量：<i class="color-danger">{{
+            totalInfo.paperPagesLeft + totalInfo.cardPagesLeft
+          }}</i>
           张</span
         >
         <span
-          >A4剩余印量：<i class="color-primary">{{ totalInfo.pagesA4Left }}</i>
-          张</span
+          >（试卷：<i class="color-danger">{{ totalInfo.paperPagesLeft }}</i>
+          张，</span
+        >
+        <span
+          >题卡：<i class="color-danger">{{ totalInfo.cardPagesLeft }}</i>
+          张）</span
         >
       </p>
     </div>

src/plugins/axios.js

@@ -147,12 +147,13 @@ const errorDataCallback = response => {
   const error = response.data;
   let message = error.message || error.error || "请求错误";
   const unauthStatus = [401, 403];
-  const unauthDataCodes = [401001];
 
-  if (
-    unauthStatus.includes(response.status) &&
-    !unauthDataCodes.includes(error.code)
-  ) {
+  if (unauthStatus.includes(response.status)) {
+    if (error.code === 401001 && message === "没有权限") {
+      Notification.error({ title: "错误提示", message });
+      return error;
+    }
+
     if (unauthMsgBoxIsShow) return error;
 
     const exposeMsgs = ["系统授权信息已过期，请联系系统管理员激活!"];