From 26d61e42fce29487e3184d174849e8ef4b9b1f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 31 May 2022 15:10:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/epidemicreportuserinfo.vue       | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index 96c5f2d..18626e8 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -7,10 +7,11 @@
                @keyup.enter.native="beforeGetDataList()">
         <el-form-item label="所属组织"
                       label-width="90px">
-          <el-cascader v-model="deptIdList"
+          <el-cascader v-model="dataForm.deptIdList"
                        ref="deptTreeOld"
+                       :props="props"
                        :options="options"
-                       :props="{ checkStrictly: true }"
+                       collapse-tags
                        clearable>
           </el-cascader>
         </el-form-item>
@@ -793,6 +794,7 @@ export default {
   mixins: [mixinViewModule],
   data () {
     return {
+      props: { multiple: true },
       mixinViewModuleOptions: {
         getDataListURL: '/custom/epidemicuserinfo/page',
         getDataListIsPage: true,
@@ -816,7 +818,8 @@ export default {
         startBirthdayTime: '',
         endBirthdayTime: '',
         startCheckTime: '',
-        endCheckTime: ''
+        endCheckTime: '',
+        deptIdList: []
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -928,28 +931,31 @@ export default {
     InfoDetail
   },
   watch: {
-    'deptIdList': function (val) {
-      if (val.length === 0) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 1) {
-        this.dataForm.streetId = this.deptIdList[0]
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 2) {
-        this.dataForm.streetId = this.deptIdList[0]
-        this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 3) {
-        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]
-      }
+    'dataForm.deptIdList': function (val) {
+      debugger
+      console.log("11111")
+      console.log(this.deptIdList)
+      // if (val.length === 0) {
+      //   this.dataForm.streetId = ''
+      //   this.dataForm.communityId = ''
+      //   this.dataForm.gridId = ''
+      // }
+      // if (val.length === 1) {
+      //   this.dataForm.streetId = this.deptIdList[0]
+      //   this.dataForm.communityId = ''
+      //   this.dataForm.gridId = ''
+      // }
+      // if (val.length === 2) {
+      //   this.dataForm.streetId = this.deptIdList[0]
+      //   this.dataForm.communityId = this.deptIdList[1]
+      //   this.dataForm.gridId = ''
+      // }
+      // if (val.length === 3) {
+      //   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]
+      // }
     },
     'deptIdListUpload': function (val) {
       if (val.length > 0) {

From 512ab011357bb52f0ea3a751b72c5b86ead8ea4a Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Wed, 1 Jun 2022 16:09:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=A7=E8=81=94?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/epidemicreportuserinfo.vue       | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index 18626e8..d33f72d 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -7,12 +7,13 @@
                @keyup.enter.native="beforeGetDataList()">
         <el-form-item label="所属组织"
                       label-width="90px">
-          <el-cascader v-model="dataForm.deptIdList"
+          <el-cascader v-model="deptIdList"
                        ref="deptTreeOld"
                        :props="props"
                        :options="options"
                        collapse-tags
-                       clearable>
+                       clearable
+                       @change="handleChange">
           </el-cascader>
         </el-form-item>
         <el-form-item label="姓名"
@@ -916,7 +917,8 @@ export default {
       isDisabled: false,
       buttonName: "发送验证码",
       buttonTime: 60,
-      gridIdImport: ''
+      gridIdImport: '',
+      deptIdList:null
     }
   },
   created: function () {
@@ -932,9 +934,8 @@ export default {
   },
   watch: {
     'dataForm.deptIdList': function (val) {
-      debugger
-      console.log("11111")
-      console.log(this.deptIdList)
+      // console.log("11111")
+      // console.log(val)
       // if (val.length === 0) {
       //   this.dataForm.streetId = ''
       //   this.dataForm.communityId = ''
@@ -968,6 +969,14 @@ export default {
     }
   },
   methods: {
+    handleChange(value){
+      this.dataForm.deptIdList = []
+      value.forEach(e => {
+        this.dataForm.deptIdList.push(e.at(-1))
+      });
+      this.dataForm.deptIdList = this.dataForm.deptIdList + ''
+    },
+
     resetState () {
       this.$confirm('此操作将重置所有人员的核酸检测状态为未检测, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -981,7 +990,7 @@ export default {
           background: 'rgba(0, 0, 0, 0.8)'
         });
 
-        this.$http['post']('/custom/epidemicuserinfo/resetUserCheckState').then(({ data: res }) => {
+        this.$http['post']('/custom/epidemicuserinfo/rqesetUserCheckState').then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }