Merge branch 'persontesting_export' into origin/grid_member

src/views/modules/epidemic/persontesting.vue

@@ -37,6 +37,21 @@
         <el-form-item>
           <el-button type="primary" @click="toReader()">核酸检测登记</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="info"
+                     @click="exportMoudleHandle()">导出模板</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="upLoadFile()">信息导入</el-button>
+          <el-upload class="upload-demo"
+                     ref="upload"
+                     :action="uploadUrl"
+                     multiple
+                     :limit="1"
+                     :on-success='uploadSuccess'
+                     :on-error='errorExceed'>
+          </el-upload>
+        </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:persontesting:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
@@ -45,31 +60,17 @@
         </el-form-item>
       </el-form>
       <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" width="50px">
           <template slot-scope="scope">
             {{scope.$index+1}}
           </template>
         </el-table-column>
-<!--        <el-table-column prop="id" label="ID" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sex" label="性别" header-align="center" align="center"></el-table-column>
-<!--        <el-table-column prop="nation" label="民族" header-align="center" align="center"></el-table-column>-->
-<!--        <el-table-column prop="birthday" label="出生日期" header-align="center" align="center"></el-table-column>-->
-<!--        <el-table-column prop="address" label="住址" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="idcard" label="身份证号码" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="organ" label="签发机关" header-align="center" align="center"></el-table-column>
-<!--        <el-table-column prop="imgCode" label="照片base64编码" header-align="center" align="center"></el-table-column>-->
-<!--        <el-table-column prop="imgUrl" label="照片地址" header-align="center" align="center"></el-table-column>-->
-<!--        <el-table-column prop="testingResult" label="核酸接测结果" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="testingTime" label="核酸检测时间" header-align="center" align="center"></el-table-column>
-<!--        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>-->
-<!--        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>-->
-        <!-- <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column> -->
-<!--        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>-->
-<!--        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>-->
-<!--        <el-table-column prop="delFlag" label="逻辑删除标识" header-align="center" align="center"></el-table-column>-->
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="lookDetail(scope.row.id)">{{ $t('查看') }}</el-button>
@@ -91,6 +92,26 @@
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
       <person-look v-if="lookVisible" ref="personLook" @refreshDataList="getDataList"></person-look>
       <reader ref="reader" @refreshDataList="getDataList"></reader>
+      <!-- 错误信息 -->
+      <el-dialog :visible.sync="faultDataVisible"
+                 title="请修改后重新提交">
+        <el-table :data="errordataList"
+                  border
+                  style="width: 100%;">
+          <el-table-column prop="erroLine"
+                           label="行数"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="errorInfo"
+                           label="错误信息"
+                           header-align="center"
+                           align="center"></el-table-column>
+        </el-table>
+        <template slot="footer">
+          <el-button type="primary"
+                     @click="faultDataVisible = false">确定</el-button>
+        </template>
+      </el-dialog>
     </div>
   </el-card>
 </template>
@@ -100,7 +121,7 @@ import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './persontesting-add-or-update'
 import PersonLook from './persontesting-look'
 import reader from './reader'
-import Cookies from "js-cookie";
+import Cookies from 'js-cookie'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -110,11 +131,14 @@ export default {
         getDataListIsPage: true,
         deleteURL: '/custom/persontesting/v2',
         deleteIsBatch: true,
-        exportURL: '/custom/persontesting/v2/export'
+        exportURL: '/custom/persontesting/v2/export',
+        exportMoudle: '/custom/persontesting/v2/exportMoudle'
       },
       dataForm: {
         id: ''
       },
+      faultDataVisible: false,
+      errordataList: [],
       deptIdList: [],
       lookVisible: false
 
@@ -127,6 +151,7 @@ export default {
   },
   created: function () {
     this.getOptions()
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/persontesting/v2/importExcel?token=${Cookies.get('token')}`
   },
   watch: {
     'deptIdList': function (val) {
@@ -174,6 +199,30 @@ export default {
         })
         .catch(() => { })
     },
+    upLoadFile () {
+      // 触发upload组件内部点击事件，弹出文件选择框
+      this.$refs['upload'].$refs['upload-inner'].handleClick()
+    },
+    errorExceed (file, fileList) {
+      this.$message.error('上传失败请重试')
+    },
+    uploadSuccess (response, file, fileList) {
+      this.$refs.upload.clearFiles()
+      console.log(response)
+      if (response.data !== null && response.data.length > 0) {
+        this.faultDataVisible = true
+        this.errordataList = response.data
+        return
+      }
+      this.$message({
+        message: this.$t('prompt.success'),
+        type: 'success',
+        duration: 500,
+        onClose: () => {
+          this.getDataList()
+        }
+      })
+    }
   }
 }
 </script>