From 4445a3477664466c253f637761c2e0fd7ea86915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Tue, 1 Jun 2021 00:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E9=A1=B9=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _web/src/views/system/pos/index.vue           | 227 ++++++++++--------
 .../log/service/impl/SysOpLogServiceImpl.java |   1 +
 .../service/impl/SysVisLogServiceImpl.java    |   1 +
 .../org/service/impl/SysOrgServiceImpl.java   |   7 +-
 4 files changed, 137 insertions(+), 99 deletions(-)

diff --git a/_web/src/views/system/pos/index.vue b/_web/src/views/system/pos/index.vue
index ebec7f12..3bc29f11 100644
--- a/_web/src/views/system/pos/index.vue
+++ b/_web/src/views/system/pos/index.vue
@@ -14,11 +14,9 @@
                 <a-input v-model="queryParam.code" allow-clear placeholder="请输入唯一编码" />
               </a-form-item>
             </a-col>
-            <a-col :md="!advanced && 8 || 24" :sm="24">
-              <span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
-                <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
-              </span>
+            <a-col :md="8" :sm="24">
+              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
             </a-col>
           </a-row>
         </a-form>
@@ -29,127 +27,160 @@
         ref="table"
         :columns="columns"
         :data="loadData"
-        :alert="true"
-        :rowKey="(record) => record.code"
-        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :alert="options.alert"
+        :rowKey="(record) => record.id"
+        :rowSelection="options.rowSelection"
       >
         <template slot="operator" v-if="hasPerm('sysPos:add')">
           <a-button @click="$refs.addForm.add()" icon="plus" type="primary" v-if="hasPerm('sysPos:add')">新增职位</a-button>
+          <a-button type="danger" :disabled="selectedRowKeys.length < 1" v-if="hasPerm('sysPos:delete')" @click="batchDelete"><a-icon type="delete"/>批量删除</a-button>
+          <x-down
+            v-if="hasPerm('sysPos:export')"
+            ref="batchExport"
+            @batchExport="batchExport"
+          />
         </template>
         <span slot="action" slot-scope="text, record">
           <a v-if="hasPerm('sysPos:edit')" @click="$refs.editForm.edit(record)">编辑</a>
           <a-divider type="vertical" v-if="hasPerm('sysPos:edit') & hasPerm('sysPos:delete')"/>
-          <a-popconfirm v-if="hasPerm('sysPos:delete')" placement="topRight" title="确认删除？" @confirm="() => sysPosDelete(record)">
+          <a-popconfirm v-if="hasPerm('sysPos:delete')" placement="topRight" title="确认删除？" @confirm="() => singleDelete(record)">
             <a>删除</a>
           </a-popconfirm>
         </span>
-
       </s-table>
-
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
-
     </a-card>
   </div>
 </template>
 
 <script>
-  import { STable, XCard } from '@/components'
-  import { sysPosPage, sysPosDelete } from '@/api/modular/system/posManage'
-  import addForm from './addForm'
-  import editForm from './editForm'
+import { STable, XCard, XDown } from '@/components'
+import { sysPosPage, sysPosDelete, sysPosExport } from '@/api/modular/system/posManage'
+import addForm from './addForm'
+import editForm from './editForm'
 
-  export default {
-    components: {
-      XCard,
-      STable,
-      addForm,
-      editForm
-    },
+export default {
+  components: {
+    XDown,
+    XCard,
+    STable,
+    addForm,
+    editForm
+  },
 
-    data () {
-      return {
-
-        // 高级搜索 展开/关闭
-        advanced: false,
-        // 查询参数
-        queryParam: {},
-        // 表头
-        columns: [
-          {
-            title: '职位名称',
-            dataIndex: 'name'
-          },
-          {
-            title: '唯一编码',
-            dataIndex: 'code'
-          },
-          {
-            title: '排序',
-            dataIndex: 'sort'
-          },
-          {
-            title: '备注',
-            dataIndex: 'remark'
-          }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          return sysPosPage(Object.assign(parameter, this.queryParam)).then((res) => {
-            return res.data
-          })
+  data () {
+    return {
+      // 查询参数
+      queryParam: {},
+      // 表头
+      columns: [
+        {
+          title: '职位名称',
+          dataIndex: 'name'
         },
-        selectedRowKeys: [],
-        selectedRows: []
-    }
-    },
-
-    created () {
-      if (this.hasPerm('sysPos:edit') || this.hasPerm('sysPos:delete')) {
-        this.columns.push({
-          title: '操作',
-          width: '150px',
-          dataIndex: 'action',
-          scopedSlots: { customRender: 'action' }
-        })
-      }
-    },
-
-    methods: {
-      sysPosDelete (record) {
-        sysPosDelete(record).then((res) => {
-          if (res.success) {
-            this.$message.success('删除成功')
-            this.$refs.table.refresh()
-          } else {
-            this.$message.error('删除失败：' + res.message)
-          }
-        }).catch((err) => {
-          this.$message.error('删除错误：' + err.message)
+        {
+          title: '唯一编码',
+          dataIndex: 'code'
+        },
+        {
+          title: '排序',
+          dataIndex: 'sort'
+        },
+        {
+          title: '备注',
+          dataIndex: 'remark'
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return sysPosPage(Object.assign(parameter, this.queryParam)).then((res) => {
+          return res.data
         })
       },
-
-      toggleAdvanced () {
-        this.advanced = !this.advanced
-      },
-      handleOk () {
-        this.$refs.table.refresh()
-      },
-      onSelectChange (selectedRowKeys, selectedRows) {
-        this.selectedRowKeys = selectedRowKeys
-        this.selectedRows = selectedRows
+      selectedRowKeys: [],
+      selectedRows: [],
+      options: {
+        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
+        rowSelection: {
+          selectedRowKeys: this.selectedRowKeys,
+          onChange: this.onSelectChange
+        }
       }
     }
+  },
 
+  created () {
+    if (this.hasPerm('sysPos:edit') || this.hasPerm('sysPos:delete')) {
+      this.columns.push({
+        title: '操作',
+        width: '150px',
+        dataIndex: 'action',
+        scopedSlots: { customRender: 'action' }
+      })
+    }
+  },
+
+  methods: {
+    /**
+     * 单个删除
+     */
+    singleDelete (record) {
+      const param = [{ 'id': record.id }]
+      this.sysPosDelete(param)
+    },
+    /**
+     * 批量删除
+     */
+    batchDelete () {
+      const paramIds = this.selectedRowKeys.map((d) => {
+        return { 'id': d }
+      })
+      this.sysPosDelete(paramIds)
+    },
+    /**
+     * 删除
+     */
+    sysPosDelete (param) {
+      sysPosDelete(param).then((res) => {
+        if (res.success) {
+          this.$message.success('删除成功')
+          this.$refs.table.clearRefreshSelected()
+        } else {
+          this.$message.error('删除失败：' + res.message)
+        }
+      }).catch((err) => {
+        this.$message.error('删除错误：' + err.message)
+      })
+    },
+    /**
+     * 批量导出
+     */
+    batchExport () {
+      const paramIds = this.selectedRowKeys.map((d) => {
+        return { 'id': d }
+      })
+      sysPosExport(paramIds).then((res) => {
+        this.$refs.batchExport.downloadfile(res)
+      })
+    },
+    handleOk () {
+      this.$refs.table.refresh()
+    },
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+    }
   }
+
+}
 </script>
 
 <style lang="less">
-  .table-operator {
-    margin-bottom: 18px;
-  }
-  button {
-    margin-right: 8px;
-  }
-
+.table-operator {
+  margin-bottom: 18px;
+}
+button {
+  margin-right: 8px;
+}
 </style>
diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java
index 672f5689..2e758519 100644
--- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java
+++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java
@@ -37,6 +37,7 @@ import vip.xiaonuo.sys.modular.log.mapper.SysOpLogMapper;
 import vip.xiaonuo.sys.modular.log.param.SysOpLogParam;
 import vip.xiaonuo.sys.modular.log.service.SysOpLogService;
 import org.springframework.stereotype.Service;
+import java.util.List;
 
 /**
  * 系统操作日志service接口实现类
diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java
index f6db7a85..b9ff0a82 100644
--- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java
+++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java
@@ -36,6 +36,7 @@ import vip.xiaonuo.sys.modular.log.mapper.SysVisLogMapper;
 import vip.xiaonuo.sys.modular.log.param.SysVisLogParam;
 import vip.xiaonuo.sys.modular.log.service.SysVisLogService;
 import org.springframework.stereotype.Service;
+import java.util.List;
 
 /**
  * 系统访问日志service接口实现类
diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java
index c9d1c2e6..f6211b34 100644
--- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java
+++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java
@@ -56,7 +56,6 @@ import vip.xiaonuo.sys.modular.role.service.SysRoleDataScopeService;
 import vip.xiaonuo.sys.modular.user.service.SysUserDataScopeService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Set;
@@ -527,4 +526,10 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         resultSet.addAll(childIdListById);
         return CollectionUtil.newArrayList(resultSet);
     }
+
+    @Override
+    public void export(SysOrgParam sysOrgParam) {
+        List<SysOrg> list = this.list(sysOrgParam);
+        PoiUtil.exportExcelWithStream("SysOrg.xls", SysOrg.class, list);
+    }
 }