zhangjie 3 лет назад
Родитель
Сommit
e5c00ca75b

+ 8 - 4
src/modules/base/views/ApproveRecordManage.vue

@@ -42,13 +42,17 @@
           prop="primaryApproveName"
           label="第一级审核人"
         ></el-table-column>
-        <el-table-column
-          prop="primaryApproveRemark"
-          label="审核意见"
-        ></el-table-column>
+        <el-table-column prop="primaryApproveRemark" label="审核意见">
+          <span slot-scope="scope">{{
+            scope.row.primaryApproveRemark | defaultFieldFilter
+          }}</span>
+        </el-table-column>
         <el-table-column prop="secondApproveName" label="第二级审核人">
         </el-table-column>
         <el-table-column prop="secondApproveRemark" label="审核意见">
+          <span slot-scope="scope">{{
+            scope.row.secondApproveRemark | defaultFieldFilter
+          }}</span>
         </el-table-column>
         <el-table-column
           prop="statusStr"

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

@@ -23,6 +23,11 @@
         <el-table-column prop="campusName" 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="createTime" label="创建时间">
+          <span slot-scope="scope">{{
+            scope.row.createTime | timestampFilter
+          }}</span>
+        </el-table-column>
         <el-table-column label="操作" width="120px">
           <template slot-scope="scope">
             <el-button

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

@@ -58,7 +58,7 @@
         ></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="createTime" label="创建日期">
+        <el-table-column prop="createTime" label="创建时间">
           <span slot-scope="scope">{{
             scope.row.createTime | timestampFilter
           }}</span>

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

@@ -81,7 +81,7 @@
             {{ scope.row.clazzList.map(item => item.name).join(",") }}
           </span>
         </el-table-column>
-        <el-table-column prop="createTime" label="创建日期">
+        <el-table-column prop="createTime" label="创建时间">
           <span slot-scope="scope">{{
             scope.row.createTime | timestampFilter
           }}</span>

+ 4 - 1
src/modules/base/views/FlowManage.vue

@@ -135,7 +135,10 @@ export default {
         type: "warning"
       })
         .then(async () => {
-          await flowDelete({ flowId: row.id, enable: false });
+          await flowDelete({
+            flowId: row.id,
+            enable: false
+          });
           this.$message.success("操作成功!");
           this.getList();
         })

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

@@ -63,6 +63,11 @@
         </el-table-column>
         <el-table-column prop="campusName" label="校区"></el-table-column>
         <el-table-column prop="clazz" label="班级"></el-table-column>
+        <el-table-column prop="createTime" label="创建时间">
+          <span slot-scope="scope">{{
+            scope.row.createTime | timestampFilter
+          }}</span>
+        </el-table-column>
         <el-table-column label="操作" width="120px">
           <template slot-scope="scope">
             <el-button

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

@@ -233,7 +233,8 @@ export default {
       this.modalForm.batchNo = data.batchNo;
       this.batchConfirmMessage = data.errorMsg;
       this.tasks = data.tasks.map(item => {
-        item.userId = item.users.length === 1 ? item.users[0].id : "";
+        if (!item.userId)
+          item.userId = item.users.length === 1 ? item.users[0].id : "";
         return item;
       });
       this.$refs.modalFormComp.validateField("batchNo");

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

@@ -162,6 +162,11 @@
           label="创建人"
           width="100"
         ></el-table-column>
+        <el-table-column prop="createTime" label="创建时间">
+          <span slot-scope="scope">{{
+            scope.row.createTime | timestampFilter
+          }}</span>
+        </el-table-column>
         <el-table-column class-name="action-column" label="操作" width="120px">
           <template slot-scope="scope">
             <el-button

+ 11 - 1
src/plugins/axios.js

@@ -127,8 +127,10 @@ const errorCallback = error => {
       message = "请求超时";
     }
     Notification.error({ title: "错误提示", message });
+    return error;
   }
 
+  Notification.error({ title: "错误提示", message: "请求错误" });
   return error;
 };
 
@@ -179,7 +181,15 @@ const errorDataCallback = response => {
  */
 const successCallback = data => {
   if (data.code === 200) {
-    return data.data;
+    if (data.data.hasOwnProperty("success")) {
+      if (data.data.success) {
+        return data.data;
+      } else {
+        return Promise.reject(data.data);
+      }
+    } else {
+      return data.data;
+    }
   } else {
     return Promise.reject(data.data);
   }