bug fixes

src/pages/course/index.vue

@@ -47,11 +47,12 @@
       <el-upload
         class="file-import"
         ref="upload"
-        action="/"
+        action="#"
         :auto-upload="false"
         :file-list="fileList"
         :limit="1"
         :before-upload="beforeUpload"
+        :http-request="fetchFileUpload"
         accept=".xls,.xlsx"
         >
         <el-button slot="trigger" size="mini" type="primary">选取文件</el-button>
@@ -177,28 +178,27 @@ export default {
         this.$message.error('只能上传excel文件')
         return false
       } else {
-        const formData = new window.FormData()
-        formData.append('file', file)
-        return new Promise((resolve, reject) => {
-          importCourse(formData).then(res => {
-            if (res.code === 0 && res.message === 'OK') {
-              this.$message.success('导入数据成功')
-              resolve(true)
-              this.$refs.tabList.refetch()
-              window.setTimeout(() => {
-                this.dialogVisible = false
-              }, 300)
-            } else {
-              this.$message.error(res.message || '导入数据失败，请重选选取文件上传')
-              resolve(false)
-            }
-          })
-        })
+        return true
       }
     },
     submitUpload: _.debounce(function() {
       this.$refs.upload.submit()
     }, 500),
+    fetchFileUpload(data) {
+      const formData = new window.FormData()
+      formData.append('file', data.file)
+      importCourse(formData).then(res => {
+        if (res.code === 0 && res.message === 'OK') {
+          this.$message.success('导入数据成功')
+          this.$refs.tabList.refetch()
+          window.setTimeout(() => {
+            this.dialogVisible = false
+          }, 300)
+        } else {
+          this.$message.error(res.message || '导入数据失败，请重选选取文件上传')
+        }
+      })
+    },
     handleCommand(type) {
       if (type === 'all') this.fetchExportAll()
     },

src/pages/student/components/info.vue

@@ -233,6 +233,7 @@ export default {
       updateStudentInfo(this.form.id, this.form).then(res => {
         if (res.code === 0 && res.message === 'OK') {
           this.$message.success('提交数据成功')
+          this.$emit('tableRefetch')
         } else {
           this.$message.error(res.message || '提交数据失败')
         }

src/pages/student/index.vue

@@ -47,11 +47,10 @@
       :destroy-on-close="true"
       size="1100px"
       top="15px"
-      :before-close="handleBeforeClose"
-      @close="handleClose">
+      :before-close="handleBeforeClose">
       <el-tabs v-model="tabsActive" type="card">
         <el-tab-pane label="基本信息" name="info" v-if="hasViewInfo">
-          <tab-info :info="details" />
+          <tab-info :info="details" @tableRefetch="tableRefetch"/>
         </el-tab-pane>
         <el-tab-pane label="学位信息" name="degree" v-if="hasViewDegree">
           <tab-degree :id="details.id"/>
@@ -76,6 +75,7 @@
         :file-list="fileList"
         :limit="1"
         :before-upload="beforeUpload"
+        :http-request="fetchFileUpload"
         accept=".xls,.xlsx"
         >
         <el-button slot="trigger" size="mini" type="primary">选取文件</el-button>
@@ -221,7 +221,6 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val.map(item => item.id)
     },
-    handleImport() {},
     handleRemove() {
       this.$confirm('确定删除选中项?', '提示', {
         confirmButtonText: '确定',
@@ -238,8 +237,6 @@ export default {
         this.$message.error('您没有权限查看详情')
       }
     },
-    handleClose() {
-    },
     handleDialogClose() {
       this.fileList = []
     },
@@ -249,29 +246,28 @@ export default {
         this.$message.error('只能上传excel文件')
         return false
       } else {
-        const formData = new window.FormData()
-        formData.append('type', this.importType)
-        formData.append('file', file)
-        return new Promise((resolve, reject) => {
-          importStudents(formData).then(res => {
-            if (res.code === 0 && res.message === 'OK') {
-              this.$message.success('导入数据成功')
-              resolve(true)
-              this.$refs.tabList.refetch()
-              window.setTimeout(() => {
-                this.dialogVisible = false
-              }, 300)
-            } else {
-              this.$message.error(res.message || '导入数据失败，请重选选取文件上传')
-              resolve(false)
-            }
-          })
-        })
+        return true
       }
     },
     submitUpload: _.debounce(function() {
       this.$refs.upload.submit()
     }, 500),
+    fetchFileUpload(data) {
+      const formData = new window.FormData()
+      formData.append('type', this.importType)
+      formData.append('file', data.file)
+      importStudents(formData).then(res => {
+        if (res.code === 0 && res.message === 'OK') {
+          this.$message.success('导入数据成功')
+          this.tableRefetch()
+          window.setTimeout(() => {
+            this.dialogVisible = false
+          }, 300)
+        } else {
+          this.$message.error(res.message || '导入数据失败，请重选选取文件上传')
+        }
+      })
+    },
     handleBeforeClose(done) {
       if (this.hasSaveCourse) {
         this.$confirm('您已确认保存好修改的数据，并关闭弹框吗?', '提示', {
@@ -301,11 +297,14 @@ export default {
       deleteStudent(ids).then(res => {
         if (res.code === 0 && res.message === 'OK') {
           this.$message.success('删除学员成功')
-          this.$refs.tabList.refetch()
+          this.tableRefetch()
         } else {
           this.$message.error('删除学员失败')
         }
       })
+    },
+    tableRefetch() {
+      this.$refs.tabList.refetch()
     }
   }
 }