From e583e5671a40f7c5f3a3f676383e5284bba94cff Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 7 May 2021 19:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/epidemic/echarts.vue        |  1 -
 .../epidemic/epidemicreportuserinfo.vue       | 72 +------------------
 .../modules/epidemic/epidemicuserinfo.vue     | 26 ++++---
 3 files changed, 19 insertions(+), 80 deletions(-)

diff --git a/src/views/modules/epidemic/echarts.vue b/src/views/modules/epidemic/echarts.vue
index ec58be3..db218f4 100644
--- a/src/views/modules/epidemic/echarts.vue
+++ b/src/views/modules/epidemic/echarts.vue
@@ -93,7 +93,6 @@ export default {
           return this.$message.error(res.msg)
         }
         this.orgOptions.series[0].data = res.data
-        console.log(res.data)
       }).catch(() => {})
     }
   }
diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index f9c2155..211b7d5 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -4,7 +4,7 @@
     <div class="mod-demo__epidemicreportuserinfo}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataListSearch()">
+               @keyup.enter.native="getDataList()">
         <el-form-item label="姓名"
                       prop="username"
                       label-width="90px">
@@ -86,57 +86,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <!--        <el-form-item label="现居住地" label-width="90px">-->
-        <!--          <el-cascader-->
-        <!--                  v-model="ids"-->
-        <!--                  :options="options"-->
-        <!--                  :props="{ checkStrictly: true }"-->
-        <!--                  clearable-->
-        <!--                  change-on-select-->
-        <!--          >-->
-        <!--          </el-cascader>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="往返情况" prop="returnState" label-width="70px">-->
-        <!--          <el-select v-model="dataForm.returnState" placeholder="往返情况" clearable>-->
-        <!--            <el-option v-for="item in returnStateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">-->
-        <!--            </el-option>-->
-        <!--          </el-select>-->
-        <!--        </el-form-item>-->
-<!--        <el-form-item label="居住乡镇"-->
-<!--                      prop="outStreet"-->
-<!--                      label-width="90px"-->
-<!--                      v-if="$hasPermission('sys:epidemicreportuserinfo:townsSearch')">-->
-<!--          <el-select v-model="dataForm.outStreet"-->
-<!--                     placeholder="居住乡镇"-->
-<!--                     @change="selectModel($event)"-->
-<!--                     clearable>-->
-<!--            <el-option v-for="item in outStreetArr"-->
-<!--                       :key="item.dictValue"-->
-<!--                       :label="item.dictName"-->
-<!--                       :value="item.dictValue">-->
-<!--            </el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-        <!--        <el-form-item label="录入时间" prop="startTime" label-width="70px">-->
-        <!--          <el-date-picker v-model="dataForm.startTime"-->
-        <!--                          type="date"-->
-        <!--                          :picker-options="pickerBeginDateBefore"-->
-        <!--                          value-format="yyyy-MM-dd"-->
-        <!--                          format="yyyy-MM-dd"-->
-        <!--                          placeholder="选择日期时间"-->
-        <!--                          style="width:200px" @change="changeTime">-->
-        <!--          </el-date-picker>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="至" prop="endTime">-->
-        <!--          <el-date-picker v-model="dataForm.endTime"-->
-        <!--                          type="date"-->
-        <!--                          :picker-options="pickerBeginDateAfter"-->
-        <!--                          value-format="yyyy-MM-dd"-->
-        <!--                          format="yyyy-MM-dd"-->
-        <!--                          placeholder="选择日期时间"-->
-        <!--                          style="width:200px" @change="changeTime">-->
-        <!--          </el-date-picker>-->
-        <!--        </el-form-item>-->
         <el-form-item>
           <el-button type="primary"
                      @click="beforeGetDataListSearch()">{{ $t('query') }}</el-button>
@@ -199,23 +148,6 @@
                          header-align="center"
                          align="center"
                          width="150"></el-table-column>
-        <!-- <el-table-column prop="gender"
-                         label="性别"
-                         header-align="center"
-                         align="center"
-                         width="80"></el-table-column>
-        <el-table-column prop="birthday"
-                         label="出生年月"
-                         header-align="center"
-                         align="center"
-                         width="120"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="city"
-                         label="县/区"
-                         header-align="center"
-                         align="center"
-                         width="150"
-                         show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="street"
                          label="街道/乡镇"
                          header-align="center"
@@ -458,7 +390,7 @@ export default {
       } else {
         this.dataForm.company = ''
       }
-      this.getDataListSearch()
+      this.getDataList()
     },
     // 查看
     lookHandle (id) {
diff --git a/src/views/modules/epidemic/epidemicuserinfo.vue b/src/views/modules/epidemic/epidemicuserinfo.vue
index d8197f8..2e49633 100644
--- a/src/views/modules/epidemic/epidemicuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicuserinfo.vue
@@ -4,7 +4,7 @@
     <div class="mod-demo__epidemicreportuserinfo}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataListSearch()">
+               @keyup.enter.native="getDataList()">
         <el-form-item label="姓名"
                       prop="userName"
                       label-width="90px">
@@ -37,15 +37,21 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary"
-                     @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                     @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-upload class="upload-demo"
+                     ref="upload"
+                     v-loading="uploeadLoeading"
+                     :action="uploadUrl"
+                     :limit="1"
+                     :on-success='uploadSuccess'
+                     :on-error='errorExceed'
+                     :before-upload='beforeUpload'
+                     accept=".xls,.xlsx">
+            <el-button type="primary">批量导入</el-button>
+          </el-upload>
         </el-form-item>
-        <!--        <el-form-item>-->
-        <!--          <el-button type="primary" @click="exports()">{{ $t('export') }}</el-button>-->
-        <!--        </el-form-item>-->
-        <!-- <el-form-item>
-          <el-button type="primary"
-                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item> -->
         <el-form-item>
           <el-button v-if="$hasPermission('demo:epidemicreportuserinfo:delete')"
                      type="danger"
@@ -193,6 +199,7 @@
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './regist'
 import InfoDetail from './epidemicreportuserinfoDetail'
+import Cookies from "js-cookie";
 export default {
   mixins: [mixinViewModule],
 
@@ -256,6 +263,7 @@ export default {
     this.getOptions()
     // 乡镇下拉框赋值
     this.getDailyTypeArrInfo()
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/sys/vaccinationinfo/importManualScoreExcel?token=${Cookies.get('token')}`
   },
   components: {
     AddOrUpdate,