diff --git a/src/views/modules/epidemic/regist.vue b/src/views/modules/epidemic/regist.vue
index 898324d..2edfbb7 100644
--- a/src/views/modules/epidemic/regist.vue
+++ b/src/views/modules/epidemic/regist.vue
@@ -275,17 +275,18 @@ export default {
         }
         this.maxDose = res.data.maxDose
         this.doseAble = false
-      }).catch(() => { })
-      if (this.dataForm.companyId !== this.historyCompanyId && this.historyCompanyId != 0) {
-        this.dataForm.vaccinationState = 1
-        return this.$message.warning('与上次接种疫苗厂家不同')
-      } else {
-        if (this.dataForm.dose === this.maxDose) {
-          this.dataForm.vaccinationState = 2
-        } else {
+
+        if (this.dataForm.companyId !== this.historyCompanyId && this.historyCompanyId != 0) {
           this.dataForm.vaccinationState = 1
+          return this.$message.warning('与上次接种疫苗厂家不同')
+        } else {
+          if (this.dataForm.dose === this.maxDose) {
+            this.dataForm.vaccinationState = 2
+          } else {
+            this.dataForm.vaccinationState = 1
+          }
         }
-      }
+      }).catch(() => { })
     },
     doseChange (event) {
       // if (this.dataForm.distinctNum < 2){
diff --git a/src/views/modules/vim/vaccinationrole-add-or-update.vue b/src/views/modules/vim/vaccinationrole-add-or-update.vue
new file mode 100644
index 0000000..88081c5
--- /dev/null
+++ b/src/views/modules/vim/vaccinationrole-add-or-update.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '160px' : '140px'">
+          <el-form-item label="角色名称" prop="roleName">
+          <el-input v-model="dataForm.roleName" placeholder="角色名称"></el-input>
+      </el-form-item>
+          <el-form-item label="街道/乡镇关键词" prop="streetKeywords">
+          <el-input v-model="dataForm.streetKeywords" type="textarea" placeholder="街道/乡镇关键词，关键词以逗号间隔"></el-input>
+      </el-form-item>
+          <el-form-item label="社区/村关键词" prop="communityKeywords">
+          <el-input v-model="dataForm.communityKeywords" type="textarea" placeholder="社区/村关键词，关键词以逗号间隔"></el-input>
+      </el-form-item>
+          <el-form-item label="网格关键词" prop="gridKeywords">
+          <el-input v-model="dataForm.gridKeywords" type="textarea" placeholder="网格关键词，关键词以逗号间隔"></el-input>
+      </el-form-item>
+          <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" type="textarea" placeholder="备注"></el-input>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        roleName: '',
+        countyKeywords: '平阴县',
+        streetKeywords: '',
+        communityKeywords: '',
+        gridKeywords: '',
+        remark: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        roleName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        countyKeywords: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        streetKeywords: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/sys/vaccinationrole/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/vaccinationrole/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/vim/vaccinationrole.vue b/src/views/modules/vim/vaccinationrole.vue
new file mode 100644
index 0000000..3acc3b2
--- /dev/null
+++ b/src/views/modules/vim/vaccinationrole.vue
@@ -0,0 +1,68 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__vaccinationrole}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="角色名称">
+          <el-input v-model="dataForm.roleName"
+                    placeholder="角色名称"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':vaccinationrole:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="roleName" label="角色名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './vaccinationrole-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/sys/vaccinationrole/page',
+        getDataListIsPage: true,
+        deleteURL: '/sys/vaccinationrole',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/vim/vaccinationuserrole-add-or-update.vue b/src/views/modules/vim/vaccinationuserrole-add-or-update.vue
new file mode 100644
index 0000000..fb9b79d
--- /dev/null
+++ b/src/views/modules/vim/vaccinationuserrole-add-or-update.vue
@@ -0,0 +1,134 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="用户名" prop="userId">
+      <el-select v-model="dataForm.userId" filterable placeholder="请选择">
+        <el-option
+            v-for="item in userOptions"
+            :key="item.id"
+            :label="item.username"
+            :value="item.id">
+        </el-option>
+      </el-select>
+      </el-form-item>
+      <el-form-item label="角色名" prop="roleIds">
+      <el-select v-model="dataForm.roleIds" filterable multiple placeholder="请选择">
+        <el-option
+            v-for="item in roleOptions"
+            :key="item.id"
+            :label="item.roleName"
+            :value="item.id">
+        </el-option>
+      </el-select>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        userId: '',
+        roleIds: '',
+        roleId: ''
+      },
+      userOptions: [],
+      roleOptions: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        roleIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.getUserOptions()
+      this.getRoleOptions()
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    getUserOptions () {
+      this.$http
+          .get(`/sys/user/userList`)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            }
+            this.userOptions = res.data
+            this.vueLoading = false
+          })
+          .catch(() => {
+          })
+    },
+    getRoleOptions () {
+      this.$http
+          .get(`/sys/vaccinationrole/roleList`)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            }
+            this.roleOptions = res.data
+            this.vueLoading = false
+          })
+          .catch(() => {
+          })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/sys/vaccinationuserrole/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/vaccinationuserrole/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/vim/vaccinationuserrole.vue b/src/views/modules/vim/vaccinationuserrole.vue
new file mode 100644
index 0000000..ffdda56
--- /dev/null
+++ b/src/views/modules/vim/vaccinationuserrole.vue
@@ -0,0 +1,68 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__vaccinationuserrole}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="用户名">
+          <el-input v-model="dataForm.userName"
+                    placeholder="用户名"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':vaccinationuserrole:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="userName" label="用户名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="roleNames" label="角色名" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission(':vaccinationuserrole:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './vaccinationuserrole-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/sys/vaccinationuserrole/page',
+        getDataListIsPage: true,
+        deleteURL: '/sys/vaccinationuserrole',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>