防疫人员信息-列表修改

src/views/modules/epidemic/epidemicreportuserinfo.vue

@@ -5,6 +5,14 @@
       <el-form :inline="true"
                :model="dataForm"
                @keyup.enter.native="beforeGetDataList()">
+        <el-form-item label="所属组织" label-width="90px">
+          <el-cascader v-model="deptIdList"
+                       ref="deptTree"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
+          </el-cascader>
+        </el-form-item>
         <el-form-item label="姓名"
                       prop="username"
                       label-width="100px">
@@ -35,16 +43,15 @@
                     @keyup.native="btKeyUpMobile"
                     style="width:200px"></el-input>
         </el-form-item>
-        <el-form-item label="所属组织" label-width="90px">
+
-          <el-cascader v-model="deptIdList"
+
-                       ref="deptTree"
+        <el-collapse style="width: 95%;margin-bottom: 15px">
-                       :options="options"
+          <el-collapse-item>
-                       :props="{ checkStrictly: true }"
+            <template slot="title">
-                       clearable>
+              <div style="float: right">展开高级检索</div>
-          </el-cascader>
+            </template>
-        </el-form-item>
             <el-form-item label="特殊人群"
-                      prop="specialCrowd" label-width="100px">
+                          prop="specialCrowd" label-width="120px">
               <el-select v-model="dataForm.specialCrowd" clearable
                          placeholder="请选择">
                 <el-option v-for="item in specialCrowdList"
@@ -54,76 +61,13 @@
                 </el-option>
               </el-select>
             </el-form-item>
-<!--        <el-form-item label="户籍地"-->
+            <el-form-item label="核酸检测状态" prop="checkState" label-width="120px">
-<!--                      label-width="90px">-->
-<!--          <el-input v-model="dataForm.householdRegisterName"-->
-<!--                    placeholder="户籍地"-->
-<!--                    clearable-->
-<!--                    maxlength="500"-->
-<!--                    style="width:200px"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <br/>-->
-<!--        <el-form-item label="街道/乡镇名称"-->
-<!--                      prop="street"-->
-<!--                      label-width="120px">-->
-<!--          <el-input v-model="dataForm.street"-->
-<!--                    placeholder="街道/乡镇名称"-->
-<!--                    clearable-->
-<!--                    maxlength="20"-->
-<!--                    style="width:200px"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="社区/村庄名称"-->
-<!--                      prop="community"-->
-<!--                      label-width="120px">-->
-<!--          <el-input v-model="dataForm.community"-->
-<!--                    placeholder="社区/村庄名称"-->
-<!--                    clearable-->
-<!--                    maxlength="20"-->
-<!--                    style="width:200px"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="网格名称"-->
-<!--                      prop="gridName"-->
-<!--                      label-width="90px">-->
-<!--          <el-input v-model="dataForm.gridName"-->
-<!--                    placeholder="网格名称"-->
-<!--                    clearable-->
-<!--                    maxlength="20"-->
-<!--                    style="width:200px"></el-input>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="现居住地名称"-->
-<!--                      label-width="100px">-->
-<!--          <el-input v-model="dataForm.outLiveAddressName"-->
-<!--                    placeholder="现居住地名称"-->
-<!--                    clearable-->
-<!--                    maxlength="500"-->
-<!--                    style="width:200px"></el-input>-->
-<!--        </el-form-item>-->
-        <el-form-item label="核酸检测状态" prop="checkState">
               <el-select v-model="dataForm.checkState" clearable placeholder="核酸检测状态">
                 <el-option v-for="item in checkStateList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
-<!--        <br/>-->
+            <el-form-item label="已接种" label-width="120px"
-<!--        <el-form-item label="出生年月" label-width="90px"-->
-<!--                      prop="ageStart">-->
-<!--          <el-date-picker-->
-<!--              v-model="dataForm.ageStart"-->
-<!--              value-format="yyyy-MM-dd"-->
-<!--              type="date"-->
-<!--              placeholder="选择日期">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="至"-->
-<!--                      prop="ageEnd">-->
-<!--          <el-date-picker-->
-<!--              v-model="dataForm.ageEnd"-->
-<!--              value-format="yyyy-MM-dd"-->
-<!--              type="date"-->
-<!--              placeholder="选择日期">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
-        <el-form-item label="已接种" label-width="90px"
                           prop="isInoculate">
               <el-select v-model="dataForm.isInoculate" clearable
                          placeholder="请选择">
@@ -145,23 +89,188 @@
                 <i class="el-icon-question" />
               </el-tooltip>
             </el-form-item>
-        <el-form-item label="有无所属组织" prop="haveDept" label-width="100px">
+            <el-form-item label="有无所属组织" prop="haveDept" label-width="120px">
               <el-select v-model="dataForm.haveDept" clearable placeholder="有无所属组织">
                 <el-option v-for="item in haveDeptList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                 </el-option>
               </el-select>
             </el-form-item>
-<!--        <el-form-item label="生产企业"-->
+            <el-form-item label="户籍地"
-<!--                      prop="company">-->
+                          label-width="120px">
-<!--          <el-select v-model="companyArr" clearable multiple-->
+              <el-input v-model="dataForm.householdRegisterName"
-<!--                     placeholder="请选择">-->
+                        placeholder="户籍地"
-<!--            <el-option v-for="item in companyStateArr"-->
+                        clearable
-<!--                       :key="item.value"-->
+                        maxlength="500"
-<!--                       :label="item.label"-->
+                        style="width:200px"></el-input>
-<!--                       :value="item.value">-->
+            </el-form-item>
-<!--            </el-option>-->
+            <el-form-item label="籍贯" prop="nativePlace" label-width="120px">
-<!--          </el-select>-->
+              <el-input v-model="dataForm.nativePlace" placeholder="籍贯" clearable maxlength="49" style="width:200px"></el-input>
-<!--        </el-form-item>-->
+            </el-form-item>
+            <el-form-item label="房屋地址" prop="houseAddress" label-width="120px">
+              <el-input v-model="dataForm.houseAddress" placeholder="房屋地址" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="小区" prop="plot" label-width="120px">
+              <el-input v-model="dataForm.plot" placeholder="小区" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="楼号" prop="buildingNo" label-width="120px">
+              <el-input v-model="dataForm.buildingNo" placeholder="楼号" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="单元" prop="unit" label-width="120px">
+              <el-input v-model="dataForm.unit" placeholder="单元" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="房间号" prop="roomNo" label-width="120px">
+              <el-input v-model="dataForm.roomNo" placeholder="房间号" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="现居住地" prop="outLiveAddressDetail" label-width="120px">
+              <el-input v-model="dataForm.outLiveAddressDetail" placeholder="现居住地" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="性别" prop="gender" label-width="120px">
+              <el-select v-model="dataForm.gender" placeholder="性别" clearable>
+                <el-option v-for="item in genderArr" :key="item.dictName" :label="item.dictName" :value="item.dictName" >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="民族" prop="nation" label-width="120px">
+                <el-input v-model="dataForm.nation" placeholder="民族" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="曾用名" prop="formerName" label-width="120px">
+              <el-input v-model="dataForm.formerName" placeholder="曾用名" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="出生日期"
+                          prop="startBirthdayTime" label-width="120px">
+              <el-date-picker v-model="dataForm.startBirthdayTime"
+                              type="date"
+                              :picker-options="pickerBeginDateBefore"
+                              value-format="yyyy-MM-dd"
+                              format="yyyy-MM-dd"
+                              placeholder="选择日期时间"
+                              style="width:200px">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="至"
+                          label-width="120px"
+                          prop="endBirthdayTime">
+              <el-date-picker v-model="dataForm.endBirthdayTime"
+                              type="date"
+                              :picker-options="pickerBeginDateAfter"
+                              value-format="yyyy-MM-dd"
+                              format="yyyy-MM-dd"
+                              placeholder="选择日期时间"
+                              style="width:200px">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="文化程度" prop="standardOfCulture" label-width="120px">
+              <el-select v-model="dataForm.standardOfCulture" placeholder="文化程度" clearable>
+                <el-option v-for="item in standardOfCultureArr" :key="item.dictName" :label="item.dictName" :value="item.dictName" >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="健康状况" prop="health" label-width="120px">
+              <el-input v-model="dataForm.health" placeholder="健康状况" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="婚姻状况" prop="maritalStatus" label-width="120px">
+              <el-select v-model="dataForm.maritalStatus" placeholder="婚姻状况" clearable>
+                <el-option v-for="item in maritalStatusArr" :key="item.dictName" :label="item.dictName" :value="item.dictName" >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="与户主关系" prop="relation" label-width="120px">
+              <el-select v-model="dataForm.relation" placeholder="与户主关系" clearable>
+                <el-option v-for="item in relationArr" :key="item.dictName" :label="item.dictName" :value="item.dictName" >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="政治面貌" prop="politicsStatus" label-width="120px">
+              <el-select v-model="dataForm.politicsStatus" placeholder="政治面貌" clearable>
+                <el-option v-for="item in politicsStatusArr" :key="item.dictName" :label="item.dictName" :value="item.dictName" >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="宗教信仰" prop="faith" label-width="120px">
+              <el-input v-model="dataForm.faith" placeholder="宗教信仰" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="毕业院校" prop="graduateSchool" label-width="120px">
+              <el-input v-model="dataForm.graduateSchool" placeholder="毕业院校" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="专业" prop="professional" label-width="120px">
+              <el-input v-model="dataForm.professional" placeholder="专业" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="工作状态" prop="workStatus" label-width="120px">
+              <el-select v-model="dataForm.workStatus" placeholder="工作状态" clearable>
+                <el-option v-for="item in workStatusArr" :key="item.dictName" :label="item.dictName" :value="item.dictName" >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="行业类别" prop="industryCategory" label-width="120px">
+              <el-input v-model="dataForm.industryCategory" placeholder="行业类别" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="工作单位" prop="workUnits" label-width="120px">
+              <el-input v-model="dataForm.workUnits" placeholder="工作单位" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="兵役状况" prop="military" label-width="120px">
+              <el-select v-model="dataForm.military" placeholder="兵役状况" clearable>
+                <el-option v-for="item in militaryArr" :key="item.dictName" :label="item.dictName" :value="item.dictName" >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="人口类别" prop="peopleCategories" label-width="120px">
+              <el-select v-model="dataForm.peopleCategories" placeholder="人口类别" clearable>
+                <el-option v-for="item in peopleCategoriesArr" :key="item.dictName" :label="item.dictName" :value="item.dictName" >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="有无车辆" prop="car" label-width="120px">
+              <el-select v-model="dataForm.car" placeholder="有无车辆" clearable>
+                <el-option v-for="item in carArr" :key="item.dictName" :label="item.dictName" :value="item.dictName" >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="车牌号" prop="carNo" label-width="120px">
+              <el-input v-model="dataForm.carNo" placeholder="车牌号" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="人户状况" prop="hushaiStatus" label-width="120px">
+              <el-select v-model="dataForm.hushaiStatus" placeholder="人户状况" clearable>
+                <el-option v-for="item in hushaiStatusArr" :key="item.dictName" :label="item.dictName" :value="item.dictName" >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="血型" prop="bloodType" label-width="120px">
+              <el-input v-model="dataForm.bloodType" placeholder="血型" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="核酸检测时间"
+                          prop="startCheckTime" label-width="120px">
+              <el-date-picker v-model="dataForm.startCheckTime"
+                              type="date"
+                              :picker-options="pickerBeginCheckDateBefore"
+                              value-format="yyyy-MM-dd"
+                              format="yyyy-MM-dd"
+                              placeholder="选择日期时间"
+                              style="width:200px">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="至"
+                          label-width="120px"
+                          prop="endCheckTime">
+              <el-date-picker v-model="dataForm.endCheckTime"
+                              type="date"
+                              :picker-options="pickerBeginCheckDateAfter"
+                              value-format="yyyy-MM-dd"
+                              format="yyyy-MM-dd"
+                              placeholder="选择日期时间"
+                              style="width:200px">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="户口类型" prop="accountType" label-width="120px">
+              <el-input v-model="dataForm.accountType" placeholder="户口类型" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="家庭类别" prop="familyCategory" label-width="120px">
+              <el-input v-model="dataForm.familyCategory" placeholder="家庭类别" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+            <el-form-item label="救助情况" prop="helpStatus" label-width="120px">
+              <el-input v-model="dataForm.helpStatus" placeholder="救助情况" clearable maxlength="49" style="width:200px"></el-input>
+            </el-form-item>
+          </el-collapse-item>
+        </el-collapse>
         <el-form-item>
           <el-button type="primary"
                      @click="beforeGetDataListSearch()">{{ $t('query') }}</el-button>
@@ -439,7 +548,43 @@ export default {
         streetId: '',
         communityId: '',
         gridId: '',
-        haveDept:''
+        haveDept:'',
+        startBirthdayTime:'',
+        endBirthdayTime:'',
+        startCheckTime: '',
+        endCheckTime: ''
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endBirthdayTime;
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startBirthdayTime;
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginCheckDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endCheckTime;
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginCheckDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startCheckTime;
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
       },
       haveDeptList: [
         {dictValue: '1', dictName: '有'},
@@ -458,23 +603,88 @@ export default {
       specialCrowdList: [],
       peopleCategoriesList: [],
       publicPath: process.env.BASE_URL,
-      pickerBeginDateBefore: {
+      // pickerBeginDateBefore: {
-        disabledDate: (time) => {
+      //   disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
+      //     let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
+      //     if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+      //       return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
+      //     }
-        }
+      //   }
-      },
+      // },
-      pickerBeginDateAfter: {
+      // pickerBeginDateAfter: {
-        disabledDate: (time) => {
+      //   disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
+      //     let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
+      //     if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+      //       return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
+      //     }
-        }
+      //   }
-      },
+      // },
       options: [],
+      standardOfCultureArr: [
+        { dictValue: 1, dictName: '博士研究生' },
+        { dictValue: 2, dictName: '硕士研究生' },
+        { dictValue: 3, dictName: '大学本科' },
+        { dictValue: 4, dictName: '大学专科' },
+        { dictValue: 5, dictName: '高中' },
+        { dictValue: 6, dictName: '初中' },
+        { dictValue: 7, dictName: '小学' },
+        { dictValue: 8, dictName: '学前教育' },
+        { dictValue: 9, dictName: '未上过学' }
+      ],
+      maritalStatusArr: [
+        { dictValue: 1, dictName: '已婚' },
+        { dictValue: 2, dictName: '未婚' },
+        { dictValue: 3, dictName: '丧偶' },
+        { dictValue: 4, dictName: '离婚' }
+      ],
+      relationArr: [
+        { dictValue: 1, dictName: '户主' },
+        { dictValue: 2, dictName: '配偶' },
+        { dictValue: 3, dictName: '子女' },
+        { dictValue: 4, dictName: '父母' },
+        { dictValue: 5, dictName: '岳父母或公婆' },
+        { dictValue: 6, dictName: '祖父母' },
+        { dictValue: 7, dictName: '媳婿' },
+        { dictValue: 8, dictName: '孙子女' },
+        { dictValue: 9, dictName: '兄弟姐妹' },
+        { dictValue: 10, dictName: '其他' }
+      ],
+      politicsStatusArr: [
+        { dictValue: 1, dictName: '中共党员' },
+        { dictValue: 2, dictName: '共青团员' },
+        { dictValue: 3, dictName: '群众' },
+        { dictValue: 4, dictName: '民主党派' }
+      ],
+      workStatusArr: [
+        { dictValue: 1, dictName: '在职' },
+        { dictValue: 2, dictName: '学生' },
+        { dictValue: 3, dictName: '学龄前儿童' },
+        { dictValue: 4, dictName: '军人' },
+        { dictValue: 5, dictName: '退休' },
+        { dictValue: 6, dictName: '务农' },
+        { dictValue: 7, dictName: '无业' }
+      ],
+      militaryArr: [
+        { dictValue: 1, dictName: '未服兵役' },
+        { dictValue: 2, dictName: '退出现役' },
+        { dictValue: 3, dictName: '预备役' },
+        { dictValue: 4, dictName: '服现役' },
+        { dictValue: 5, dictName: '其他' }
+      ],
+      peopleCategoriesArr: [
+        { dictValue: 1, dictName: '常住' },
+        { dictValue: 2, dictName: '流动' },
+        { dictValue: 3, dictName: '境外' }
+      ],
+      carArr: [
+        { dictValue: 1, dictName: '有' },
+        { dictValue: 2, dictName: '无' }
+      ],
+      hushaiStatusArr: [
+        { dictValue: 1, dictName: '人户同在' },
+        { dictValue: 2, dictName: '人在户不在' },
+        { dictValue: 3, dictName: '户在人不在' }
+      ],
       inoculateStateArr: [
         { dictValue: '0', dictName: '未接种' },
         { dictValue: '10', dictName: '接种中' },
@@ -483,6 +693,10 @@ export default {
         { dictValue: '1', dictName: '第一针' },
         { dictValue: '2', dictName: '第二针' }
       ],
+      genderArr: [
+        { dictValue: 1, dictName: '男' },
+        { dictValue: 2, dictName: '女' }
+      ],
       specialCrowdOptions: [
         { dictValue: '刑满释放', dictName: '刑满释放' },
         { dictValue: '社区矫正', dictName: '社区矫正' },