diff --git a/src/views/modules/custom/epidemicsentrypost-add-or-update.vue b/src/views/modules/custom/epidemicsentrypost-add-or-update.vue
index a730aeae..7852898f 100644
--- a/src/views/modules/custom/epidemicsentrypost-add-or-update.vue
+++ b/src/views/modules/custom/epidemicsentrypost-add-or-update.vue
@@ -1,52 +1,32 @@
 <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="sentryPostCode">
-          <el-input v-model="dataForm.sentryPostCode" placeholder="哨卡编码"></el-input>
+  <el-dialog
+    :visible.sync="visible"
+    :title="!dataForm.id ? $t('add') : $t('update')"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :append-to-body="true"
+  >
+    <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="sentryPostCode">
+        <el-input v-model="dataForm.sentryPostCode" placeholder="哨卡编码(唯一性最长6位)" style="width: 800px"></el-input>
       </el-form-item>
-          <el-form-item label="哨卡名称" prop="sentryPostName">
-          <el-input v-model="dataForm.sentryPostName" placeholder="哨卡名称"></el-input>
+      <el-form-item label="哨卡名称" prop="sentryPostName">
+        <el-select v-model="dataForm.sentryPostName"
+                     placeholder="请选择" style="width: 800px" @change="selectModel($event)">
+            <el-option v-for="item in verifyOptions"
+                       :key="item.id"
+                       :label="item.sentryPostName"
+                       :value="item.sentryPostName">
+            </el-option>
+          </el-select>
       </el-form-item>
-          <el-form-item label="第三方哨卡id" prop="thirdSentryPostId">
-          <el-input v-model="dataForm.thirdSentryPostId" placeholder="第三方哨卡id"></el-input>
-      </el-form-item>
-          <el-form-item label="哨卡所在网格id" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="哨卡所在网格id"></el-input>
-      </el-form-item>
-          <el-form-item label="哨卡小程序码访问地址" prop="maCodeUrl">
-          <el-input v-model="dataForm.maCodeUrl" placeholder="哨卡小程序码访问地址"></el-input>
-      </el-form-item>
-          <el-form-item label="父所有部门ID" prop="parentDeptIds">
-          <el-input v-model="dataForm.parentDeptIds" placeholder="父所有部门ID"></el-input>
-      </el-form-item>
-          <el-form-item label="父所有部门名称" prop="parentDeptNames">
-          <el-input v-model="dataForm.parentDeptNames" placeholder="父所有部门名称"></el-input>
-      </el-form-item>
-          <el-form-item label="所有部门ID" prop="allDeptIds">
-          <el-input v-model="dataForm.allDeptIds" placeholder="所有部门ID"></el-input>
-      </el-form-item>
-          <el-form-item label="所有部门名称" prop="allDeptNames">
-          <el-input v-model="dataForm.allDeptNames" placeholder="所有部门名称"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识 0：否，1：是" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0：否，1：是"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-      </el-form>
+    </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
       <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
@@ -64,69 +44,27 @@ export default {
         id: '',
         sentryPostCode: '',
         sentryPostName: '',
-        thirdSentryPostId: '',
-        gridId: '',
-        maCodeUrl: '',
-        parentDeptIds: '',
-        parentDeptNames: '',
-        allDeptIds: '',
-        allDeptNames: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: ''
-      }
+        gridId: ''
+      },
+      verifyOptions: []
     }
   },
   computed: {
     dataRule () {
       return {
         sentryPostCode: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
         ],
         sentryPostName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        thirdSentryPostId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        maCodeUrl: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptIds: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptNames: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptIds: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptNames: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          {
+            required: true,
+            message: this.$t('validate.required'),
+            trigger: 'blur'
+          }
         ]
       }
     }
@@ -134,6 +72,7 @@ export default {
   methods: {
     init () {
       this.visible = true
+      this.querySentryPostName()
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -141,40 +80,97 @@ export default {
         }
       })
     },
+    // 哨卡名称查询(未绑定网格id的)
+    querySentryPostName () {
+      this.$http
+        .get(`custom/epidemicsentrypost/selectListSentryPostName`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.verifyOptions = res.data
+        })
+        .catch(() => {})
+    },
+    // 根据下拉框选择的value 赋值key
+    selectModel (sentryPostName) {
+      let obj = {}
+      obj = this.verifyOptions.find((dataForm) => {
+        return this.dataForm.sentryPostName === sentryPostName
+      })
+      this.dataForm.id = obj.id
+    },
     // 获取信息
     getInfo () {
-      this.$http.get(`/news/epidemicsentrypost/${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']('/news/epidemicsentrypost/', this.dataForm).then(({ data: res }) => {
+      this.$http
+        .get(`/news/epidemicsentrypost/${this.dataForm.id}`)
+        .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 })
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data
+          }
+        })
+        .catch(() => {})
+    },
+    // 编码校验
+    // sentryPostCodeIsRepeat () {
+    //   if (this.dataForm.sentryPostCode.replace(/\s+/g, '').length === 0) {
+    //     return this.$message.error('哨卡编码不可为空')
+    //   }
+    //   this.$http
+    //     .get(`custom/epidemicsentrypost/sentryPostCodeIsRepeat/${this.dataForm.sentryPostCode}`)
+    //     .then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg)
+    //       }
+    //       if (res.data > 0) {
+    //         return this.$message.error('哨卡编码不可重复')
+    //       }
+    //       return res.data
+    //     })
+    //     .catch(() => {})
+    // },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs['dataForm'].validate(valid => {
+          if (!valid) {
+            return false
+          }
+          if (this.dataForm.sentryPostCode.length > 6) {
+            return this.$message.error('哨卡编码长度不可超6位')
+          }
+          var reg = /^[0-9a-zA-Z]+$/
+          if (!reg.test(this.dataForm.sentryPostCode)) {
+            return this.$message.error('哨卡编码仅支持数字或字母')
+          }
+          this.$http[!this.dataForm.id ? 'post' : 'put'](
+            '/custom/epidemicsentrypost/',
+            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/custom/epidemicsentrypost.vue b/src/views/modules/custom/epidemicsentrypost.vue
index ddb76d59..525711c2 100644
--- a/src/views/modules/custom/epidemicsentrypost.vue
+++ b/src/views/modules/custom/epidemicsentrypost.vue
@@ -13,7 +13,7 @@
         <el-button @click="getDataList()">{{ $t('query') }}</el-button>
       </el-form-item>
       <el-form-item>
-        <el-button v-if="$hasPermission('news:epidemicsentrypost:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
       </el-form-item>
       <el-form-item>
         <el-button v-if="$hasPermission('news:epidemicsentrypost:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -28,9 +28,9 @@
       <el-table-column prop="maCodeUrl" label="哨卡小程序码访问地址" header-align="center" align="center"></el-table-column>
       <el-table-column prop="createdTime" 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">
+        <!-- <template slot-scope="scope">
           <el-button v-if="$hasPermission('news:epidemicsentrypost:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">下载</el-button>
-        </template>
+        </template> -->
       </el-table-column>
     </el-table>
     <el-pagination
@@ -43,27 +43,39 @@
       @current-change="pageCurrentChangeHandle">
     </el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
-    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> -->
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
   </el-dialog>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-// import addOrUpdate from './epidemicsentrypost-add-or-update'
+import AddOrUpdate from './epidemicsentrypost-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       visible: false,
       dataForm: {
-        id: ''
+        id: '',
+        gridId: ''
       }
     }
   },
   methods: {
     init () {
       this.visible = true
+    },
+    // 新增 修改
+    addOrUpdateHandle () {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.dataForm.gridId = this.dataForm.gridId
+        this.$refs.addOrUpdate.init()
+      })
     }
+  },
+  components: {
+    AddOrUpdate
   }
 }
 </script>
diff --git a/src/views/modules/sys/deptmacode.vue b/src/views/modules/sys/deptmacode.vue
index 9a8196ba..e5770303 100644
--- a/src/views/modules/sys/deptmacode.vue
+++ b/src/views/modules/sys/deptmacode.vue
@@ -116,7 +116,7 @@
                        @click="downloadHandle(scope.row.codeUrl)">下载</el-button>
             <el-button type="danger"
                        size="mini"
-                       @click="sentryManage()">哨卡管理</el-button>
+                       @click="sentryManage(scope.row.gridId)">哨卡管理</el-button>
             <el-button v-if="
                 $hasPermission('sys:deptmacode:create') && !scope.row.codeUrl
               "
@@ -315,10 +315,10 @@ export default {
       window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${codeUrl}`
     },
     // 哨卡管理
-    sentryManage () {
+    sentryManage (id) {
       this.epidemicSentryPostVisible = true
       this.$nextTick(() => {
-        // this.$refs.epidemicSentryPostVisible.dataForm.id = id
+        this.$refs.epidemicSentryPost.dataForm.gridId = id
         this.$refs.epidemicSentryPost.init()
       })
     },