调整查询条件的位置

src/views/modules/epidemic/epidemicreportuserinfo.vue

@@ -35,17 +35,6 @@
                     @keyup.native="btKeyUpMobile"
                     style="width:200px"></el-input>
         </el-form-item>
-        <el-form-item label="年龄"
-                      prop="age">
-          <el-select v-model="ageArr" clearable multiple
-                     placeholder="请选择">
-            <el-option v-for="item in ageStateArr"
-                       :key="item.dictValue"
-                       :label="item.dictName"
-                       :value="item.dictValue">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="社区/村庄名称"
                       prop="community"
                       label-width="120px">
@@ -64,6 +53,18 @@
                     maxlength="20"
                     style="width:200px"></el-input>
         </el-form-item>
+        <el-form-item label="年龄" label-width="90px"
+                      prop="ageStart">
+          <el-input-number v-model="dataForm.ageStart"
+                           :min="0"
+                           label="年龄"></el-input-number>
+        </el-form-item>
+        <el-form-item label="至"
+                      prop="ageEnd">
+          <el-input-number v-model="dataForm.ageEnd"
+                           :min="0"
+                           label="至"></el-input-number>
+        </el-form-item>
         <el-form-item label="已接种"
                       prop="isInoculate">
           <el-select v-model="dataForm.isInoculate" clearable
@@ -75,17 +76,17 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="生产企业"
+<!--        <el-form-item label="生产企业"-->
-                      prop="company">
+<!--                      prop="company">-->
-          <el-select v-model="companyArr" clearable multiple
+<!--          <el-select v-model="companyArr" clearable multiple-->
-                     placeholder="请选择">
+<!--                     placeholder="请选择">-->
-            <el-option v-for="item in companyStateArr"
+<!--            <el-option v-for="item in companyStateArr"-->
-                       :key="item.value"
+<!--                       :key="item.value"-->
-                       :label="item.label"
+<!--                       :label="item.label"-->
-                       :value="item.value">
+<!--                       :value="item.value">-->
-            </el-option>
+<!--            </el-option>-->
-          </el-select>
+<!--          </el-select>-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <el-form-item>
           <el-button type="primary"
                      @click="beforeGetDataListSearch()">{{ $t('query') }}</el-button>
@@ -117,6 +118,11 @@
                      type="danger"
                      @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('demo:reportuserinfo:updateAge')"
+                     type="danger"
+                     @click="updateAge()">更新年龄</el-button>
+        </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
@@ -348,7 +354,9 @@ export default {
         { dictValue: '3', dictName: '30-39岁' },
         { dictValue: '4', dictName: '40-49岁' },
         { dictValue: '5', dictName: '50-59岁' },
-        { dictValue: '6', dictName: '60岁以上' }
+        { dictValue: '6', dictName: '60-69岁' },
+        { dictValue: '7', dictName: '70-79岁' },
+        { dictValue: '8', dictName: '80岁以上' }
       ],
       companyStateArr: [],
       exportTemplate: false,
@@ -358,7 +366,7 @@ export default {
     }
   },
   created: function () {
-    this.getDataList()
+    // this.getDataList()
     this.getcompantyOptions()
     this.getOptions()
     // 乡镇下拉框赋值
@@ -418,6 +426,19 @@ export default {
         .catch(() => {
         })
     },
+    updateAge () {
+      this.$http.get(`/sys/epidemicuserinfo/updateAge`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        } else {
+          this.$message({
+            message: '更新成功',
+            type: 'success',
+            duration: 1000
+          })
+        }
+      }).catch(() => { })
+    },
     // 乡镇取值变化事件
     selectModel (event) {
       this.outStreetArr.find((item) => {