Merge branch 'feature/sleltc'

src/views/modules/epidemic/epidemicreportuserinfo.vue

@@ -9,9 +9,11 @@
                       label-width="90px">
           <el-cascader v-model="deptIdList"
                        ref="deptTreeOld"
+                       :props="props"
                        :options="options"
-                       :props="{ checkStrictly: true }"
-                       clearable>
+                       collapse-tags
+                       clearable
+                       @change="handleChange">
           </el-cascader>
         </el-form-item>
         <el-form-item label="姓名"
@@ -793,6 +795,7 @@ export default {
   mixins: [mixinViewModule],
   data () {
     return {
+      props: { multiple: true },
       mixinViewModuleOptions: {
         getDataListURL: '/custom/epidemicuserinfo/page',
         getDataListIsPage: true,
@@ -816,7 +819,8 @@ export default {
         startBirthdayTime: '',
         endBirthdayTime: '',
         startCheckTime: '',
-        endCheckTime: ''
+        endCheckTime: '',
+        deptIdList: []
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -913,7 +917,8 @@ export default {
       isDisabled: false,
       buttonName: "发送验证码",
       buttonTime: 60,
-      gridIdImport: ''
+      gridIdImport: '',
+      deptIdList:null
     }
   },
   created: function () {
@@ -928,28 +933,30 @@ 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) {
+      // console.log("11111")
+      // console.log(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]
+      // }
     },
     'deptIdListUpload': function (val) {
       if (val.length > 0) {
@@ -962,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: '确定',
@@ -975,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)
           }