添加校验单导入报错

ZRAdmin-vue-main/src/views/Business/SapDeliverRecord/index.vue

@@ -304,7 +304,7 @@
     </el-dialog>
     <!-- 导入对话框 -->
     <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
-      <el-upload name="file" ref="uploadRef" :limit="1" accept=".xlsx" :headers="upload.headers"
+      <el-upload name="file" ref="uploadRef" :limit="1" accept=".xlsx,.xls" :headers="upload.headers"
         :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :on-error="handleFileError"
         :auto-upload="false" :data="uploadPara" drag>
@@ -317,7 +317,7 @@
             <!-- <div class="el-upload__tip">
                   <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
                 </div> -->
-            <span>仅允许导入xlsx格式文件。</span>
+            <span>仅允许导入xlsx和xls格式文件。</span>
             <!-- <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
               @click="importTemplate">下载模板</el-link> -->
           </div>
@@ -480,7 +480,8 @@ const handleFileSuccess = (response, file, fileList) => {
   upload.open = false
   upload.isUploading = false
   proxy.$refs['uploadRef'].clearFiles()
-  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '导入结果', {
+  console.log(response)
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.data + '</div>', '导入结果', {
     dangerouslyUseHTMLString: true
   })
   getList()
@@ -488,7 +489,7 @@ const handleFileSuccess = (response, file, fileList) => {
 /** 文件上传失败处理 */
 const handleFileError = (Error, file, fileList) => {
   upload.isUploading = false
-  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>文件：《" + file.name + "》导入错误，请检查文件。<br/>请确认：<br/>交验单号<br/>采购订单<br/>生产令号<br/>行项目<br/>规格型号<br/>关键件标识<br/>交验单数量<br/>抽检数量<br/>以上内容在表格中正确无误。" + '</div>', '导入错误', {
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>文件：【" + file.name + "】导入错误。<br/>请确认：<br/>交验单号<br/>采购订单<br/>生产令号<br/>行项目<br/>规格型号<br/>关键件标识<br/>交验单数量<br/>抽检数量<br/>以上内容在表格中正确无误。" + '</div>', '导入错误', {
     dangerouslyUseHTMLString: true
   })
 }

ZRAdmin-vue-main/src/views/index_v1.vue

@@ -151,23 +151,16 @@
             </el-button>
           </template>
           <el-table v-loading="loading" border :data="list">
-            <el-table-column type="index" label="序号" width="50" align="center" />
+            <el-table-column type="index" label="序号" align="center" />
+            <el-table-column label="用户" align="center" prop="operName" />
+            <el-table-column label="IP地址" align="center" prop="operIp" :show-overflow-tooltip="true" />
             <el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />
-            <el-table-column prop="businessType" label="业务类型" align="center">
-              <template #default="scope">
-                <dict-tag :options="businessTypeOptions" :value="scope.row.businessType" />
-              </template>
-            </el-table-column>
-            <el-table-column label="操作人员" align="center" prop="operName" />
-            <el-table-column label="主机" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
-            <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
             <el-table-column label="操作状态" align="center" prop="status">
               <template #default="{ row }">
                 <dict-tag :options="statusOptions" :value="row.status"></dict-tag>
               </template>
             </el-table-column>
-            <el-table-column label="日志内容" align="center" prop="errorMsg" :show-overflow-tooltip="true" />
-            <el-table-column label="操作日期" align="center" prop="operTime" width="180">
+            <el-table-column label="操作日期" align="center" prop="operTime">
               <template #default="scope">
                 <span>{{ scope.row.operTime }}</span>
               </template>