Selaa lähdekoodia

基础设置~系统设置页面优化

chenrui 1 vuosi sitten
vanhempi
commit
4e1187f953

+ 25 - 21
src/views/power/OperateJournal/OperateJournal.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false">
-    <div class="operateJournal">
+  <div>
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
       <!-- 搜索框 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -27,23 +27,27 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        rowKey="id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <span slot="actDesc" slot-scope="text, record">{{ record.actDate }}-{{ record.actDesc }}</span>
-        <span slot="actorName" slot-scope="text, record">{{ record.actorName }}-{{ record.actorPhone }}</span>
-      </s-table>
-    </div>
-  </a-card>
+    </a-card>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <div class="operateJournal">
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          rowKey="id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <span slot="actDesc" slot-scope="text, record">{{ record.actDate }}-{{ record.actDesc }}</span>
+          <span slot="actorName" slot-scope="text, record">{{ record.actorName }}-{{ record.actorPhone }}</span>
+        </s-table>
+      </div>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -77,7 +81,7 @@ export default {
         { title: '操作时间', dataIndex: 'actDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: 'IP', dataIndex: 'ip', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作人', dataIndex: 'actorName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '操作信息', dataIndex: 'actDesc', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '操作信息', dataIndex: 'actDesc', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -120,7 +124,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 203
+      this.tableHeight = window.innerHeight - tableSearchH - 210
     }
   },
   watch: {

+ 9 - 5
src/views/power/dataDictionary/dataDictionary.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered="false" :style="{height:windowHeight+'px'}">
     <a-row :gutter="24">
       <!-- 左侧字典列表 -->
       <a-col :span="6">
@@ -19,7 +19,7 @@
           <a-input-search v-model="code" placeholder="输入编码类别/名称 搜索字典" style="width: 100%" @search="getCodeList" />
         </a-row>
         <a-row :gutter="24" >
-          <a-menu class="menu-box" style="border-right: 0;max-height: 650px;overflow: auto;" v-model="selectedKey" >
+          <a-menu class="menu-box" style="border-right: 0;max-height: 660px;overflow: auto;" v-model="selectedKey" >
             <a-menu-item style="margin-bottom: 0px;height: 30px; line-height: 30px;" v-for="(item,index) in codeList" :key="index" :value="item">{{ item.name }}</a-menu-item>
           </a-menu>
           <span v-if="noData" style="line-height: 50px; font-weight: 600;">暂无数据</span>
@@ -217,7 +217,8 @@ export default {
           return res.data
         })
       },
-      optionAlertShow: false
+      optionAlertShow: false,
+      windowHeight: 0
     }
   },
   methods: {
@@ -226,7 +227,6 @@ export default {
     getCodeList () {
       console.log({ code: this.code })
       listLookUp({ code: this.code }).then(res => {
-        console.log(res, 'res1111111')
         if (res.status == 200) {
           this.codeList = res.data
           this.noData = false
@@ -343,8 +343,10 @@ export default {
       console.log(row, 'row')
       this.showItemCodeModal = true
       this.itemCodeData = row
+    },
+    setTableH () {
+      this.windowHeight = window.innerHeight - 90
     }
-
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'miniForm' })
@@ -358,6 +360,7 @@ export default {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.getCodeList()
       this.cancelSel()
+      this.setTableH()
     }
   },
   activated () {
@@ -365,6 +368,7 @@ export default {
     if (this.$store.state.app.isNewTab) {
       this.getCodeList()
       this.cancelSel()
+      this.setTableH()
     }
   },
   watch: {

+ 7 - 2
src/views/setting/bigScreenSet/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card size="small" :bordered="false" class="noticeManagementList-wrap">
+  <a-card size="small" :bordered="false" class="noticeManagementList-wrap" :style="{height:windowHeight +'px'}">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 设置条件 -->
       <div class="setTit">大屏参数设置</div>
@@ -63,7 +63,8 @@ export default {
         saleNum: [{ required: true, message: '销售系数不能为空', trigger: 'blur' }],
         saleType: [{ required: true, message: '销售额类型不能为空', trigger: 'change' }]
       },
-      iconLoading: false
+      iconLoading: false,
+      windowHeight: 0
     }
   },
   methods: {
@@ -95,10 +96,14 @@ export default {
         }
         this.iconLoading = false
       })
+    },
+    setTableH () {
+      this.windowHeight = window.innerHeight - 90
     }
   },
   created () {
     this.getData()
+    this.setTableH()
   }
 }
 </script>

+ 11 - 4
src/views/setting/checkDingTask/list.vue

@@ -1,9 +1,9 @@
 <template>
-  <a-card size="small" :bordered="false" class="rebateSettingsList-wrap">
+  <a-card size="small" :bordered="false" class="rebateSettingsList-wrap" :style="{height:windowHeight +'px'}">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
-         <a-button type="primary" @click="updateFun">钉钉审批查询</a-button>
+        <a-button type="primary" @click="updateFun">钉钉审批查询</a-button>
       </div>
     </a-spin>
   </a-card>
@@ -12,13 +12,14 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { checkOptionTask } from '@/api/mqmsg'
- 
+
 export default {
   name: 'CheckDingTaskList',
   mixins: [commonMixin],
   data () {
     return {
-      spinning: false
+      spinning: false,
+      windowHeight: 0
     }
   },
   methods: {
@@ -31,6 +32,12 @@ export default {
         _this.spinning = false
       })
     },
+    setTableH () {
+      this.windowHeight = window.innerHeight - 90
+    }
+  },
+  created () {
+    this.setTableH()
   }
 }
 </script>

+ 55 - 51
src/views/setting/erpMessageManagement/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="rebateSettingsList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="rebateSettingsList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -34,54 +34,58 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 业务模块 -->
-        <template slot="workModule">
-          采购单管理
-        </template>
-        <!-- 同步状态 -->
-        <template slot="syncStatus" slot-scope="text, record">
-          <span v-if="record.handleResult&&record.handleResult=='finish'">处理成功</span>
-          <span v-else-if="record.handleResult&&record.handleResult=='wait'">等待处理</span>
-          <span v-else style="color:#ed1c24;">处理失败</span>
-        </template>
-        <!-- 错误信息 -->
-        <template slot="errInfo" slot-scope="text, record">
-          <div v-if="record.errInfo">
-            <a-popover trigger="hover">
-              <template slot="content">
-                {{ record.errInfo }}
-              </template>
-              <div>{{ record.errInfo }}</div>
-            </a-popover>
-          </div>
-          <div v-else>--</div>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            v-if="record.handleResult&&record.handleResult=='fail'"
-            @click="handleAgainSync(record)"
-            id="rebateSettingsList-edit-btn">重新同步</a-button>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-  </a-card>
+    </a-card>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 业务模块 -->
+          <template slot="workModule">
+            采购单管理
+          </template>
+          <!-- 同步状态 -->
+          <template slot="syncStatus" slot-scope="text, record">
+            <span v-if="record.handleResult&&record.handleResult=='finish'">处理成功</span>
+            <span v-else-if="record.handleResult&&record.handleResult=='wait'">等待处理</span>
+            <span v-else style="color:#ed1c24;">处理失败</span>
+          </template>
+          <!-- 错误信息 -->
+          <template slot="errInfo" slot-scope="text, record">
+            <div v-if="record.errInfo">
+              <a-popover trigger="hover">
+                <template slot="content">
+                  {{ record.errInfo }}
+                </template>
+                <div>{{ record.errInfo }}</div>
+              </a-popover>
+            </div>
+            <div v-else>--</div>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.handleResult&&record.handleResult=='fail'"
+              @click="handleAgainSync(record)"
+              id="rebateSettingsList-edit-btn">重新同步</a-button>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -180,7 +184,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 205
+      this.tableHeight = window.innerHeight - tableSearchH - 215
     }
   },
   watch: {

+ 56 - 52
src/views/setting/notice/list.vue

@@ -1,56 +1,60 @@
 <template>
-  <a-card size="small" :bordered="false" class="noticeList-wrap">
-    <!-- 搜索条件 -->
-    <div ref="tableSearch" class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="handelSearch(1)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="发布时间">
-              <rangeDate ref="rangeDate" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="公告名称">
-              <a-input id="noticeList-title" v-model.trim="queryParam.notice.title" allowClear placeholder="请输入公告名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="handelSearch(1)" :disabled="disabled" id="noticeList-refresh">查询</a-button>
-            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="noticeList-reset">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+  <div>
+    <a-card size="small" :bordered="false" class="noticeList-wrap searchBoxNormal">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="handelSearch(1)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="发布时间">
+                <rangeDate ref="rangeDate" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="公告名称">
+                <a-input id="noticeList-title" v-model.trim="queryParam.notice.title" allowClear placeholder="请输入公告名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="handelSearch(1)" :disabled="disabled" id="noticeList-refresh">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="noticeList-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
     <!-- 列表 -->
-    <a-table
-      class="sTable fixPagination"
-      ref="table"
-      :style="{ height: tableHeight+84.5+'px' }"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :dataSource="loadData"
-      :loading="listLoading"
-      :pagination="false"
-      bordered>
-      <!-- 操作 -->
-      <template slot="action" slot-scope="text, record">
-        <a-badge :count="record.readFlag=='0'? 1 : 0" dot>
-          <a-button size="small" type="primary" class="button-success" @click="handleDetail(record)" id="noticeList-detail-btn">详情</a-button>
-        </a-badge>
-      </template>
-    </a-table>
-    <!-- 分页 -->
-    <tablePagination
-      ref="tablePagination"
-      :total="paginationProps.total"
-      :current="paginationProps.current"
-      :pageSize="paginationProps.pageSize"
-      @changePageSize="changePageSize"
-      @changePage="changePage" />
-    <!-- 公告详情 -->
-    <notice-detail-modal v-drag :openModal="openModal" :itemId="itemId" @close="closeModal" />
-  </a-card>
+    <a-card size="small" :bordered="false">
+      <a-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :dataSource="loadData"
+        :loading="listLoading"
+        :pagination="false"
+        bordered>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text, record">
+          <a-badge :count="record.readFlag=='0'? 1 : 0" dot>
+            <a-button size="small" type="primary" class="button-success" @click="handleDetail(record)" id="noticeList-detail-btn">详情</a-button>
+          </a-badge>
+        </template>
+      </a-table>
+      <!-- 分页 -->
+      <tablePagination
+        ref="tablePagination"
+        :total="paginationProps.total"
+        :current="paginationProps.current"
+        :pageSize="paginationProps.pageSize"
+        @changePageSize="changePageSize"
+        @changePage="changePage" />
+      <!-- 公告详情 -->
+      <notice-detail-modal v-drag :openModal="openModal" :itemId="itemId" @close="closeModal" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -196,7 +200,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 255
     }
   },
   watch: {

+ 11 - 7
src/views/setting/noticeManagement/detailModal.vue

@@ -7,8 +7,8 @@
     title="公告详情"
     v-model="isShow"
     @cancel="isShow=false"
-    width="80%">
-    <div>
+    width="68%">
+    <div class="noticeEditContent">
       <a-descriptions bordered size="small" :column="2">
         <a-descriptions-item label="类别">{{ typeDictValue }}</a-descriptions-item>
         <a-descriptions-item label="可见性">{{ toAppNameDictValue }}</a-descriptions-item>
@@ -33,9 +33,9 @@
           <span v-if="attachPathsArr.length == 0">--</span>
         </a-descriptions-item>
       </a-descriptions>
-      <div class="btn-cont">
-        <a-button id="announcementDetail-back" @click="isShow = false" style="margin-left: 15px;">关闭</a-button>
-      </div>
+    </div>
+    <div class="btn-cont">
+      <a-button id="announcementDetail-back" @click="isShow = false" style="margin-left: 15px;">关闭</a-button>
     </div>
     <a-modal :visible="previewVisible" :footer="null" centered :maskClosable="false" @cancel="previewVisible=false">
       <img alt="example" style="width: 100%" :src="previewImage" />
@@ -147,7 +147,7 @@ export default {
 <style lang="less">
   .announcementDetail-modal{
     .ant-modal-body {
-      padding: 40px 40px 24px;
+      padding: 20px 40px 24px;
     }
     .ant-descriptions-item-label.ant-descriptions-item-colon{
       width: 90px;
@@ -185,7 +185,7 @@ export default {
     }
     .btn-cont {
       text-align: center;
-      margin: 35px 0 10px;
+      margin: 20px 0 10px;
     }
     .attachLink{
       display: inline-block;
@@ -194,5 +194,9 @@ export default {
         text-decoration: underline;
       }
     }
+    .noticeEditContent{
+      max-height:650px;
+      overflow-y:scroll;
+    }
   }
 </style>

+ 17 - 13
src/views/setting/noticeManagement/editModal.vue

@@ -7,9 +7,9 @@
     :title="modalTit"
     v-model="isShow"
     @cancel="isShow=false"
-    width="80%">
+    width="68%">
     <!-- 表单 -->
-    <div>
+    <div class="noticeEditContent">
       <a-spin :spinning="spinning" tip="Loading...">
         <a-form-model
           id="noticeEdit-form"
@@ -19,12 +19,6 @@
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
         >
-          <a-form-model-item label="类别" prop="type">
-            <v-select code="NOTITY_BIZ_TYPE" id="noticeEdit-type" v-model="form.type" allowClear placeholder="请选择类别"></v-select>
-          </a-form-model-item>
-          <a-form-model-item label="可见性" prop="toAppName">
-            <v-select code="NOTITY_APP_TYPE" id="noticeEdit-toAppName" v-model="form.toAppName" allowClear placeholder="请选择可见性"></v-select>
-          </a-form-model-item>
           <a-form-model-item label="公告标题" prop="title">
             <a-input
               id="noticeEdit-title"
@@ -33,6 +27,12 @@
               placeholder="请输入公告标题(最多30个字符)"
               allowClear />
           </a-form-model-item>
+          <a-form-model-item label="类别" prop="type">
+            <v-select code="NOTITY_BIZ_TYPE" id="noticeEdit-type" v-model="form.type" allowClear placeholder="请选择类别"></v-select>
+          </a-form-model-item>
+          <a-form-model-item label="可见性" prop="toAppName">
+            <v-select code="NOTITY_APP_TYPE" id="noticeEdit-toAppName" v-model="form.toAppName" allowClear placeholder="请选择可见性"></v-select>
+          </a-form-model-item>
           <a-form-model-item label="发布时间" prop="releaseDate">
             <a-date-picker
               show-time
@@ -72,12 +72,12 @@
             <editor id="noticeEdit-editor" ref="editor" class="noticeEdit-editor" @on-change="editorChange" :cache="false"></editor>
           </a-form-model-item>
         </a-form-model>
-        <div class="btn-cont">
-          <a-button type="primary" id="product-brand-edit-modal-save" @click="handleSave">保存</a-button>
-          <a-button id="product-brand-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
-        </div>
       </a-spin>
     </div>
+    <div class="btn-cont">
+      <a-button type="primary" id="product-brand-edit-modal-save" @click="handleSave">保存</a-button>
+      <a-button id="product-brand-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
+    </div>
   </a-modal>
 </template>
 
@@ -283,7 +283,7 @@ export default {
 <style lang="less">
   .noticeEdit-modal{
     .ant-modal-body {
-      padding: 40px 40px 24px;
+      padding: 20px 40px 24px;
     }
     .upload{
       width: 100%!important;
@@ -309,5 +309,9 @@ export default {
     a{
       color: inherit;
     }
+    .noticeEditContent{
+      max-height:655px;
+      overflow-y:scroll;
+    }
   }
 </style>

+ 56 - 52
src/views/setting/noticeManagement/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="noticeManagementList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="noticeManagementList-wrap searchBoxNormal">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -27,57 +27,61 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button id="noticeManagementList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
-      </div>
-      <!-- 总计 -->
-      <!-- <a-alert type="info" style="margin-bottom:10px">
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button id="noticeManagementList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+        </div>
+        <!-- 总计 -->
+        <!-- <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">合计:<strong>{{ total || 0 }}</strong>条</div>
       </a-alert> -->
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            v-if="record.sendStatus=='0'"
-            @click="handleEdit(record)"
-            id="noticeManagementList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-success"
-            v-if="record.sendStatus=='1'"
-            @click="handleDetail(record)"
-            id="noticeManagementList-detail-btn">详情</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-error"
-            v-if="record.sendStatus=='0'"
-            @click="handleDel(record)"
-            id="noticeManagementList-del-btn">删除</a-button>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 编辑 -->
-    <notice-edit-modal :openModal="openModal" :itemId="itemId" @close="closeModal" @ok="$refs.table.refresh()" />
-    <!-- 详情 -->
-    <notice-detail-modal :openModal="openDetailModal" :itemId="itemId" @close="closeDetailModal" />
-  </a-card>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.sendStatus=='0'"
+              @click="handleEdit(record)"
+              id="noticeManagementList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-success"
+              v-if="record.sendStatus=='1'"
+              @click="handleDetail(record)"
+              id="noticeManagementList-detail-btn">详情</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              v-if="record.sendStatus=='0'"
+              @click="handleDel(record)"
+              id="noticeManagementList-del-btn">删除</a-button>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 编辑 -->
+      <notice-edit-modal :openModal="openModal" :itemId="itemId" @close="closeModal" @ok="$refs.table.refresh()" />
+      <!-- 详情 -->
+      <notice-detail-modal :openModal="openDetailModal" :itemId="itemId" @close="closeDetailModal" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -200,7 +204,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 240
+      this.tableHeight = window.innerHeight - tableSearchH - 254
     }
   },
   watch: {