From 238adc2138befcbbc1bdebad30064fe79d2f44c3 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Fri, 24 Jul 2020 18:08:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=20=E4=BC=98=E5=8C=96bu?=
 =?UTF-8?q?g=E3=80=91-=E3=80=90=E4=BC=98=E5=8C=96bug=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E9=AD=8F=E5=87=AF=EF=BC=89-2020/07/23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/custom/majorfunctionconf.vue      | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/custom/majorfunctionconf.vue b/src/views/modules/custom/majorfunctionconf.vue
index 0e9b0aa8..70c48b69 100644
--- a/src/views/modules/custom/majorfunctionconf.vue
+++ b/src/views/modules/custom/majorfunctionconf.vue
@@ -4,7 +4,7 @@
     <div class="mod-__majorfunctionconf}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <!-- <el-form-item>
           <el-input v-model="dataForm.id"
                     placeholder="id"
@@ -14,7 +14,7 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item> -->
         <el-form-item>
-          <el-button type="primary"
+          <el-button type="success"
                      @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <!-- <el-form-item>
@@ -28,13 +28,23 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
+        <el-table-column
+                         label="序号"
+                         type="index"
+                         width="50"
+                         header-align="center"
+                         align="center"></el-table-column>
         <el-table-column prop="code"
                          label="功能编码"
                          header-align="center"
+                         width="150"
+                         show-overflow-tooltip
                          align="center"></el-table-column>
         <el-table-column prop="name"
                          label="功能名称"
                          header-align="center"
+                         width="120"
+                         show-overflow-tooltip
                          align="center"></el-table-column>
         <el-table-column prop="availableFlag"
                          label="是否可用"
@@ -45,10 +55,13 @@
                          label="是否访问外链"
                          :formatter="externalFlagFormat"
                          header-align="center"
+                         width="140"
                          align="center"></el-table-column>
         <el-table-column prop="externalUrl"
                          label="访问地址"
                          header-align="center"
+                         width="200"
+                         show-overflow-tooltip
                          align="center"></el-table-column>
         <el-table-column prop="remark"
                          label="备注"
@@ -71,6 +84,7 @@
         <el-table-column prop="createdTime"
                          label="创建时间"
                          header-align="center"
+                         width="180"
                          align="center"></el-table-column>
         <el-table-column prop="updatedBy"
                          label="更新人"
@@ -78,6 +92,7 @@
                          align="center"></el-table-column>
         <el-table-column prop="updatedTime"
                          label="更新时间"
+                         width="180"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column :label="$t('handle')"