From efb4493fef1089bbc008ffc998ece4cce3d0b54b Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 18 May 2021 13:57:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E7=A7=8D=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/epidemic/regist.vue     |  2 +-
 src/views/modules/vim/vaccinationinfo.vue | 38 +++++++++++++++++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/epidemic/regist.vue b/src/views/modules/epidemic/regist.vue
index e6384b2..898324d 100644
--- a/src/views/modules/epidemic/regist.vue
+++ b/src/views/modules/epidemic/regist.vue
@@ -276,7 +276,7 @@ export default {
         this.maxDose = res.data.maxDose
         this.doseAble = false
       }).catch(() => { })
-      if (this.dataForm.companyId !== this.historyCompanyId) {
+      if (this.dataForm.companyId !== this.historyCompanyId && this.historyCompanyId != 0) {
         this.dataForm.vaccinationState = 1
         return this.$message.warning('与上次接种疫苗厂家不同')
       } else {
diff --git a/src/views/modules/vim/vaccinationinfo.vue b/src/views/modules/vim/vaccinationinfo.vue
index 8e9c505..71932f1 100644
--- a/src/views/modules/vim/vaccinationinfo.vue
+++ b/src/views/modules/vim/vaccinationinfo.vue
@@ -24,8 +24,32 @@
                     placeholder="请输入手机号"
                     clearable></el-input>
         </el-form-item>
+        <el-form-item label="生产企业"
+                      prop="companyId">
+          <el-select v-model="dataForm.companyId" clearable
+                     placeholder="请选择">
+            <el-option v-for="item in compantyOptions"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <br/>
+        <el-form-item label="已接种至"
+                      prop="vaccNo">
+          <el-input-number v-model="dataForm.vaccNo"
+                           :min="0" clearable
+                           label="已接种至"></el-input-number> 针
+        </el-form-item>
+        <el-form-item label="已接种满" label-width="90px"
+                      prop="vaccTime">
+          <el-input-number v-model="dataForm.vaccTime"
+                           :min="0" clearable
+                           label="已接种满"></el-input-number> 日
+        </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="beforeGetDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <!-- <el-form-item>
           <el-button type="primary"
@@ -163,6 +187,8 @@ export default {
         id: '',
         realName: '',
         identityNo: '',
+        vaccNo: 0,
+        vaccTime: 0,
         mobile: ''
       },
       options: [],
@@ -179,6 +205,14 @@ export default {
     this.getcompantyOptions()
   },
   methods: {
+    beforeGetDataList () {
+      if (this.dataForm.vaccNo === 0 && this.dataForm.vaccTime > 0) {
+        return this.$message.error("请填写已接种至剂次")
+      } else if (this.dataForm.vaccNo > 0 && this.dataForm.vaccTime === 0) {
+        return this.$message.error("请填写已接种满时日")
+      }
+      this.getDataList()
+    },
     getOptions () {
       this.$http
         .get(`/sys/vaccinetype/getVaccineList`)
@@ -242,7 +276,7 @@ export default {
     btKeyUpIdentityNo (e) {
       e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
       this.dataForm.identityNo = e.target.value
-    },
+    }
   }
 }
 </script>