调整查询条件

src/views/modules/vim/vaccinationinfo.vue

@@ -24,6 +24,13 @@
                     placeholder="请输入手机号"
                     clearable></el-input>
         </el-form-item>
+        <el-form-item label="剂次"
+                      prop="dose" v-if="dataForm.vaccNo === 0">
+          <el-input-number v-model="dataForm.dose"
+                           :min="0" :max="3" clearable
+                           label="已接种至"></el-input-number>
+        </el-form-item>
+        <br/>
         <el-form-item label="生产企业"
                       prop="companyId">
           <el-select v-model="dataForm.companyId" clearable
@@ -35,15 +42,18 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <br/>
+        <el-form-item label="已接种至第"
-        <el-form-item label="已接种至"
+                      prop="vaccNo" v-if="dataForm.dose === 0">
-                      prop="vaccNo">
           <el-input-number v-model="dataForm.vaccNo"
                            :min="0" clearable
-                           label="已接种至"></el-input-number> 针
+                           label="已接种至第"></el-input-number> 针
+        <el-tooltip class="item" effect="light" placement="top-end">
+            <div slot="content">只检索‘接种中’的记录<br/>若居民已接种完成，则不会显示在查询结果中</div>
+            <i class="el-icon-question" />
+        </el-tooltip>
         </el-form-item>
         <el-form-item label="已接种满" label-width="90px"
-                      prop="vaccTime">
+                      prop="vaccTime" v-if="dataForm.dose === 0 && dataForm.vaccNo > 0">
           <el-input-number v-model="dataForm.vaccTime"
                            :min="0" clearable
                            label="已接种满"></el-input-number> 日
@@ -110,6 +120,7 @@
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="dwellingPlace"
+                         show-overflow-tooltip
                          label="住处"
                          header-align="center"
                          align="center"></el-table-column>
@@ -189,7 +200,8 @@ export default {
         identityNo: '',
         vaccNo: 0,
         vaccTime: 0,
-        mobile: ''
+        mobile: '',
+        dose: 0
       },
       options: [],
       compantyOptions: [],
@@ -206,10 +218,14 @@ export default {
   },
   methods: {
     beforeGetDataList () {
-      if (this.dataForm.vaccNo === 0 && this.dataForm.vaccTime > 0) {
+      if (this.dataForm.dose > 0) {
-        return this.$message.error("请填写已接种至剂次")
+        this.dataForm.vaccNo = 0
-      } else if (this.dataForm.vaccNo > 0 && this.dataForm.vaccTime === 0) {
+      }
-        return this.$message.error("请填写已接种满时日")
+      if ((this.dataForm.vaccNo === 0 || !this.dataForm.vaccNo) && this.dataForm.vaccTime > 0) {
+        this.dataForm.vaccTime = 0
+        // return this.$message.error('请填写已接种至剂次')
+      } else if (this.dataForm.vaccNo > 0 && (!this.dataForm.vaccTime || this.dataForm.vaccTime === 0)) {
+        return this.$message.error('请填写已接种满时日')
       }
       this.getDataList()
     },