From ad6e313fa2b50c8d6ffaed610d19a3fd4f670c90 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Sun, 24 Apr 2022 17:53:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/epidemicreportuserinfo.vue       | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index c9d53dc..20eae8e 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -284,6 +284,10 @@
           <el-button v-if="$hasPermission('epidemicreportuserinfo:reset')" type="primary"  @click="resetState">重置核酸检测状态</el-button>
         </el-form-item>
 
+          <el-form-item>
+              <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item>
+
         <el-form-item label="导入网格" label-width="90px">
           <el-cascader v-model="deptIdListUpload"
                        ref="deptTree"
@@ -323,17 +327,9 @@
 <!--                     type="primary"-->
 <!--                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
 <!--        </el-form-item>-->
-        <el-form-item>
-          <el-button v-if="$hasPermission('demo:epidemicreportuserinfo:delete')"
-                     type="danger"
-                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading"
-                :data="dataList"
-                border
-                @selection-change="dataListSelectionChangeHandle"
-                style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+          <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column label="序号"
                          header-align="center"
                          align="center"
@@ -487,8 +483,8 @@
                            align="center"></el-table-column>
         </el-table>
         <template slot="footer">
-          <el-button type="primary"
-                     @click="importResult">确定</el-button>
+          <!--<el-button type="primary" @click="importResult">忽略错误</el-button>-->
+          <el-button type="primary" @click="exportError">导出错误数据</el-button>
         </template>
       </el-dialog>
 
@@ -760,6 +756,19 @@ export default {
       this.faultDataVisible = false
       this.getDataList()
     },
+      // 导出错误数据
+      exportError(){
+          var params = qs.stringify({
+              // 'token': window.localStorage.getItem('token'),
+              'token': Cookies.get('token'),
+              ...this.dataForm
+          })
+          window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportErrorInfoURL}?${params}`
+          this.$message({
+              type: 'success',
+              message: '下载成功'
+          });
+      },
     beforeImportUser () {
       //所属组织全都不选，直接上传
       if (this.gridIdImport === ''){