Merge remote-tracking branch 'origin/dev' into dev

src/views/modules/base/smartImport.vue

@@ -390,7 +390,7 @@ export default {
             this.importCode = fileCode;
             this.fileData = file;
           } else {
-            this.$message.error(msg);
+            this.$message.error(res.data.msg);
           }
         })
         .catch((err) => {

src/views/modules/importRecord/index.vue

@@ -32,13 +32,14 @@
               v-if="scope.row.resultDescFile"
               >下载结果说明</a
             >
-            <span
+            <!-- <span
               v-else-if="
                 scope.row.processStatus == 'finished_fail' &&
                 !scope.row.resultDescFile
               "
               >未知错误</span
             >
+            <span v-else></span> -->
           </template>
         </el-table-column>
       </el-table>