浏览代码

bug修改

zhangjie 3 年之前
父节点
当前提交
9d3662aab1

+ 4 - 0
src/components/base/TeachingRoomSelect.vue

@@ -47,6 +47,7 @@ export default {
   },
   },
   created() {
   created() {
     this.search();
     this.search();
+    console.log("create");
   },
   },
   methods: {
   methods: {
     async search() {
     async search() {
@@ -60,6 +61,9 @@ export default {
         this.optionList.find(item => item.id === this.selected)
         this.optionList.find(item => item.id === this.selected)
       );
       );
     }
     }
+  },
+  beforeDestroy() {
+    console.log("before destory");
   }
   }
 };
 };
 </script>
 </script>

+ 6 - 0
src/modules/base/views/CampusManage.vue

@@ -14,6 +14,12 @@
     </div>
     </div>
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">
       <el-table ref="TableList" :data="dataList">
       <el-table ref="TableList" :data="dataList">
+        <el-table-column
+          type="index"
+          label="序号"
+          width="70"
+          :index="indexMethod"
+        ></el-table-column>
         <el-table-column prop="campusName" label="校区名称"></el-table-column>
         <el-table-column prop="campusName" label="校区名称"></el-table-column>
         <el-table-column prop="campusCode" label="校区编码"></el-table-column>
         <el-table-column prop="campusCode" label="校区编码"></el-table-column>
         <el-table-column prop="printHouseName" label="印刷室"></el-table-column>
         <el-table-column prop="printHouseName" label="印刷室"></el-table-column>

+ 5 - 1
src/modules/base/views/CardRuleManage.vue

@@ -74,7 +74,11 @@
             {{ scope.row.orgs | orgsFilter }}
             {{ scope.row.orgs | orgsFilter }}
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="remark" label="备注"></el-table-column>
+        <el-table-column prop="remark" label="备注">
+          <span slot-scope="scope">{{
+            scope.row.remark | defaultFieldFilter
+          }}</span>
+        </el-table-column>
         <el-table-column prop="enable" label="启用/禁用" width="100">
         <el-table-column prop="enable" label="启用/禁用" width="100">
           <template slot-scope="scope">
           <template slot-scope="scope">
             {{ scope.row.enable | enableFilter }}
             {{ scope.row.enable | enableFilter }}

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

@@ -50,6 +50,12 @@
     </div>
     </div>
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">
       <el-table ref="TableList" :data="dataList">
       <el-table ref="TableList" :data="dataList">
+        <el-table-column
+          type="index"
+          label="序号"
+          width="70"
+          :index="indexMethod"
+        ></el-table-column>
         <el-table-column prop="clazzName" label="班级名称"></el-table-column>
         <el-table-column prop="clazzName" label="班级名称"></el-table-column>
         <el-table-column prop="campusName" label="所属校区"></el-table-column>
         <el-table-column prop="campusName" label="所属校区"></el-table-column>
         <el-table-column prop="createTime" label="创建日期">
         <el-table-column prop="createTime" label="创建日期">

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

@@ -64,6 +64,12 @@
     </div>
     </div>
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">
       <el-table ref="TableList" :data="courses">
       <el-table ref="TableList" :data="courses">
+        <el-table-column
+          type="index"
+          label="序号"
+          width="70"
+          :index="indexMethod"
+        ></el-table-column>
         <el-table-column prop="courseName" label="课程名称"></el-table-column>
         <el-table-column prop="courseName" label="课程名称"></el-table-column>
         <el-table-column prop="courseCode" label="课程编码"></el-table-column>
         <el-table-column prop="courseCode" label="课程编码"></el-table-column>
         <el-table-column
         <el-table-column

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

@@ -48,6 +48,12 @@
     </div>
     </div>
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">
       <el-table ref="TableList" :data="dataList">
       <el-table ref="TableList" :data="dataList">
+        <el-table-column
+          type="index"
+          label="序号"
+          width="70"
+          :index="indexMethod"
+        ></el-table-column>
         <el-table-column prop="studentName" label="姓名"></el-table-column>
         <el-table-column prop="studentName" label="姓名"></el-table-column>
         <el-table-column prop="studentCode" label="学号"></el-table-column>
         <el-table-column prop="studentCode" label="学号"></el-table-column>
         <el-table-column prop="phoneNumber" label="手机号">
         <el-table-column prop="phoneNumber" label="手机号">

+ 5 - 1
src/modules/base/views/TemplateManage.vue

@@ -82,7 +82,11 @@
             {{ scope.row.orgs | orgsFilter }}
             {{ scope.row.orgs | orgsFilter }}
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="remark" label="备注"></el-table-column>
+        <el-table-column prop="remark" label="备注">
+          <span slot-scope="scope">{{
+            scope.row.remark | defaultFieldFilter
+          }}</span>
+        </el-table-column>
         <el-table-column prop="enable" label="启用/禁用" width="100">
         <el-table-column prop="enable" label="启用/禁用" width="100">
           <template slot-scope="scope">
           <template slot-scope="scope">
             {{ scope.row.enable | enableFilter }}
             {{ scope.row.enable | enableFilter }}

+ 1 - 0
src/modules/exam/components/CreateTaskApply.vue

@@ -8,6 +8,7 @@
     :close-on-click-modal="false"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     :close-on-press-escape="false"
     append-to-body
     append-to-body
+    destroy-on-close
     @open="visibleChange"
     @open="visibleChange"
   >
   >
     <div class="part-box part-box-pad part-box-border">
     <div class="part-box part-box-pad part-box-border">

+ 2 - 1
src/modules/exam/components/ModifyExamTask.vue

@@ -8,11 +8,12 @@
     :close-on-click-modal="false"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     :close-on-press-escape="false"
     append-to-body
     append-to-body
+    destroy-on-close
     @open="visibleChange"
     @open="visibleChange"
   >
   >
     <el-form
     <el-form
       ref="modalFormComp"
       ref="modalFormComp"
-      label-width="130px"
+      label-width="120px"
       :class="{ 'form-info': !editable }"
       :class="{ 'form-info': !editable }"
       :rules="rules"
       :rules="rules"
       :model="modalForm"
       :model="modalForm"

+ 1 - 0
src/modules/exam/components/PublishPrintTask.vue

@@ -7,6 +7,7 @@
     :show-close="false"
     :show-close="false"
     append-to-body
     append-to-body
     fullscreen
     fullscreen
+    destroy-on-close
     @opened="visibleChange"
     @opened="visibleChange"
   >
   >
     <div slot="title">
     <div slot="title">

+ 5 - 1
src/modules/exam/views/ExamTaskManage.vue

@@ -157,7 +157,11 @@
             {{ scope.row.enable | enableFilter }}
             {{ scope.row.enable | enableFilter }}
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="createName" label="创建人"></el-table-column>
+        <el-table-column
+          prop="createName"
+          label="创建人"
+          width="100"
+        ></el-table-column>
         <el-table-column class-name="action-column" label="操作" width="120px">
         <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <el-button
             <el-button

+ 10 - 10
src/modules/exam/views/TaskPaperManage.vue

@@ -107,16 +107,16 @@
             scope.row.createTime | timestampFilter
             scope.row.createTime | timestampFilter
           }}</span>
           }}</span>
         </el-table-column>
         </el-table-column>
-        <el-table-column
-          prop="exposedPaperType"
-          label="已曝光"
-          width="100"
-        ></el-table-column>
-        <el-table-column
-          prop="unexposedPaperType"
-          label="未曝光"
-          width="100"
-        ></el-table-column>
+        <el-table-column prop="exposedPaperType" label="已曝光" width="100">
+          <span slot-scope="scope">{{
+            scope.row.exposedPaperType | defaultFieldFilter
+          }}</span>
+        </el-table-column>
+        <el-table-column prop="unexposedPaperType" label="未曝光" width="100">
+          <span slot-scope="scope">{{
+            scope.row.unexposedPaperType | defaultFieldFilter
+          }}</span>
+        </el-table-column>
         <el-table-column prop="cardRuleName" label="题卡规则"></el-table-column>
         <el-table-column prop="cardRuleName" label="题卡规则"></el-table-column>
         <el-table-column prop="makeMethod" label="题卡创建类型">
         <el-table-column prop="makeMethod" label="题卡创建类型">
           <span slot-scope="scope">{{
           <span slot-scope="scope">{{

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

@@ -174,7 +174,11 @@
             {{ scope.row.createTime | timestampFilter }}
             {{ scope.row.createTime | timestampFilter }}
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="createName" label="创建人"></el-table-column>
+        <el-table-column
+          prop="createName"
+          label="创建人"
+          width="100"
+        ></el-table-column>
         <el-table-column class-name="action-column" label="操作" width="80px">
         <el-table-column class-name="action-column" label="操作" width="80px">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <el-button
             <el-button

+ 5 - 1
src/modules/exam/views/WaitTask.vue

@@ -15,7 +15,11 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
         <el-table-column prop="cardRuleName" label="题卡规则"></el-table-column>
         <el-table-column prop="cardRuleName" label="题卡规则"></el-table-column>
-        <el-table-column prop="taskName" label="流程节点"> </el-table-column>
+        <el-table-column prop="taskName" label="流程节点">
+          <span slot-scope="scope">
+            {{ scope.row.taskName | flowTaskNameFilter }}
+          </span>
+        </el-table-column>
         <el-table-column prop="createTime" label="创建时间" width="180">
         <el-table-column prop="createTime" label="创建时间" width="180">
           <span slot-scope="scope">{{
           <span slot-scope="scope">{{
             scope.row.createTime | timestampFilter
             scope.row.createTime | timestampFilter

+ 3 - 1
src/modules/print/components/ModifyPlanPaper.vue

@@ -230,7 +230,9 @@ export default {
     },
     },
     visibleChange() {
     visibleChange() {
       this.modalForm = this.$objAssign(initModalForm, this.instance);
       this.modalForm = this.$objAssign(initModalForm, this.instance);
-      this.modalForm.relatePaperType = this.instance.relatePaperType.split(",");
+      this.modalForm.relatePaperType = this.instance.relatePaperType
+        ? this.instance.relatePaperType.split(",")
+        : [];
 
 
       this.getPapers();
       this.getPapers();
       // this.getPaperTypes();
       // this.getPaperTypes();

+ 1 - 3
src/modules/print/components/UploadBusinessDataDialog.vue

@@ -69,15 +69,13 @@ export default {
       }
       }
     };
     };
   },
   },
-  created() {
-    this.getPlans();
-  },
   methods: {
   methods: {
     async getPlans() {
     async getPlans() {
       const res = await printPlanQuery();
       const res = await printPlanQuery();
       this.plans = res.filter(item => ["NEW", "READY"].includes(item.status));
       this.plans = res.filter(item => ["NEW", "READY"].includes(item.status));
     },
     },
     visibleChange() {
     visibleChange() {
+      this.getPlans();
       this.modalForm.printPlanId = "";
       this.modalForm.printPlanId = "";
       this.loading = false;
       this.loading = false;
       if (this.plans.length === 1) {
       if (this.plans.length === 1) {

+ 9 - 0
src/modules/print/views/PlanLinkPaper.vue

@@ -94,14 +94,23 @@
         <el-table-column prop="userName" label="命题老师" width="100">
         <el-table-column prop="userName" label="命题老师" width="100">
         </el-table-column>
         </el-table-column>
         <el-table-column prop="exposedPaperType" label="已曝光类型" width="100">
         <el-table-column prop="exposedPaperType" label="已曝光类型" width="100">
+          <span slot-scope="scope">{{
+            scope.row.exposedPaperType | defaultFieldFilter
+          }}</span>
         </el-table-column>
         </el-table-column>
         <el-table-column
         <el-table-column
           prop="unexposedPaperType"
           prop="unexposedPaperType"
           label="未曝光类型"
           label="未曝光类型"
           width="100"
           width="100"
         >
         >
+          <span slot-scope="scope">{{
+            scope.row.unexposedPaperType | defaultFieldFilter
+          }}</span>
         </el-table-column>
         </el-table-column>
         <el-table-column prop="relatePaperType" label="关联卷型" width="100">
         <el-table-column prop="relatePaperType" label="关联卷型" width="100">
+          <span slot-scope="scope">{{
+            scope.row.relatePaperType | defaultFieldFilter
+          }}</span>
         </el-table-column>
         </el-table-column>
         <el-table-column label="关联状态" width="80">
         <el-table-column label="关联状态" width="80">
           <span slot-scope="scope">
           <span slot-scope="scope">

+ 3 - 0
src/plugins/filters.js

@@ -69,3 +69,6 @@ Vue.filter("timestampFilter", function(val) {
     ? formatDate("YYYY-MM-DD HH:mm:ss", new Date(val * 1))
     ? formatDate("YYYY-MM-DD HH:mm:ss", new Date(val * 1))
     : DEFAULT_FIELD;
     : DEFAULT_FIELD;
 });
 });
+Vue.filter("flowTaskNameFilter", function(val) {
+  return val ? val.replace(/\(.+?\)/g, "") : DEFAULT_FIELD;
+});