From c41d09e0501089ec0a62b1d7b368b9331b8fd885 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 20 Apr 2022 16:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AF=BC=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=80=89=E6=8B=A9=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/epidemicreportuserinfo.vue       | 45 +++++++++++++------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index 1314790..114047f 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -7,7 +7,7 @@
                @keyup.enter.native="beforeGetDataList()">
         <el-form-item label="所属组织" label-width="90px">
           <el-cascader v-model="deptIdList"
-                       ref="deptTree"
+                       ref="deptTreeOld"
                        :options="options"
                        :props="{ checkStrictly: true }"
                        clearable>
@@ -281,11 +281,21 @@
                      @click="exports()">{{ $t('export') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="beforeImportUser">导入</el-button>
+          <el-button v-if="$hasPermission('epidemicreportuserinfo:reset')" type="primary"  @click="resetState">重置核酸检测状态</el-button>
+        </el-form-item>
+
+        <el-form-item label="导入网格" label-width="90px">
+          <el-cascader v-model="deptIdListUpload"
+                       ref="deptTree"
+                       :options="options"
+                       :props="{ checkStrictly: false }"
+                       clearable>
+          </el-cascader>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('epidemicreportuserinfo:reset')" type="primary"  @click="resetState">重置核酸检测状态</el-button>
+          <el-button type="primary" @click="beforeImportUser">导入</el-button>
         </el-form-item>
+
         <el-form-item>
           <el-upload ref="upload" v-if="$hasPermission('epidemic:person:export')"
                      :action="uploadUrl"
@@ -613,6 +623,7 @@ export default {
         {dictValue: '1', dictName: '未检测'},
       ],
       deptIdList: [],
+      deptIdListUpload: [],
       companyArr: [],
       politicsStatusList: [],
       specialCrowdList: [],
@@ -662,7 +673,8 @@ export default {
       checkMobile: '',
       isDisabled: false,
       buttonName: "发送验证码",
-      buttonTime: 60
+      buttonTime: 60,
+      gridIdImport: ''
     }
   },
   created: function () {
@@ -697,8 +709,17 @@ export default {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
         this.dataForm.gridId = this.deptIdList[2]
-        this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/epidemicuserinfo/importExcel?token=${Cookies.get('token')}&gridId=` + this.deptIdList[2]
+        // this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/epidemicuserinfo/importExcel?token=${Cookies.get('token')}&gridId=` + this.deptIdList[2]
       }
+    },
+    'deptIdListUpload': function (val) {
+        if (val.length > 0){
+            this.gridIdImport = val[val.length - 1]
+            this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/epidemicuserinfo/importExcel?token=
+           ${Cookies.get('token')}&gridId=` + val[val.length - 1]
+        }else{
+            this.gridIdImport = ''
+        }
     }
   },
   methods: {
@@ -741,18 +762,16 @@ export default {
     },
     beforeImportUser () {
       //所属组织全都不选，直接上传
-      if ((this.dataForm.streetId === undefined || this.dataForm.streetId === '') &&
-        (this.dataForm.communityId === undefined || this.dataForm.communityId === '') &&
-      (this.dataForm.gridId === undefined || this.dataForm.gridId === '') ){
+      if (this.gridIdImport === ''){
         document.getElementById('importBut').click()
         return
       }
       //选中社区或者及街道提示请选中网格
-      if ((this.dataForm.streetId != undefined || this.dataForm.streetId != '') &&
-              (this.dataForm.gridId === undefined || this.dataForm.gridId === '') ){
-        this.$message.error('请选择到网格层级后导入')
-        return false
-      }
+      // if ((this.dataForm.streetId != undefined && this.dataForm.streetId != '') &&
+      //         (this.dataForm.gridId === undefined || this.dataForm.gridId === '') ){
+      //   this.$message.error('请选择到网格层级后导入')
+      //   return false
+      // }
       //选中网格
       let selectGird = this.$refs['deptTree'].getCheckedNodes()[0].label