From 6586ca9abf250c8debd09c6c8e94f0dc6646f13d Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 14 Feb 2020 14:12:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=A8=E5=8D=A1=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=911?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/custom/epidemicsentrypost.vue      | 16 ++++------------
 src/views/modules/sys/deptmacode.vue           | 18 +++++++++++++++---
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/custom/epidemicsentrypost.vue b/src/views/modules/custom/epidemicsentrypost.vue
index a0d1514f..8370e037 100644
--- a/src/views/modules/custom/epidemicsentrypost.vue
+++ b/src/views/modules/custom/epidemicsentrypost.vue
@@ -17,26 +17,18 @@
       </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="id" label="主键" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column> -->
         <el-table-column prop="sentryPostCode" label="哨卡编码" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sentryPostName" label="哨卡名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="thirdSentryPostId" label="第三方哨卡id" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gridId" label="哨卡所在网格id" header-align="center" align="center"></el-table-column>
         <el-table-column prop="maCodeUrl" label="哨卡小程序码访问地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptIds" label="父所有部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptNames" label="父所有部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptIds" label="所有部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="所有部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标识 0：否，1：是" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" 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 prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" 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('news:epidemicsentrypost:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:epidemicsentrypost:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('news:epidemicsentrypost:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">下载</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/sys/deptmacode.vue b/src/views/modules/sys/deptmacode.vue
index cdc5caba..65563738 100644
--- a/src/views/modules/sys/deptmacode.vue
+++ b/src/views/modules/sys/deptmacode.vue
@@ -92,8 +92,7 @@
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
-                         align="center"
-                         width="150">
+                         align="center">
           <template slot-scope="scope">
             <!-- <el-button v-if="$hasPermission('sys:deptmacode:delete') && scope.row.codeUrl && scope.row.leaderFlag === '0'"
                        type="danger"
@@ -103,6 +102,9 @@
                        type="danger"
                        size="mini"
                        @click="downloadHandle(scope.row.codeUrl)">下载</el-button>
+            <el-button type="danger"
+                       size="mini"
+                       @click="sentryManage()">哨卡管理</el-button>
             <el-button v-if="
                 $hasPermission('sys:deptmacode:create') && !scope.row.codeUrl
               "
@@ -126,6 +128,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
+import epidemicSentryPost from '../custom/epidemicsentrypost'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -142,6 +145,7 @@ export default {
         gridId: null,
         leaderFlag: '0'
       },
+      epidemicSentryPostVisible: false,
       deptIdList: [],
       options: [],
       streetList: [],
@@ -289,7 +293,15 @@ export default {
     },
     downloadHandle (codeUrl) {
       window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${codeUrl}`
-    }
+    },
+    // 哨卡管理
+    sentryManage () {
+      this.epidemicSentryPostVisible = true
+      this.$nextTick(() => {
+        // this.$refs.epidemicSentryPostVisible.dataForm.id = id
+        this.$refs.epidemicSentryPostVisible.init()
+      })
+    } 
   }
 }
 </script>