vue版本上线

jshERP-web/src/views/system/AccountList.vue

@@ -0,0 +1,154 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="4" :sm="6">
+            <a-form-item label="名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入名称查询" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="6">
+            <a-form-item label="编号" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入编号查询" v-model="queryParam.serialNo"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="6">
+            <a-form-item label="备注" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入备注查询" v-model="queryParam.remark"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a-popconfirm title="确定设为默认吗?" @confirm="() => handleSetDefault(record.id)">
+            <a>设为默认</a>
+          </a-popconfirm>
+          <a-divider type="vertical" />
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+        <!-- 状态渲染模板 -->
+        <template slot="customRenderFlag" slot-scope="isDefault">
+          <a-tag v-if="isDefault" color="green">是</a-tag>
+          <a-tag v-if="!isDefault" color="orange">否</a-tag>
+        </template>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <account-modal ref="modalForm" @ok="modalFormOk"></account-modal>
+  </a-card>
+</template>
+<script>
+  import AccountModal from './modules/AccountModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDate from '@/components/jeecg/JDate'
+  import { postAction } from '@api/manage'
+  export default {
+    name: "AccountList",
+    mixins:[JeecgListMixin],
+    components: {
+      AccountModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {name:'',serialNo:'',remark:''},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {title: '名称', dataIndex: 'name', width: 100},
+          {title: '编号', dataIndex: 'serialNo', width: 150, align: "center"},
+          {title: '期初金额', dataIndex: 'initialAmount', width: 100, align: "center"},
+          {title: '当前余额', dataIndex: 'currentAmount', width: 100, align: "center"},
+          { title: '是否默认',dataIndex: 'isDefault',width:100,align:"center",
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
+          {title: '备注', dataIndex: 'remark', width: 100},
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/account/list",
+          delete: "/account/delete",
+          deleteBatch: "/account/deleteBatch",
+          setDefault: "/account/updateIsDefault"
+        }
+      }
+    },
+    computed: {
+
+    },
+    methods: {
+      handleSetDefault: function (id) {
+        if(!this.url.setDefault){
+          this.$message.error("请设置url.delete属性!")
+          return
+        }
+        let that = this;
+        postAction(that.url.setDefault, {id: id}).then((res) => {
+          if(res.code === 200){
+            that.loadData();
+          } else {
+            that.$message.warning(res.data.message);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/AddressList.vue

@@ -0,0 +1,31 @@
+<template>
+  <a-row type="flex" :gutter="16">
+    <a-col :md="5" :sm="24">
+      <address-list-left v-model="currentOrgCode"/>
+    </a-col>
+    <a-col :md="24-5" :sm="24">
+      <address-list-right v-model="currentOrgCode"/>
+    </a-col>
+  </a-row>
+</template>
+
+<script>
+  import AddressListLeft from './modules/AddressListLeft'
+  import AddressListRight from './modules/AddressListRight'
+
+  export default {
+    name: 'AddressList',
+    components: { AddressListLeft, AddressListRight },
+    data() {
+      return {
+        description: '通讯录页面',
+        currentOrgCode: ''
+      }
+    },
+
+    methods: {}
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jshERP-web/src/views/system/CustomerList.vue

@@ -0,0 +1,166 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="5" :sm="10">
+            <a-form-item label="名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入名称查询" v-model="queryParam.supplier"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="10">
+            <a-form-item label="手机号码" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入手机号码查询" v-model="queryParam.telephone"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="10">
+            <a-form-item label="联系电话" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入联系电话查询" v-model="queryParam.phonenum"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-popover title="导入注意点">
+          <template slot="content">
+            <p>预收款、期初应收、期初应付、税率均为数值且要大于0；<br/>另外期初应收、期初应付不能同时输入</p>
+          </template>
+          <a-button type="primary" icon="import">导入</a-button>
+        </a-popover>
+      </a-upload>
+      <a-button type="primary" icon="download" @click="handleExportXls('客户信息')">导出</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+          <a-menu-item key="2" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
+          <a-menu-item key="3" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+        <!-- 状态渲染模板 -->
+        <template slot="customRenderFlag" slot-scope="enabled">
+          <a-tag v-if="enabled" color="green">启用</a-tag>
+          <a-tag v-if="!enabled" color="orange">禁用</a-tag>
+        </template>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <customer-modal ref="modalForm" @ok="modalFormOk"></customer-modal>
+  </a-card>
+</template>
+<script>
+  import CustomerModal from './modules/CustomerModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDate from '@/components/jeecg/JDate'
+  export default {
+    name: "CustomerList",
+    mixins:[JeecgListMixin],
+    components: {
+      CustomerModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {
+          supplier:'',
+          type:'客户',
+          telephone:'',
+          phonenum:''
+        },
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          { title: '名称',dataIndex: 'supplier',width:150},
+          { title: '联系人', dataIndex: 'contacts',width:70,align:"center"},
+          { title: '手机号码', dataIndex: 'telephone',width:100,align:"center"},
+          { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"},
+          { title: '预付款',dataIndex: 'advanceIn',width:70,align:"center"},
+          { title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"center"},
+          { title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"center"},
+          { title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"center"},
+          { title: '期末应付',dataIndex: 'allNeedPay',width:80,align:"center"},
+          { title: '税率(%)', dataIndex: 'taxRate',width:80,align:"center"},
+          { title: '状态',dataIndex: 'enabled',width:70,align:"center",
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/supplier/list",
+          delete: "/supplier/delete",
+          deleteBatch: "/supplier/deleteBatch",
+          importExcelUrl: "/supplier/importExcel",
+          exportXlsUrl: "/supplier/exportExcel",
+          batchSetStatusUrl: "/supplier/batchSetStatus"
+        }
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {
+      searchReset() {
+        this.queryParam = {
+          type:'客户',
+        }
+        this.loadData(1);
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/DataLogList.vue

@@ -0,0 +1,138 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="表名">
+              <a-input placeholder="请输入表名" v-model="queryParam.dataTable"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="数据ID">
+              <a-input placeholder="请输入ID" v-model="queryParam.dataId"></a-input>
+            </a-form-item>
+          </a-col>
+
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+               </a-col>
+            </span>
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleCompare()" type="primary" icon="plus">数据比较</a-button>
+    </div>
+
+    <!--table区 -->
+    <div>
+      <!--已选择的清空 -->
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys,onChange: onSelectChange}"
+        @change="handleTableChange"
+      >
+        <!-- 字符串超长截取省略号显示-->
+        <span slot="dataContent" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="80" />
+        </span>
+      </a-table>
+    </div>
+    <data-log-modal ref="modalForm" @ok="modalFormOk"></data-log-modal>
+  </a-card>
+</template>
+
+<script>
+  import DataLogModal from './modules/DataLogModal'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import JEllipsis from "@/components/jeecg/JEllipsis";
+
+  export default {
+    name: 'DataLogList',
+    mixins: [JeecgListMixin],
+    components: {
+      JEllipsis,
+      DataLogModal
+    },
+    data() {
+      return {
+        description: '数据日志管理页面',
+        //表头
+        columns: [
+          {
+            title: '表名',
+            align: 'center',
+            dataIndex: 'dataTable',
+            width: "120"
+          }, {
+            title: '数据ID',
+            align: 'center',
+            dataIndex: 'dataId',
+            width: "120"
+          }, {
+            title: '版本号',
+            align: 'center',
+            dataIndex: 'dataVersion',
+            width: "50"
+          }, {
+            title: '数据内容',
+            align: 'center',
+            dataIndex: 'dataContent',
+            width: "150",
+            scopedSlots: {customRender: 'dataContent'},
+          }, {
+            title: '创建人',
+            align: 'center',
+            dataIndex: 'createBy',
+            width: "100"
+          },
+        ],
+        url: {
+          list: "/sys/dataLog/list",
+        },
+      }
+    },
+    methods: {
+      handleCompare: function () {
+        if (!this.selectionRows || this.selectionRows.length != 2) {
+          this.openNotifIcon('请选择两条数据');
+          return false;
+        } else if (this.selectionRows[0].dataId != this.selectionRows[1].dataId) {
+          this.openNotifIcon('请选择相同的数据库表和数据ID进行比较');
+          return false;
+        } else {
+          this.$refs.modalForm.addModal(this.selectionRows);
+          this.$refs.modalForm.title = "数据比较";
+        }
+      },
+      openNotifIcon(msg) {
+        this.$notification['warning']({
+          message: '提示信息',
+          description: msg,
+        });
+      },
+    }
+
+  }
+
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/DepartList.vue

@@ -0,0 +1,657 @@
+<template xmlns:background-color="http://www.w3.org/1999/xhtml">
+  <a-row :gutter="10">
+    <a-col :md="12" :sm="24">
+      <a-card :bordered="false">
+
+        <!-- 按钮操作区域 -->
+        <a-row style="margin-left: 14px">
+          <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
+          <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
+          <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
+          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+            <a-button type="primary" icon="import">导入</a-button>
+          </a-upload>
+          <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
+          <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
+        </a-row>
+        <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
+          <a-alert type="info" :showIcon="true">
+            <div slot="message">
+              当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
+              <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a>
+            </div>
+          </a-alert>
+          <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
+          <!-- 树-->
+          <a-col :md="10" :sm="24">
+            <template>
+              <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
+               <span style="user-select: none">
+            <a-tree
+              checkable
+              multiple
+              @select="onSelect"
+              @check="onCheck"
+              @rightClick="rightHandle"
+              :selectedKeys="selectedKeys"
+              :checkedKeys="checkedKeys"
+              :treeData="departTree"
+              :checkStrictly="checkStrictly"
+              :expandedKeys="iExpandedKeys"
+              :autoExpandParent="autoExpandParent"
+              @expand="onExpand"/>
+                </span>
+                <!--新增右键点击事件,和增加添加和删除功能-->
+                <a-menu slot="overlay">
+                  <a-menu-item @click="handleAdd(3)" key="1">添加</a-menu-item>
+                  <a-menu-item @click="handleDelete" key="2">删除</a-menu-item>
+                  <a-menu-item @click="closeDrop" key="3">取消</a-menu-item>
+                </a-menu>
+              </a-dropdown>
+            </template>
+          </a-col>
+        </div>
+      </a-card>
+      <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+      <div class="drawer-bootom-button">
+        <a-dropdown :trigger="['click']" placement="topCenter">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
+            <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
+            <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
+            <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
+            <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
+            <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
+          </a-menu>
+          <a-button>
+            树操作 <a-icon type="up" />
+          </a-button>
+        </a-dropdown>
+      </div>
+      <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+    </a-col>
+    <a-col :md="12" :sm="24">
+      <a-tabs defaultActiveKey="1">
+        <a-tab-pane tab="基本信息" key="1" >
+          <a-card :bordered="false" v-if="selectedKeys.length>0">
+            <a-form :form="form">
+              <a-form-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="机构名称">
+                <a-input placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
+              </a-form-item>
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
+                <a-tree-select
+                  style="width:100%"
+                  :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+                  :treeData="treeData"
+                  :disabled="disable"
+                  v-model="model.parentId"
+                  placeholder="无">
+                </a-tree-select>
+              </a-form-item>
+              <a-form-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="机构编码">
+                <a-input disabled placeholder="请输入机构编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
+              </a-form-item>
+              <a-form-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="机构类型">
+                <template v-if="orgCategoryDisabled">
+                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
+                    <a-radio value="1">
+                      公司
+                    </a-radio>
+                  </a-radio-group>
+                </template>
+                <template v-else>
+                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
+                    <a-radio value="2">
+                      部门
+                    </a-radio>
+                    <a-radio value="3">
+                      岗位
+                    </a-radio>
+                  </a-radio-group>
+                </template>
+              </a-form-item>
+              <a-form-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="排序">
+                <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
+              </a-form-item>
+              <a-form-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="手机号">
+                <a-input placeholder="请输入手机号" v-decorator="['mobile', {'initialValue':''}]"/>
+              </a-form-item>
+              <a-form-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="地址">
+                <a-input placeholder="请输入地址" v-decorator="['address', {'initialValue':''}]"/>
+              </a-form-item>
+              <a-form-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="备注">
+                <a-textarea placeholder="请输入备注" v-decorator="['memo', {'initialValue':''}]"/>
+              </a-form-item>
+            </a-form>
+            <div class="anty-form-btn">
+              <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">重置</a-button>
+              <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">保存</a-button>
+            </div>
+          </a-card>
+          <a-card v-else >
+            <a-empty>
+              <span slot="description"> 请先选择一个部门! </span>
+            </a-empty>
+          </a-card>
+        </a-tab-pane>
+        <a-tab-pane tab="部门权限" key="2" forceRender>
+          <depart-auth-modal ref="departAuth"/>
+        </a-tab-pane>
+      </a-tabs>
+
+    </a-col>
+    <depart-modal ref="departModal" @ok="loadTree"></depart-modal>
+  </a-row>
+</template>
+<script>
+  import DepartModal from './modules/DepartModal'
+  import pick from 'lodash.pick'
+  import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
+  import {httpAction, deleteAction} from '@/api/manage'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import DepartAuthModal from './modules/DepartAuthModal'
+  // 表头
+  const columns = [
+    {
+      title: '机构名称',
+      dataIndex: 'departName'
+    },
+    {
+      title: '机构类型',
+      align: 'center',
+      dataIndex: 'orgType'
+    },
+    {
+      title: '机构编码',
+      dataIndex: 'orgCode',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'mobile'
+    },
+    {
+      title: '传真',
+      dataIndex: 'fax'
+    },
+    {
+      title: '地址',
+      dataIndex: 'address'
+    },
+    {
+      title: '排序',
+      align: 'center',
+      dataIndex: 'departOrder'
+    },
+    {
+      title: '操作',
+      align: 'center',
+      dataIndex: 'action',
+      scopedSlots: {customRender: 'action'}
+    }
+  ]
+  export default {
+    name: 'DepartList',
+    mixins: [JeecgListMixin],
+    components: {
+      DepartAuthModal,
+      DepartModal
+    },
+    data() {
+      return {
+        iExpandedKeys: [],
+        loading: false,
+        autoExpandParent: true,
+        currFlowId: '',
+        currFlowName: '',
+        disable: true,
+        treeData: [],
+        visible: false,
+        departTree: [],
+        rightClickSelectedKey: '',
+        rightClickSelectedOrgCode: '',
+        hiding: true,
+        model: {},
+        dropTrigger: '',
+        depart: {},
+        columns: columns,
+        disableSubmit: false,
+        checkedKeys: [],
+        selectedKeys: [],
+        autoIncr: 1,
+        currSelected: {},
+
+        allTreeKeys:[],
+        checkStrictly: true,
+
+        form: this.$form.createForm(this),
+        labelCol: {
+          xs: {span: 24},
+          sm: {span: 5}
+        },
+        wrapperCol: {
+          xs: {span: 24},
+          sm: {span: 16}
+        },
+        graphDatasource: {
+          nodes: [],
+          edges: []
+        },
+        validatorRules: {
+          departName: {rules: [{required: true, message: '请输入机构/部门名称!'}]},
+          orgCode: {rules: [{required: true, message: '请输入机构编码!'}]},
+          orgCategory: {rules: [{required: true, message: '请输入机构类型!'}]},
+          mobile: {rules: [{validator: this.validateMobile}]}
+        },
+        url: {
+          delete: '/sys/sysDepart/delete',
+          edit: '/sys/sysDepart/edit',
+          deleteBatch: '/sys/sysDepart/deleteBatch',
+          exportXlsUrl: "sys/sysDepart/exportXls",
+          importExcelUrl: "sys/sysDepart/importExcel",
+        },
+        orgCategoryDisabled:false,
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {
+      loadData() {
+        this.refresh();
+      },
+      loadTree() {
+        var that = this
+        that.treeData = []
+        that.departTree = []
+        queryDepartTreeList().then((res) => {
+          if (res.success) {
+            //部门全选后，再添加部门，选中数量增多
+            this.allTreeKeys = [];
+            for (let i = 0; i < res.result.length; i++) {
+              let temp = res.result[i]
+              that.treeData.push(temp)
+              that.departTree.push(temp)
+              that.setThisExpandedKeys(temp)
+              that.getAllKeys(temp);
+              // console.log(temp.id)
+            }
+            this.loading = false
+          }
+        })
+      },
+      setThisExpandedKeys(node) {
+        if (node.children && node.children.length > 0) {
+          this.iExpandedKeys.push(node.key)
+          for (let a = 0; a < node.children.length; a++) {
+            this.setThisExpandedKeys(node.children[a])
+          }
+        }
+      },
+      refresh() {
+        this.loading = true
+        this.loadTree()
+      },
+      // 右键操作方法
+      rightHandle(node) {
+        this.dropTrigger = 'contextmenu'
+        console.log(node.node.eventKey)
+        this.rightClickSelectedKey = node.node.eventKey
+        this.rightClickSelectedOrgCode = node.node.dataRef.orgCode
+      },
+      onExpand(expandedKeys) {
+        console.log('onExpand', expandedKeys)
+        // if not set autoExpandParent to false, if children expanded, parent can not collapse.
+        // or, you can remove all expanded children keys.
+        this.iExpandedKeys = expandedKeys
+        this.autoExpandParent = false
+      },
+      backFlowList() {
+        this.$router.back(-1)
+      },
+      // 右键点击下拉框改变事件
+      dropStatus(visible) {
+        if (visible == false) {
+          this.dropTrigger = ''
+        }
+      },
+      // 右键店家下拉关闭下拉框
+      closeDrop() {
+        this.dropTrigger = ''
+      },
+      addRootNode() {
+        this.$refs.nodeModal.add(this.currFlowId, '')
+      },
+      batchDel: function () {
+        console.log(this.checkedKeys)
+        if (this.checkedKeys.length <= 0) {
+          this.$message.warning('请选择一条记录！')
+        } else {
+          var ids = ''
+          for (var a = 0; a < this.checkedKeys.length; a++) {
+            ids += this.checkedKeys[a] + ','
+          }
+          var that = this
+          this.$confirm({
+            title: '确认删除',
+            content: '确定要删除所选中的 ' + this.checkedKeys.length + ' 条数据，以及子节点数据吗?',
+            onOk: function () {
+              deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+                if (res.success) {
+                  that.$message.success(res.message)
+                  that.loadTree()
+                  that.onClearSelected()
+                } else {
+                  that.$message.warning(res.message)
+                }
+              })
+            }
+          })
+        }
+      },
+      onSearch(value) {
+        let that = this
+        if (value) {
+          searchByKeywords({keyWord: value}).then((res) => {
+            if (res.success) {
+              that.departTree = []
+              for (let i = 0; i < res.result.length; i++) {
+                let temp = res.result[i]
+                that.departTree.push(temp)
+              }
+            } else {
+              that.$message.warning(res.message)
+            }
+          })
+        } else {
+          that.loadTree()
+        }
+
+      },
+      nodeModalOk() {
+        this.loadTree()
+      },
+      nodeModalClose() {
+      },
+      hide() {
+        console.log(111)
+        this.visible = false
+      },
+      onCheck(checkedKeys, info) {
+        console.log('onCheck', checkedKeys, info)
+        this.hiding = false
+        //this.checkedKeys = checkedKeys.checked
+        // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+        if(this.checkStrictly){
+          this.checkedKeys = checkedKeys.checked;
+        }else{
+          this.checkedKeys = checkedKeys
+        }
+        // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+      },
+      onSelect(selectedKeys, e) {
+        console.log('selected', selectedKeys, e)
+        this.hiding = false
+        let record = e.node.dataRef
+        console.log('onSelect-record', record)
+        this.currSelected = Object.assign({}, record)
+        this.model = this.currSelected
+        this.selectedKeys = [record.key]
+        this.model.parentId = record.parentId
+        this.setValuesToForm(record)
+        this.$refs.departAuth.show(record.id);
+
+      },
+      // 触发onSelect事件时,为部门树右侧的form表单赋值
+      setValuesToForm(record) {
+        if(record.orgCategory == '1'){
+          this.orgCategoryDisabled = true;
+        }else{
+          this.orgCategoryDisabled = false;
+        }
+        this.$nextTick(() => {
+          this.form.getFieldDecorator('fax', {initialValue: ''})
+          this.form.setFieldsValue(pick(record, 'departName','orgCategory', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
+        })
+      },
+      getCurrSelectedTitle() {
+        return !this.currSelected.title ? '' : this.currSelected.title
+      },
+      onClearSelected() {
+        this.hiding = true
+        this.checkedKeys = []
+        this.currSelected = {}
+        this.form.resetFields()
+        this.selectedKeys = []
+        this.$refs.departAuth.departId = ''
+      },
+      handleNodeTypeChange(val) {
+        this.currSelected.nodeType = val
+      },
+      notifyTriggerTypeChange(value) {
+        this.currSelected.notifyTriggerType = value
+      },
+      receiptTriggerTypeChange(value) {
+        this.currSelected.receiptTriggerType = value
+      },
+      submitCurrForm() {
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            if (!this.currSelected.id) {
+              this.$message.warning('请点击选择要修改部门!')
+              return
+            }
+
+            let formData = Object.assign(this.currSelected, values)
+            console.log('Received values of form: ', formData)
+            httpAction(this.url.edit, formData, 'put').then((res) => {
+              if (res.success) {
+                this.$message.success('保存成功!')
+                this.loadTree()
+              } else {
+                this.$message.error(res.message)
+              }
+            })
+          }
+        })
+      },
+      emptyCurrForm() {
+        this.form.resetFields()
+      },
+      nodeSettingFormSubmit() {
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            console.log('Received values of form: ', values)
+          }
+        })
+      },
+      openSelect() {
+        this.$refs.sysDirectiveModal.show()
+      },
+      handleAdd(num) {
+        if (num == 1) {
+          this.$refs.departModal.add()
+          this.$refs.departModal.title = '新增'
+        } else if (num == 2) {
+          let key = this.currSelected.key
+          if (!key) {
+            this.$message.warning('请先点击选中上级部门！')
+            return false
+          }
+          this.$refs.departModal.add(this.selectedKeys)
+          this.$refs.departModal.title = '新增'
+        } else {
+          this.$refs.departModal.add(this.rightClickSelectedKey)
+          this.$refs.departModal.title = '新增'
+        }
+      },
+      handleDelete() {
+        var that = this
+        this.$confirm({
+          title: '确认删除',
+          content: '确定要删除此部门以及子节点数据吗?',
+          onOk: function () {
+            deleteByDepartId({id: that.rightClickSelectedKey}).then((resp) => {
+              if (resp.success) {
+                //删除成功后，去除已选中中的数据
+                that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1);
+                that.$message.success('删除成功!')
+                that.loadTree()
+                //删除后同步清空右侧基本信息内容
+                let orgCode=that.form.getFieldValue("orgCode");
+                if(orgCode && orgCode === that.rightClickSelectedOrgCode){
+                  that.onClearSelected()
+                }
+              } else {
+                that.$message.warning('删除失败!')
+              }
+            })
+          }
+        })
+      },
+      selectDirectiveOk(record) {
+        console.log('选中指令数据', record)
+        this.nodeSettingForm.setFieldsValue({directiveCode: record.directiveCode})
+        this.currSelected.sysCode = record.sysCode
+      },
+      getFlowGraphData(node) {
+        this.graphDatasource.nodes.push({
+          id: node.id,
+          text: node.flowNodeName
+        })
+        if (node.children.length > 0) {
+          for (let a = 0; a < node.children.length; a++) {
+            let temp = node.children[a]
+            this.graphDatasource.edges.push({
+              source: node.id,
+              target: temp.id
+            })
+            this.getFlowGraphData(temp)
+          }
+        }
+      },
+     // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+      expandAll () {
+        this.iExpandedKeys = this.allTreeKeys
+      },
+      closeAll () {
+        this.iExpandedKeys = []
+      },
+      checkALL () {
+        this.checkStriccheckStrictlytly = false
+        this.checkedKeys = this.allTreeKeys
+      },
+      cancelCheckALL () {
+        //this.checkedKeys = this.defaultCheckedKeys
+        this.checkedKeys = []
+      },
+      switchCheckStrictly (v) {
+        if(v==1){
+          this.checkStrictly = false
+        }else if(v==2){
+          this.checkStrictly = true
+        }
+      },
+      getAllKeys(node) {
+        // console.log('node',node);
+        this.allTreeKeys.push(node.key)
+        if (node.children && node.children.length > 0) {
+          for (let a = 0; a < node.children.length; a++) {
+            this.getAllKeys(node.children[a])
+          }
+        }
+      }
+      // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+      
+    },
+    created() {
+      this.currFlowId = this.$route.params.id
+      this.currFlowName = this.$route.params.name
+      // this.loadTree()
+    },
+
+  }
+</script>
+<style scoped>
+  .ant-card-body .table-operator {
+    margin: 15px;
+  }
+
+  .anty-form-btn {
+    width: 100%;
+    text-align: center;
+  }
+
+  .anty-form-btn button {
+    margin: 0 5px;
+  }
+
+  .anty-node-layout .ant-layout-header {
+    padding-right: 0
+  }
+
+  .header {
+    padding: 0 8px;
+  }
+
+  .header button {
+    margin: 0 3px
+  }
+
+  .ant-modal-cust-warp {
+    height: 100%
+  }
+
+  .ant-modal-cust-warp .ant-modal-body {
+    height: calc(100% - 110px) !important;
+    overflow-y: auto
+  }
+
+  .ant-modal-cust-warp .ant-modal-content {
+    height: 90% !important;
+    overflow-y: hidden
+  }
+
+  #app .desktop {
+    height: auto !important;
+  }
+
+  /** Button按钮间距 */
+  .ant-btn {
+    margin-left: 3px
+  }
+
+  .drawer-bootom-button {
+    /*position: absolute;*/
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: left;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jshERP-web/src/views/system/DepartList2.vue

@@ -0,0 +1,260 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <!--
+   -->
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a href="javascript:;" @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <sysDepart-modal ref="sysDepartModal" @ok="modalFormOk"></sysDepart-modal>
+  </a-card>
+</template>
+
+<script>
+  import SysDepartModal from './modules/DepartModal'
+  /*  import { filterObj } from '@/utils/util'
+    , queryByFactories*/
+  import {queryDepartTreeList} from '@/api/api'
+  import {deleteAction} from '@/api/manage'
+
+  // 表头
+  const columns = [
+    {
+      title: '机构名称',
+      dataIndex: 'departName',
+    },
+    {
+      title: '机构类型',
+      align: "center",
+      dataIndex: 'orgType'
+    },
+    {
+      title: '机构编码',
+      dataIndex: 'orgCode'
+    },
+    {
+      title: '手机号',
+      dataIndex: 'mobile'
+    },
+    {
+      title: '传真',
+      dataIndex: 'fax'
+    },
+    {
+      title: '地址',
+      dataIndex: 'address'
+    },
+    {
+      title: '排序',
+      align: 'center',
+      dataIndex: 'departOrder'
+    },
+    {
+      title: '操作',
+      align: "center",
+      dataIndex: 'action',
+      scopedSlots: {customRender: 'action'},
+    }
+  ];
+
+  export default {
+    name: "DepartList2",
+    components: {
+      SysDepartModal
+    },
+    data() {
+      return {
+        description: 'jeecg 生成SysDepart代码管理页面',
+        // 查询条件
+        queryParam: {},
+        //数据集
+        factories: '',
+        dataSource: [],
+        columns: columns,
+        // 分页参数
+        /*        ipagination:{
+                  current: 1,
+                  pageSize: 5,
+                  pageSizeOptions: ['5', '10', '20'],
+                  showTotal: (total, range) => {
+                    return range[0] + "-" + range[1] + " 共" + total + "条"
+                  },
+                  showQuickJumper: true,
+                  showSizeChanger: true,
+                  total: 0
+                },*/
+        isorter: {
+          column: 'createTime',
+          order: 'desc',
+        },
+        loading: false,
+        selectedRowKeys: [],
+        selectedRows: [],
+        url: {
+          list: "/sys/sysDepart/list",
+          delete: "/sys/sysDepart/delete",
+          deleteBatch: "/sys/sysDepart/deleteBatch",
+        },
+
+      }
+    },
+    created() {
+      this.loadData();
+    },
+    methods: {
+      loadData() {
+        this.dataSource = [];
+        queryDepartTreeList().then((res) => {
+          if (res.success) {
+            this.dataSource = res.result;
+          }
+        })
+
+      },
+
+      getQueryField() {
+        //TODO 字段权限控制
+        var str = "id,";
+        for (var a = 0; a < this.columns.length; a++) {
+          str += "," + this.columns[a].dataIndex;
+        }
+        return str;
+      },
+      onSelectChange(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+      },
+      onClearSelected() {
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+      },
+//TODO getQueryParams
+      handleDelete: function (id) {
+        var that = this;
+        deleteAction(that.url.delete, {id: id}).then((res) => {
+          if (res.success) {
+            that.$message.success(res.message);
+            that.loadData();
+          } else {
+            that.$message.warning(res.message);
+          }
+        });
+      },
+      handleDetail(record) {
+        this.$refs.sysDepartModal.edit(record);
+        this.$refs.sysDepartModal.title = "详情";
+        this.$refs.sysDepartModal.disableSubmit = true;
+      },
+      batchDel: function () {
+        if (this.selectedRowKeys.length <= 0) {
+          this.$message.warning('请选择一条记录！');
+          return;
+        } else {
+          var ids = "";
+          for (var a = 0; a < this.selectedRowKeys.length; a++) {
+            ids += this.selectedRowKeys[a] + ",";
+          }
+          var that = this;
+          this.$confirm({
+            title: "确认删除",
+            content: "是否删除选中数据?",
+            onOk: function () {
+              deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+                if (res.success) {
+                  that.$message.success(res.message);
+                  that.loadData();
+                  that.onClearSelected();
+                } else {
+                  that.$message.warning(res.message);
+                }
+              });
+            }
+          });
+        }
+      },
+      handleEdit: function (record) {
+        this.$refs.sysDepartModal.edit(record);
+        this.$refs.sysDepartModal.title = "编辑";
+      },
+      handleAdd() {
+        this.$refs.sysDepartModal.add();
+        this.$refs.sysDepartModal.title = "新增";
+      },
+      handleTableChange(pagination, filters, sorter) {
+        //分页、排序、筛选变化时触发
+        console.log(sorter);
+        //TODO 筛选
+        if (Object.keys(sorter).length > 0) {
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+        }
+        /*this.ipagination = pagination;*/
+        this.loadData();
+      },
+      modalFormOk() {
+        // 新增/修改 成功时，重载列表
+        this.loadData();
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/DepartUserList.vue

@@ -0,0 +1,221 @@
+<template>
+  <a-row :gutter="10">
+    <a-col :md="8" :sm="24">
+      <a-card :bordered="false">
+        <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
+          <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
+          <!-- 树-->
+
+          <template v-if="userIdentity === '2' && departTree.length>0">
+
+            <!--组织机构-->
+            <a-tree
+              showLine
+              :selectedKeys="selectedKeys"
+              :checkStrictly="true"
+              @select="onSelect"
+              :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+              :treeData="departTree"
+              :autoExpandParent="autoExpandParent"
+              :expandedKeys="iExpandedKeys"
+              @expand="onExpand"
+            />
+
+          </template>
+          <div style="margin-top: 24px;" v-else-if="userIdentity === '2' && departTree.length==0">
+            <h3><span>您的部门下暂无有效部门信息</span></h3>
+          </div>
+          <div style="margin-top: 24px;" v-else><h3>普通员工暂此权限</h3></div>
+        </div>
+      </a-card>
+    </a-col>
+    <a-col :md="16" :sm="24">
+      <a-card :bordered="false">
+        <a-tabs defaultActiveKey="2" @change="callback">
+          <a-tab-pane tab="基本信息" key="1" forceRender>
+            <Dept-Base-Info ref="DeptBaseInfo"></Dept-Base-Info>
+          </a-tab-pane>
+          <a-tab-pane tab="用户信息" key="2">
+            <Dept-User-Info ref="DeptUserInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"></Dept-User-Info>
+          </a-tab-pane>
+          <a-tab-pane tab="部门角色" key="3" forceRender>
+            <dept-role-info ref="DeptRoleInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"/>
+          </a-tab-pane>
+        </a-tabs>
+      </a-card>
+    </a-col>
+  </a-row>
+</template>
+<script>
+  import DeptBaseInfo from './modules/DeptBaseInfo'
+  import DeptUserInfo from './modules/DeptUserInfo'
+  import {queryMyDepartTreeList, searchByKeywords} from '@/api/api'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import DeptRoleInfo from './modules/DeptRoleInfo'
+
+  export default {
+    name: 'DepartUserList',
+    mixins: [JeecgListMixin],
+    components: {
+      DeptRoleInfo,
+      DeptBaseInfo,
+      DeptUserInfo,
+    },
+    data() {
+      return {
+        currentDeptId: '',
+        iExpandedKeys: [],
+        loading: false,
+        autoExpandParent: true,
+        currFlowId: '',
+        currFlowName: '',
+        disable: true,
+        treeData: [],
+        visible: false,
+        departTree: [],
+        rightClickSelectedKey: '',
+        hiding: true,
+        model: {},
+        dropTrigger: '',
+        depart: {},
+        disableSubmit: false,
+        checkedKeys: [],
+        selectedKeys: [],
+        autoIncr: 1,
+        currSelected: {},
+        form: this.$form.createForm(this),
+        labelCol: {
+          xs: {span: 24},
+          sm: {span: 5}
+        },
+        wrapperCol: {
+          xs: {span: 24},
+          sm: {span: 16}
+        },
+        graphDatasource: {
+          nodes: [],
+          edges: []
+        },
+        userIdentity:"",
+      }
+    },
+    methods: {
+      callback(key) {
+        //console.log(key)
+      },
+      loadData() {
+        this.refresh();
+      },
+      clearSelectedDepartKeys() {
+        this.checkedKeys = [];
+        this.selectedKeys = [];
+        this.currentDeptId = '';
+        this.$refs.DeptUserInfo.currentDeptId='';
+        this.$refs.DeptRoleInfo.currentDeptId='';
+      },
+      loadTree() {
+        var that = this
+        that.treeData = []
+        that.departTree = []
+        queryMyDepartTreeList().then((res) => {
+          if (res.success && res.result ) {
+            for (let i = 0; i < res.result.length; i++) {
+              let temp = res.result[i]
+              that.treeData.push(temp)
+              that.departTree.push(temp)
+              that.setThisExpandedKeys(temp)
+              // console.log(temp.id)
+            }
+            this.loading = false
+          }
+          that.userIdentity = res.message
+        })
+      },
+      setThisExpandedKeys(node) {
+        //只展开一级目录
+        if (node.children && node.children.length > 0) {
+          this.iExpandedKeys.push(node.key)
+          //下方代码放开注释则默认展开所有节点
+          /**
+          for (let a = 0; a < node.children.length; a++) {
+            this.setThisExpandedKeys(node.children[a])
+          }
+          */
+        }
+      },
+      refresh() {
+        this.loading = true
+        this.loadTree()
+      },
+
+      onExpand(expandedKeys) {
+        // console.log('onExpand', expandedKeys)
+        // if not set autoExpandParent to false, if children expanded, parent can not collapse.
+        // or, you can remove all expanded children keys.
+        this.iExpandedKeys = expandedKeys
+        this.autoExpandParent = false
+      },
+
+      onSearch(value) {
+        let that = this
+        if (value) {
+          searchByKeywords({keyWord: value,myDeptSearch:'1'}).then((res) => {
+            if (res.success) {
+              that.departTree = []
+              for (let i = 0; i < res.result.length; i++) {
+                let temp = res.result[i]
+                that.departTree.push(temp)
+              }
+            } else {
+              that.$message.warning(res.message)
+            }
+          })
+        } else {
+          that.loadTree()
+        }
+
+      },
+      onCheck(checkedKeys, e) {
+        let record = e.node.dataRef;
+        // console.log('onCheck', checkedKeys, e);
+        this.checkedKeys = [];
+        // if (e.checked === true) {
+        this.currentDeptId = record.id;
+        this.checkedKeys.push(record.id);
+
+        this.$refs.DeptBaseInfo.open(record);
+        this.$refs.DeptUserInfo.open(record);
+        this.$refs.DeptRoleInfo.open(record);
+        // }
+        // else {
+        //   this.checkedKeys = [];
+        //   this.$refs.DeptBaseInfo.clearForm();
+        //   this.$refs.DeptUserInfo.clearList();
+        // }
+
+        this.hiding = false;
+        // this.checkedKeys = checkedKeys.checked
+      },
+      onSelect(selectedKeys, e) {
+        if (this.selectedKeys[0] !== selectedKeys[0]) {
+          this.selectedKeys = [selectedKeys[0]];
+        }
+        let record = e.node.dataRef;
+        this.checkedKeys.push(record.id);
+        this.$refs.DeptBaseInfo.open(record);
+        this.$refs.DeptUserInfo.onClearSelected();
+        this.$refs.DeptUserInfo.open(record);
+        this.$refs.DeptRoleInfo.onClearSelected();
+        this.$refs.DeptRoleInfo.open(record);
+      },
+    },
+    created() {
+      this.currFlowId = this.$route.params.id
+      this.currFlowName = this.$route.params.name
+      // this.loadTree()
+    },
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/DepotList.vue

@@ -0,0 +1,151 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="4" :sm="6">
+            <a-form-item label="仓库名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入仓库名称查询" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="6">
+            <a-form-item label="描述" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入描述查询" v-model="queryParam.remark"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a-popconfirm title="确定设为默认吗?" @confirm="() => handleSetDefault(record.id)">
+            <a>设为默认</a>
+          </a-popconfirm>
+          <a-divider type="vertical" />
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+        <!-- 状态渲染模板 -->
+        <template slot="customRenderFlag" slot-scope="isDefault">
+          <a-tag v-if="isDefault" color="green">是</a-tag>
+          <a-tag v-if="!isDefault" color="orange">否</a-tag>
+        </template>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <depot-modal ref="modalForm" @ok="modalFormOk"></depot-modal>
+  </a-card>
+</template>
+<script>
+  import DepotModal from './modules/DepotModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDate from '@/components/jeecg/JDate'
+  import { postAction } from '@api/manage'
+  export default {
+    name: "DepotList",
+    mixins:[JeecgListMixin],
+    components: {
+      DepotModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {name:'',remark:''},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {title: '仓库名称', dataIndex: 'name', width: 200},
+          {title: '仓库地址', dataIndex: 'address', width: 200},
+          {title: '仓储费', dataIndex: 'warehousing', width: 80},
+          {title: '搬运费', dataIndex: 'truckage', width: 80},
+          {title: '负责人', dataIndex: 'principalName', width: 80},
+          {title: '排序', dataIndex: 'sort', width: 80},
+          {title: '是否默认',dataIndex: 'isDefault',width:100,align:"center",
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
+          {title: '备注', dataIndex: 'remark', width: 120},
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/depot/list",
+          delete: "/depot/delete",
+          deleteBatch: "/depot/deleteBatch",
+          setDefault: "/depot/updateIsDefault"
+        }
+      }
+    },
+    computed: {
+
+    },
+    methods: {
+      handleSetDefault: function (id) {
+        if(!this.url.setDefault){
+          this.$message.error("请设置url.delete属性!")
+          return
+        }
+        let that = this;
+        postAction(that.url.setDefault, {id: id}).then((res) => {
+          if(res.code === 200){
+            that.loadData();
+          } else {
+            that.$message.warning(res.data.message);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/DictDeleteList.vue

@@ -0,0 +1,138 @@
+<template>
+  <a-modal
+    :width="modalWidth"
+    :style="modalStyle"
+    :visible="visible"
+    :maskClosable="false"
+    @cancel="handleCancel">
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+    </template>
+    <a-table
+      ref="table"
+      rowKey="id"
+      size="middle"
+      :columns="columns"
+      :loading="loading"
+      :dataSource="dataSource"
+      :pagination="false">
+      <span slot="action" slot-scope="text, record">
+        <a @click="handleBack(record.id)"><a-icon type="redo"/>字典取回</a>
+        <a-divider type="vertical"/>
+        <a @click="handleDelete(record.id)"><a-icon type="scissor"/>彻底删除</a>
+      </span>
+    </a-table>
+
+  </a-modal>
+
+
+</template>
+
+<script>
+  import { getAction,deleteAction,putAction } from '@/api/manage'
+  export default {
+    name: "DictDeleteList",
+    data () {
+      return {
+        modalWidth: '90%',
+        modalStyle: { 'top': '20px'},
+        title: '操作',
+        visible: false,
+        loading: false,
+        dataSource:[],
+        columns:[
+          {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 120,
+            align: "center",
+            customRender: function (t, r, index) {
+              return parseInt(index) + 1;
+            }
+          },
+          {
+            title: '字典名称',
+            align: "left",
+            dataIndex: 'dictName'
+          },
+          {
+            title: '字典编号',
+            align: "left",
+            dataIndex: 'dictCode'
+          },
+          {
+            title: '描述',
+            align: "left",
+            dataIndex: 'description'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: "center",
+            scopedSlots: {customRender: 'action'}
+          }
+        ]
+      }
+    },
+
+    methods: {
+      handleCancel(){
+        this.visible = false
+        //回收站字典列表刷新
+        this.$emit("refresh")
+      },
+      show(){
+        this.visible = true
+        this.loadData();
+      },
+      loadData(){
+        this.loading = true
+        getAction("/sys/dict/deleteList").then(res=>{
+          this.loading = false
+          if(res.success){
+            this.dataSource = res.result
+          }else{
+            this.$message.warning(res.message)
+          }
+        })
+      },
+      handleBack(id){
+        putAction("/sys/dict/back/"+id).then(res=>{
+          if(res.success){
+            this.$message.success(res.message)
+            this.loadData();
+          }else{
+            this.$message.warning(res.message)
+          }
+        })
+      },
+      handleDelete(id){
+        this.$confirm({
+          title: '彻底删除字典',
+          content: (<div>
+            <p>您确定要彻底删除这个字典项吗？</p>
+            <p style="color:red;">注意：彻底删除后将无法恢复，请谨慎操作！</p>
+            </div>),
+          centered: false,
+          onOk: () => {
+          var that = this;
+          deleteAction("/sys/dict/deletePhysic/"+id).then((res) => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.loadData();
+            } else {
+              that.$message.warning(res.message);
+            }
+          });
+        },
+      })
+      }
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/DictItemList.vue

@@ -0,0 +1,207 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 抽屉 -->
+    <a-drawer
+      title="字典列表"
+      :width="screenWidth"
+      @close="onClose"
+      :visible="visible"
+    >
+      <!-- 抽屉内容的border -->
+      <div
+        :style="{
+          padding:'10px',
+          border: '1px solid #e9e9e9',
+          background: '#fff',
+        }">
+
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline" :form="form" @keyup.enter.native="searchQuery">
+            <a-row :gutter="10">
+              <a-col :md="8" :sm="12">
+                <a-form-item label="名称">
+                  <a-input style="width: 120px;" placeholder="请输入名称" v-model="queryParam.itemText"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="9" :sm="24">
+                <a-form-item label="状态" style="width: 170px" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-select
+                    placeholder="请选择"
+                    v-model="queryParam.status"
+                  >
+                    <a-select-option value="1">正常</a-select-option>
+                    <a-select-option value="0">禁用</a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="7" :sm="24">
+              <span style="float: left;" class="table-page-search-submitButtons">
+                <a-button type="primary" @click="searchQuery">搜索</a-button>
+                <a-button type="primary" @click="searchReset" style="margin-left: 8px">重置</a-button>
+              </span>
+              </a-col>
+            </a-row>
+            <a-row>
+              <a-col :md="2" :sm="24">
+                <a-button style="margin-bottom: 10px" type="primary" @click="handleAdd">新增</a-button>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+        <div>
+          <a-table
+            ref="table"
+            rowKey="id"
+            size="middle"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange"
+          >
+
+          <span slot="action" slot-scope="text, record">
+            <a @click="handleEdit(record)">编辑</a>
+            <a-divider type="vertical"/>
+            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+              <a>删除</a>
+            </a-popconfirm>
+          </span>
+
+          </a-table>
+        </div>
+      </div>
+    </a-drawer>
+    <dict-item-modal ref="modalForm" @ok="modalFormOk"></dict-item-modal> <!-- 字典数据 -->
+  </a-card>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import {filterObj} from '@/utils/util';
+  import DictItemModal from './modules/DictItemModal'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "DictItemList",
+    mixins: [JeecgListMixin],
+    components: {DictItemModal},
+    data() {
+      return {
+        columns: [
+          {
+            title: '名称',
+            align: "center",
+            dataIndex: 'itemText',
+          },
+          {
+            title: '数据值',
+            align: "center",
+            dataIndex: 'itemValue',
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: "center",
+            scopedSlots: {customRender: 'action'},
+          }
+        ],
+        queryParam: {
+          dictId: "",
+          dictName: "",
+          itemText: "",
+          delFlag: "1",
+          status: [],
+        },
+        title: "操作",
+        visible: false,
+        screenWidth: 800,
+        model: {},
+        dictId: "",
+        status: 1,
+        labelCol: {
+          xs: {span: 5},
+          sm: {span: 5},
+        },
+        wrapperCol: {
+          xs: {span: 12},
+          sm: {span: 12},
+        },
+        form: this.$form.createForm(this),
+        validatorRules: {
+          itemText: {rules: [{required: true, message: '请输入名称!'}]},
+          itemValue: {rules: [{required: true, message: '请输入数据值!'}]},
+        },
+        url: {
+          list: "/sys/dictItem/list",
+          delete: "/sys/dictItem/delete",
+          deleteBatch: "/sys/dictItem/deleteBatch",
+        },
+      }
+    },
+    created() {
+      // 当页面初始化时,根据屏幕大小来给抽屉设置宽度
+      this.resetScreenSize();
+    },
+    methods: {
+      add(dictId) {
+        this.dictId = dictId;
+        this.edit({});
+      },
+      edit(record) {
+        if (record.id) {
+          this.dictId = record.id;
+        }
+        this.queryParam = {}
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.model.dictId = this.dictId;
+        this.model.status = this.status;
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'itemText', 'itemValue'))
+        });
+        // 当其它模块调用该模块时,调用此方法加载字典数据
+        this.loadData();
+      },
+
+      getQueryParams() {
+        var param = Object.assign({}, this.queryParam);
+        param.dictId = this.dictId;
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        if (this.superQueryParams) {
+          param['superQueryParams'] = encodeURI(this.superQueryParams)
+          param['superQueryMatchType'] = this.superQueryMatchType
+        }
+        return filterObj(param);
+      },
+
+      // 添加字典数据
+      handleAdd() {
+        this.$refs.modalForm.add(this.dictId);
+        this.$refs.modalForm.title = "新增";
+      },
+      showDrawer() {
+        this.visible = true
+      },
+      onClose() {
+        this.visible = false
+        this.form.resetFields();
+        this.dataSource = [];
+      },
+      // 抽屉的宽度随着屏幕大小来改变
+      resetScreenSize() {
+        let screenWidth = document.body.clientWidth;
+        if (screenWidth < 600) {
+          this.screenWidth = screenWidth;
+        } else {
+          this.screenWidth = 600;
+        }
+      },
+    }
+  }
+</script>
+<style scoped>
+</style>

jshERP-web/src/views/system/DictList.vue

@@ -0,0 +1,208 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 左侧面板 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="12">
+          <a-col :md="7" :sm="8">
+            <a-form-item label="字典名称" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
+              <a-input placeholder="请输入字典名称" v-model="queryParam.dictName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="7" :sm="8">
+            <a-form-item label="字典编号" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
+              <a-input placeholder="请输入字典编号" v-model="queryParam.dictCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="7" :sm="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+
+      <div class="table-operator" style="border-top: 5px">
+        <a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls('字典信息')">导出</a-button>
+        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+          <a-button type="primary" icon="import">导入</a-button>
+        </a-upload>
+        <a-button type="primary" icon="sync" @click="refleshCache()">刷新缓存</a-button>
+
+        <a-button type="primary" icon="hdd" @click="openDeleteList">回收站</a-button>
+      </div>
+
+      <a-table
+        ref="table"
+        rowKey="id"
+        size="middle"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">
+            <a-icon type="edit"/>
+            编辑
+          </a>
+          <a-divider type="vertical"/>
+          <a @click="editDictItem(record)"><a-icon type="setting"/> 字典配置</a>
+          <a-divider type="vertical"/>
+          <a-popconfirm title="确定删除吗?" @confirm="() =>handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+      </a-table>
+
+    </div>
+    <dict-modal ref="modalForm" @ok="modalFormOk"></dict-modal>  <!-- 字典类型 -->
+    <dict-item-list ref="dictItemList"></dict-item-list>
+    <dict-delete-list ref="dictDeleteList" @refresh="() =>loadData()"></dict-delete-list>
+  </a-card>
+</template>
+
+<script>
+  import { filterObj } from '@/utils/util';
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import DictModal from './modules/DictModal'
+  import DictItemList from './DictItemList'
+  import DictDeleteList from './DictDeleteList'
+  import { getAction } from '@/api/manage'
+  import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
+  import Vue from 'vue'
+
+  export default {
+    name: "DictList",
+    mixins:[JeecgListMixin],
+    components: {DictModal, DictItemList,DictDeleteList},
+    data() {
+      return {
+        description: '这是数据字典页面',
+        visible: false,
+        // 查询条件
+        queryParam: {
+          dictCode: "",
+          dictName: "",
+        },
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 120,
+            align: "center",
+            customRender: function (t, r, index) {
+              return parseInt(index) + 1;
+            }
+          },
+          {
+            title: '字典名称',
+            align: "left",
+            dataIndex: 'dictName',
+          },
+          {
+            title: '字典编号',
+            align: "left",
+            dataIndex: 'dictCode',
+          },
+          {
+            title: '描述',
+            align: "left",
+            dataIndex: 'description',
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: "center",
+            scopedSlots: {customRender: 'action'},
+          }
+        ],
+        dict: "",
+        labelCol: {
+          xs: {span: 8},
+          sm: {span: 5},
+        },
+        wrapperCol: {
+          xs: {span: 16},
+          sm: {span: 19},
+        },
+        url: {
+          list: "/sys/dict/list",
+          delete: "/sys/dict/delete",
+          exportXlsUrl: "sys/dict/exportXls",
+          importExcelUrl: "sys/dict/importExcel",
+          refleshCache: "sys/dict/refleshCache",
+          queryAllDictItems: "sys/dict/queryAllDictItems",
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {
+      getQueryParams() {
+        var param = Object.assign({}, this.queryParam, this.isorter);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        if (this.superQueryParams) {
+          param['superQueryParams'] = encodeURI(this.superQueryParams)
+          param['superQueryMatchType'] = this.superQueryMatchType
+        }
+        return filterObj(param);
+      },
+      //取消选择
+      cancelDict() {
+        this.dict = "";
+        this.visible = false;
+        this.loadData();
+      },
+      //编辑字典数据
+      editDictItem(record) {
+        this.$refs.dictItemList.edit(record);
+      },
+      // 重置字典类型搜索框的内容
+      searchReset() {
+        var that = this;
+        that.queryParam.dictName = "";
+        that.queryParam.dictCode = "";
+        that.loadData(this.ipagination.current);
+      },
+      openDeleteList(){
+        this.$refs.dictDeleteList.show()
+      },
+      refleshCache(){
+        getAction(this.url.refleshCache).then((res) => {
+          if (res.success) {
+            //重新加载缓存
+            getAction(this.url.queryAllDictItems).then((res) => {
+              if (res.success) {
+                Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
+                Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
+              }
+            })
+            this.$message.success("刷新缓存完成！");
+          }
+        }).catch(e=>{
+          this.$message.warn("刷新缓存失败！");
+          console.log("刷新失败",e)
+        })
+      }
+    },
+    watch: {
+      openKeys(val) {
+        console.log('openKeys', val)
+      },
+    },
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/FunctionList.vue

@@ -0,0 +1,127 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入名称查询" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+        <!-- 状态渲染模板 -->
+        <template slot="customRenderFlag" slot-scope="enabled">
+          <a-tag v-if="enabled==1" color="green">启用</a-tag>
+          <a-tag v-if="enabled==0" color="orange">禁用</a-tag>
+        </template>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <function-modal ref="modalForm" @ok="modalFormOk"></function-modal>
+  </a-card>
+</template>
+<script>
+  import FunctionModal from './modules/FunctionModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDate from '@/components/jeecg/JDate'
+  export default {
+    name: "FunctionList",
+    mixins:[JeecgListMixin],
+    components: {
+      FunctionModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {name:'',type:''},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:40,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {title: '编号 ', dataIndex: 'number', width: 80},
+          {title: '名称', dataIndex: 'name', width: 100},
+          {title: '上级编号', dataIndex: 'parentNumber', width: 80},
+          {title: '链接', dataIndex: 'url', width: 250},
+          {title: '排序', dataIndex: 'sort', width: 80},
+          {
+            title: '是否启用', dataIndex: 'enabled', width: 80, align: "center",
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
+          {title: '图标', dataIndex: 'icon', width: 110},
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/function/list",
+          delete: "/function/delete",
+          deleteBatch: "/function/deleteBatch"
+        }
+      }
+    },
+    computed: {
+
+    },
+    methods: {
+
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/InOutItemList.vue

@@ -0,0 +1,134 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="4" :sm="6">
+            <a-form-item label="名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入名称查询" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="6">
+            <a-form-item label="类型" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-select v-model="queryParam.type" placeholder="请选择类型">
+                <a-select-option value="">请选择</a-select-option>
+                <a-select-option value="收入">收入</a-select-option>
+                <a-select-option value="支出">支出</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="6">
+            <a-form-item label="备注" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入备注查询" v-model="queryParam.remark"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+        <!-- 状态渲染模板 -->
+        <template slot="customRenderFlag" slot-scope="isDefault">
+          <a-tag v-if="isDefault" color="green">是</a-tag>
+          <a-tag v-if="!isDefault" color="orange">否</a-tag>
+        </template>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <inOutItem-modal ref="modalForm" @ok="modalFormOk"></inOutItem-modal>
+  </a-card>
+</template>
+<script>
+  import InOutItemModal from './modules/InOutItemModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDate from '@/components/jeecg/JDate'
+  export default {
+    name: "InOutItemList",
+    mixins:[JeecgListMixin],
+    components: {
+      InOutItemModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {name:'',type:'',remark:''},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {title: '名称', dataIndex: 'name', width: 200},
+          {title: '类型', dataIndex: 'type', width: 100},
+          {title: '备注', dataIndex: 'remark', width: 200},
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/inOutItem/list",
+          delete: "/inOutItem/delete",
+          deleteBatch: "/inOutItem/deleteBatch"
+        }
+      }
+    },
+    computed: {
+
+    },
+    methods: {
+
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/LogList.vue

@@ -0,0 +1,176 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="操作模块">
+              <a-input placeholder="请输入操作模块" v-model="queryParam.operation"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="操作详情">
+              <a-input placeholder="请输入操作详情" v-model="queryParam.content"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-range-picker
+                style="width: 210px"
+                v-model="queryParam.createTimeRange"
+                format="YYYY-MM-DD"
+                :placeholder="['开始时间', '结束时间']"
+                @change="onDateChange"
+                @ok="onDateOk"
+              />
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <a-form-item label="操作IP">
+                <a-input placeholder="请输入操作IP" v-model="queryParam.clientIp"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-item label="操作状态">
+                <a-select v-model="queryParam.status" placeholder="请选择操作状态">
+                  <a-select-option value="">请选择</a-select-option>
+                  <a-select-option value="0">成功</a-select-option>
+                  <a-select-option value="1">失败</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- table区域-begin -->
+    <a-table
+      ref="table"
+      bordered
+      size="middle"
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="ipagination"
+      :loading="loading"
+      @change="handleTableChange">
+      <!-- 字符串超长截取省略号显示-->
+      <span slot="content" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="40"/>
+        </span>
+    </a-table>
+    <!-- table区域-end -->
+  </a-card>
+</template>
+
+<script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+
+  export default {
+    name: "LogList",
+    mixins:[JeecgListMixin],
+    components: {
+      JEllipsis
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {
+          operation:'',
+          content:'',
+          createTimeRange:[],
+          clientIp:'',
+          status:''
+        },
+        tabKey: "1",
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:40,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {title: '操作模块', dataIndex: 'operation', width: 120},
+          {title: '操作详情', align:"left", dataIndex: 'content', scopedSlots: { customRender: 'content' }, width: 350 },
+          {title: '操作人员', dataIndex: 'userName', width: 100, align: "center"},
+          {
+            title: '操作状态', dataIndex: 'status',width:80, align:"center",
+            customRender:function (text) {
+              if(text){
+                return "失败";
+              }else {
+                return "成功";
+              }
+            }
+          },
+          {title: '操作IP', dataIndex: 'clientIp', width: 110, align: "center"},
+          {title: '操作时间', dataIndex: 'createTimeStr', width: 150, align: "center"}
+        ],
+        operateColumn:
+        {
+          title: '操作类型',
+          dataIndex: 'operateType_dictText',
+          align:"center",
+        },
+        labelCol: {
+          xs: { span: 1 },
+          sm: { span: 2 },
+        },
+        wrapperCol: {
+          xs: { span: 10 },
+          sm: { span: 16 },
+        },
+        url: {
+          list: "/log/list",
+        }
+      }
+    },
+    methods: {
+      // 日志类型
+      callback(key){
+        // 动态添加操作类型列
+        if (key == 2) {
+          this.tabKey = '2';
+          this.columns.splice(7, 0, this.operateColumn);
+        }else if(this.columns.length == 9)
+        {
+          this.tabKey = '1';
+          this.columns.splice(7,1);
+        }
+
+        let that=this;
+        that.queryParam.logType=key;
+        that.loadData();
+      },
+      onDateChange: function (value, dateString) {
+        console.log(dateString[0],dateString[1]);
+        this.queryParam.beginTime=dateString[0];
+        this.queryParam.endTime=dateString[1];
+      },
+      onDateOk(value) {
+        console.log(value);
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/MemberList.vue

@@ -0,0 +1,166 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="5" :sm="10">
+            <a-form-item label="名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入名称查询" v-model="queryParam.supplier"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="10">
+            <a-form-item label="手机号码" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入手机号码查询" v-model="queryParam.telephone"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="10">
+            <a-form-item label="联系电话" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入联系电话查询" v-model="queryParam.phonenum"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-popover title="导入注意点">
+          <template slot="content">
+            <p>预收款、期初应收、期初应付、税率均为数值且要大于0；<br/>另外期初应收、期初应付不能同时输入</p>
+          </template>
+          <a-button type="primary" icon="import">导入</a-button>
+        </a-popover>
+      </a-upload>
+      <a-button type="primary" icon="download" @click="handleExportXls('会员信息')">导出</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+          <a-menu-item key="2" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
+          <a-menu-item key="3" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+        <!-- 状态渲染模板 -->
+        <template slot="customRenderFlag" slot-scope="enabled">
+          <a-tag v-if="enabled" color="green">启用</a-tag>
+          <a-tag v-if="!enabled" color="orange">禁用</a-tag>
+        </template>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <member-modal ref="modalForm" @ok="modalFormOk"></member-modal>
+  </a-card>
+</template>
+<script>
+  import MemberModal from './modules/MemberModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDate from '@/components/jeecg/JDate'
+  export default {
+    name: "MemberList",
+    mixins:[JeecgListMixin],
+    components: {
+      MemberModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {
+          supplier:'',
+          type:'会员',
+          telephone:'',
+          phonenum:''
+        },
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          { title: '名称',dataIndex: 'supplier',width:150},
+          { title: '联系人', dataIndex: 'contacts',width:70,align:"center"},
+          { title: '手机号码', dataIndex: 'telephone',width:110,align:"center"},
+          { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"},
+          { title: '预付款',dataIndex: 'advanceIn',width:70,align:"center"},
+          { title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"center"},
+          { title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"center"},
+          { title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"center"},
+          { title: '期末应付',dataIndex: 'allNeedPay',width:80,align:"center"},
+          { title: '税率(%)', dataIndex: 'taxRate',width:80,align:"center"},
+          { title: '状态',dataIndex: 'enabled',width:70,align:"center",
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/supplier/list",
+          delete: "/supplier/delete",
+          deleteBatch: "/supplier/deleteBatch",
+          importExcelUrl: "/supplier/importExcel",
+          exportXlsUrl: "/supplier/exportExcel",
+          batchSetStatusUrl: "/supplier/batchSetStatus"
+        }
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {
+      searchReset() {
+        this.queryParam = {
+          type:'会员',
+        }
+        this.loadData(1);
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/NewPermissionList.vue

@@ -0,0 +1,227 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button
+        @click="batchDel"
+        v-if="selectedRowKeys.length > 0"
+        ghost
+        type="primary"
+        icon="delete">批量删除
+      </a-button>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{
+        selectedRowKeys.length }}</a>项&nbsp;&nbsp;
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        :columns="columns"
+        size="middle"
+        :pagination="false"
+        :dataSource="dataSource"
+        :loading="loading"
+        @expand="expandSubmenu"
+        :expandedRowKeys="expandedRowKeys"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @expandedRowsChange="handleExpandedRowsChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">
+              更多 <a-icon type="down"/>
+            </a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a href="javascript:;" @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a href="javascript:;" @click="handleAddSub(record)">添加下级</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a href="javascript:;" @click="handleDataRule(record)">数据规则</a>
+              </a-menu-item>
+
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+        <!-- 字符串超长截取省略号显示 -->
+        <span slot="url" slot-scope="text">
+          <j-ellipsis :value="text" :length="25"/>
+        </span>
+        <!-- 字符串超长截取省略号显示-->
+        <span slot="component" slot-scope="text">
+          <j-ellipsis :value="text"/>
+        </span>
+      </a-table>
+
+    </div>
+    <!-- table区域-end -->
+
+    <permission-modal ref="modalForm" @ok="modalFormOk"></permission-modal>
+    <permission-data-rule-list ref="PermissionDataRuleList" @ok="modalFormOk"></permission-data-rule-list>
+
+  </a-card>
+</template>
+
+<script>
+  import PermissionModal from './modules/PermissionModal'
+  import { getSystemMenuList, getSystemSubmenu, getSystemSubmenuBatch } from '@/api/api'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import PermissionDataRuleList from './PermissionDataRuleList'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+
+  const columns = [
+    {
+      title: '菜单名称',
+      dataIndex: 'name',
+      key: 'name'
+    }, {
+      title: '菜单类型',
+      dataIndex: 'menuType',
+      key: 'menuType',
+      customRender: function(text) {
+        if (text == 0) {
+          return '菜单'
+        } else if (text == 1) {
+          return '菜单'
+        } else if (text == 2) {
+          return '按钮/权限'
+        } else {
+          return text
+        }
+      }
+    },/*{
+      title: '权限编码',
+      dataIndex: 'perms',
+      key: 'permissionCode',
+    },*/{
+      title: 'icon',
+      dataIndex: 'icon',
+      key: 'icon'
+    },
+    {
+      title: '组件',
+      dataIndex: 'component',
+      key: 'component',
+      scopedSlots: { customRender: 'component' }
+    },
+    {
+      title: '路径',
+      dataIndex: 'url',
+      key: 'url',
+      scopedSlots: { customRender: 'url' }
+    },
+    {
+      title: '排序',
+      dataIndex: 'sortNo',
+      key: 'sortNo'
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      scopedSlots: { customRender: 'action' },
+      align: 'center',
+      width: 150
+    }
+  ]
+
+  export default {
+    name: 'PermissionListAsync',
+    mixins: [JeecgListMixin],
+    components: {
+      PermissionDataRuleList,
+      PermissionModal,
+      JEllipsis
+    },
+    data() {
+      return {
+        description: '这是菜单管理页面',
+        // 表头
+        columns: columns,
+        loading: false,
+        // 展开的行，受控属性
+        expandedRowKeys: [],
+        url: {
+          list: '/sys/permission/list',
+          delete: '/sys/permission/delete',
+          deleteBatch: '/sys/permission/deleteBatch'
+        }
+      }
+    },
+    methods: {
+      loadData() {
+        this.loading = true
+        getSystemMenuList().then((res) => {
+          if (res.success) {
+            this.dataSource = res.result
+            return this.loadDataByExpandedRows(this.dataSource)
+          }
+        }).finally(()=>{
+          this.loading = false
+        })
+      },
+      expandSubmenu(expanded, record){
+        if (expanded && (!record.children || record.children.length === 0)) {
+          getSystemSubmenu({parentId:record.id}).then((res) => {
+            if (res.success) {
+              record.children = res.result
+            }
+          })
+        }
+      },
+      // 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
+      loadDataByExpandedRows(dataList) {
+        if (this.expandedRowKeys.length > 0) {
+          return getSystemSubmenuBatch({ parentIds: this.expandedRowKeys.join(',') }).then((res) => {
+            if (res.success) {
+              let childrenMap = res.result
+              let fn = (list) => {
+                list.forEach(data => {
+                  if (this.expandedRowKeys.includes(data.id)) {
+                    data.children = childrenMap[data.id]
+                    fn(data.children)
+                  }
+                })
+              }
+              fn(dataList)
+            }
+          })
+        } else {
+          return Promise.resolve()
+        }
+      },
+      // 打开数据规则编辑
+      handleDataRule(record) {
+        this.$refs.PermissionDataRuleList.edit(record)
+      },
+      handleAddSub(record) {
+        this.$refs.modalForm.title = "添加子菜单";
+        this.$refs.modalForm.localMenuType = 1;
+        this.$refs.modalForm.disableSubmit = false;
+        this.$refs.modalForm.edit({status:'1',permsType:'1',route:true,'parentId':record.id});
+      },
+      handleExpandedRowsChange(expandedRows) {
+        this.expandedRowKeys = expandedRows
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jshERP-web/src/views/system/OrganizationList.vue

@@ -0,0 +1,517 @@
+<template xmlns:background-color="http://www.w3.org/1999/xhtml">
+  <a-row :gutter="10">
+    <a-col :md="12" :sm="24">
+      <a-card :bordered="false">
+
+        <!-- 按钮操作区域 -->
+        <a-row style="margin-left: 14px">
+          <a-button @click="handleAdd()" type="primary">添加机构</a-button>
+          <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
+          <a-button @click="refresh" type="default" icon="reload">刷新</a-button>
+        </a-row>
+        <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
+          <a-alert type="info" :showIcon="true">
+            <div slot="message">
+              当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
+              <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a>
+            </div>
+          </a-alert>
+          <!-- 树-->
+          <a-col :md="10" :sm="24">
+            <template>
+              <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
+               <span style="user-select: none">
+                <a-tree
+                  checkable
+                  multiple
+                  @select="onSelect"
+                  @check="onCheck"
+                  @rightClick="rightHandle"
+                  :selectedKeys="selectedKeys"
+                  :checkedKeys="checkedKeys"
+                  :treeData="departTree"
+                  :checkStrictly="checkStrictly"
+                  :expandedKeys="iExpandedKeys"
+                  :autoExpandParent="true"
+                  @expand="onExpand"/>
+                </span>
+              </a-dropdown>
+            </template>
+          </a-col>
+        </div>
+      </a-card>
+      <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+      <div class="drawer-bootom-button">
+        <a-dropdown :trigger="['click']" placement="topCenter">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
+            <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
+            <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
+            <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
+            <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
+            <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
+          </a-menu>
+          <a-button>
+            树操作 <a-icon type="up" />
+          </a-button>
+        </a-dropdown>
+      </div>
+      <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+    </a-col>
+    <a-col :md="12" :sm="24">
+      <a-card :bordered="false" v-if="selectedKeys.length>0">
+        <a-form :form="form">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="全称">
+            <a-input placeholder="请输入全称" v-decorator="['orgFullName', validatorRules.orgFullName ]"/>
+          </a-form-item>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="简称">
+            <a-input placeholder="请输入简称" v-decorator="['orgAbr', validatorRules.orgAbr ]"/>
+          </a-form-item>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
+            <a-input placeholder="请输入编号" v-decorator="['orgNo', validatorRules.orgNo ]"/>
+          </a-form-item>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级机构">
+            <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+                           allow-clear treeDefaultExpandAll="true"
+                           :treeData="treeData" v-model="model.parentId" placeholder="请选择上级机构">
+            </a-tree-select>
+          </a-form-item>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
+            <a-input-number v-decorator="[ 'sort' ]"/>
+          </a-form-item>
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+            <a-textarea placeholder="请输入备注":rows="2" v-decorator.trim="[ 'remark' ]" />
+          </a-form-item>
+        </a-form>
+        <div class="anty-form-btn">
+          <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">重置</a-button>
+          <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">保存</a-button>
+        </div>
+      </a-card>
+      <a-card v-else >
+        <a-empty>
+          <span slot="description"> 请先选择一个机构! </span>
+        </a-empty>
+      </a-card>
+    </a-col>
+    <organization-modal ref="organizationModal" @ok="loadTree"></organization-modal>
+  </a-row>
+</template>
+<script>
+import OrganizationModal from './modules/OrganizationModal'
+import pick from 'lodash.pick'
+import {queryOrganizationTreeList,queryOrganizationById, searchByKeywords, deleteByDepartId} from '@/api/api'
+import {httpAction, deleteAction} from '@/api/manage'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+export default {
+  name: 'OrganizationList',
+  mixins: [JeecgListMixin],
+  components: {
+    OrganizationModal
+  },
+  data() {
+    return {
+      iExpandedKeys: [],
+      loading: false,
+      currFlowId: '',
+      currFlowName: '',
+      disable: true,
+      treeData: [],
+      visible: false,
+      departTree: [],
+      rightClickSelectedKey: '',
+      rightClickSelectedOrgCode: '',
+      hiding: true,
+      model: {},
+      dropTrigger: '',
+      depart: {},
+      disableSubmit: false,
+      checkedKeys: [],
+      selectedKeys: [],
+      autoIncr: 1,
+      currSelected: {},
+      allTreeKeys:[],
+      checkStrictly: true,
+      form: this.$form.createForm(this),
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 5}
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 16}
+      },
+      graphDatasource: {
+        nodes: [],
+        edges: []
+      },
+      validatorRules: {
+        orgFullName: {rules: [{required: true, message: '请输入全称!'}]},
+        orgAbr: {rules: [{required: true, message: '请输入简称!'}]},
+        orgNo: {rules: [{required: true, message: '请输入编码!'}]}
+      },
+      url: {
+        delete: '/organization/delete',
+        edit: '/organization/update',
+        deleteBatch: '/organization/deleteBatch'
+      },
+      orgCategoryDisabled:false,
+    }
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+  methods: {
+    loadData() {
+      this.refresh();
+    },
+    loadTree() {
+      var that = this
+      that.treeData = []
+      that.departTree = []
+      let params = {};
+      params.id='';
+      queryOrganizationTreeList(params).then((res) => {
+        if (res) {
+          //机构全选后，再添加机构，选中数量增多
+          this.allTreeKeys = [];
+          for (let i = 0; i < res.length; i++) {
+            let temp = res[i]
+            that.treeData.push(temp)
+            that.departTree.push(temp)
+            that.setThisExpandedKeys(temp)
+            that.getAllKeys(temp);
+            // console.log(temp.id)
+          }
+          this.loading = false
+        }
+      })
+    },
+    setThisExpandedKeys(node) {
+      if (node.children && node.children.length > 0) {
+        this.iExpandedKeys.push(node.key)
+        for (let a = 0; a < node.children.length; a++) {
+          this.setThisExpandedKeys(node.children[a])
+        }
+      }
+    },
+    refresh() {
+      this.loading = true
+      this.loadTree()
+    },
+    // 右键操作方法
+    rightHandle(node) {
+      this.dropTrigger = 'contextmenu'
+      console.log(node.node.eventKey)
+      this.rightClickSelectedKey = node.node.eventKey
+      this.rightClickSelectedOrgCode = node.node.dataRef.orgCode
+    },
+    onExpand(expandedKeys) {
+      console.log('onExpand', expandedKeys)
+      // if not set autoExpandParent to false, if children expanded, parent can not collapse.
+      // or, you can remove all expanded children keys.
+      this.iExpandedKeys = expandedKeys
+    },
+    backFlowList() {
+      this.$router.back(-1)
+    },
+    // 右键点击下拉框改变事件
+    dropStatus(visible) {
+      if (visible == false) {
+        this.dropTrigger = ''
+      }
+    },
+    // 右键店家下拉关闭下拉框
+    closeDrop() {
+      this.dropTrigger = ''
+    },
+    addRootNode() {
+      this.$refs.nodeModal.add(this.currFlowId, '')
+    },
+    batchDel: function () {
+      console.log(this.checkedKeys)
+      if (this.checkedKeys.length <= 0) {
+        this.$message.warning('请选择一条记录！')
+      } else {
+        var ids = ''
+        for (var a = 0; a < this.checkedKeys.length; a++) {
+          ids += this.checkedKeys[a] + ','
+        }
+        var that = this
+        this.$confirm({
+          title: '确认删除',
+          content: '确定要删除所选中的 ' + this.checkedKeys.length + ' 条数据，以及子节点数据吗?',
+          onOk: function () {
+            deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+              if (res.code == 200) {
+                that.$message.success(res.data.message)
+                that.loadTree()
+                that.onClearSelected()
+              } else {
+                that.$message.warning(res.data.message)
+              }
+            })
+          }
+        })
+      }
+    },
+    nodeModalOk() {
+      this.loadTree()
+    },
+    nodeModalClose() {
+    },
+    hide() {
+      console.log(111)
+      this.visible = false
+    },
+    onCheck(checkedKeys, info) {
+      console.log('onCheck', checkedKeys, info)
+      this.hiding = false
+      //this.checkedKeys = checkedKeys.checked
+      // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+      if(this.checkStrictly){
+        this.checkedKeys = checkedKeys.checked;
+      }else{
+        this.checkedKeys = checkedKeys
+      }
+      // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+    },
+    onSelect(selectedKeys, e) {
+      console.log('selected', selectedKeys, e)
+      this.hiding = false
+      let record = e.node.dataRef
+      let params = {};
+      params.id=record.id;
+      queryOrganizationById(params).then((res) => {
+        if (res && res.code == 200) {
+          if(res.data){
+            record.orgFullName = res.data.orgFullName;
+            record.orgAbr = res.data.orgAbr;
+            record.orgNo = res.data.orgNo;
+            record.parentId = res.data.parentId;
+            record.sort = res.data.sort;
+            record.remark = res.data.remark;
+            console.log('onSelect-record', record)
+            this.currSelected = Object.assign({}, record)
+            this.model = this.currSelected
+            this.selectedKeys = [record.key]
+            this.model.parentId = record.parentId
+            this.setValuesToForm(record)
+          }
+        }
+      });
+    },
+    // 触发onSelect事件时,为机构树右侧的form表单赋值
+    setValuesToForm(record) {
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(record, 'orgFullName','orgAbr', 'orgNo', 'parentId', 'sort', 'remark'))
+      })
+    },
+    getCurrSelectedTitle() {
+      return !this.currSelected.title ? '' : this.currSelected.title
+    },
+    onClearSelected() {
+      this.hiding = true
+      this.checkedKeys = []
+      this.currSelected = {}
+      this.form.resetFields()
+      this.selectedKeys = []
+      this.$refs.departAuth.departId = ''
+    },
+    handleNodeTypeChange(val) {
+      this.currSelected.nodeType = val
+    },
+    notifyTriggerTypeChange(value) {
+      this.currSelected.notifyTriggerType = value
+    },
+    receiptTriggerTypeChange(value) {
+      this.currSelected.receiptTriggerType = value
+    },
+    submitCurrForm() {
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          if (!this.currSelected.id) {
+            this.$message.warning('请点击选择要修改机构!')
+            return
+          }
+
+          let formData = Object.assign(this.currSelected, values)
+          console.log('Received values of form: ', formData)
+          httpAction(this.url.edit, formData, 'put').then((res) => {
+            if (res.code == 200) {
+              this.$message.success('保存成功!')
+              this.loadTree()
+            } else {
+              this.$message.error(res.message)
+            }
+          })
+        }
+      })
+    },
+    emptyCurrForm() {
+      this.form.resetFields()
+    },
+    nodeSettingFormSubmit() {
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values)
+        }
+      })
+    },
+    openSelect() {
+      this.$refs.sysDirectiveModal.show()
+    },
+    handleAdd() {
+      this.$refs.organizationModal.add()
+      this.$refs.organizationModal.title = '新增'
+    },
+    handleDelete() {
+      var that = this
+      this.$confirm({
+        title: '确认删除',
+        content: '确定要删除此机构以及子节点数据吗?',
+        onOk: function () {
+          deleteByDepartId({id: that.rightClickSelectedKey}).then((resp) => {
+            if (resp.success) {
+              //删除成功后，去除已选中中的数据
+              that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1);
+              that.$message.success('删除成功!')
+              that.loadTree()
+              //删除后同步清空右侧基本信息内容
+              let orgCode=that.form.getFieldValue("orgCode");
+              if(orgCode && orgCode === that.rightClickSelectedOrgCode){
+                that.onClearSelected()
+              }
+            } else {
+              that.$message.warning('删除失败!')
+            }
+          })
+        }
+      })
+    },
+    selectDirectiveOk(record) {
+      console.log('选中指令数据', record)
+      this.nodeSettingForm.setFieldsValue({directiveCode: record.directiveCode})
+      this.currSelected.sysCode = record.sysCode
+    },
+    getFlowGraphData(node) {
+      this.graphDatasource.nodes.push({
+        id: node.id,
+        text: node.flowNodeName
+      })
+      if (node.children.length > 0) {
+        for (let a = 0; a < node.children.length; a++) {
+          let temp = node.children[a]
+          this.graphDatasource.edges.push({
+            source: node.id,
+            target: temp.id
+          })
+          this.getFlowGraphData(temp)
+        }
+      }
+    },
+    // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+    expandAll () {
+      this.iExpandedKeys = this.allTreeKeys
+    },
+    closeAll () {
+      this.iExpandedKeys = []
+    },
+    checkALL () {
+      this.checkStriccheckStrictlytly = false
+      this.checkedKeys = this.allTreeKeys
+    },
+    cancelCheckALL () {
+      //this.checkedKeys = this.defaultCheckedKeys
+      this.checkedKeys = []
+    },
+    switchCheckStrictly (v) {
+      if(v==1){
+        this.checkStrictly = false
+      }else if(v==2){
+        this.checkStrictly = true
+      }
+    },
+    getAllKeys(node) {
+      // console.log('node',node);
+      this.allTreeKeys.push(node.key)
+      if (node.children && node.children.length > 0) {
+        for (let a = 0; a < node.children.length; a++) {
+          this.getAllKeys(node.children[a])
+        }
+      }
+    }
+    // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+
+  },
+  created() {
+    this.currFlowId = this.$route.params.id
+    this.currFlowName = this.$route.params.name
+    // this.loadTree()
+  },
+
+}
+</script>
+<style scoped>
+.ant-card-body .table-operator {
+  margin: 15px;
+}
+
+.anty-form-btn {
+  width: 100%;
+  text-align: center;
+}
+
+.anty-form-btn button {
+  margin: 0 5px;
+}
+
+.anty-node-layout .ant-layout-header {
+  padding-right: 0
+}
+
+.header {
+  padding: 0 8px;
+}
+
+.header button {
+  margin: 0 3px
+}
+
+.ant-modal-cust-warp {
+  height: 100%
+}
+
+.ant-modal-cust-warp .ant-modal-body {
+  height: calc(100% - 110px) !important;
+  overflow-y: auto
+}
+
+.ant-modal-cust-warp .ant-modal-content {
+  height: 90% !important;
+  overflow-y: hidden
+}
+
+#app .desktop {
+  height: auto !important;
+}
+
+/** Button按钮间距 */
+.ant-btn {
+  margin-left: 3px
+}
+
+.drawer-bootom-button {
+  /*position: absolute;*/
+  bottom: 0;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: left;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+</style>

jshERP-web/src/views/system/PermissionDataRuleList.vue

@@ -0,0 +1,188 @@
+<template>
+  <a-drawer
+    title="数据权限规则"
+    :width="drawerWidth"
+    @close="onClose"
+    :visible="visible">
+
+    <!-- 抽屉内容的border -->
+    <div
+      :style="{
+        padding:'10px',
+        border: '1px solid #e9e9e9',
+        background: '#fff',
+      }">
+      <div class="table-page-search-wrapper">
+        <a-form @keyup.enter.native="searchQuery">
+          <a-row :gutter="12">
+            <a-col :md="8" :sm="8">
+              <a-form-item label="规则名称" :labelCol="{span: 8}" :wrapperCol="{span: 14, offset: 1}">
+                <a-input placeholder="请输入规则名称" v-model="queryParam.ruleName"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :md="8" :sm="8">
+              <a-form-item label="规则值" :labelCol="{span: 8}" :wrapperCol="{span: 14, offset: 1}">
+                <a-input placeholder="请输入规则值" v-model="queryParam.ruleValue"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :md="7" :sm="8">
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              </span>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :md="24" :sm="24">
+              <a-button style="margin-bottom: 10px" @click="addPermissionRule" type="primary" icon="plus">添加</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+
+        <a-table
+          ref="table"
+          rowKey="id"
+          size="middle"
+          :columns="columns"
+          :dataSource="dataSource"
+          :loading="loading"
+          :rowClassName="getRowClassname">
+          <span slot="action" slot-scope="text, record">
+            <a @click="handleEdit(record)">
+              <a-icon type="edit"/>编辑
+            </a>
+            <a-divider type="vertical"/>
+            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+              <a>删除</a>
+            </a-popconfirm>
+          </span>
+        </a-table>
+
+      </div>
+    </div>
+    <permission-data-rule-modal @ok="modalFormOk" ref="modalForm"></permission-data-rule-modal>
+  </a-drawer>
+</template>
+<script>
+  import {getPermissionRuleList, queryPermissionRule} from '@/api/api'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import PermissionDataRuleModal from './modules/PermissionDataRuleModal'
+
+  const columns = [
+    {
+      title: '规则名称',
+      dataIndex: 'ruleName',
+      key: 'ruleName'
+    },
+    {
+      title: '规则字段',
+      dataIndex: 'ruleColumn',
+      key: 'ruleColumn'
+    },
+    {
+      title: '规则值',
+      dataIndex: 'ruleValue',
+      key: 'ruleValue'
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      scopedSlots: {customRender: 'action'},
+      align: 'center'
+    }
+  ]
+  export default {
+    name: 'PermissionDataRuleList',
+    mixins: [JeecgListMixin],
+    components: {
+      PermissionDataRuleModal
+    },
+    data() {
+      return {
+        queryParam: {},
+        drawerWidth: 650,
+        columns: columns,
+        permId: '',
+        visible: false,
+        form: this.$form.createForm(this),
+        loading: false,
+        url: {
+          list: "/sys/permission/getPermRuleListByPermId",
+          delete: "/sys/permission/deletePermissionRule",
+        },
+      }
+    },
+    created() {
+      this.resetScreenSize()
+    },
+    methods: {
+      loadData() {
+        //20190908 scott for: 首次进入菜单列表的时候，不加载权限列表
+        if(!this.permId){
+          return
+        }
+        let that = this
+        this.dataSource = []
+        var params = this.getQueryParams()//查询条件
+        getPermissionRuleList(params).then((res) => {
+          if (res.success) {
+            that.dataSource = res.result
+          }
+        })
+      },
+      edit(record) {
+        if (record.id) {
+          this.visible = true
+          this.permId = record.id
+        }
+        this.queryParam = {}
+        this.queryParam.permissionId = record.id
+        this.visible = true
+        this.loadData()
+        this.resetScreenSize()
+      },
+      addPermissionRule() {
+        this.$refs.modalForm.add(this.permId)
+        this.$refs.modalForm.title = '新增'
+      },
+      searchQuery() {
+        var params = this.getQueryParams();
+        params.permissionId = this.permId;
+        queryPermissionRule(params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result
+          }
+        })
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.queryParam.permissionId = this.permId
+        this.loadData(1);
+      },
+      onClose() {
+        this.visible = false
+      },
+      // 根据屏幕变化,设置抽屉尺寸
+      resetScreenSize() {
+        let screenWidth = document.body.clientWidth
+        if (screenWidth < 500) {
+          this.drawerWidth = screenWidth
+        } else {
+          this.drawerWidth = 650
+        }
+      },
+      getRowClassname(record){
+        if(record.status!=1){
+          return "data-rule-invalid"
+        }
+      }
+    }
+  }
+</script>
+
+<style>
+  .data-rule-invalid{
+    background: #f4f4f4;
+    color: #bababa;
+  }
+</style>

jshERP-web/src/views/system/PermissionList.vue

@@ -0,0 +1,196 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button
+        @click="batchDel"
+        v-if="selectedRowKeys.length > 0"
+        ghost
+        type="primary"
+        icon="delete">批量删除
+      </a-button>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{
+        selectedRowKeys.length }}</a>项&nbsp;&nbsp;
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        :columns="columns"
+        :scroll="{x: 1500}"
+        size="middle"
+        :pagination="false"
+        :dataSource="dataSource"
+        :loading="loading"
+        :expandedRowKeys="expandedRowKeys"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @expandedRowsChange="handleExpandedRowsChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">
+              更多 <a-icon type="down"/>
+            </a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a href="javascript:;" @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a href="javascript:;" @click="handleAddSub(record)">添加下级</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a href="javascript:;" @click="handleDataRule(record)">数据规则</a>
+              </a-menu-item>
+
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+        <!-- 字符串超长截取省略号显示 -->
+        <span slot="url" slot-scope="text">
+          <j-ellipsis :value="text" :length="25"/>
+        </span>
+        <!-- 字符串超长截取省略号显示-->
+        <span slot="component" slot-scope="text">
+          <j-ellipsis :value="text"/>
+        </span>
+      </a-table>
+
+    </div>
+    <!-- table区域-end -->
+
+    <permission-modal ref="modalForm" @ok="modalFormOk"></permission-modal>
+    <permission-data-rule-list ref="PermissionDataRuleList" @ok="modalFormOk"></permission-data-rule-list>
+
+  </a-card>
+</template>
+
+<script>
+  import PermissionModal from './modules/PermissionModal'
+  import { getPermissionList } from '@/api/api'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import PermissionDataRuleList from './PermissionDataRuleList'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+
+  const columns = [
+    {
+      title: '菜单名称',
+      dataIndex: 'name',
+      key: 'name'
+    }, {
+      title: '菜单类型',
+      dataIndex: 'menuType',
+      key: 'menuType',
+      customRender: function(text) {
+        if (text == 0) {
+          return '菜单'
+        } else if (text == 1) {
+          return '菜单'
+        } else if (text == 2) {
+          return '按钮/权限'
+        } else {
+          return text
+        }
+      }
+    },/*{
+      title: '权限编码',
+      dataIndex: 'perms',
+      key: 'permissionCode',
+    },*/{
+      title: 'icon',
+      dataIndex: 'icon',
+      key: 'icon'
+    },
+    {
+      title: '组件',
+      dataIndex: 'component',
+      key: 'component',
+      scopedSlots: { customRender: 'component' }
+    },
+    {
+      title: '路径',
+      dataIndex: 'url',
+      key: 'url',
+      scopedSlots: { customRender: 'url' }
+    },
+    {
+      title: '排序',
+      dataIndex: 'sortNo',
+      key: 'sortNo'
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      fixed: 'right',
+      scopedSlots: { customRender: 'action' },
+      align: 'center',
+      width: 150
+    }
+  ]
+
+  export default {
+    name: 'PermissionList',
+    mixins: [JeecgListMixin],
+    components: {
+      PermissionDataRuleList,
+      PermissionModal,
+      JEllipsis
+    },
+    data() {
+      return {
+        description: '这是菜单管理页面',
+        // 表头
+        columns: columns,
+        loading: false,
+        // 展开的行，受控属性
+        expandedRowKeys: [],
+        url: {
+          list: '/sys/permission/list',
+          delete: '/sys/permission/delete',
+          deleteBatch: '/sys/permission/deleteBatch'
+        }
+      }
+    },
+    methods: {
+      loadData() {
+        this.dataSource = []
+        getPermissionList().then((res) => {
+          if (res.success) {
+            console.log(res.result)
+            this.dataSource = res.result
+          }
+        })
+      },
+      // 打开数据规则编辑
+      handleDataRule(record) {
+        this.$refs.PermissionDataRuleList.edit(record)
+      },
+      handleAddSub(record) {
+        this.$refs.modalForm.title = "添加子菜单";
+        this.$refs.modalForm.localMenuType = 1;
+        this.$refs.modalForm.disableSubmit = false;
+        this.$refs.modalForm.edit({status:'1',permsType:'1',route:true,'parentId':record.id});
+      },
+      handleExpandedRowsChange(expandedRows) {
+        this.expandedRowKeys = expandedRows
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jshERP-web/src/views/system/PersonList.vue

@@ -0,0 +1,132 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="姓名" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入姓名查询" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="类型" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-select v-model="queryParam.type" placeholder="请选择类型">
+                <a-select-option value="">请选择</a-select-option>
+                <a-select-option value="业务员">业务员</a-select-option>
+                <a-select-option value="仓管员">仓管员</a-select-option>
+                <a-select-option value="财务员">财务员</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <person-modal ref="modalForm" @ok="modalFormOk"></person-modal>
+  </a-card>
+</template>
+<script>
+  import PersonModal from './modules/PersonModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDate from '@/components/jeecg/JDate'
+  export default {
+    name: "PersonList",
+    mixins:[JeecgListMixin],
+    components: {
+      PersonModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {name:'',type:''},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title: '姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title: '类型',
+            align:"center",
+            dataIndex: 'type'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/person/list",
+          delete: "/person/delete",
+          deleteBatch: "/person/deleteBatch"
+        }
+      }
+    },
+    computed: {
+
+    },
+    methods: {
+
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/PluginList.vue

@@ -0,0 +1,235 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入名称查询" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+              <a-button type="primary" style="margin-left: 8px" @click="writeCode">填写激活码</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importUrl" @change="handleImportJar">
+        <a-popover title="导入注意点">
+          <template slot="content">
+            <p>请选择需要导入的插件jar包</p>
+          </template>
+          <a-button type="primary" icon="import">上传插件包</a-button>
+        </a-popover>
+      </a-upload>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="uploadTemplate(record)" >上传页面</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定要开启该插件吗?" @confirm="() => startPlugin(record.pluginDescriptor.pluginId)">
+            <a>开启</a>
+          </a-popconfirm>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定要停止该插件吗?" @confirm="() => stopPlugin(record.pluginDescriptor.pluginId)">
+            <a>停止</a>
+          </a-popconfirm>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定要卸载该插件吗?" @confirm="() => uninstallPlugin(record.pluginDescriptor.pluginId)">
+            <a>卸载</a>
+          </a-popconfirm>
+        </span>
+        <span slot="linkInfo" slot-scope="text, record">
+          <a @click="linkTo(record)" target='_blank'>链接跳转</a>
+        </span>
+        <template slot="customRenderFlag" slot-scope="pluginState">
+          <a-tag v-if="pluginState=='STARTED'" color="green">启用</a-tag>
+          <a-tag v-if="pluginState=='STOPPED'" color="orange">停止</a-tag>
+        </template>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <plugin-modal ref="modalForm" @ok="modalFormOk"></plugin-modal>
+  </a-card>
+</template>
+<script>
+  import PluginModal from './modules/PluginModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import {postAction} from '@/api/manage';
+  import JDate from '@/components/jeecg/JDate'
+  import { filterObj } from '@/utils/util'
+  export default {
+    name: "PluginList",
+    mixins:[JeecgListMixin],
+    components: {
+      PluginModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {name:''},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:40,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {title: '名称', dataIndex: '', width: 120,
+            customRender:function (t,r,index) {
+              if (r) {
+                var desc = r.pluginDescriptor.pluginDescription;
+                if(desc.indexOf("|")){
+                  var arr = desc.split("|");
+                  return arr[0];
+                }
+              }
+            }
+          },
+          {title: '标识', dataIndex: '', width: 180,
+            customRender:function (t,r,index) {
+              if (r) {
+                return r.pluginDescriptor.pluginId;
+              }
+            }
+          },
+          {title: '版本', dataIndex: '', width: 120,
+            customRender:function (t,r,index) {
+              if (r) {
+                return r.pluginDescriptor.version;
+              }
+            }
+          },
+          {title: '作者', dataIndex: '', width: 100,
+            customRender:function (t,r,index) {
+              if (r) {
+                return r.pluginDescriptor.provider;
+              }
+            }
+          },
+          {title: '页面链接', dataIndex: '', width: 250,
+            scopedSlots: { customRender: 'linkInfo' }
+          },
+          {title: '状态', dataIndex: 'pluginState', width: 80, align: "center",
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/plugin/list",
+          delete: "/plugin/delete",
+          deleteBatch: "/plugin/deleteBatch",
+          importJarUrl: "/plugin/uploadInstallPluginJar",
+        }
+      }
+    },
+    computed: {
+      importUrl: function () {
+        return `${window._CONFIG['domianURL']}${this.url.importJarUrl}`;
+      }
+    },
+    methods: {
+      getQueryParams() {
+        //获取查询条件
+        let sqp = {}
+        if(this.superQueryParams){
+          sqp['superQueryParams']=encodeURI(this.superQueryParams)
+          sqp['superQueryMatchType'] = this.superQueryMatchType
+        }
+        let param = {};
+        param.name = this.queryParam.name;
+        param.currentPage = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        return filterObj(param);
+      },
+      writeCode() {
+        this.$refs.modalForm.edit();
+        this.$refs.modalForm.title = "填写激活码";
+        this.$refs.modalForm.disableSubmit = false;
+      },
+      linkTo(record) {
+        let desc = record.pluginDescriptor.pluginDescription;
+        if(desc.indexOf("|")){
+          let arr = desc.split("|");
+          window.location.href = arr[1]
+        }
+      },
+      uploadTemplate(record) {
+        var rootPath = record.path.substring(0, record.path.indexOf("plugins"));
+        this.$message.info('请将页面上传到服务器目录：' + " /前端根目录/plugin/");
+      },
+      startPlugin(pluginId) {
+        postAction('/plugin/start/' + pluginId).then((res)=>{
+          if(res && res.code == 200) {
+            this.loadData();
+          }
+        })
+      },
+      stopPlugin(pluginId) {
+        postAction('/plugin/stop/' + pluginId).then((res)=>{
+          if(res && res.code == 200) {
+            this.loadData();
+          }
+        })
+      },
+      uninstallPlugin(pluginId) {
+        postAction('/plugin/uninstall/' + pluginId).then((res)=>{
+          if(res && res.code == 200) {
+            this.loadData();
+          }
+        })
+      },
+      handleImportJar(info){
+        if (info.file.status !== 'uploading') {
+          console.log(info.file, info.fileList);
+        }
+        if (info.file.status === 'done') {
+          if (info.file.response) {
+            if (info.file.response.code === 200) {
+              this.$message.success(info.file.response.data)
+              this.loadData()
+            }
+          } else {
+            this.$message.error(info.file.response.data);
+          }
+        } else if (info.file.status === 'error') {
+          this.$message.error(`文件上传失败: ${info.file.msg} `);
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/QuartzJobList.vue

@@ -0,0 +1,263 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="10">
+            <a-form-item label="任务类名">
+              <a-input placeholder="请输入任务类名" v-model="queryParam.jobClassName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="任务状态">
+              <a-select style="width: 220px" v-model="queryParam.status" placeholder="请选择状态">
+                <a-select-option value="">全部</a-select-option>
+                <a-select-option value="0">正常</a-select-option>
+                <a-select-option value="-1">停止</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <a-col :md="6" :sm="10" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('定时任务信息')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <!-- 字符串超长截取省略号显示-->
+        <span slot="description" slot-scope="text">
+          <j-ellipsis :value="text" :length="20" />
+        </span>
+        <span slot="parameterRender" slot-scope="text">
+          <j-ellipsis :value="text" :length="20" />
+        </span>
+
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="resumeJob(record)" v-if="record.status==-1">启动</a>
+          <a @click="pauseJob(record)" v-if="record.status==0">停止</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item><a @click="handleEdit(record)">编辑</a></a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+        <!-- 状态渲染模板 -->
+        <template slot="customRenderStatus" slot-scope="status">
+          <a-tag v-if="status==0" color="green">已启动</a-tag>
+          <a-tag v-if="status==-1" color="orange">已暂停</a-tag>
+        </template>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <quartzJob-modal ref="modalForm" @ok="modalFormOk"></quartzJob-modal>
+  </a-card>
+</template>
+
+<script>
+  import QuartzJobModal from './modules/QuartzJobModal'
+  import { getAction } from '@/api/manage'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JEllipsis from "@/components/jeecg/JEllipsis";
+
+  export default {
+    name: "QuartzJobList",
+    mixins:[JeecgListMixin],
+    components: {
+      QuartzJobModal,
+      JEllipsis
+    },
+    data () {
+      return {
+        description: '定时任务在线管理',
+        // 查询条件
+        queryParam: {},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title: '任务类名',
+            align:"center",
+            dataIndex: 'jobClassName',
+            sorter: true,
+/*            customRender:function (text) {
+              return "*"+text.substring(9,text.length);
+            }*/
+          },
+          {
+            title: 'cron表达式',
+            align:"center",
+            dataIndex: 'cronExpression'
+          },
+          {
+            title: '参数',
+            align:"center",
+            width: 150,
+            dataIndex: 'parameter',
+            scopedSlots: {customRender: 'parameterRender'},
+          },
+          {
+            title: '描述',
+            align:"center",
+            width: 250,
+            dataIndex: 'description',
+            scopedSlots: {customRender: 'description'},
+          },
+          {
+            title: '状态',
+            align:"center",
+            dataIndex: 'status',
+            scopedSlots: { customRender: 'customRenderStatus' },
+            filterMultiple: false,
+            filters: [
+              { text: '已启动', value: '0' },
+              { text: '已暂停', value: '-1' },
+            ]
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            width:180,
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/sys/quartzJob/list",
+          delete: "/sys/quartzJob/delete",
+          deleteBatch: "/sys/quartzJob/deleteBatch",
+          pause: "/sys/quartzJob/pause",
+          resume: "/sys/quartzJob/resume",
+          exportXlsUrl: "sys/quartzJob/exportXls",
+          importExcelUrl: "sys/quartzJob/importExcel",
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
+
+    methods: {
+
+      //筛选需要重写handleTableChange
+      handleTableChange(pagination, filters, sorter) {
+        //分页、排序、筛选变化时触发
+        //TODO 筛选
+        if (Object.keys(sorter).length > 0) {
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+        }
+        //这种筛选方式只支持单选
+        this.filters.status = filters.status[0];
+        this.ipagination = pagination;
+        this.loadData();
+      },
+      pauseJob: function(record){
+        var that = this;
+        //暂停定时任务
+        this.$confirm({
+          title:"确认暂停",
+          content:"是否暂停选中任务?",
+          onOk: function(){
+            getAction(that.url.pause,{jobClassName:record.jobClassName}).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.loadData();
+                that.onClearSelected();
+              }else{
+                that.$message.warning(res.message);
+              }
+            });
+          }
+        });
+
+      },
+      resumeJob: function(record){
+        var that = this;
+        //恢复定时任务
+        this.$confirm({
+          title:"确认启动",
+          content:"是否启动选中任务?",
+          onOk: function(){
+            getAction(that.url.resume,{jobClassName:record.jobClassName}).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.loadData();
+                that.onClearSelected();
+              }else{
+                that.$message.warning(res.message);
+              }
+            });
+          }
+        });
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/RoleList.vue

@@ -0,0 +1,152 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="角色名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入角色名称查询" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleSetFunction(record.id)">分配功能</a>
+          <a-divider type="vertical" />
+<!--          <a @click="handleSetPushBtn(record.id)">分配按钮</a>-->
+<!--          <a-divider type="vertical" />-->
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
+    <role-function-modal ref="roleFunctionModal" @ok="modalFormOk"></role-function-modal>
+    <role-push-btn-modal ref="rolePushBtnModal" @ok="modalFormOk"></role-push-btn-modal>
+  </a-card>
+</template>
+<script>
+  import RoleModal from './modules/RoleModal'
+  import RoleFunctionModal from './modules/RoleFunctionModal'
+  import RolePushBtnModal from './modules/RolePushBtnModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDate from '@/components/jeecg/JDate'
+  export default {
+    name: "RoleList",
+    mixins:[JeecgListMixin],
+    components: {
+      RoleModal,
+      RoleFunctionModal,
+      RolePushBtnModal,
+      JDate
+    },
+    data () {
+      return {
+        description: '角色管理页面',
+        // 查询条件
+        queryParam: {name:'',},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:40,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title: '角色名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title: '数据类型',
+            align:"center",
+            dataIndex: 'type'
+          },
+          {
+            title: '描述',
+            align:"center",
+            dataIndex: 'description'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/role/list",
+          delete: "/role/delete",
+          deleteBatch: "/role/deleteBatch"
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {
+      handleSetFunction(id) {
+        this.$refs.roleFunctionModal.edit(id);
+        this.$refs.roleFunctionModal.title = "分配功能";
+        this.$refs.roleFunctionModal.disableSubmit = false;
+      },
+      handleSetPushBtn(id) {
+        this.$refs.rolePushBtnModal.add();
+        this.$refs.rolePushBtnModal.title = "分配按钮";
+        this.$refs.rolePushBtnModal.disableSubmit = false;
+      },
+      onChangeDate(date, dateString) {
+        console.log(date, dateString);
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/RoleUserList.vue

@@ -0,0 +1,548 @@
+<template>
+  <a-row :gutter="10">
+    <a-col :md="leftColMd" :sm="24" style="margin-bottom: 20px">
+      <a-card :bordered="false">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+          <!-- 搜索区域 -->
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+              <a-col :md="12" :sm="8">
+                <a-form-item label="角色名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+                  <a-input placeholder="" v-model="queryParam.roleName"></a-input>
+                </a-form-item>
+              </a-col>
+              <!--
+              <a-col :md="11" :sm="12">
+                <a-form-item label="创建时间" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+                  <j-date v-model="queryParam.createTime_begin" :showTime="true" date-format="YYYY-MM-DD HH:mm:ss" style="width:45%" placeholder="请选择开始时间" ></j-date>
+                  <span style="width: 10px;">~</span>
+                  <j-date v-model="queryParam.createTime_end" :showTime="true" date-format="YYYY-MM-DD HH:mm:ss" style="width:45%" placeholder="请选择结束时间"></j-date>
+                </a-form-item>
+              </a-col>
+              -->
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="12" :sm="24">
+               <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </a-col>
+          </span>
+            </a-row>
+          </a-form>
+        </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator" style="margin: 5px 0 10px 2px">
+          <a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button>
+          <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
+          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+            <a-button type="primary" icon="import">导入</a-button>
+          </a-upload>
+          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>
+        </div>
+
+        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+          <i class="anticon anticon-info-circle ant-alert-icon">
+          </i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a>项
+          <a style="margin-left: 24px" @click="onClearSelected1">清空</a>
+        </div>
+
+        <div style="margin-top: 15px">
+          <a-table
+            style="height:500px"
+            ref="table"
+            size="middle"
+            bordered
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            :rowSelection="{selectedRowKeys: selectedRowKeys1, onChange: onSelectChange1, type:'radio'}"
+            @change="handleTableChange">
+          <span slot="action" slot-scope="text, record">
+            <a @click="handleOpen(record)">用户</a>
+            <a-divider type="vertical"/>
+
+
+            <a-dropdown>
+              <a class="ant-dropdown-link">
+                更多 <a-icon type="down"/>
+              </a>
+              <a-menu slot="overlay">
+                <a-menu-item>
+                  <a @click="handlePerssion(record.id)">授权</a>
+                </a-menu-item>
+                <a-menu-item>
+                  <a @click="handleEdit(record)">编辑</a>
+                </a-menu-item>
+                <a-menu-item>
+                  <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete1(record.id)">
+                    <a>删除</a>
+                  </a-popconfirm>
+                </a-menu-item>
+              </a-menu>
+            </a-dropdown>
+        </span>
+          </a-table>
+        </div>
+        <!-- 右侧的角色权限配置 -->
+        <user-role-modal ref="modalUserRole"></user-role-modal>
+        <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
+      </a-card>
+    </a-col>
+    <a-col :md="rightColMd" :sm="24" v-if="this.rightcolval == 1">
+      <a-card :bordered="false">
+        <div style="text-align: right;">
+          <a-icon type="close-circle" @click="hideUserList" />
+        </div>
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline">
+            <a-row :gutter="24">
+
+              <a-col :md="12" :sm="12">
+                <a-form-item label="用户账号">
+                  <a-input placeholder="" v-model="queryParam2.username"></a-input>
+                </a-form-item>
+              </a-col>
+              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="9" :sm="24">
+             <a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">查询</a-button>
+              <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">重置</a-button>
+
+            </a-col>
+          </span>
+            </a-row>
+          </a-form>
+        </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator" :md="24" :sm="24">
+          <a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">新增用户</a-button>
+          <!--<a-button @click="handleEdit2" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
+          <a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">已有用户</a-button>
+
+          <a-dropdown v-if="selectedRowKeys2.length > 0">
+            <a-menu slot="overlay">
+              <a-menu-item key="1" @click="batchDel2">
+                <a-icon type="delete"/>
+                删除
+              </a-menu-item>
+            </a-menu>
+            <a-button style="margin-left: 8px"> 批量操作
+              <a-icon type="down"/>
+            </a-button>
+          </a-dropdown>
+        </div>
+        <!-- table区域-begin -->
+        <div>
+          <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+            <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+            selectedRowKeys2.length }}</a>项
+            <a style="margin-left: 24px" @click="onClearSelected2">清空</a>
+          </div>
+          <a-table
+            style="height:500px"
+            ref="table2"
+            bordered
+            size="middle"
+            rowKey="id"
+            :columns="columns2"
+            :dataSource="dataSource2"
+            :pagination="ipagination2"
+            :loading="loading2"
+            :rowSelection="{selectedRowKeys: selectedRowKeys2, onChange: onSelectChange2}"
+            @change="handleTableChange2">
+           <span slot="action" slot-scope="text, record">
+           <a @click="handleEdit2(record)">编辑</a>
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">
+              更多 <a-icon type="down"/>
+            </a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete2(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+          </a-table>
+        </div>
+        <!-- 表单区域 -->
+        <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
+        <user-modal ref="modalForm2" @ok="modalFormOk2"></user-modal>
+        <Select-User-Modal ref="selectUserModal" @selectFinished="selectOK"></Select-User-Modal>
+      </a-card>
+    </a-col>
+  </a-row>
+</template>
+<script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { deleteAction, postAction, getAction } from '@/api/manage'
+  import SelectUserModal from './modules/SelectUserModal'
+  import RoleModal from './modules/RoleModal'
+  import UserModal from './modules/UserModal'
+  import { filterObj } from '@/utils/util'
+  import UserRoleModal from './modules/UserRoleModal'
+  import moment from 'moment'
+
+  export default {
+    name: 'RoleUserList',
+    mixins: [JeecgListMixin],
+    components: {
+      UserRoleModal,
+      SelectUserModal,
+      RoleModal,
+      UserModal,
+      moment
+    },
+    data() {
+      return {
+        model1: {},
+        model2: {},
+        currentRoleId: '',
+        queryParam1: {},
+        queryParam2: {},
+        dataSource1: [],
+        dataSource2: [],
+        ipagination1: {
+          current: 1,
+          pageSize: 10,
+          pageSizeOptions: ['10', '20', '30'],
+          showTotal: (total, range) => {
+            return range[0] + '-' + range[1] + ' 共' + total + '条'
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        ipagination2: {
+          current: 1,
+          pageSize: 10,
+          pageSizeOptions: ['10', '20', '30'],
+          showTotal: (total, range) => {
+            return range[0] + '-' + range[1] + ' 共' + total + '条'
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        isorter1: {
+          column: 'createTime',
+          order: 'desc'
+        },
+        isorter2: {
+          column: 'createTime',
+          order: 'desc'
+        },
+        filters1: {},
+        filters2: {},
+        loading1: false,
+        loading2: false,
+        selectedRowKeys1: [],
+        selectedRowKeys2: [],
+        selectionRows1: [],
+        selectionRows2: [],
+        test:{},
+        rightcolval:0,
+        columns:
+          [
+            {
+              title: '角色编码',
+              align: 'center',
+              dataIndex: 'roleCode'
+            },
+            {
+              title: '角色名称',
+              align: 'center',
+              dataIndex: 'roleName'
+            },
+            {
+              title: '创建时间',
+              dataIndex: 'createTime',
+              align:"center",
+              sorter: true,
+              customRender: (text) => {
+                return moment(text).format('YYYY-MM-DD')
+              }
+            },
+            {
+              title: '操作',
+              dataIndex: 'action',
+              align: 'center',
+              scopedSlots: { customRender: 'action' }
+            }
+          ],
+        columns2: [{
+          title: '用户账号',
+          align: 'center',
+          dataIndex: 'username',
+          width: 120
+        },
+          {
+            title: '用户名称',
+            align: 'center',
+            width: 100,
+            dataIndex: 'realname'
+          },
+          {
+            title: '状态',
+            align: 'center',
+            width: 80,
+            dataIndex: 'status_dictText'
+          },
+
+          {
+            title: '操作',
+            dataIndex: 'action',
+            scopedSlots: { customRender: 'action' },
+            align: 'center',
+            width: 120
+          }],
+
+        // 高级查询参数
+        superQueryParams2: '',
+        // 高级查询拼接条件
+        superQueryMatchType2: 'and',
+        url: {
+          list: '/sys/role/list',
+          delete: '/sys/role/delete',
+          list2: '/sys/user/userRoleList',
+          addUserRole: '/sys/user/addSysUserRole',
+          delete2: '/sys/user/deleteUserRole',
+          deleteBatch2: '/sys/user/deleteUserRoleBatch',
+          exportXlsUrl: 'sys/role/exportXls',
+          importExcelUrl: 'sys/role/importExcel'
+        }
+      }
+    },
+    computed: {
+      importExcelUrl: function() {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+      },
+      leftColMd() {
+        return this.selectedRowKeys1.length === 0 ? 24 : 12
+      },
+      rightColMd() {
+        return this.selectedRowKeys1.length === 0 ? 0 : 12
+      }
+    },
+    methods: {
+      onSelectChange2(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys2 = selectedRowKeys
+        this.selectionRows2 = selectionRows
+      },
+      onClearSelected2() {
+        this.selectedRowKeys2 = []
+        this.selectionRows2 = []
+      },
+      onClearSelected1() {
+        this.selectedRowKeys1 = []
+        this.selectionRows1 = []
+      },
+      onSelectChange1(selectedRowKeys, selectionRows) {
+        this.rightcolval = 1
+        this.selectedRowKeys1 = selectedRowKeys
+        this.selectionRows1 = selectionRows
+        this.model1 = Object.assign({}, selectionRows[0])
+        console.log(this.model1)
+        this.currentRoleId = selectedRowKeys[0]
+        this.loadData2()
+      },
+      onClearSelected() {
+      },
+
+      getQueryParams2() {
+        //获取查询条件
+        let sqp = {}
+        if (this.superQueryParams2) {
+          sqp['superQueryParams'] = encodeURI(this.superQueryParams2)
+          sqp['superQueryMatchType'] = this.superQueryMatchType2
+        }
+        var param = Object.assign(sqp, this.queryParam2, this.isorter2, this.filters2)
+        param.field = this.getQueryField2()
+        param.pageNo = this.ipagination2.current
+        param.pageSize = this.ipagination2.pageSize
+        return filterObj(param)
+      },
+      getQueryField2() {
+        //TODO 字段权限控制
+        var str = 'id,'
+        this.columns2.forEach(function(value) {
+          str += ',' + value.dataIndex
+        })
+        return str
+      },
+      handleEdit2: function(record) {
+        this.$refs.modalForm2.title = '编辑'
+        this.$refs.modalForm2.roleDisabled = true
+        this.$refs.modalForm2.edit(record)
+      },
+      handleAdd2: function() {
+        if (this.currentRoleId == '') {
+          this.$message.error('请选择一个角色!')
+        } else {
+          this.$refs.modalForm2.roleDisabled = true
+          this.$refs.modalForm2.selectedRole = [this.currentRoleId]
+
+          this.$refs.modalForm2.add()
+
+          this.$refs.modalForm2.title = '新增'
+        }
+      },
+      modalFormOk2() {
+        // 新增/修改 成功时，重载列表
+        this.loadData2()
+      },
+      loadData2(arg) {
+        if (!this.url.list2) {
+          this.$message.error('请设置url.list2属性!')
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination2.current = 1
+        }
+        if (this.currentRoleId === '') return
+        let params = this.getQueryParams2()//查询条件
+        params.roleId = this.currentRoleId
+        this.loading2 = true
+        getAction(this.url.list2, params).then((res) => {
+          if (res.success) {
+            this.dataSource2 = res.result.records
+            this.ipagination2.total = res.result.total
+
+          }
+          this.loading2 = false
+        })
+
+      },
+      handleDelete1: function(id) {
+        this.handleDelete(id)
+        this.dataSource2 = []
+        this.currentRoleId = ''
+      },
+      handleDelete2: function(id) {
+        if (!this.url.delete2) {
+          this.$message.error('请设置url.delete2属性!')
+          return
+        }
+        var that = this
+        deleteAction(that.url.delete2, { roleId: this.currentRoleId, userId: id }).then((res) => {
+          if (res.success) {
+            that.$message.success(res.message)
+            that.loadData2()
+          } else {
+            that.$message.warning(res.message)
+          }
+        })
+      },
+      batchDel2: function() {
+
+        if (!this.url.deleteBatch2) {
+          this.$message.error('请设置url.deleteBatch2属性!')
+          return
+        }
+        if (this.selectedRowKeys2.length <= 0) {
+          this.$message.warning('请选择一条记录！')
+          return
+        } else {
+          var ids = ''
+          for (var a = 0; a < this.selectedRowKeys2.length; a++) {
+            ids += this.selectedRowKeys2[a] + ','
+          }
+          var that = this
+          console.log(this.currentDeptId)
+          this.$confirm({
+            title: '确认删除',
+            content: '是否删除选中数据?',
+            onOk: function() {
+              deleteAction(that.url.deleteBatch2, { roleId: that.currentRoleId, userIds: ids }).then((res) => {
+                if (res.success) {
+                  that.$message.success(res.message)
+                  that.loadData2()
+                  that.onClearSelected()
+                } else {
+                  that.$message.warning(res.message)
+                }
+              })
+            }
+          })
+        }
+      },
+      selectOK(data) {
+        let params = {}
+        params.roleId = this.currentRoleId
+        params.userIdList = []
+        for (var a = 0; a < data.length; a++) {
+          params.userIdList.push(data[a])
+        }
+        console.log(params)
+        postAction(this.url.addUserRole, params).then((res) => {
+          if (res.success) {
+            this.loadData2()
+            this.$message.success(res.message)
+          } else {
+            this.$message.warning(res.message)
+          }
+        })
+      },
+
+      handleAddUserRole() {
+        if (this.currentRoleId == '') {
+          this.$message.error('请选择一个角色!')
+        } else {
+          this.$refs.selectUserModal.visible = true
+        }
+      },
+      handleOpen(record) {
+        this.rightcolval = 1
+        this.selectedRowKeys1 = [record.id]
+        this.model1 = Object.assign({}, record)
+        this.currentRoleId = record.id
+        this.onClearSelected2()
+        this.loadData2()
+      },
+      /*handleEdit: function(record) {
+        if (this.currentRoleId == '') {
+          this.$message.error('请选择一个角色!')
+        } else {
+          this.$refs.modalForm.edit(record)
+          this.$refs.modalForm.title = '编辑'
+        }
+      },*/
+      searchQuery2() {
+        this.loadData2(1)
+      },
+      searchReset2() {
+        this.queryParam2 = {}
+        this.loadData2(1)
+      },
+      handleTableChange2(pagination, filters, sorter) {
+        //分页、排序、筛选变化时触发
+        //TODO 筛选
+        if (Object.keys(sorter).length > 0) {
+          this.isorter2.column = sorter.field
+          this.isorter2.order = 'ascend' == sorter.order ? 'asc' : 'desc'
+        }
+        this.ipagination2 = pagination
+        this.loadData2()
+      },
+      hideUserList(){
+        //this.rightcolval = 0
+        this.selectedRowKeys1 = []
+      },
+      handlePerssion(roleId){
+        this.$refs.modalUserRole.show(roleId);
+      },
+    }
+  }
+</script>
+<style scoped>
+  /** Button按钮间距 */
+  .ant-btn {
+    margin-left: 8px
+  }
+</style>

jshERP-web/src/views/system/SerialNumberList.vue

@@ -0,0 +1,151 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="序列号" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入序列号查询" v-model="queryParam.serialNumber"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="商品名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入商品名称查询" v-model="queryParam.materialName"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="handleBatchAdd" type="primary" icon="plus">批量新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+        <!-- 状态渲染模板 -->
+        <template slot="customRenderFlag" slot-scope="isSell">
+          <a-tag v-if="isSell==1" color="green">是</a-tag>
+          <a-tag v-if="isSell==0" color="orange">否</a-tag>
+        </template>
+        <template slot="customRenderTime" slot-scope="timeStr">
+          {{simpleDateFormat(timeStr, 'yyyy-MM-dd hh:mm:ss')}}
+        </template>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <serial-number-modal ref="modalForm" @ok="modalFormOk"></serial-number-modal>
+    <serial-number-batch-modal ref="serialNumberBatchModel" @ok="modalFormOk"></serial-number-batch-modal>
+  </a-card>
+</template>
+<script>
+  import SerialNumberModal from './modules/SerialNumberModal'
+  import SerialNumberBatchModal from './modules/SerialNumberBatchModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { formatDate } from "@/utils/util"
+  import JDate from '@/components/jeecg/JDate'
+  export default {
+    name: "SerialNumberList",
+    mixins:[JeecgListMixin],
+    components: {
+      SerialNumberModal,
+      SerialNumberBatchModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {materialName:'',serialNumber:''},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:40,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {title: '序列号',align: "left", dataIndex: 'serialNumber', width: 180},
+          {title: '商品条码', align: "center",dataIndex: 'materialCode', width: 120},
+          {title: '商品名称', align: "center",dataIndex: 'materialName', width: 120},
+          {title: '单据编号', align: "center", dataIndex: 'depotHeadNumber', width: 140},
+          {title: '已卖出', align: "center", dataIndex: 'isSell', width: 60,
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
+          {title: '创建时间',align: "center",  dataIndex: 'createTime', width: 150,
+            scopedSlots: { customRender: 'customRenderTime' }
+          },
+          {title: '更新时间', align: "center", dataIndex: 'updateTime', width: 150,
+            scopedSlots: { customRender: 'customRenderTime' }
+          },
+          {title: '备注',align: "center",  dataIndex: 'remark',width: 140},
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/serialNumber/list",
+          delete: "/serialNumber/delete",
+          deleteBatch: "/serialNumber/deleteBatch"
+        }
+      }
+    },
+    computed: {
+
+    },
+    methods: {
+      handleBatchAdd() {
+        this.$refs.serialNumberBatchModel.add();
+        this.$refs.serialNumberBatchModel.title = "批量新增";
+        this.$refs.serialNumberBatchModel.disableSubmit = false;
+      },
+      simpleDateFormat(millisecond, format) {
+        return formatDate(millisecond, format)
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/SysAnnouncementList.vue

@@ -0,0 +1,291 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :span="6">
+            <a-form-item label="标题">
+              <a-input placeholder="请输入标题" v-model="queryParam.titile"></a-input>
+            </a-form-item>
+          </a-col>
+          <!--<a-col :span="6">
+            <a-form-item label="内容">
+              <a-input placeholder="请输入内容" v-model="queryParam.msgContent"></a-input>
+            </a-form-item>
+          </a-col>-->
+
+          <a-col :span="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('系统通告')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a  v-if="record.sendStatus == 0" @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" v-if="record.sendStatus == 0"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item v-if="record.sendStatus != 1">
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+              <a-menu-item v-if="record.sendStatus == 0">
+                <a-popconfirm title="确定发布吗?" @confirm="() => releaseData(record.id)">
+                  <a>发布</a>
+                </a-popconfirm>
+              </a-menu-item>
+              <a-menu-item v-if="record.sendStatus == 1">
+                <a-popconfirm title="确定撤销吗?" @confirm="() => reovkeData(record.id)">
+                  <a>撤销</a>
+                </a-popconfirm>
+              </a-menu-item>
+              <a-menu-item>
+                  <a @click="handleDetail(record)">查看</a>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <sysAnnouncement-modal ref="modalForm" @ok="modalFormOk"></sysAnnouncement-modal>
+  </a-card>
+</template>
+
+<script>
+  import SysAnnouncementModal from './modules/SysAnnouncementModal'
+  import {doReleaseData, doReovkeData} from '@/api/api'
+  import {getAction} from '@/api/manage'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "SysAnnouncementList",
+    mixins: [JeecgListMixin],
+    components: {
+      SysAnnouncementModal
+    },
+    data() {
+      return {
+        description: '系统通告表管理页面',
+        // 查询条件
+        queryParam: {},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 60,
+            align: "center",
+            customRender: function (t, r, index) {
+              return parseInt(index) + 1;
+            }
+          },
+
+          {
+            title: '标题',
+            align: "center",
+            dataIndex: 'titile'
+          },
+          {
+            title: '消息类型',
+            align: "center",
+            dataIndex: 'msgCategory',
+            customRender: function (text) {
+              if (text == '1') {
+                return "通知公告";
+              } else if (text == "2") {
+                return "系统消息";
+              } else {
+                return text;
+              }
+            }
+          },
+          /*{
+            title: '开始时间',
+            align: "center",
+            dataIndex: 'startTime'
+          },
+          {
+            title: '结束时间',
+            align: "center",
+            dataIndex: 'endTime'
+          },*/
+          {
+            title: '发布人',
+            align: "center",
+            dataIndex: 'sender'
+          },
+          {
+            title: '优先级',
+            align: "center",
+            dataIndex: 'priority',
+            customRender: function (text) {
+              if (text == 'L') {
+                return "低";
+              } else if (text == "M") {
+                return "中";
+              } else if (text == "H") {
+                return "高";
+              } else {
+                return text;
+              }
+            }
+          },
+          {
+            title: '通告对象',
+            align: "center",
+            dataIndex: 'msgType',
+            customRender: function (text) {
+              if (text == 'USER') {
+                return "指定用户";
+              } else if (text == "ALL") {
+                return "全体用户";
+              } else {
+                return text;
+              }
+            }
+          },
+          {
+            title: '发布状态',
+            align: "center",
+            dataIndex: 'sendStatus',
+            customRender: function (text) {
+              if (text == 0) {
+                return "未发布";
+              } else if (text == 1) {
+                return "已发布";
+              } else if (text == 2) {
+                return "已撤销";
+              } else {
+                return text;
+              }
+            }
+          },
+          {
+            title: '发布时间',
+            align: "center",
+            dataIndex: 'sendTime'
+          },
+          {
+            title: '撤销时间',
+            align: "center",
+            dataIndex: 'cancelTime'
+          },
+          /*{
+                title: '删除状态（0，正常，1已删除）',
+                align:"center",
+                dataIndex: 'delFlag'
+              },*/
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: "center",
+            scopedSlots: {customRender: 'action'},
+          }
+        ],
+        url: {
+          list: "/sys/annountCement/list",
+          delete: "/sys/annountCement/delete",
+          deleteBatch: "/sys/annountCement/deleteBatch",
+          releaseDataUrl: "/sys/annountCement/doReleaseData",
+          reovkeDataUrl: "sys/annountCement/doReovkeData",
+          exportXlsUrl: "sys/annountCement/exportXls",
+          importExcelUrl: "sys/annountCement/importExcel",
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {
+      //执行发布操作
+      releaseData: function (id) {
+        console.log(id);
+        var that = this;
+        doReleaseData({id: id}).then((res) => {
+          if (res.success) {
+            that.$message.success(res.message);
+            that.loadData(1);
+          } else {
+            that.$message.warning(res.message);
+          }
+        });
+      },
+      //执行撤销操作
+      reovkeData: function (id) {
+        var that = this;
+        doReovkeData({id: id}).then((res) => {
+          if (res.success) {
+            that.$message.success(res.message);
+            that.loadData(1);
+            this.syncHeadNotic(id)
+          } else {
+            that.$message.warning(res.message);
+          }
+        });
+      },
+      syncHeadNotic(anntId){
+        getAction("sys/annountCement/syncNotic",{anntId:anntId})
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/SysCategoryList.vue

@@ -0,0 +1,302 @@
+<template>
+  <a-card :bordered="false">
+    
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <!--<a-button type="primary" icon="download" @click="handleExportXls('分类字典')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :expandedRowKeys="expandedRowKeys"
+        @change="handleTableChange"
+        @expand="handleExpand"
+        v-bind="tableProps">
+        
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record)">
+            <a>删除</a>
+          </a-popconfirm>
+          <a-divider type="vertical" />
+          <a @click="handleAddSub(record)">添加下级</a>
+        </span>
+
+      </a-table>
+    </div>
+
+    <sysCategory-modal ref="modalForm" @ok="modalFormOk"></sysCategory-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import { getAction } from '@/api/manage'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import SysCategoryModal from './modules/SysCategoryModal'
+  import { deleteAction } from '@/api/manage'
+  
+  export default {
+    name: "SysCategoryList",
+    mixins:[JeecgListMixin],
+    components: {
+      SysCategoryModal
+    },
+    data () {
+      return {
+        description: '分类字典管理页面',
+        // 表头
+        columns: [
+          {
+            title:'分类名称',
+            align:"left",
+            dataIndex: 'name'
+          },
+          {
+            title:'分类编码',
+            align:"left",
+            dataIndex: 'code'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/sys/category/rootList",
+          childList: "/sys/category/childList",
+          delete: "/sys/category/delete",
+          deleteBatch: "/sys/category/deleteBatch",
+          exportXlsUrl: "/sys/category/exportXls",
+          importExcelUrl: "sys/category/importExcel",
+        },
+        expandedRowKeys:[],
+        hasChildrenField:"hasChild",
+        pidField:"pid",
+        dictOptions:{
+        },
+        subExpandedKeys:[],
+      }
+    },
+    computed: {
+      importExcelUrl(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+      tableProps() {
+        let _this = this
+        return {
+          // 列表项是否可选择
+          rowSelection: {
+            selectedRowKeys: _this.selectedRowKeys,
+            onChange: (selectedRowKeys) => _this.selectedRowKeys = selectedRowKeys
+          }
+        }
+      }
+    },
+    methods: {
+      loadData(arg){
+        if(arg==1){
+          this.ipagination.current=1
+        }
+        this.loading = true
+        this.expandedRowKeys = []
+        let params = this.getQueryParams()
+        return new Promise((resolve) => {
+          getAction(this.url.list,params).then(res=>{
+            if(res.success){
+              let result = res.result
+              if(Number(result.total)>0){
+                this.ipagination.total = Number(result.total)
+                this.dataSource = this.getDataByResult(res.result.records)
+                resolve()
+              }else{
+                this.ipagination.total=0
+                this.dataSource=[]
+              }
+            }else{
+              this.$message.warning(res.message)
+            }
+            this.loading = false
+          })
+        })
+      },
+      getDataByResult(result){
+        return result.map(item=>{
+          //判断是否标记了带有子节点
+          if(item[this.hasChildrenField]=='1'){
+            let loadChild = { id: item.id+'_loadChild', name: 'loading...', isLoading: true }
+            item.children = [loadChild]
+          }
+          return item
+        })
+      },
+      handleExpand(expanded, record){
+        // 判断是否是展开状态
+        if (expanded) {
+          this.expandedRowKeys.push(record.id)
+          if (record.children.length>0 && record.children[0].isLoading === true) {
+            let params = this.getQueryParams();//查询条件
+            params[this.pidField] = record.id
+            getAction(this.url.childList,params).then((res)=>{
+              if(res.success){
+                if(res.result && res.result.length>0){
+                  record.children = this.getDataByResult(res.result)
+                  this.dataSource = [...this.dataSource]
+                }else{
+                  record.children=''
+                  record.hasChildrenField='0'
+                }
+              }else{
+                this.$message.warning(res.message)
+              }
+            })
+          }
+        }else{
+          let keyIndex = this.expandedRowKeys.indexOf(record.id)
+          if(keyIndex>=0){
+            this.expandedRowKeys.splice(keyIndex, 1);
+          }
+        }
+      },
+      initDictConfig(){
+      },
+      modalFormOk(formData,arr){
+        if(!formData.id){
+          this.addOk(formData,arr)
+        }else{
+          this.editOk(formData,this.dataSource)
+          this.dataSource=[...this.dataSource]
+        }
+      },
+      editOk(formData,arr){
+        if(arr && arr.length>0){
+          for(let i=0;i<arr.length;i++){
+            if(arr[i].id==formData.id){
+              arr[i]=formData
+              break
+            }else{
+              this.editOk(formData,arr[i].children)
+            }
+          }
+        }
+      },
+      async addOk(formData,arr){
+        if(!formData[this.pidField]){
+          this.loadData()
+        }else{
+          this.expandedRowKeys=[]
+          console.log("22222",arr)
+          for(let i of arr){
+            await this.expandTreeNode(i)
+          }
+        }
+      },
+      expandTreeNode(nodeId){
+        return new Promise((resolve,reject)=>{
+          this.getFormDataById(nodeId,this.dataSource)
+          let row = this.parentFormData
+          this.expandedRowKeys.push(nodeId)
+          let params = this.getQueryParams();//查询条件
+          params[this.pidField] = nodeId
+          getAction(this.url.childList,params).then((res)=>{
+            console.log("11111",res)
+            if(res.success){
+              if(res.result && res.result.length>0){
+                row.children = this.getDataByResult(res.result)
+                this.dataSource = [...this.dataSource]
+                resolve()
+              }else{
+                row.children=''
+                row.hasChildrenField='0'
+                reject()
+              }
+            }else{
+              reject()
+            }
+          })
+        })
+      },
+      getFormDataById(id,arr){
+        if(arr && arr.length>0){
+          for(let i=0;i<arr.length;i++){
+            if(arr[i].id==id){
+              this.parentFormData = arr[i]
+            }else{
+              this.getFormDataById(id,arr[i].children)
+            }
+          }
+        }
+      },
+      handleAddSub(record){
+        this.subExpandedKeys = [];
+        this.getExpandKeysByPid(record.id,this.dataSource,this.dataSource)
+        this.$refs.modalForm.subExpandedKeys = this.subExpandedKeys;
+        this.$refs.modalForm.title = "添加子分类";
+        this.$refs.modalForm.edit({'pid':record.id});
+        this.$refs.modalForm.disableSubmit = false;
+      },
+      handleDelete: function (record) {
+        let that = this;
+        deleteAction(that.url.delete, {id: record.id}).then((res) => {
+          if (res.success) {
+            if (record.pid && record.pid!='0') {
+              let formData = {pid: record.pid};
+              that.$message.success(res.message);
+              that.subExpandedKeys = [];
+              that.getExpandKeysByPid(record.pid, this.dataSource, this.dataSource)
+              that.addOk(formData, this.subExpandedKeys.reverse())
+            } else {
+              that.loadData();
+            }
+          } else {
+            that.$message.warning(res.message);
+          }
+        });
+      },
+      // 添加子分类时获取所有父级id
+      getExpandKeysByPid(pid,arr,all){
+        if(pid && arr && arr.length>0){
+          for(let i=0;i<arr.length;i++){
+            if(arr[i].id==pid){
+              this.subExpandedKeys.push(arr[i].id)
+              this.getExpandKeysByPid(arr[i]['pid'],all,all)
+            }else{
+              this.getExpandKeysByPid(pid,arr[i].children,all)
+            }
+          }
+        }
+      },
+      
+       
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/SysCheckRuleList.vue

@@ -0,0 +1,178 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="规则名称">
+              <a-input placeholder="请输入规则名称" v-model="queryParam.ruleName"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="规则Code">
+              <a-input placeholder="请输入规则Code" v-model="queryParam.ruleCode"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+          </template>
+          <a-col :md="6" :sm="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('编码校验规则')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <a-alert type="info" showIcon style="margin-bottom: 16px;">
+      <template slot="message">
+        <span>已选择</span>
+        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
+        <span>项</span>
+        <template v-if="selectedRowKeys.length>0">
+          <a-divider type="vertical"/>
+          <a @click="onClearSelected">清空</a>
+        </template>
+      </template>
+    </a-alert>
+
+    <a-table
+      ref="table"
+      size="middle"
+      bordered
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="ipagination"
+      :loading="loading"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      @change="handleTableChange">
+
+      <template slot="action" slot-scope="text, record">
+        <a @click="handleEdit(record)">编辑</a>
+        <a-divider type="vertical"/>
+        <a @click="handleTest(record)">功能测试</a>
+        <a-divider type="vertical"/>
+        <a-dropdown>
+          <a class="ant-dropdown-link">
+            <span>更多</span>
+            <a-icon type="down"/>
+          </a>
+          <a-menu slot="overlay">
+            <a-menu-item>
+              <a-popconfirm title="确定删除吗？" @confirm="handleDelete(record.id)">删除</a-popconfirm>
+            </a-menu-item>
+          </a-menu>
+        </a-dropdown>
+      </template>
+
+    </a-table>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <sys-check-rule-modal ref="modalForm" @ok="modalFormOk"/>
+
+    <sys-check-rule-test-modal ref="testModal"/>
+
+  </a-card>
+</template>
+
+<script>
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import SysCheckRuleModal from './modules/SysCheckRuleModal'
+  import SysCheckRuleTestModal from './modules/SysCheckRuleTestModal'
+
+  export default {
+    name: 'SysCheckRuleList',
+    mixins: [JeecgListMixin],
+    components: { SysCheckRuleModal, SysCheckRuleTestModal, JEllipsis },
+    data() {
+      return {
+        description: '编码校验规则管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            key: 'rowIndex',
+            width: 60,
+            align: 'center',
+            customRender: (t, r, i) => i + 1
+          },
+          {
+            title: '规则名称',
+            align: 'center',
+            dataIndex: 'ruleName'
+          },
+          {
+            title: '规则Code',
+            align: 'center',
+            dataIndex: 'ruleCode'
+          },
+          {
+            title: '规则描述',
+            align: 'center',
+            dataIndex: 'ruleDescription',
+            customRender: (t) => (<j-ellipsis value={t} length={48}/>)
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: 'center',
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: '/sys/checkRule/list',
+          delete: '/sys/checkRule/delete',
+          deleteBatch: '/sys/checkRule/deleteBatch',
+          exportXlsUrl: 'sys/checkRule/exportXls',
+          importExcelUrl: 'sys/checkRule/importExcel',
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+      }
+    },
+    methods: {
+      handleTest(record) {
+        this.$refs.testModal.open(record.ruleCode)
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jshERP-web/src/views/system/SysDataSourceList.vue

@@ -0,0 +1,188 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="数据源名称">
+              <a-input placeholder="请输入数据源名称" v-model="queryParam.name"/>
+            </a-form-item>
+          </a-col>
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="数据库类型">
+              <j-dict-select-tag v-model="queryParam.dbType" placeholder="请选择数据库类型" dict-code="database_type"/>
+            </a-form-item>
+          </a-col>
+
+          <a-col :md="6" :sm="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('多数据源管理')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+
+      <a-alert type="info" showIcon style="margin-bottom: 16px;">
+        <template slot="message">
+          <span>已选择</span>
+          <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
+          <span>项</span>
+          <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+        </template>
+      </a-alert>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <sys-data-source-modal ref="modalForm" @ok="modalFormOk"/>
+
+  </a-card>
+</template>
+
+<script>
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import SysDataSourceModal from './modules/SysDataSourceModal'
+
+  export default {
+    name: 'SysDataSourceList',
+    mixins: [JeecgListMixin],
+    components: { JEllipsis, SysDataSourceModal },
+    data() {
+      let ellipsis = (v, l = 20) => (<j-ellipsis value={v} length={l}/>)
+      return {
+        description: '多数据源管理管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 60,
+            align: 'center',
+            customRender: (t, r, index) => index + 1
+          },
+          {
+            title: '数据源编码',
+            align: 'center',
+            dataIndex: 'code'
+          },
+          {
+            title: '数据源名称',
+            align: 'center',
+            dataIndex: 'name'
+          },
+          {
+            title: '数据库类型',
+            align: 'center',
+            dataIndex: 'dbType_dictText'
+          },
+          {
+            title: '驱动类',
+            align: 'center',
+            dataIndex: 'dbDriver',
+            customRender: (t) => ellipsis(t)
+          },
+          {
+            title: '数据源地址',
+            align: 'center',
+            dataIndex: 'dbUrl',
+            customRender: (t) => ellipsis(t)
+          },
+          {
+            title: '数据库名称',
+            align: 'center',
+            dataIndex: 'dbName'
+          },
+          {
+            title: '用户名',
+            align: 'center',
+            dataIndex: 'dbUsername'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: 'center',
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: '/sys/dataSource/list',
+          delete: '/sys/dataSource/delete',
+          deleteBatch: '/sys/dataSource/deleteBatch',
+          exportXlsUrl: 'sys/dataSource/exportXls',
+          importExcelUrl: 'sys/dataSource/importExcel',
+        },
+      }
+    },
+    computed: {
+      importExcelUrl() {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+      }
+    },
+    methods: {}
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jshERP-web/src/views/system/SysFillRuleList.vue

@@ -0,0 +1,187 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="规则名称">
+              <a-input placeholder="请输入规则名称" v-model="queryParam.ruleName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="规则Code">
+              <a-input placeholder="请输入规则Code" v-model="queryParam.ruleCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('填值规则')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <a-alert type="info" showIcon style="margin-bottom: 16px;">
+      <template slot="message">
+        <span>已选择</span>
+        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
+        <span>项</span>
+        <template v-if="selectedRowKeys.length>0">
+          <a-divider type="vertical"/>
+          <a @click="onClearSelected">清空</a>
+        </template>
+      </template>
+    </a-alert>
+
+    <a-table
+      ref="table"
+      size="middle"
+      bordered
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="ipagination"
+      :loading="loading"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item @click="handleTest(record)">
+                功能测试
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+    </a-table>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <sys-fill-rule-modal ref="modalForm" @ok="modalFormOk"/>
+  </a-card>
+</template>
+
+<script>
+  import { getAction } from '@/api/manage'
+  import SysFillRuleModal from './modules/SysFillRuleModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'SysFillRuleList',
+    mixins: [JeecgListMixin],
+    components: { SysFillRuleModal },
+    data() {
+      return {
+        description: '填值规则管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 60,
+            align: 'center',
+            customRender: (t, r, index) => 1 + index
+          },
+          {
+            title: '规则名称',
+            align: 'center',
+            dataIndex: 'ruleName'
+          },
+          {
+            title: '规则Code',
+            align: 'center',
+            dataIndex: 'ruleCode'
+          },
+          {
+            title: '规则实现类',
+            align: 'center',
+            dataIndex: 'ruleClass'
+          },
+          {
+            title: '规则参数',
+            align: 'center',
+            dataIndex: 'ruleParams'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: 'center',
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: '/sys/fillRule/list',
+          test: '/sys/fillRule/testFillRule',
+          delete: '/sys/fillRule/delete',
+          deleteBatch: '/sys/fillRule/deleteBatch',
+          exportXlsUrl: '/sys/fillRule/exportXls',
+          importExcelUrl: '/sys/fillRule/importExcel',
+        },
+      }
+    },
+    computed: {
+      importExcelUrl() {
+        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`
+      }
+    },
+    methods: {
+      handleTest(record) {
+        let closeLoading = this.$message.loading('生成中...', 0)
+
+        getAction(this.url.test, {
+          ruleCode: record.ruleCode
+        }).then(res => {
+          if (res.success) {
+            this.$info({
+              title: '填值规则功能测试',
+              content: '生成结果：' + res.result
+            })
+          } else {
+            this.$message.warn(res.message)
+          }
+        }).finally(() => {
+          closeLoading()
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/SysPositionList.vue

@@ -0,0 +1,178 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="职务编码">
+              <a-input placeholder="请输入职务编码" v-model="queryParam.code"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="职务名称">
+              <a-input placeholder="请输入职务名称" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <a-form-item label="职级">
+                <j-dict-select-tag v-model="queryParam.postRank" placeholder="请选择职级" dictCode="position_rank"/>
+              </a-form-item>
+            </a-col>
+
+          </template>
+          <a-col :md="6" :sm="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('职务表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <sysPosition-modal ref="modalForm" @ok="modalFormOk"></sysPosition-modal>
+  </a-card>
+</template>
+
+<script>
+  import SysPositionModal from './modules/SysPositionModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDictSelectTag from '@/components/dict/JDictSelectTag'
+
+  export default {
+    name: 'SysPositionList',
+    mixins: [JeecgListMixin],
+    components: {
+      SysPositionModal,
+      JDictSelectTag
+    },
+    data() {
+      return {
+        description: '职务表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 60,
+            align: 'center',
+            customRender: function (t, r, index) {
+              return parseInt(index) + 1
+            }
+          },
+          {
+            title: '职务编码',
+            align: 'center',
+            dataIndex: 'code'
+          },
+          {
+            title: '职务名称',
+            align: 'center',
+            dataIndex: 'name'
+          },
+          {
+            title: '职级',
+            align: 'center',
+            dataIndex: 'postRank_dictText'
+          },
+          // {
+          //   title: '公司id',
+          //   align: 'center',
+          //   dataIndex: 'companyId'
+          // },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: 'center',
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: '/sys/position/list',
+          delete: '/sys/position/delete',
+          deleteBatch: '/sys/position/deleteBatch',
+          exportXlsUrl: '/sys/position/exportXls',
+          importExcelUrl: '/sys/position/importExcel',
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/SystemConfigList.vue

@@ -0,0 +1,133 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="公司名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入公司名称查询" v-model="queryParam.companyName"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+        </span>
+        <!-- 状态渲染模板 -->
+        <template slot="customRenderFlag" slot-scope="flag">
+          <a-tag v-if="flag==1" color="green">启用</a-tag>
+          <a-tag v-if="flag==0" color="orange">关闭</a-tag>
+        </template>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <systemConfig-modal ref="modalForm" @ok="modalFormOk"></systemConfig-modal>
+  </a-card>
+</template>
+<script>
+  import SystemConfigModal from './modules/SystemConfigModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDate from '@/components/jeecg/JDate'
+  export default {
+    name: "SystemConfigList",
+    mixins:[JeecgListMixin],
+    components: {
+      SystemConfigModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {companyName:'',},
+        // 表头
+        columns: [
+          {
+            title: '#', dataIndex: '', key:'rowIndex', width:40, align:"center",
+            customRender:function (text,record,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {title: '公司名称', dataIndex: 'companyName', width: 150},
+          {title: '联系人', dataIndex: 'companyContacts', width: 80, align: "center"},
+          {title: '公司地址', dataIndex: 'companyAddress', width: 150, align: "center"},
+          {title: '公司电话', dataIndex: 'companyTel', width: 120, align: "center"},
+          {title: '公司传真', dataIndex: 'companyFax', width: 120, align: "center"},
+          {title: '公司邮编', dataIndex: 'companyPostCode', width: 80, align: "center"},
+          {
+            title: '仓库权限', dataIndex: 'depotFlag', width: 80, align: "center",
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
+          {
+            title: '客户权限', dataIndex: 'customerFlag', width: 80, align: "center",
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
+          {
+            title: '负库存', dataIndex: 'minusStockFlag', width: 80, align: "center",
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
+          {title: '操作', dataIndex: 'action', align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/systemConfig/list",
+          delete: "/systemConfig/delete",
+          deleteBatch: "/systemConfig/deleteBatch"
+        },
+      }
+    },
+    computed: {
+    },
+    methods: {
+      myHandleAdd() {
+        if(this.ipagination.total>=1) {
+          this.$message.warning('抱歉，只能填写一条系统配置信息！');
+        } else {
+          this.handleAdd()
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/UnitList.vue

@@ -0,0 +1,116 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="计量单位" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入计量单位查询" v-model="queryParam.name"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <unit-modal ref="modalForm" @ok="modalFormOk"></unit-modal>
+  </a-card>
+</template>
+<script>
+  import UnitModal from './modules/UnitModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDate from '@/components/jeecg/JDate'
+  export default {
+    name: "UnitList",
+    mixins:[JeecgListMixin],
+    components: {
+      UnitModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {name:'',type:''},
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:40,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          { title: '计量单位', align:"center", dataIndex: 'name' },
+          { title: '基本单位', align:"center", dataIndex: 'basicUnit' },
+          { title: '副单位', align:"center", dataIndex: 'otherUnit' },
+          { title: '比例', align:"center", dataIndex: 'ratio' },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/unit/list",
+          delete: "/unit/delete",
+          deleteBatch: "/unit/deleteBatch"
+        }
+      }
+    },
+    computed: {
+
+    },
+    methods: {
+
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/UserAnnouncementList.vue

@@ -0,0 +1,192 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :span="6">
+            <a-form-item label="标题">
+              <a-input placeholder="请输入标题" v-model="queryParam.titile"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="发布人">
+              <a-input placeholder="请输入发布人" v-model="queryParam.sender"></a-input>
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <div class="table-operator">
+      <a-button type="primary" @click="readAll" icon="book">全部标注已读</a-button>
+    </div>
+
+    <a-table
+      ref="table"
+      size="default"
+      bordered
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="ipagination"
+      :loading="loading"
+      @change="handleTableChange">
+      <span slot="action" slot-scope="text, record">
+        <a @click="showAnnouncement(record)">查看</a>
+      </span>
+    </a-table>
+    <show-announcement ref="ShowAnnouncement"></show-announcement>
+    <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>
+  </a-card>
+</template>
+
+<script>
+  import { filterObj } from '@/utils/util'
+  import { getAction,putAction } from '@/api/manage'
+  import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import DynamicNotice from '../../components/tools/DynamicNotice'
+
+  export default {
+    name: "UserAnnouncementList",
+    mixins: [JeecgListMixin],
+    components: {
+      DynamicNotice,
+      ShowAnnouncement
+    },
+    data () {
+      return {
+        description: '系统通告表管理页面',
+        queryParam: {},
+        columns: [{
+          title: '标题',
+          align:"center",
+          dataIndex: 'titile'
+        },{
+          title: '消息类型',
+          align: "center",
+          dataIndex: 'msgCategory',
+          customRender: function (text) {
+            if (text == '1') {
+              return "通知公告";
+            } else if (text == "2") {
+              return "系统消息";
+            } else {
+              return text;
+            }
+          }
+        },{
+          title: '发布人',
+          align:"center",
+          dataIndex: 'sender'
+        },{
+          title: '发布时间',
+          align:"center",
+          dataIndex: 'sendTime'
+        },{
+          title: '优先级',
+          align:"center",
+          dataIndex: 'priority',
+          customRender:function (text) {
+            if(text=='L'){
+              return "低";
+            }else if(text=="M"){
+              return "中";
+            }else if(text=="H"){
+              return "高";
+            } else {
+              return text;
+            }
+          }
+        },{
+          title: '阅读状态',
+          align:"center",
+          dataIndex: 'readFlag',
+          customRender:function (text) {
+            if(text=='0'){
+              return "未读";
+            }else if(text=="1"){
+              return "已读";
+            } else {
+              return text;
+            }
+          }
+        },{
+          title: '操作',
+          dataIndex: 'action',
+          align:"center",
+          scopedSlots: { customRender: 'action' },
+        }],
+		    url: {
+          list: "/sys/sysAnnouncementSend/getMyAnnouncementSend",
+          editCementSend:"sys/sysAnnouncementSend/editByAnntIdAndUserId",
+          readAllMsg:"sys/sysAnnouncementSend/readAll",
+        },
+        loading:false,
+        openPath:'',
+        formData:''
+      }
+    },
+    methods: {
+      handleDetail: function(record){
+        this.$refs.sysAnnouncementModal.detail(record);
+        this.$refs.sysAnnouncementModal.title="查看";
+      },
+      showAnnouncement(record){
+        putAction(this.url.editCementSend,{anntId:record.anntId}).then((res)=>{
+          if(res.success){
+            this.loadData();
+            this.syncHeadNotic(record.anntId)
+          }
+        });
+        if(record.openType==='component'){
+          this.openPath = record.openPage;
+          this.formData = {id:record.busId};
+          this.$refs.showDynamNotice.detail();
+        }else{
+          this.$refs.ShowAnnouncement.detail(record);
+        }
+      },
+      syncHeadNotic(anntId){
+        getAction("sys/annountCement/syncNotic",{anntId:anntId})
+      },
+      readAll(){
+        var that = this;
+        that.$confirm({
+          title:"确认操作",
+          content:"是否全部标注已读?",
+          onOk: function(){
+            putAction(that.url.readAllMsg).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.loadData();
+                that.syncHeadNotic();
+              }
+            });
+          }
+        });
+      },
+    }
+  }
+</script>
+<style scoped>
+  .ant-card-body .table-operator{
+    margin-bottom: 18px;
+  }
+  .anty-row-operator button{margin: 0 5px}
+  .ant-btn-danger{background-color: #ffffff}z
+
+  .ant-modal-cust-warp{height: 100%}
+  .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+  .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>

jshERP-web/src/views/system/UserList.vue

@@ -0,0 +1,222 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="12">
+            <a-form-item label="登录名称">
+              <a-input placeholder="输入登录名称模糊查询" v-model="queryParam.loginName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="用户姓名">
+              <a-input placeholder="输入用户姓名模糊查询" v-model="queryParam.userName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator" style="border-top: 5px">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay" @click="handleMenuClick">
+          <a-menu-item key="1">
+            <a-icon type="delete" @click="batchDel"/>
+            删除
+          </a-menu-item>
+          <a-menu-item key="2">
+            <a-icon type="lock" @click="batchFrozen('2')"/>
+            冻结
+          </a-menu-item>
+          <a-menu-item key="3">
+            <a-icon type="unlock" @click="batchFrozen('1')"/>
+            解冻
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        bordered
+        size="middle"
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <template slot="avatarslot" slot-scope="text, record, index">
+          <div class="anty-img-wrap">
+            <a-avatar shape="square" :src="getAvatarView(record.avatar)" icon="user"/>
+          </div>
+        </template>
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical"/>
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+          <a-divider type="vertical"/>
+          <a-popconfirm title="确定重置密码为123456吗?" @confirm="() => handleReset(record.id)">
+            <a>重置密码</a>
+          </a-popconfirm>
+        </span>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <user-modal ref="modalForm" @ok="modalFormOk"></user-modal>
+    <password-modal ref="passwordmodal" @ok="passwordModalOk"></password-modal>
+    <sys-user-agent-modal ref="sysUserAgentModal"></sys-user-agent-modal>
+    <!-- 用户回收站 -->
+    <user-recycle-bin-modal :visible.sync="recycleBinVisible" @ok="modalFormOk"/>
+  </a-card>
+</template>
+
+<script>
+  import UserModal from './modules/UserModal'
+  import PasswordModal from './modules/PasswordModal'
+  import {postAction,getFileAccessHttpUrl} from '@/api/manage';
+  import {frozenBatch} from '@/api/api'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import SysUserAgentModal from "./modules/SysUserAgentModal";
+  import JInput from '@/components/jeecg/JInput'
+  import UserRecycleBinModal from './modules/UserRecycleBinModal'
+  export default {
+    name: "UserList",
+    mixins: [JeecgListMixin],
+    components: {
+      SysUserAgentModal,
+      UserModal,
+      PasswordModal,
+      JInput,
+      UserRecycleBinModal
+    },
+    data() {
+      return {
+        description: '这是用户管理页面',
+        queryParam: {},
+        recycleBinVisible: false,
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:40,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          { title: '登录名称', dataIndex: 'loginName', width: 100, align: "center"},
+          { title: '用户姓名', dataIndex: 'username', width: 100, align: "center"},
+          { title: '用户类型', dataIndex: 'userType', width: 80, align: "center" },
+          { title: '角色', dataIndex: 'roleName', width: 100, align: "center"},
+          { title: '机构', dataIndex: 'orgAbr', width: 115, align: "center"},
+          { title: '职位', dataIndex: 'position', width: 115, align: "center"},
+          { title: '电话号码', dataIndex: 'phonenum', width: 150, align: "center"},
+          { title: '电子邮箱', dataIndex: 'email', width: 150, align: "center"},
+          { title: '排序', dataIndex: 'userBlngOrgaDsplSeq', width: 60, align: "center"},
+          {
+            title: '操作',
+            dataIndex: 'action',
+            scopedSlots: {customRender: 'action'},
+            align: "center",
+            width: 170
+          }
+        ],
+        url: {
+          list: "/user/list",
+          delete: "/user/delete",
+          deleteBatch: "/user/deleteBatch",
+          resetPwd: "/user/resetPwd"
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {
+      getAvatarView: function (avatar) {
+        return getFileAccessHttpUrl(avatar)
+      },
+      batchFrozen: function (status) {
+        if (this.selectedRowKeys.length <= 0) {
+          this.$message.warning('请选择一条记录！');
+          return false;
+        } else {
+          let ids = "";
+          let that = this;
+          let isAdmin = false;
+          that.selectionRows.forEach(function (row) {
+            if (row.username == 'admin') {
+              isAdmin = true;
+            }
+          });
+          if (isAdmin) {
+            that.$message.warning('管理员账号不允许此操作,请重新选择！');
+            return;
+          }
+          that.selectedRowKeys.forEach(function (val) {
+            ids += val + ",";
+          });
+          that.$confirm({
+            title: "确认操作",
+            content: "是否" + (status == 1 ? "解冻" : "冻结") + "选中账号?",
+            onOk: function () {
+              frozenBatch({ids: ids, status: status}).then((res) => {
+                if (res.success) {
+                  that.$message.success(res.message);
+                  that.loadData();
+                  that.onClearSelected();
+                } else {
+                  that.$message.warning(res.message);
+                }
+              });
+            }
+          });
+        }
+      },
+      handleMenuClick(e) {
+        if (e.key == 1) {
+          this.batchDel();
+        } else if (e.key == 2) {
+          this.batchFrozen(2);
+        } else if (e.key == 3) {
+          this.batchFrozen(1);
+        }
+      },
+      handleReset(id) {
+        let that = this;
+        postAction(that.url.resetPwd, {id: id}).then((res) => {
+          if(res.code === 200){
+            that.$message.info('重置密码成功！');
+            that.loadData();
+          } else {
+            that.$message.warning(res.data.message);
+          }
+        })
+      }
+    }
+
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/VendorList.vue

@@ -0,0 +1,166 @@
+<template>
+  <a-card :bordered="false" class="card-area">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="5" :sm="10">
+            <a-form-item label="名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入名称查询" v-model="queryParam.supplier"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="10">
+            <a-form-item label="手机号码" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入手机号码查询" v-model="queryParam.telephone"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="10">
+            <a-form-item label="联系电话" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-input placeholder="请输入联系电话查询" v-model="queryParam.phonenum"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery">查询</a-button>
+              <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator"  style="margin-top: 5px">
+      <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-popover title="导入注意点">
+          <template slot="content">
+            <p>预收款、期初应收、期初应付、税率均为数值且要大于0；<br/>另外期初应收、期初应付不能同时输入</p>
+          </template>
+          <a-button type="primary" icon="import">导入</a-button>
+        </a-popover>
+      </a-upload>
+      <a-button type="primary" icon="download" @click="handleExportXls('供应商信息')">导出</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+          <a-menu-item key="2" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
+          <a-menu-item key="3" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作 <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+        <!-- 状态渲染模板 -->
+        <template slot="customRenderFlag" slot-scope="enabled">
+          <a-tag v-if="enabled" color="green">启用</a-tag>
+          <a-tag v-if="!enabled" color="orange">禁用</a-tag>
+        </template>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <vendor-modal ref="modalForm" @ok="modalFormOk"></vendor-modal>
+  </a-card>
+</template>
+<script>
+  import VendorModal from './modules/VendorModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JDate from '@/components/jeecg/JDate'
+  export default {
+    name: "VendorList",
+    mixins:[JeecgListMixin],
+    components: {
+      VendorModal,
+      JDate
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {
+          supplier:'',
+          type:'供应商',
+          telephone:'',
+          phonenum:''
+        },
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          { title: '名称',dataIndex: 'supplier',width:150},
+          { title: '联系人', dataIndex: 'contacts',width:70,align:"center"},
+          { title: '手机号码', dataIndex: 'telephone',width:110,align:"center"},
+          { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"},
+          { title: '预付款',dataIndex: 'advanceIn',width:70,align:"center"},
+          { title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"center"},
+          { title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"center"},
+          { title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"center"},
+          { title: '期末应付',dataIndex: 'allNeedPay',width:80,align:"center"},
+          { title: '税率(%)', dataIndex: 'taxRate',width:80,align:"center"},
+          { title: '状态',dataIndex: 'enabled',width:70,align:"center",
+            scopedSlots: { customRender: 'customRenderFlag' }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/supplier/list",
+          delete: "/supplier/delete",
+          deleteBatch: "/supplier/deleteBatch",
+          importExcelUrl: "/supplier/importExcel",
+          exportXlsUrl: "/supplier/exportExcel",
+          batchSetStatusUrl: "/supplier/batchSetStatus"
+        }
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {
+      searchReset() {
+        this.queryParam = {
+          type:'供应商',
+        }
+        this.loadData(1);
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/modules/AccountModal.vue

@@ -0,0 +1,138 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:15%;height: 80%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
+          <a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
+          <a-input placeholder="请输入编号" v-decorator.trim="[ 'serialNo', validatorRules.serialNo]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初金额">
+          <a-input placeholder="请输入期初金额" v-decorator.trim="[ 'initialAmount' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="当前余额">
+          <a-input placeholder="请输入当前余额" :read-only="true" v-decorator.trim="[ 'currentAmount' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+          <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addAccount,editAccount,checkAccount } from '@/api/api'
+  export default {
+    name: "AccountModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          name:{
+            rules: [
+              { required: true, message: '请输入名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validateAccountName}
+            ]},
+          serialNo:{
+            rules: [
+              { required: true, message: '请输入编号!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
+            ]
+          }
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'name', 'serialNo', 'initialAmount', 'currentAmount', 'remark'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=addAccount(formData);
+            }else{
+              obj=editAccount(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateAccountName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkAccount(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/AddressListLeft.vue

@@ -0,0 +1,99 @@
+<template>
+  <a-card :loading="cardLoading" :bordered="false" style="height: 100%;">
+    <a-spin :spinning="loading">
+      <a-input-search @search="handleSearch" style="width:100%;margin-top: 10px" placeholder="输入机构名称查询..." enterButton />
+
+      <a-tree
+        showLine
+        checkStrictly
+        :expandedKeys.sync="expandedKeys"
+        :selectedKeys="selectedKeys"
+        :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+        :treeData="treeDataSource"
+        @select="handleTreeSelect"
+      />
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+  import { queryDepartTreeList, searchByKeywords } from '@/api/api'
+
+  export default {
+    name: 'AddressListLeft',
+    props: ['value'],
+    data() {
+      return {
+        cardLoading: true,
+        loading: false,
+        treeDataSource: [],
+        selectedKeys: [],
+        expandedKeys: []
+      }
+    },
+    created() {
+      this.queryTreeData()
+    },
+    methods: {
+
+      queryTreeData(keyword) {
+        this.commonRequestThen(queryDepartTreeList({
+          departName: keyword ? keyword : undefined
+        }))
+      },
+
+      handleSearch(value) {
+        if (value) {
+          this.commonRequestThen(searchByKeywords({ keyWord: value }))
+        } else {
+          this.queryTreeData()
+        }
+      },
+
+      handleTreeSelect(selectedKeys, event) {
+        if (selectedKeys.length > 0 && this.selectedKeys[0] !== selectedKeys[0]) {
+          this.selectedKeys = [selectedKeys[0]]
+          let orgCode = event.node.dataRef.orgCode
+          this.emitInput(orgCode)
+        }
+      },
+
+      emitInput(orgCode) {
+        this.$emit('input', orgCode)
+      },
+
+      commonRequestThen(promise) {
+        this.loading = true
+        promise.then(res => {
+          if (res.success) {
+            this.treeDataSource = res.result
+            // update-begin- --- author:wangshuai ------ date:20200102 ---- for:去除默认选中第一条数据、默认展开所有第一级
+            // 默认选中第一条数据、默认展开所有第一级
+            // if (res.result.length > 0) {
+            //   this.expandedKeys = []
+            //   res.result.forEach((item, index) => {
+            //     if (index === 0) {
+            //       this.selectedKeys = [item.id]
+            //       this.emitInput(item.orgCode)
+            //     }
+            //     this.expandedKeys.push(item.id)
+            //   })
+            // }
+           // update-end- --- author:wangshuai ------ date:20200102 ---- for:去除默认选中第一条数据、默认展开所有第一级
+          } else {
+            this.$message.warn(res.message)
+            console.error('组织机构查询失败:', res)
+          }
+        }).finally(() => {
+          this.loading = false
+          this.cardLoading = false
+        })
+      },
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/AddressListRight.vue

@@ -0,0 +1,211 @@
+<template>
+  <a-card class="j-address-list-right-card-box" :loading="cardLoading" :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="10">
+
+          <a-col :md="6" :sm="12">
+            <a-form-item label="姓名" style="margin-left:8px">
+              <a-input placeholder="请输入姓名查询" v-model="queryParam.realname"></a-input>
+            </a-form-item>
+          </a-col>
+
+
+          <a-col :md="6" :sm="12">
+            <a-form-item label="工号" style="margin-left:8px">
+              <a-input placeholder="请输入工号查询" v-model="queryParam.workNo"></a-input>
+            </a-form-item>
+          </a-col>
+
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+
+    <a-table
+      ref="table"
+      size="middle"
+      bordered
+      rowKey="userId"
+      :pagination="ipagination"
+      :columns="columns"
+      :dataSource="dataSource"
+      :loading="loading"
+      @change="handleTableChange">
+    </a-table>
+
+  </a-card>
+</template>
+
+<script>
+  import { getAction } from '@/api/manage'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'AddressListRight',
+    mixins: [JeecgListMixin],
+    components: {},
+    props: ['value'],
+    data() {
+      return {
+        description: '用户信息',
+        cardLoading: true,
+        positionInfo: {},
+        columns: [
+          {
+            title: '#',
+            key: 'rowIndex',
+            dataIndex: '',
+            width: 60,
+            align: 'center',
+            customRender: (t, r, i) => parseInt(i) + 1
+          },
+          {
+            title: '姓名',
+            width: '15%',
+            align: 'center',
+            dataIndex: 'realname'
+          },
+          {
+            title: '工号',
+            width: '15%',
+            align: 'center',
+            dataIndex: 'workNo'
+          },
+          {
+            title: '部门',
+            width: '20%',
+            align: 'center',
+            dataIndex: 'departName'
+          },
+          {
+            title: '职务',
+            width: '15%',
+            align: 'center',
+            dataIndex: 'post',
+            customRender: (text) => (text || '').split(',').map(t => this.positionInfo[t] ? this.positionInfo[t] : t).join(',')
+          },
+          {
+            title: '手机',
+            width: '15%',
+            align: 'center',
+            dataIndex: 'telephone'
+          },
+          // {
+          //   title: '手机号',
+          //   width: '12%',
+          //   align: 'center',
+          //   dataIndex: 'phone'
+          // },
+          {
+            title: '公司邮箱',
+            width: '15%',
+            align: 'center',
+            dataIndex: 'email'
+          }
+        ],
+        url: {
+          list: '/sys/user/queryByOrgCodeForAddressList',
+          listByPosition: '/sys/position/list'
+        }
+      }
+    },
+    watch: {
+      value: {
+        immediate: true,
+        handler(orgCode) {
+          this.dataSource = []
+          this.loadData(1, orgCode)
+        }
+      },
+    },
+    created() {
+      this.queryPositionInfo()
+    },
+    methods: {
+
+      loadData(pageNum, orgCode) {
+        this.loading = true
+        if (pageNum === 1) {
+            this.ipagination.current = 1
+        }
+        // update-begin- --- author:wangshuai ------ date:20200102 ---- for:传过来的部门编码为空全查
+        if (!orgCode) {
+            getAction(this.url.list, {
+                ...this.getQueryParams()
+            }).then((res) => {
+                if (res.success) {
+                    this.dataSource = res.result.records
+                    this.ipagination.total = res.result.total
+                }
+            }).finally(() => {
+                this.loading = false
+                this.cardLoading = false
+            })
+          // update-end- --- author:wangshuai ------ date:20200102 ---- for:传过来的部门编码为空全查
+        }else{
+        //加载数据 若传入参数1则加载第一页的内容
+        getAction(this.url.list, {
+          orgCode,
+          ...this.getQueryParams()
+        }).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records
+            this.ipagination.total = res.result.total
+          }
+        }).finally(() => {
+          this.loading = false
+          this.cardLoading = false
+        })
+        }
+      },
+
+      searchQuery() {
+        this.loadData(1, this.value)
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.loadData(1, this.value)
+      },
+
+      handleTableChange(pagination, filters, sorter) {
+        if (Object.keys(sorter).length > 0) {
+          this.isorter.column = sorter.field
+          this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
+        }
+        this.ipagination = pagination
+        this.loadData(null, this.value)
+      },
+
+      // 查询职务信息
+      queryPositionInfo() {
+        getAction(this.url.listByPosition, { pageSize: 99999 }).then(res => {
+          if (res.success) {
+            let positionInfo = {}
+            res.result.records.forEach(record => {
+              positionInfo[record['code']] = record['name']
+            })
+            this.positionInfo = positionInfo
+          }
+        })
+      }
+
+    }
+  }
+</script>
+<style>
+  .j-address-list-right-card-box .ant-table-placeholder {
+    min-height: 46px;
+  }
+</style>
+<style scoped>
+  .j-address-list-right-card-box {
+    height: 100%;
+    min-height: 300px;
+  }
+</style>

jshERP-web/src/views/system/modules/CustomerModal.vue

@@ -0,0 +1,206 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
+            <a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
+            <a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
+            <a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
+            <a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
+            <a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真">
+            <a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应收">
+            <a-input placeholder="请输入期初应收" v-decorator.trim="[ 'beginNeedGet' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应付">
+            <a-input placeholder="请输入期初应付" v-decorator.trim="[ 'beginNeedPay' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应收">
+            <a-input v-decorator.trim="[ 'AllNeedGet' ]" :readOnly="true" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应付">
+            <a-input v-decorator.trim="[ 'AllNeedPay' ]" :readOnly="true" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号">
+            <a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)">
+            <a-input placeholder="请输入税率(%)" v-decorator.trim="[ 'taxRate' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行">
+            <a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号">
+            <a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
+            <a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+            <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
+          </a-form-item>
+        </a-col>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addSupplier,editSupplier,checkSupplier } from '@/api/api'
+  export default {
+    name: "CustomerModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 6 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          supplier:{
+            rules: [
+              { required: true, message: '请输入名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validateSupplierName}
+            ]
+          }
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone',
+            'phoneNum', 'fax', 'beginNeedGet', 'beginNeedPay', 'AllNeedGet', 'AllNeedPay', 'taxNum', 'taxRate',
+            'bankName', 'accountNumber', 'address', 'description'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            if(this.model.beginNeedGet && this.model.beginNeedPay) {
+              that.$message.warn("期初应收和期初应付不能同时输入");
+              that.confirmLoading = false;
+              return;
+            }
+            formData.type = "客户";
+            let obj;
+            if(!this.model.id){
+              obj=addSupplier(formData);
+            }else{
+              obj=editSupplier(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateSupplierName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkSupplier(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/DataLogCompareModal.vue

@@ -0,0 +1,163 @@
+<template>
+  <a-modal
+    :width="modalWidth"
+    :visible="visible"
+    :footer="null"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <!--table区 -->
+    <div class="marginCss">
+      <a-table
+        ref="table"
+        size="small"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :rowClassName="setdataCss"
+        :loading="loading"
+        :scroll="{ y: 700 }"
+        :pagination="false">
+        <span slot="dataVersionTitle1"><a-icon type="smile-o" /> 版本:{{dataVersion1Num}}</span>
+        <span slot="dataVersionTitle2"><a-icon type="smile-o" /> 版本:{{dataVersion2Num}}</span>
+        <template slot="avatarslot" slot-scope="text, record">
+          <div class="anty-img-wrap">
+            <img :src="getAvatarView(record)"/>
+          </div>
+
+        </template>
+      </a-table>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+  import {getAction} from '@/api/manage'
+
+  export default {
+    name: 'DataLogCompareModal',
+    data() {
+      return {
+        modalWidth: 1000,
+        modaltoggleFlag: true,
+        confirmDirty: false,
+        title: '操作',
+        visible: false,
+        model: {},
+        confirmLoading: false,
+        headers: {},
+        //版本号
+        dataVersion1Num:'',
+        dataVersion2Num:'',
+        //表头
+        columns: [
+          {
+            title: '字段名',
+            align: 'left',
+            dataIndex: 'code',
+            width: '30%',
+          }, {
+            align: 'left',
+            dataIndex: 'dataVersion1',
+            width: '30%',
+            slots: { title: 'dataVersionTitle1' },
+          }, {
+            title: '',
+            dataIndex: 'imgshow',
+            align: 'center',
+            scopedSlots: {customRender: "avatarslot"},
+            width: '10%',
+          }, {
+            align: 'left',
+            dataIndex: 'dataVersion2',
+            width: '30%',
+            slots: { title: 'dataVersionTitle2' },
+          }
+        ],
+        //数据集
+        dataSource: [],
+        loading: false,
+        url: {
+          queryCompareUrl: "/sys/dataLog/queryCompareList",
+        },
+      }
+    },
+    created() {
+
+    },
+    methods: {
+      loadData(dataId1, dataId2) {
+        this.dataSource = [];
+        let that = this;
+        getAction(that.url.queryCompareUrl, {dataId1: dataId1, dataId2: dataId2}).then((res) => {
+          if (res.success) {
+            that.dataVersion1Num = res.result[0].dataVersion;
+            that.dataVersion2Num = res.result[1].dataVersion;
+            let json1 = JSON.parse(res.result[0].dataContent);
+            let json2 = JSON.parse(res.result[1].dataContent);
+            for (var item1 in json1) {
+              for (var item2 in json2) {
+                if (item1 == item2) {
+                  this.dataSource.push({
+                    code: item1,
+                    imgshow: '',
+                    dataVersion1: json1[item1],
+                    dataVersion2: json2[item2],
+                  })
+                }
+              }
+            }
+          } else {
+            console.log(res.message);
+          }
+        })
+      },
+      compareModal(dataId1, dataId2) {
+        this.visible = true
+        this.loadData(dataId1, dataId2);
+      },
+      handleCancel() {
+        this.close()
+      },
+      modalFormOk() {
+      },
+      close() {
+        this.$emit('close');
+        this.visible = false;
+        this.disableSubmit = false;
+      },
+      setdataCss(record) {
+        let className = 'trcolor';
+        const dataVersion1 = record.dataVersion1;
+        const dataVersion2 = record.dataVersion2;
+        if (dataVersion1 != dataVersion2) {
+          return className;
+        }
+      },
+      getAvatarView: function (avatar) {
+        if (avatar.dataVersion1 != avatar.dataVersion2) {
+          return "/goright.png";
+        } else {
+          return "";
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .anty-img-wrap {
+    height: 25px;
+    position: relative;
+  }
+
+  .anty-img-wrap > img {
+    max-height: 100%;
+  }
+
+  .marginCss {
+    margin-top: 20px;
+  }
+
+  @import '../../../assets/less/index.less';
+</style>

jshERP-web/src/views/system/modules/DataLogModal.vue

@@ -0,0 +1,153 @@
+<template>
+  <div>
+    <a-modal
+      :width="modalWidth"
+      :visible="visible"
+      title="数据对比窗口"
+      :confirmLoading="confirmLoading"
+      @ok="handleOk"
+      @cancel="handleCancel"
+      cancelText="取消">
+
+      <a-spin :spinning="confirmLoading">
+        <a-form @submit="handleSubmit" :form="form" class="form">
+          <a-row class="form-row" :gutter="24">
+            <a-col :md="12" :sm="8">
+              <a-form-item label="数据库表名"  :label-col="{ span: 6 }" :wrapper-col="{ span: 15 }">
+                <a-input placeholder="请输入数据库表名" v-decorator="[ 'dataTale', {}]" @blur="handleTableBlur" disabled/>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="12" :sm="8">
+              <a-form-item label="数据ID"  :label-col="{ span: 5 }" :wrapper-col="{ span: 15 }">
+                <a-input placeholder="请输入数据ID" v-decorator="[ 'dataId', {}]" @blur="handleIdBlur" disabled/>
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+          <a-row class="form-row" :gutter="24">
+            <a-col :md="12" :sm="8">
+              <a-form-item label="版本号1"  :label-col="{ span: 6 }" :wrapper-col="{ span: 15 }">
+                <a-select placeholder="请选择版本号" v-decorator="[ 'dataVersion1', {}]" @change="handleChange1">
+                  <a-select-option v-for="(log,logindex) in DataVersionList" :key="logindex.toString()" :value="log.id">
+                    {{ log.dataVersion }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="8">
+              <a-form-item label="版本号2"  :label-col="{ span: 5 }" :wrapper-col="{ span: 15 }">
+                <a-select placeholder="请选择版本号" v-decorator="[ 'dataVersion2', {}]" @change="handleChange2">
+                  <a-select-option v-for="(log,logindex) in DataVersionList" :key="logindex.toString()" :value="log.id">
+                    {{ log.dataVersion }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </a-spin>
+      <data-log-compare-modal ref="modal" @ok="modalFormOk" ></data-log-compare-modal>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+  import { getAction } from '@/api/manage'
+  import DataLogCompareModal from './DataLogCompareModal'
+  export default {
+    name: 'DataLogModal',
+    components: { DataLogCompareModal },
+    dataId1:'',
+    dataId2: '',
+    dataTable1:'',
+    dataID3:'',
+
+    data () {
+      return {
+        modalWidth:700,
+        modaltoggleFlag:true,
+        confirmDirty: false,
+        title:"操作",
+        visible: false,
+        model: {},
+        confirmLoading: false,
+        headers:{},
+        form:this.$form.createForm(this),
+        url: {
+          queryDataVerListUrl:"/sys/dataLog/queryDataVerList",
+        },
+        DataVersionList:[],
+      }
+    },
+    created () {
+    },
+    methods: {
+      addModal(records){
+        const dataTable = records[0].dataTable
+        const dataId = records[0].dataId;
+        const dataVersion1 = records[0].dataVersion;
+        const dataVersion2 = records[1].dataVersion;
+        this.dataId1 = records[0].id;
+        this.dataId2 = records[1].id;
+        this.dataTable1 = records[0].dataTable
+        this.dataID3 =  records[0].dataId
+        this.initDataVersionList();
+        this.form.resetFields();
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue({dataTale:dataTable,dataId:dataId,dataVersion1:dataVersion1,dataVersion2:dataVersion2});
+        });
+      },
+      handleOk () {
+        this.close();
+        this.$refs.modal.compareModal(this.dataId1  ,this.dataId2);
+        this.$refs.modal.title="数据比较";
+      },
+      handleCancel(){
+        this.close()
+      },
+      handleSubmit(){
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+        this.disableSubmit = false;
+      },
+      modalFormOk () {
+      },
+      initDataVersionList(){
+        let that = this;
+        getAction(that.url.queryDataVerListUrl,{dataTable:this.dataTable1,dataId:this.dataID3}).then((res)=>{
+          if(res.success){
+            this.DataVersionList = res.result;
+          }else{
+            this.DataVersionList=[];
+            this.dataId1 = '',
+            this.dataId2='',
+            console.log(res.message);
+
+          }
+        });
+      },
+      handleChange1(value) {
+        this.dataId1 = value;
+      },
+      handleChange2(value) {
+        this.dataId2 = value;
+      },
+      handleTableBlur(e){
+        this.dataTable1 = e.target.value;
+        this.initDataVersionList();
+      },
+      handleIdBlur(e){
+        this.dataID3 = e.target.value;
+        this.initDataVersionList();
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/DepartAuthModal.vue

@@ -0,0 +1,188 @@
+<template>
+  <a-card :bordered="false">
+    <template v-if="this.departId">
+      <a-form>
+        <a-form-item label='所拥有的权限'>
+          <a-tree
+            checkable
+            @check="onCheck"
+            :checkedKeys="checkedKeys"
+            :treeData="treeData"
+            @expand="onExpand"
+            @select="onTreeNodeSelect"
+            :selectedKeys="selectedKeys"
+            :expandedKeys="expandedKeysss"
+            :checkStrictly="checkStrictly"
+            style="height:500px;overflow: auto;">
+            <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
+              {{ slotTitle }}
+              <a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
+            </span>
+          </a-tree>
+        </a-form-item>
+      </a-form>
+      <div class="anty-form-btn">
+        <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
+          <a-menu slot="overlay">
+            <!-- 简化Tree逻辑，使用默认checkStrictly为false的行为，即默认父子关联
+            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
+            <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
+            -->
+            <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
+            <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
+            <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
+            <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
+          </a-menu>
+          <a-button>
+            树操作 <a-icon type="up" />
+          </a-button>
+        </a-dropdown>
+        <a-button style="float: right" @click="handleSubmit" type="primary" htmlType="button" icon="form">保存</a-button>
+      </div>
+    </template>
+    <a-card v-else :bordered="false" style="height:200px">
+      <a-empty>
+        <span slot="description"> 请先选择一个部门! </span>
+      </a-empty>
+    </a-card>
+    <depart-datarule-modal ref="datarule"/>
+  </a-card>
+</template>
+
+<script>
+  import {queryTreeListForRole,queryDepartPermission,saveDepartPermission} from '@/api/api'
+  import DepartDataruleModal from './DepartDataruleModal'
+
+  export default {
+    name: 'DepartAuthModal',
+    components: { DepartDataruleModal },
+    data(){
+      return {
+        departId:"",
+        treeData: [],
+        defaultCheckedKeys:[],
+        checkedKeys:[],
+        halfCheckedKeys:[],
+        expandedKeysss:[],
+        allTreeKeys:[],
+        autoExpandParent: true,
+        checkStrictly: false,
+        title:"部门权限配置",
+        visible: false,
+        loading: false,
+        selectedKeys:[]
+      }
+    },
+    methods: {
+      onTreeNodeSelect(id){
+        if(id && id.length>0){
+          this.selectedKeys = id
+        }
+        this.$refs.datarule.show(this.selectedKeys[0],this.departId)
+      },
+      onCheck (checkedKeys, { halfCheckedKeys }) {
+        // 保存选中的和半选中的，后面保存的时候合并提交
+        this.checkedKeys = checkedKeys
+        this.halfCheckedKeys = halfCheckedKeys
+      },
+      show(departId){
+        this.departId=departId
+        this.loadData();
+      },
+      close () {
+        this.reset()
+        this.$emit('close');
+        this.visible = false;
+      },
+      onExpand(expandedKeys){
+        this.expandedKeysss = expandedKeys;
+        this.autoExpandParent = false
+      },
+      reset () {
+        this.expandedKeysss = []
+        this.checkedKeys = []
+        this.defaultCheckedKeys = []
+        this.loading = false
+      },
+      expandAll () {
+        this.expandedKeysss = this.allTreeKeys
+      },
+      closeAll () {
+        this.expandedKeysss = []
+      },
+      checkALL () {
+        this.checkedKeys = this.allTreeKeys
+      },
+      cancelCheckALL () {
+        this.checkedKeys = []
+      },
+      handleCancel () {
+        this.close()
+      },
+      handleSubmit() {
+        let that = this;
+        if(!that.departId){
+          this.$message.warning('请点击选择一个部门!')
+        }
+        let checkedKeys = [...that.checkedKeys, ...that.halfCheckedKeys]
+        const permissionIds = checkedKeys.join(",")
+        let params =  {
+          departId:that.departId,
+          permissionIds,
+          lastpermissionIds:that.defaultCheckedKeys.join(","),
+        };
+        that.loading = true;
+        saveDepartPermission(params).then((res)=>{
+          if(res.success){
+            that.$message.success(res.message);
+            that.loading = false;
+            that.loadData();
+          }else {
+            that.$message.error(res.message);
+            that.loading = false;
+          }
+        })
+      },
+      convertTreeListToKeyLeafPairs(treeList, keyLeafPair = []) {
+        for(const {key, isLeaf, children} of treeList) {
+          keyLeafPair.push({key, isLeaf})
+          if(children && children.length > 0) {
+            this.convertTreeListToKeyLeafPairs(children, keyLeafPair)
+          }
+        }
+        return keyLeafPair;
+      },
+      emptyCurrForm() {
+        this.form.resetFields()
+      },
+      loadData(){
+        queryTreeListForRole().then((res) => {
+          this.treeData = res.result.treeList
+          this.allTreeKeys = res.result.ids
+          const keyLeafPairs = this.convertTreeListToKeyLeafPairs(this.treeData)
+          queryDepartPermission({departId:this.departId}).then((res)=>{
+            // 过滤出 leaf node 即可，即选中的
+            // Tree组件中checkStrictly默认为false的时候，选中子节点，父节点会自动设置选中或半选中
+            // 保存 checkedKeys 以及 halfCheckedKeys 以便于未做任何操作时提交表单数据
+            const checkedKeys = [...res.result].filter(key => {
+              const keyLeafPair = keyLeafPairs.filter(item => item.key === key)[0]
+              return keyLeafPair && keyLeafPair.isLeaf
+            })
+            const halfCheckedKeys = [...res.result].filter(key => {
+              const keyLeafPair = keyLeafPairs.filter(item => item.key === key)[0]
+              return keyLeafPair && !keyLeafPair.isLeaf
+            })
+            this.checkedKeys = [...checkedKeys];
+            this.halfCheckedKeys = [...halfCheckedKeys]
+            this.defaultCheckedKeys = [...halfCheckedKeys, ...checkedKeys];
+            this.expandedKeysss = this.allTreeKeys;
+          })
+        })
+      }
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/DepartDataruleModal.vue

@@ -0,0 +1,116 @@
+<template>
+  <a-drawer
+    title="数据规则/按钮权限配置"
+    width="365"
+    :closable="false"
+    @close="onClose"
+    :visible="visible"
+  >
+    <a-tabs defaultActiveKey="1">
+      <a-tab-pane tab="数据规则" key="1">
+
+        <a-checkbox-group v-model="dataruleChecked" v-if="dataruleList.length>0">
+          <a-row>
+            <a-col :span="24" v-for="(item,index) in dataruleList" :key=" 'dr'+index ">
+              <a-checkbox :value="item.id">{{ item.ruleName }}</a-checkbox>
+            </a-col>
+
+            <a-col :span="24">
+              <div style="width: 100%;margin-top: 15px">
+                <a-button @click="saveDataruleForRole" type="primary" size="small" icon="save">点击保存</a-button>
+              </div>
+            </a-col>
+          </a-row>
+        </a-checkbox-group>
+        <div v-else><h3>无配置信息!</h3></div>
+
+      </a-tab-pane>
+    </a-tabs>
+
+  </a-drawer>
+</template>
+
+<script>
+  import ARow from 'ant-design-vue/es/grid/Row'
+  import ACol from 'ant-design-vue/es/grid/Col'
+  import { getAction,postAction } from '@/api/manage'
+
+  export default {
+    name: 'DepartDataruleModal',
+    components: { ACol, ARow },
+    data(){
+      return {
+        functionId:'',
+        departId:'',
+        visible:false,
+        tabList: [{
+          key: '1',
+          tab: '数据规则',
+        }, {
+          key: '2',
+          tab: '按钮权限',
+        }],
+        activeTabKey: '1',
+        url:{
+          datarule:"/sys/sysDepartPermission/datarule",
+        },
+        dataruleList:[],
+        dataruleChecked:[]
+      }
+    },
+    methods:{
+      loadData(){
+        getAction(`${this.url.datarule}/${this.functionId}/${this.departId}`).then(res=>{
+          if(res.success){
+            this.dataruleList = res.result.datarule
+            let drChecked = res.result.drChecked
+            if(drChecked){
+              this.dataruleChecked = drChecked.split(",")
+            }
+          }
+        })
+      },
+      saveDataruleForRole(){
+        if(!this.dataruleChecked || this.dataruleChecked.length==0){
+          this.$message.warning("请注意，现未勾选任何数据权限!")
+        }
+        let params = {
+          permissionId:this.functionId,
+          departId:this.departId,
+          dataRuleIds:this.dataruleChecked.join(",")
+        }
+        postAction(this.url.datarule,params).then(res=>{
+          if(res.success){
+            this.$message.success(res.message)
+          }else{
+            this.$message.error(res.message)
+          }
+        })
+      },
+      show(functionId,departId){
+        this.onReset()
+        this.functionId = functionId
+        this.departId = departId
+        this.visible=true
+        this.loadData()
+      },
+      onClose(){
+        this.visible=false
+        this.onReset()
+      },
+      onTabChange (key) {
+        this.activeTabKey = key
+      },
+      onReset(){
+        this.functionId=''
+        this.departId=''
+        this.dataruleList=[]
+        this.dataruleChecked=[]
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/DepartModal.vue

@@ -0,0 +1,223 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :ok=false
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :okButtonProps="{ props: {disabled: disableSubmit} }"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="机构名称"
+          :hidden="false"
+          hasFeedback >
+          <a-input id="departName" placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="上级部门" hasFeedback>
+        <a-tree-select
+          style="width:100%"
+          :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+          :treeData="departTree"
+          v-model="model.parentId"
+          placeholder="请选择上级部门"
+          :disabled="condition">
+        </a-tree-select>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="机构类型">
+          <template v-if="seen">
+          <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
+            <a-radio value="1">
+              公司
+            </a-radio>
+          </a-radio-group>
+          </template>
+          <template v-else>
+            <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
+              <a-radio value="2">
+                部门
+              </a-radio>
+              <a-radio value="3">
+                岗位
+              </a-radio>
+            </a-radio-group>
+          </template>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="电话">
+          <a-input placeholder="请输入电话" v-decorator="['mobile',validatorRules.mobile]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="传真">
+          <a-input placeholder="请输入传真" v-decorator="['fax', {}]"  />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="地址">
+          <a-input placeholder="请输入地址" v-decorator="['address', {}]"  />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="排序">
+          <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="备注">
+          <a-textarea placeholder="请输入备注" v-decorator="['memo', {}]"  />
+        </a-form-item>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import { queryIdTree } from '@/api/api'
+  import pick from 'lodash.pick'
+  import ATextarea from 'ant-design-vue/es/input/TextArea'
+  export default {
+    name: "SysDepartModal",
+    components: { ATextarea },
+    data () {
+      return {
+        departTree:[],
+        orgTypeData:[],
+        phoneWarning:'',
+        departName:"",
+        title:"操作",
+        seen:false,
+        visible: false,
+        condition:true,
+        disableSubmit:false,
+        model: {},
+        menuhidden:false,
+        menuusing:true,
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        departName:{rules: [{ required: true, message: '请输入机构/部门名称!' }]},
+        orgCode:{rules: [{ required: true, message: '请输入机构编码!' }]},
+         mobile:{rules: [{validator:this.validateMobile}]}
+        },
+        url: {
+          add: "/sys/sysDepart/add",
+        },
+        dictDisabled:true,
+      }
+    },
+    created () {
+    },
+    methods: {
+      loadTreeData(){
+        var that = this;
+        queryIdTree().then((res)=>{
+          if(res.success){
+            that.departTree = [];
+            for (let i = 0; i < res.result.length; i++) {
+              let temp = res.result[i];
+              that.departTree.push(temp);
+            }
+          }
+
+        })
+      },
+      add (depart) {
+        if(depart){
+          this.seen = false;
+          this.dictDisabled = false;
+        }else{
+          this.seen = true;
+          this.dictDisabled = true;
+        }
+        this.edit(depart);
+      },
+      edit (record) {
+          this.form.resetFields();
+          this.model = Object.assign({}, {});
+          this.visible = true;
+          this.loadTreeData();
+          this.model.parentId = record!=null?record.toString():null;
+          if(this.seen){
+            this.model.orgCategory = '1';
+          }else{
+            this.model.orgCategory = '2';
+          }
+          this.$nextTick(() => {
+            this.form.setFieldsValue(pick(this.model,'orgCategory','departName','departNameEn','departNameAbbr','departOrder','description','orgType','orgCode','mobile','fax','address','memo','status','delFlag'))
+          });
+      },
+      close () {
+        this.$emit('close');
+        this.disableSubmit = false;
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            console.log(formData)
+            httpAction(this.url.add,formData,"post").then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.loadTreeData();
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateMobile(rule,value,callback){
+        if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)){
+          callback();
+        }else{
+          callback("您的手机号码格式不正确!");
+        }
+
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/DepartWindow.vue

@@ -0,0 +1,185 @@
+<template>
+  <a-modal
+    :width="modalWidth"
+    :visible="visible"
+    title="部门搜索"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    >
+    <!--部门树-->
+    <template>
+      <a-form :form="form">
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
+      <a-tree
+        multiple
+        treeCheckable="tree"
+        checkable
+        @expand="onExpand"
+        :expandedKeys="expandedKeysss"
+        :checkedKeys="checkedKeys"
+        allowClear="true"
+        :checkStrictly="true"
+        @check="onCheck"
+        :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+        :treeData="departTree"
+        placeholder="请选择上级部门"
+        >
+      </a-tree>
+      </a-form-item>
+      </a-form>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import { getAction } from '@/api/manage'
+  import { queryIdTree } from '@/api/api'
+  import userModal from './UserModal'
+  export default {
+    name: "DepartWindow",
+    components: {
+      userModal,
+    },
+    data () {
+      return {
+        checkedKeys:[], // 存储选中的部门id
+        expandedKeysss:[],//展开的节点
+        userId:"", // 存储用户id
+        model:{}, // 存储SysUserDepartsVO表
+        userDepartModel:{userId:'',departIdList:[]}, // 存储用户id一对多部门信息的对象
+        departList:[], // 存储部门信息
+        modalWidth:400,
+        departTree:[],
+        title:"操作",
+        visible: false,
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        headers:{},
+        form:this.$form.createForm(this),
+        url: {
+          userId:"/sys/user/generateUserId", // 引入生成添加用户情况下的url
+        },
+      }
+    },
+    methods: {
+      add (checkedDepartKeys,userId) {
+        this.checkedKeys = checkedDepartKeys;
+        this.userId = userId;
+        this.edit({});
+      },
+      edit (record) {
+        this.departList = [];
+        this.queryDepartTree();
+        this.form.resetFields();
+        this.visible = true;
+        this.model = Object.assign({}, record);
+        let filedsVal = pick(this.model,'id','userId','departIdList');
+        this.$nextTick(() => {
+          this.form.setFieldsValue(filedsVal);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+        this.departList = [];
+        this.checkedKeys = [];
+      },
+      handleSubmit () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err) => {
+          if (!err) {
+            that.confirmLoading = true;
+            if(this.userId == null){
+              getAction(this.url.userId).then((res)=>{
+                if(res.success){
+                  let formData = {userId:res.result,
+                  departIdList:this.departList}
+                  console.log(formData)
+                  that.$emit('ok', formData);
+                }
+              }).finally(() => {
+                that.departList = [];
+                that.confirmLoading = false;
+                that.close();
+              })
+            }else {
+              let formData = {userId:this.userId,
+                departIdList:this.departList}
+              console.log(formData)
+              that.departList = [];
+              that.$emit('ok', formData);
+              that.confirmLoading = false;
+              that.close();
+            }
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+      // 选择部门时作用的API
+      onCheck(checkedKeys, info){
+        this.departList = [];
+        this.checkedKeys = checkedKeys.checked;
+        let checkedNodes = info.checkedNodes;
+        for (let i = 0; i < checkedNodes.length; i++) {
+          let de = checkedNodes[i].data.props;
+          let depart = {key:"",value:"",title:""};
+          depart.key = de.value;
+          depart.value = de.value;
+          depart.title = de.title;
+          this.departList.push(depart);
+        }
+        console.log('onCheck', checkedKeys, info);
+      },
+      queryDepartTree(){
+        queryIdTree().then((res)=>{
+          if(res.success){
+            this.departTree = res.result;
+            if(this.checkedKeys&&this.checkedKeys.length >0){
+              let treekey=[];
+              let arr=res.result;
+              if(arr&&arr.length>0){
+                arr.forEach(item => {
+                  treekey.push(item.key);
+             /*     if(item.children&&item.children.length>0){
+                    item.children.forEach(item1 => {
+                      treekey.push(item1.key);
+                    })
+                  }*/
+                })
+                this.expandedKeysss = treekey
+              }
+            }
+          }
+        })
+      },
+      onExpand(expandedKeys){
+        this.expandedKeysss = expandedKeys;
+      },
+      modalFormOk(){
+
+      }
+      },
+  }
+</script>
+
+<style scoped>
+  .ant-table-tbody .ant-table-row td{
+    padding-top:10px;
+    padding-bottom:10px;
+  }
+</style>

jshERP-web/src/views/system/modules/DepotModal.vue

@@ -0,0 +1,139 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 98%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库名称">
+          <a-input placeholder="请输入仓库名称" v-decorator.trim="[ 'name', validatorRules.name]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库地址">
+          <a-input placeholder="请输入仓库地址" v-decorator.trim="[ 'address' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓储费">
+          <a-input placeholder="请输入仓储费" v-decorator.trim="[ 'warehousing' ]" suffix="元/天/KG"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="搬运费">
+          <a-input placeholder="请输入搬运费" v-decorator.trim="[ 'truckage' ]" suffix="元"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="负责人">
+          <a-input placeholder="请输入负责人" v-decorator.trim="[ 'principalName' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
+          <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+          <a-input placeholder="请输入备注" v-decorator.trim="[ 'remark' ]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addDepot,editDepot,checkDepot } from '@/api/api'
+  export default {
+    name: "DepotModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          name:{
+            rules: [
+              { required: true, message: '请输入仓库名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validateDepotName}
+            ]}
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,
+            'name', 'address', 'warehousing', 'truckage', 'principalName', 'sort', 'remark'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=addDepot(formData);
+            }else{
+              obj=editDepot(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateDepotName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkDepot(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/DeptBaseInfo.vue

@@ -0,0 +1,129 @@
+<template>
+  <a-card :visible="visible">
+    <a-form :form="form">
+      <a-form-item
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
+        label="机构名称">
+        <a-input style="border:0px;" placeholder="" v-decorator="['departName', {}]"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
+        <a-tree-select
+          disabled
+          style="width:100%;border: 0px;border: none;outline:none;"
+          :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+          :treeData="treeData"
+          v-model="model.parentId"
+          placeholder="无">
+        </a-tree-select>
+      </a-form-item>
+      <a-form-item
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
+        label="机构编码">
+        <a-input style="border:0px;" placeholder="" v-decorator="['orgCode', {}]"/>
+      </a-form-item>
+      <a-form-item
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
+        label="机构类型">
+          <a-radio-group :disabled="true" v-decorator="['orgCategory',{}]" placeholder="请选择机构类型">
+            <a-radio value="1">
+              公司
+            </a-radio>
+            <a-radio value="2">
+              部门
+            </a-radio>
+            <a-radio value="3">
+              岗位
+            </a-radio>
+          </a-radio-group>
+      </a-form-item>
+      <a-form-item
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
+        label="排序">
+        <a-input-number style="border:0px;" v-decorator="[ 'departOrder',{}]"/>
+      </a-form-item>
+      <a-form-item
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
+        label="手机号">
+        <a-input style="border:0px;" placeholder="" v-decorator="['mobile', {}]"/>
+      </a-form-item>
+      <a-form-item
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
+        label="地址">
+        <a-input style="border:0px;" placeholder="" v-decorator="['address', {}]"/>
+      </a-form-item>
+      <a-form-item
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
+        label="备注">
+        <a-textarea style="border:0px;" placeholder="" v-decorator="['memo', {}]"/>
+      </a-form-item>
+    </a-form>
+  </a-card>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {queryIdTree} from '@/api/api'
+
+  export default {
+    name: 'DeptBaseInfo',
+    components: {},
+    data() {
+      return {
+        departTree: [],
+        id: '',
+        model: {},
+        visible: false,
+        disable: true,
+        treeData: [],
+        form: this.$form.createForm(this),
+        labelCol: {
+          xs: {span: 24},
+          sm: {span: 3}
+        },
+        wrapperCol: {
+          xs: {span: 24},
+          sm: {span: 16}
+        },
+      }
+    },
+    created() {
+      this.loadTreeData();
+    },
+    methods: {
+      loadTreeData() {
+        queryIdTree().then((res) => {
+          if (res.success) {
+            for (let i = 0; i < res.result.length; i++) {
+              let temp = res.result[i];
+              this.treeData.push(temp);
+            }
+          }
+
+        })
+      },
+      open(record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        console.log("record:");
+        console.log(record);
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(record, 'orgCategory','departName', 'parentId', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'));
+        });
+      },
+      clearForm() {
+        this.form.resetFields();
+        this.treeData = [];
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

jshERP-web/src/views/system/modules/DeptRoleAuthModal.vue

@@ -0,0 +1,213 @@
+<template>
+  <a-drawer
+    :title="title"
+    :maskClosable="true"
+    width=650
+    placement="right"
+    :closable="true"
+    @close="close"
+    :visible="visible"
+    style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;">
+
+    <a-form>
+      <a-form-item label='所拥有的部门权限'>
+
+        <a-tree
+          v-if="treeData.length>0"
+          checkable
+          @check="onCheck"
+          :checkedKeys="checkedKeys"
+          :treeData="treeData"
+          @expand="onExpand"
+          @select="onTreeNodeSelect"
+          :selectedKeys="selectedKeys"
+          :expandedKeys="expandedKeysss"
+          :checkStrictly="checkStrictly">
+          <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
+            {{ slotTitle }}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
+          </span>
+        </a-tree>
+        <div v-else><h3>无可配置部门权限!</h3></div>
+      </a-form-item>
+    </a-form>
+
+    <div class="drawer-bootom-button">
+      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
+          <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
+          <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
+          <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
+          <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
+          <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
+        </a-menu>
+        <a-button>
+          树操作 <a-icon type="up" />
+        </a-button>
+      </a-dropdown>
+      <a-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">
+        <a-button style="margin-right: .8rem">取消</a-button>
+      </a-popconfirm>
+      <a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">仅保存</a-button>
+      <a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button>
+    </div>
+    <dept-role-datarule-modal ref="datarule"></dept-role-datarule-modal>
+  </a-drawer>
+
+</template>
+<script>
+  import {queryTreeListForDeptRole,queryDeptRolePermission,saveDeptRolePermission} from '@/api/api'
+  import RoleDataruleModal from './RoleDataruleModal.vue'
+  import DeptRoleDataruleModal from './DeptRoleDataruleModal'
+
+  export default {
+    name: "DeptRoleAuthModal",
+    components:{
+      DeptRoleDataruleModal,
+      RoleDataruleModal
+    },
+    data(){
+      return {
+        departId:"",
+        roleId:"",
+        treeData: [],
+        defaultCheckedKeys:[],
+        checkedKeys:[],
+        halfCheckedKeys:[],
+        expandedKeysss:[],
+        allTreeKeys:[],
+        autoExpandParent: true,
+        checkStrictly: true,
+        title:"部门角色权限配置",
+        visible: false,
+        loading: false,
+        selectedKeys:[]
+      }
+    },
+    methods: {
+      switchCheckStrictly (v) {
+        if(v==1){
+          this.checkStrictly = false
+        }else if(v==2){
+          this.checkStrictly = true
+        }
+      },
+      onTreeNodeSelect(id){
+        if(id && id.length>0){
+          this.selectedKeys = id
+        }
+        this.$refs.datarule.show(this.selectedKeys[0],this.departId,this.roleId)
+      },
+      onCheck (o) {
+        if(this.checkStrictly){
+          this.checkedKeys = o.checked;
+        }else{
+          this.checkedKeys = o
+        }
+      },
+      show(roleId,departId){
+        this.departId = departId
+        this.roleId=roleId
+        this.visible = true;
+      },
+      close () {
+        this.reset()
+        this.$emit('close');
+        this.visible = false;
+      },
+      onExpand(expandedKeys){
+        this.expandedKeysss = expandedKeys;
+        this.autoExpandParent = false
+      },
+      reset () {
+        this.expandedKeysss = []
+        this.checkedKeys = []
+        this.defaultCheckedKeys = []
+        this.loading = false
+      },
+      expandAll () {
+        this.expandedKeysss = this.allTreeKeys
+      },
+      closeAll () {
+        this.expandedKeysss = []
+      },
+      checkALL () {
+        this.checkedKeys = this.allTreeKeys
+      },
+      cancelCheckALL () {
+        this.checkedKeys = []
+      },
+      handleCancel () {
+        this.close()
+      },
+      handleSubmit(exit) {
+        let that = this;
+        let params =  {
+          roleId:that.roleId,
+          permissionIds:that.checkedKeys.join(","),
+          lastpermissionIds:that.defaultCheckedKeys.join(","),
+        };
+        that.loading = true;
+        console.log("请求参数：",params);
+        saveDeptRolePermission(params).then((res)=>{
+          if(res.success){
+            that.$message.success(res.message);
+            that.loading = false;
+            if (exit) {
+              that.close()
+            }
+          }else {
+            that.$message.error(res.message);
+            that.loading = false;
+            if (exit) {
+              that.close()
+            }
+          }
+          this.loadData();
+        })
+      },
+      convertTreeListToKeyLeafPairs(treeList, keyLeafPair = []) {
+        for(const {key, isLeaf, children} of treeList) {
+          keyLeafPair.push({key, isLeaf})
+          if(children && children.length > 0) {
+            this.convertTreeListToKeyLeafPairs(children, keyLeafPair)
+          }
+        }
+        return keyLeafPair;
+      },
+      loadData(){
+        queryTreeListForDeptRole({departId:this.departId}).then((res) => {
+          this.treeData = res.result.treeList
+          this.allTreeKeys = res.result.ids
+          queryDeptRolePermission({roleId:this.roleId}).then((res)=>{
+            this.checkedKeys = [...res.result];
+            this.defaultCheckedKeys = [...res.result];
+            this.expandedKeysss = this.allTreeKeys;
+          })
+        })
+      }
+    },
+    watch: {
+      visible () {
+        if (this.visible ) {
+          this.loadData();
+        }
+      }
+    }
+  }
+
+</script>
+<style lang="less" scoped>
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+</style>

jshERP-web/src/views/system/modules/DeptRoleDataruleModal.vue

@@ -0,0 +1,122 @@
+<template>
+  <a-drawer
+    title="数据规则/按钮权限配置"
+    width="365"
+    :closable="false"
+    @close="onClose"
+    :visible="visible"
+  >
+
+    <a-tabs defaultActiveKey="1">
+      <a-tab-pane tab="数据规则" key="1">
+
+        <a-checkbox-group v-model="dataruleChecked" v-if="dataruleList.length>0">
+          <a-row>
+            <a-col :span="24" v-for="(item,index) in dataruleList" :key=" 'dr'+index ">
+              <a-checkbox :value="item.id">{{ item.ruleName }}</a-checkbox>
+            </a-col>
+
+            <a-col :span="24">
+              <div style="width: 100%;margin-top: 15px">
+                <a-button @click="saveDataruleForRole" type="primary" size="small" icon="save">点击保存</a-button>
+              </div>
+            </a-col>
+          </a-row>
+        </a-checkbox-group>
+        <div v-else><h3>无配置信息!</h3></div>
+
+      </a-tab-pane>
+      <!--<a-tab-pane tab="按钮权限" key="2">敬请期待!!!</a-tab-pane>-->
+    </a-tabs>
+
+  </a-drawer>
+</template>
+
+<script>
+  import ARow from 'ant-design-vue/es/grid/Row'
+  import ACol from 'ant-design-vue/es/grid/Col'
+  import { getAction,postAction } from '@/api/manage'
+
+  export default {
+    name: 'DeptRoleDataruleModal',
+    components: { ACol, ARow },
+    data(){
+      return {
+        departId:'',
+        functionId:'',
+        roleId:'',
+        visible:false,
+        tabList: [{
+          key: '1',
+          tab: '数据规则',
+        }, {
+          key: '2',
+          tab: '按钮权限',
+        }],
+        activeTabKey: '1',
+        url:{
+          datarule:"/sys/sysDepartRole/datarule",
+        },
+        dataruleList:[],
+        dataruleChecked:[]
+      }
+    },
+    methods:{
+      loadData(){
+        getAction(`${this.url.datarule}/${this.functionId}/${this.departId}/${this.roleId}`).then(res=>{
+          console.log(res)
+          if(res.success){
+            this.dataruleList = res.result.datarule
+            let drChecked = res.result.drChecked
+            if(drChecked){
+              this.dataruleChecked = drChecked.split(",")
+            }
+          }
+        })
+      },
+      saveDataruleForRole(){
+        if(!this.dataruleChecked || this.dataruleChecked.length==0){
+          this.$message.warning("请注意，现未勾选任何数据权限!")
+        }
+        let params = {
+          permissionId:this.functionId,
+          roleId:this.roleId,
+          dataRuleIds:this.dataruleChecked.join(",")
+        }
+        console.log("保存数据权限",params)
+        postAction(this.url.datarule,params).then(res=>{
+          if(res.success){
+            this.$message.success(res.message)
+          }else{
+            this.$message.error(res.message)
+          }
+        })
+      },
+      show(functionId,departId,roleId){
+        this.onReset()
+        this.departId = departId
+        this.functionId = functionId
+        this.roleId = roleId
+        this.visible=true
+        this.loadData()
+      },
+      onClose(){
+        this.visible=false
+        this.onReset()
+      },
+      onTabChange (key) {
+        this.activeTabKey = key
+      },
+      onReset(){
+        this.functionId=''
+        this.roleId=''
+        this.dataruleList=[]
+        this.dataruleChecked=[]
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/DeptRoleInfo.vue

@@ -0,0 +1,191 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline">
+        <a-row :gutter="10">
+          <a-col :md="10" :sm="12">
+            <a-form-item label="部门角色名称" style="margin-left:8px">
+              <a-input placeholder="请输入部门角色" v-model="queryParam.roleName"></a-input>
+            </a-form-item>
+          </a-col>
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator" :md="24" :sm="24">
+      <a-button @click="handleAdd" type="primary" icon="plus">新建部门角色</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">
+          {{selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical"/>
+          <a-dropdown>
+            <a class="ant-dropdown-link">
+              更多 <a-icon type="down"/>
+            </a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handlePerssion(record)">授权</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+             </a-menu>
+          </a-dropdown>
+        </span>
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <sys-depart-role-modal ref="modalForm" @ok="modalFormOk"/>
+    <dept-role-auth-modal ref="modalDeptRole" />
+  </a-card>
+</template>
+
+<script>
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import {getAction} from '@/api/manage'
+  import SysDepartRoleModal from './SysDepartRoleModal'
+  import DeptRoleAuthModal from './DeptRoleAuthModal'
+
+  export default {
+    name: 'DeptRoleInfo',
+    components: { DeptRoleAuthModal, SysDepartRoleModal },
+    mixins: [JeecgListMixin],
+    data() {
+      return {
+        description: '部门角色信息',
+        currentDeptId: '',
+        // 表头
+        columns: [{
+          title: '部门角色名称',
+          align: "center",
+          dataIndex: 'roleName'
+        },
+        {
+          title: '部门角色编码',
+          align: "center",
+          dataIndex: 'roleCode'
+        },
+        {
+          title: '部门',
+          align: "center",
+          dataIndex: 'departId_dictText'
+        },
+        {
+          title: '备注',
+          align: "center",
+          dataIndex: 'description'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          scopedSlots: {customRender: 'action'},
+          align: "center",
+          width: 170
+        }],
+        url: {
+          list: "/sys/sysDepartRole/list",
+          delete: "/sys/sysDepartRole/delete",
+          deleteBatch: "/sys/sysDepartRole/deleteBatch",
+        }
+      }
+    },
+    created() {
+    },
+    methods: {
+      searchReset() {
+        this.queryParam = {}
+        this.loadData(1);
+      },
+      loadData(arg) {
+        if (!this.url.list) {
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        let params = this.getQueryParams();//查询条件
+        params.deptId = this.currentDeptId;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success && res.result) {
+            this.dataSource = res.result.records;
+            this.ipagination.total = res.result.total;
+          }
+        })
+      },
+      open(record) {
+        this.currentDeptId = record.id;
+        this.loadData(1);
+      },
+      clearList() {
+        this.currentDeptId = '';
+        this.dataSource = [];
+      },
+      hasSelectDept() {
+        if (this.currentDeptId == '') {
+          this.$message.error("请选择一个部门!")
+          return false;
+        }
+        return true;
+      },
+      handleEdit: function (record) {
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.departDisabled = true;
+        this.$refs.modalForm.disableSubmit = false;
+        this.$refs.modalForm.edit(record,record.departId);
+      },
+      handleAdd: function () {
+        if (this.currentDeptId == '') {
+          this.$message.error("请选择一个部门!")
+        } else {
+          this.$refs.modalForm.departDisabled = true;
+          this.$refs.modalForm.add(this.currentDeptId);
+          this.$refs.modalForm.title = "新增";
+        }
+      },
+      handlePerssion: function(record){
+        this.$refs.modalDeptRole.show(record.id,record.departId);
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/DeptRoleUserModal.vue

@@ -0,0 +1,200 @@
+<template>
+  <a-drawer
+    :title="title"
+    :maskClosable="true"
+    width=600
+    placement="right"
+    :closable="true"
+    @close="close"
+    :visible="visible"
+    style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;">
+
+    <a-spin :spinning="confirmLoading">
+
+      <a-form :form="form" v-if="designNameOption.length>0">
+        <a-form-item label=''>
+          <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+            <a-card :style="{ marginTop: '12px',height:'auto' }">
+              <a-checkbox-group @change="designNameChange" v-model="designNameValue" style="width: 100%">
+                <a-row>
+                  <template v-for="(des) in designNameOption">
+                    <a-col :span="6">
+                      <a-checkbox :value="des.value">{{ des.text }}</a-checkbox>
+                    </a-col>
+                  </template>
+                </a-row>
+              </a-checkbox-group>
+            </a-card>
+          </a-col>
+        </a-form-item>
+      </a-form>
+      <div v-else><h3>无可配置角色!</h3></div>
+    </a-spin>
+    <div class="drawer-bootom-button">
+      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="checkALL">全部勾选</a-menu-item>
+          <a-menu-item key="2" @click="cancelCheckALL">取消全选</a-menu-item>
+        </a-menu>
+        <a-button>
+          操作 <a-icon type="up" />
+        </a-button>
+      </a-dropdown>
+      <a-popconfirm  title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">
+        <a-button style="margin-right: .8rem">取消</a-button>
+      </a-popconfirm>
+      <a-button @click="handleSubmit(true)" type="primary">保存</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import {httpAction, getAction} from '@/api/manage'
+  import  JEllipsis  from '@/components/jeecg/JEllipsis'
+  import {initDictOptions} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'DeptRoleUserModal',
+    components: {
+      JEllipsis
+    },
+    data() {
+      return {
+        currentDeptId:"",
+        title: "部门角色分配",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: {span: 24},
+          sm: {span: 5},
+        },
+        wrapperCol: {
+          xs: {span: 24},
+          sm: {span: 16},
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {},
+        url: {
+          add: "/sys/sysDepartRole/deptRoleUserAdd",
+          getDeptRoleList:"/sys/sysDepartRole/getDeptRoleList",
+          getDeptRoleByUserId:"/sys/sysDepartRole/getDeptRoleByUserId"
+        },
+        designNameOption: [],
+        userId: "",
+        newRoleId:"",
+        oldRoleId:"",
+        designNameValue:[],
+        desformList: [],
+      }
+    },
+    created() {
+
+    },
+    methods: {
+      add(record,departId) {
+        this.userId = record.id;
+        this.currentDeptId = departId;
+        this.loadDesformList();
+        this.edit({});
+      },
+      edit(record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        getAction(this.url.getDeptRoleByUserId,{userId:this.userId}).then((res) => {
+          if (res.success) {
+            var designName = [];
+            for (let value of res.result) {
+              designName.push(value.droleId)
+            }
+            this.oldRoleId=designName.join(",");
+            this.designNameValue = designName;
+            this.newRoleId = designName.join(",");
+          }
+        });
+      },
+      close() {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleSubmit() {
+        const that = this;
+        // 触发表单验证
+        that.confirmLoading = true;
+        let  httpurl = this.url.add;
+        let  method = 'post';
+        let formData = Object.assign(this.model, {});
+        //时间格式化
+        formData.userId = this.userId;
+        formData.newRoleId=this.newRoleId;
+        formData.oldRoleId=this.oldRoleId;
+        httpAction(httpurl, formData, method).then((res) => {
+          if (res.success) {
+            that.$message.success(res.message);
+            that.$emit('reload');
+            that.$emit('ok');
+          } else {
+            that.$message.warning(res.message);
+          }
+        }).finally(() => {
+          that.confirmLoading = false;
+          that.close();
+        })
+      },
+      handleCancel() {
+        this.designNameOption=[];
+        this.designNameValue=[];
+        this.close()
+      },
+      designNameChange(selectedValue) {
+        this.newRoleId=selectedValue.join(",");
+      },
+      checkALL(){
+        var designName = [];
+        for (let value of this.desformList) {
+          designName.push(
+            value.id
+          )
+        }
+        this.designNameValue = designName;
+        this.newRoleId=designName.join(",");
+      },
+      cancelCheckALL(){
+        this.designNameValue=[];
+        this.newRoleId="";
+      },
+      /** 加载desform */
+      loadDesformList() {
+        getAction(this.url.getDeptRoleList, { departId: this.currentDeptId, userId:this.userId }).then((res) => {
+          if (res.success) {
+            this.desformList = res.result
+            var designName = [];
+            for (let value of this.desformList) {
+              designName.push({
+                value: value.id,
+                text: value.roleName,
+              })
+            }
+            this.designNameOption = designName;
+          }
+        });
+      },
+    }
+
+  }
+</script>
+
+<style scoped>
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jshERP-web/src/views/system/modules/DeptUserInfo.vue

@@ -0,0 +1,342 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 搜索区域 -->
+      <a-form layout="inline">
+        <a-row :gutter="10">
+          <a-col :md="10" :sm="12">
+            <a-form-item label="用户账号" style="margin-left:8px">
+              <a-input placeholder="请输入账号" v-model="queryParam.username"></a-input>
+            </a-form-item>
+          </a-col>
+          <!--<a-col :md="8" :sm="8">-->
+          <!--<a-form-item label="用户名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">-->
+          <!--<a-input placeholder="请输入名称查询" v-model="queryParam.realname"></a-input>-->
+          <!--</a-form-item>-->
+          <!--</a-col>-->
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24">
+             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </a-col>
+          </span>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <div class="table-operator" :md="24" :sm="24" style="margin-top: -15px">
+      <!--<a-button @click="handleEdit" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
+      <a-button @click="handleAddUserDepart" type="primary" icon="plus">添加已有用户</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" style="margin-top: 16px">新建用户</a-button>
+
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete"/>
+            取消关联
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
+        selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical"/>
+
+          <a-dropdown>
+            <a class="ant-dropdown-link">
+              更多 <a-icon type="down"/>
+            </a>
+            <a-menu slot="overlay">
+                <a-menu-item>
+                <a href="javascript:;" @click="handleDeptRole(record)">分配部门角色</a>
+              </a-menu-item>
+
+              <a-menu-item>
+                <a href="javascript:;" @click="handleDetail(record)">用户详情</a>
+              </a-menu-item>
+
+              <a-menu-item>
+                <a-popconfirm title="确定取消与选中部门关联吗?" @confirm="() => handleDelete(record.id)">
+                  <a>取消关联</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <user-modal ref="modalForm" @ok="modalFormOk"></user-modal>
+    <Select-User-Modal ref="selectUserModal" @selectFinished="selectOK"></Select-User-Modal>
+    <dept-role-user-modal ref="deptRoleUser"></dept-role-user-modal>
+  </a-card>
+</template>
+
+<script>
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import {getAction, postAction, deleteAction} from '@/api/manage'
+  import SelectUserModal from './SelectUserModal'
+  import UserModal from './UserModal'
+  import DeptRoleUserModal from './DeptRoleUserModal'
+
+  export default {
+    name: "DeptUserInfo",
+    mixins: [JeecgListMixin],
+    components: {
+      DeptRoleUserModal,
+      SelectUserModal,
+      UserModal
+    },
+    data() {
+      return {
+        description: '用户信息',
+        currentDeptId: '',
+        // 表头
+        columns: [{
+            title: '用户账号',
+            align: "center",
+            dataIndex: 'username'
+          },
+          {
+            title: '用户名称',
+            align: "center",
+            dataIndex: 'realname'
+          },
+          {
+            title: '部门',
+            align: "center",
+            dataIndex: 'orgCode'
+          },
+          {
+            title: '性别',
+            align: "center",
+            dataIndex: 'sex_dictText'
+          },
+          {
+            title: '电话',
+            align: "center",
+            dataIndex: 'phone'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            scopedSlots: {customRender: 'action'},
+            align: "center",
+            width: 150
+          }],
+        url: {
+          list: "/sys/user/departUserList",
+          edit: "/sys/user/editSysDepartWithUser",
+          delete: "/sys/user/deleteUserInDepart",
+          deleteBatch: "/sys/user/deleteUserInDepartBatch",
+        }
+      }
+    },
+    created() {
+    },
+
+    methods: {
+      searchReset() {
+        this.queryParam = {}
+        this.loadData(1);
+      },
+      loadData(arg) {
+        if (!this.url.list) {
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        //if (this.currentDeptId === '') return;
+        let params = this.getQueryParams();//查询条件
+        params.depId = this.currentDeptId;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success && res.result) {
+            this.dataSource = res.result.records;
+            this.ipagination.total = res.result.total;
+          }
+        })
+      },
+      batchDel: function () {
+
+        if (!this.url.deleteBatch) {
+          this.$message.error("请设置url.deleteBatch属性!")
+          return
+        }
+        if (!this.currentDeptId) {
+          this.$message.error("未选中任何部门，无法取消部门与用户的关联!")
+          return
+        }
+
+        if (this.selectedRowKeys.length <= 0) {
+          this.$message.warning('请选择一条记录！');
+          return;
+        } else {
+          var ids = "";
+          for (var a = 0; a < this.selectedRowKeys.length; a++) {
+            ids += this.selectedRowKeys[a] + ",";
+          }
+          var that = this;
+          console.log(this.currentDeptId);
+          this.$confirm({
+            title: "确认取消",
+            content: "是否取消用户与选中部门的关联?",
+            onOk: function () {
+              deleteAction(that.url.deleteBatch, {depId: that.currentDeptId, userIds: ids}).then((res) => {
+                if (res.success) {
+                  that.$message.success("删除用户与选中部门关系成功！");
+                  that.loadData();
+                  that.onClearSelected();
+                } else {
+                  that.$message.warning(res.message);
+                }
+              });
+            }
+          });
+        }
+      },
+      handleDelete: function (id) {
+        if (!this.url.delete) {
+          this.$message.error("请设置url.delete属性!")
+          return
+        }
+        if (!this.currentDeptId) {
+          this.$message.error("未选中任何部门，无法取消部门与用户的关联!")
+          return
+        }
+
+        var that = this;
+        deleteAction(that.url.delete, {depId: this.currentDeptId, userId: id}).then((res) => {
+          if (res.success) {
+            that.$message.success("删除用户与选中部门关系成功！");
+            if (this.selectedRowKeys.length>0){
+               for(let i =0; i<this.selectedRowKeys.length;i++){
+                   if (this.selectedRowKeys[i] == id){
+                     this.selectedRowKeys.splice(i,1);
+                     break;
+                   }
+               }
+            }
+            that.loadData();
+          } else {
+            that.$message.warning(res.message);
+          }
+        });
+      },
+      open(record) {
+        //console.log(record);
+        this.currentDeptId = record.id;
+        this.loadData(1);
+      },
+      clearList() {
+        this.currentDeptId = '';
+        this.dataSource = [];
+      },
+      hasSelectDept() {
+        if (this.currentDeptId == '') {
+          this.$message.error("请选择一个部门!")
+          return false;
+        }
+        return true;
+      },
+      handleAddUserDepart() {
+        if (this.currentDeptId == '' ) {
+          this.$message.error("请选择一个部门!")
+        } else {
+          this.$refs.selectUserModal.visible = true;
+        }
+      },
+      handleEdit: function (record) {
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.departDisabled = true;
+        this.$refs.modalForm.disableSubmit = false;
+        this.$refs.modalForm.edit(record);
+      },
+      handleAdd: function () {
+        if (this.currentDeptId == '') {
+          this.$message.error("请选择一个部门!")
+        } else {
+          this.$refs.modalForm.departDisabled = true;
+          this.$refs.modalForm.userDepartModel.departIdList = [this.currentDeptId];  //传入一个部门id
+          this.$refs.modalForm.add();
+          this.$refs.modalForm.title = "新增";
+        }
+      },
+      selectOK(data) {
+        let params = {};
+        params.depId = this.currentDeptId;
+        params.userIdList = [];
+        for (var a = 0; a < data.length; a++) {
+          params.userIdList.push(data[a]);
+        }
+        console.log(params);
+        postAction(this.url.edit, params).then((res) => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.loadData();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+      },
+      handleDeptRole(record){
+        if(this.currentDeptId != ''){
+          this.$refs.deptRoleUser.add(record,this.currentDeptId);
+          this.$refs.deptRoleUser.title = "部门角色分配";
+        }else{
+          this.$message.warning("请先选择一个部门!");
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+  /** Button按钮间距 */
+  .ant-btn {
+    margin-left: 3px
+  }
+
+  .ant-card {
+    margin-left: -30px;
+    margin-right: -30px;
+  }
+
+  .table-page-search-wrapper {
+    margin-top: -16px;
+    margin-bottom: 16px;
+  }
+</style>

jshERP-web/src/views/system/modules/DictItemModal.vue

@@ -0,0 +1,158 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="名称">
+          <a-input placeholder="请输入名称" v-decorator.trim="['itemText', validatorRules.itemText]"/>
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="数据值">
+          <a-input placeholder="请输入数据值" v-decorator.trim="['itemValue', validatorRules.itemValue]"/>
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="描述">
+          <a-input v-decorator="['description']"/>
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="排序值">
+          <a-input-number :min="1" v-decorator="['sortOrder',{'initialValue':1}]"/>
+          值越小越靠前，支持小数
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="是否启用"
+          hasFeedback>
+          <a-switch checkedChildren="启用" unCheckedChildren="禁用" @change="onChose" v-model="visibleCheck"/>
+        </a-form-item>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import {addDictItem, editDictItem} from '@/api/api'
+
+  export default {
+    name: "DictItemModal",
+    data() {
+      return {
+        title: "操作",
+        visible: false,
+        visibleCheck: true,
+        model: {},
+        dictId: "",
+        status: 1,
+        labelCol: {
+          xs: {span: 24},
+          sm: {span: 5},
+        },
+        wrapperCol: {
+          xs: {span: 24},
+          sm: {span: 16},
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {
+          itemText: {rules: [{required: true, message: '请输入名称!'}]},
+          itemValue: {rules: [{required: true, message: '请输入数据值!'}]},
+        },
+      }
+    },
+    created() {
+    },
+    methods: {
+      add(dictId) {
+        this.dictId = dictId;
+        this.edit({});
+      },
+      edit(record) {
+        if (record.id) {
+          this.dictId = record.dictId;
+          this.visibleCheck = (record.status == 1) ? true : false;
+        }
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.model.dictId = this.dictId;
+        this.model.status = this.status;
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'itemText', 'itemValue', 'description', 'sortOrder'))
+        });
+      },
+      onChose(checked) {
+        if (checked) {
+          this.status = 1;
+          this.visibleCheck = true;
+        } else {
+          this.status = 0;
+          this.visibleCheck = false;
+        }
+      },
+      // 确定
+      handleOk() {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            values.itemText = (values.itemText || '').trim()
+            values.itemValue = (values.itemValue || '').trim()
+            values.description = (values.description || '').trim()
+            let formData = Object.assign(this.model, values);
+            formData.status = this.status;
+            let obj;
+            if (!this.model.id) {
+              obj = addDictItem(formData);
+            } else {
+              obj = editDictItem(formData);
+            }
+            obj.then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.$emit('ok');
+              } else {
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      // 关闭
+      handleCancel() {
+        this.close();
+      },
+      close() {
+        this.$emit('close');
+        this.visible = false;
+      },
+    }
+  }
+</script>

jshERP-web/src/views/system/modules/DictModal.vue

@@ -0,0 +1,151 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="600"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="字典名称">
+          <a-input placeholder="请输入字典名称" v-decorator.trim="[ 'dictName', validatorRules.dictName]"/>
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="字典编码">
+          <a-input placeholder="请输入字典编码" v-decorator.trim="[ 'dictCode', validatorRules.dictCode]"/>
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="描述">
+          <a-input v-decorator="[ 'description']"/>
+        </a-form-item>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import { addDict, editDict, duplicateCheck } from '@/api/api'
+
+  export default {
+    name: 'DictModal',
+    data() {
+      return {
+        value: 1,
+        title: '操作',
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 }
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 }
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {
+          dictName: { rules: [{ required: true, message: '请输入字典名称!' }] },
+          dictCode: {
+            rules: [{ required: true, message: '请输入字典编码!' },
+              { validator: this.validateDictCode }]
+          }
+        }
+      }
+    },
+    created() {
+    },
+    methods: {
+      validateDictCode(rule, value, callback) {
+        // 重复校验
+        var params = {
+          tableName: 'sys_dict',
+          fieldName: 'dict_code',
+          fieldVal: value,
+          dataId: this.model.id
+        }
+        duplicateCheck(params).then((res) => {
+          if (res.success) {
+            callback()
+          } else {
+            callback(res.message)
+          }
+        })
+      },
+      handleChange(value) {
+        this.model.status = value
+      },
+      add() {
+        this.edit({})
+      },
+      edit(record) {
+        if (record.id) {
+          this.visiblekey = true
+        } else {
+          this.visiblekey = false
+        }
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'dictName', 'dictCode', 'description'))
+        })
+      },
+      // 确定
+      handleOk() {
+        const that = this
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true
+            values.dictName = (values.dictName || '').trim()
+            values.dictCode = (values.dictCode || '').trim()
+            values.description = (values.description || '').trim()
+            let formData = Object.assign(this.model, values)
+            let obj
+            console.log(formData)
+            if (!this.model.id) {
+              obj = addDict(formData)
+            } else {
+              obj = editDict(formData)
+            }
+            obj.then((res) => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.$emit('ok')
+              } else {
+                that.$message.warning(res.message)
+              }
+            }).finally(() => {
+              that.confirmLoading = false
+              that.close()
+            })
+          }
+        })
+      },
+      // 关闭
+      handleCancel() {
+        this.close()
+      },
+      close() {
+        this.$emit('close')
+        this.visible = false
+      }
+    }
+  }
+</script>

jshERP-web/src/views/system/modules/FunctionModal.vue

@@ -0,0 +1,174 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:10%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
+          <a-input placeholder="请输入编号" v-decorator.trim="[ 'number', validatorRules.number]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
+          <a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级编号">
+          <a-input placeholder="请输入上级编号" v-decorator.trim="[ 'parentNumber' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="链接">
+          <a-input placeholder="请输入链接" v-decorator.trim="[ 'url' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
+          <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="功能按钮">
+          <j-select-multiple placeholder="请选择功能按钮" v-model="jselectMultiple.value" :options="jselectMultiple.options"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="图标">
+          <a-input placeholder="请输入图标" v-decorator.trim="[ 'icon' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否启用">
+          <a-switch checked-children="启用" un-checked-children="禁用" v-model="enabledSwitch" @change="onChange"/>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addFunction,editFunction,checkFunction } from '@/api/api'
+  import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
+  export default {
+    name: "FunctionModal",
+    components: {
+      JSelectMultiple
+    },
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        enabledSwitch: true, //是否启用
+        jselectMultiple: {
+          options: [
+            { text: '编辑', value: '1' },
+            { text: '审核反审核', value: '2' },
+            { text: '导入导出', value: '3' },
+            { text: '启用禁用', value: '4' },
+            { text: '打印', value: '5' },
+            { text: '作废', value: '6' }
+          ],
+          value: ''
+        },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          name:{
+            rules: [
+              { required: true, message: '请输入名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validatePersonName}
+            ]},
+          type:{
+            rules: [
+              { required: true, message: '请选择类型!' }
+            ]
+          }
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      onChange(checked) {
+        this.model.enabled = checked
+      },
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        if(record.enabled!=null){
+          this.enabledSwitch = record.enabled?true:false;
+        }
+        if(this.model.id){
+          this.jselectMultiple.value = record.pushBtn
+        } else {
+          this.jselectMultiple.value = ''
+        }
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'number', 'name', 'parentNumber', 'url','sort','pushBtn','icon','enabled'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            formData.pushBtn = this.jselectMultiple.value
+            let obj;
+            if(!this.model.id){
+              obj=addFunction(formData);
+            }else{
+              obj=editFunction(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validatePersonName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkFunction(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/InOutItemModal.vue

@@ -0,0 +1,134 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:25%;height: 60%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
+          <a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类型">
+          <a-select placeholder="请选择类型" v-decorator="[ 'type', validatorRules.type]">
+            <a-select-option value="收入">收入</a-select-option>
+            <a-select-option value="支出">支出</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+          <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addInOutItem,editInOutItem,checkInOutItem } from '@/api/api'
+  export default {
+    name: "InOutItemModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          name:{
+            rules: [
+              { required: true, message: '请输入名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validatePersonName}
+            ]},
+          type:{
+            rules: [
+              { required: true, message: '请选择类型!' }
+            ]
+          }
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'name', 'type', 'remark'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=addInOutItem(formData);
+            }else{
+              obj=editInOutItem(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validatePersonName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkInOutItem(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/MemberModal.vue

@@ -0,0 +1,206 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
+            <a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
+            <a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
+            <a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
+            <a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
+            <a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真">
+            <a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应收">
+            <a-input placeholder="请输入期初应收" v-decorator.trim="[ 'beginNeedGet' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应付">
+            <a-input placeholder="请输入期初应付" v-decorator.trim="[ 'beginNeedPay' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应收">
+            <a-input v-decorator.trim="[ 'AllNeedGet' ]" :readOnly="true" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应付">
+            <a-input v-decorator.trim="[ 'AllNeedPay' ]" :readOnly="true" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号">
+            <a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)">
+            <a-input placeholder="请输入税率(%)" v-decorator.trim="[ 'taxRate' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行">
+            <a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号">
+            <a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
+            <a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+            <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
+          </a-form-item>
+        </a-col>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addSupplier,editSupplier,checkSupplier } from '@/api/api'
+  export default {
+    name: "MemberModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 6 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          supplier:{
+            rules: [
+              { required: true, message: '请输入名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validateSupplierName}
+            ]
+          }
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone',
+            'phoneNum', 'fax', 'beginNeedGet', 'beginNeedPay', 'AllNeedGet', 'AllNeedPay', 'taxNum', 'taxRate',
+            'bankName', 'accountNumber', 'address', 'description'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            if(this.model.beginNeedGet && this.model.beginNeedPay) {
+              that.$message.warn("期初应收和期初应付不能同时输入");
+              that.confirmLoading = false;
+              return;
+            }
+            formData.type = "会员";
+            let obj;
+            if(!this.model.id){
+              obj=addSupplier(formData);
+            }else{
+              obj=editSupplier(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateSupplierName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkSupplier(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/OrganizationModal.vue

@@ -0,0 +1,149 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :ok=false
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :okButtonProps="{ props: {disabled: disableSubmit} }"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="全称">
+          <a-input placeholder="请输入全称" v-decorator="['orgFullName', validatorRules.orgFullName ]"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="简称">
+          <a-input placeholder="请输入简称" v-decorator="['orgAbr', validatorRules.orgAbr ]"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
+          <a-input placeholder="请输入编号" v-decorator="['orgNo', validatorRules.orgNo ]"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级机构">
+          <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+                         allow-clear treeDefaultExpandAll="true"
+               :treeData="departTree" v-model="model.parentId" placeholder="请选择上级机构">
+          </a-tree-select>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
+          <a-input-number v-decorator="[ 'sort' ]"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+          <a-textarea placeholder="请输入备注":rows="2" v-decorator.trim="[ 'remark' ]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import { queryOrganizationTreeList } from '@/api/api'
+  import pick from 'lodash.pick'
+  import ATextarea from 'ant-design-vue/es/input/TextArea'
+  export default {
+    name: "OrganizationModal",
+    components: { ATextarea },
+    data () {
+      return {
+        departTree:[],
+        orgTypeData:[],
+        phoneWarning:'',
+        departName:"",
+        title:"操作",
+        visible: false,
+        disableSubmit:false,
+        model: {},
+        menuhidden:false,
+        menuusing:true,
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          orgFullName: {rules: [{required: true, message: '请输入全称!'}]},
+          orgAbr: {rules: [{required: true, message: '请输入简称!'}]},
+          orgNo: {rules: [{required: true, message: '请输入编码!'}]}
+        },
+        url: {
+          add: "/organization/add",
+        }
+      }
+    },
+    created () {
+    },
+    methods: {
+      loadTreeData(){
+        var that = this;
+        let params = {};
+        params.id='';
+        queryOrganizationTreeList(params).then((res)=>{
+          if(res){
+            that.departTree = [];
+            for (let i = 0; i < res.length; i++) {
+              let temp = res[i];
+              that.departTree.push(temp);
+            }
+          }
+        })
+      },
+      add () {
+        this.edit();
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, {});
+        this.visible = true;
+        this.loadTreeData();
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(record, 'orgFullName','orgAbr', 'orgNo', 'parentId', 'sort', 'remark'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.disableSubmit = false;
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            console.log(formData)
+            httpAction(this.url.add,formData,"post").then((res)=>{
+              if(res.code == 200){
+                that.$message.success(res.data.message);
+                that.loadTreeData();
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/PasswordModal.vue

@@ -0,0 +1,142 @@
+<template>
+  <a-modal
+    title="重新设定密码"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    style="top:20px;"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入用户账号" v-decorator="[ 'username', {}]" :readOnly="true"/>
+        </a-form-item>
+
+        <a-form-item label="登陆密码" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback >
+          <a-input type="password" placeholder="请输入登陆密码" v-decorator="[ 'password', validatorRules.password]" />
+        </a-form-item>
+
+        <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback >
+          <a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登陆密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
+        </a-form-item>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import {changePassword} from '@/api/api'
+
+  export default {
+    name: "PasswordModal",
+    data () {
+      return {
+        visible: false,
+        confirmLoading: false,
+        confirmDirty: false,
+        validatorRules:{
+          password:{
+            rules: [{
+              required: true,
+              pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+              message: '密码由8位数字、大小写字母和特殊符号组成!'
+            }, {
+              validator: this.validateToNextPassword,
+            }],
+          },
+          confirmpassword:{
+            rules: [{
+              required: true, message: '请重新输入登陆密码!',
+            }, {
+              validator: this.compareToFirstPassword,
+            }],
+          },
+        },
+
+        model: {},
+
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        form:this.$form.createForm(this)
+      }
+    },
+    created () {
+      console.log("created");
+    },
+
+    methods: {
+      show (username) {
+        this.form.resetFields();
+        this.visible = true;
+        this.model.username = username;
+        this.$nextTick(() => {
+          this.form.setFieldsValue({username:username});
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+        this.disableSubmit = false;
+        this.selectedRole = [];
+      },
+      handleSubmit () {
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            this.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            changePassword(formData).then((res)=>{
+              if(res.success){
+                this.$message.success(res.message);
+                this.$emit('ok');
+              }else{
+                this.$message.warning(res.message);
+              }
+            }).finally(() => {
+              this.confirmLoading = false;
+              this.close();
+            });
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateToNextPassword  (rule, value, callback) {
+        const form = this.form;
+        const confirmpassword=form.getFieldValue('confirmpassword');
+        console.log("confirmpassword==>",confirmpassword);
+        if (value && confirmpassword && value !== confirmpassword) {
+          callback('两次输入的密码不一样！');
+        }
+        if (value && this.confirmDirty) {
+          form.validateFields(['confirm'], { force: true })
+        }
+        callback();
+      },
+      compareToFirstPassword  (rule, value, callback) {
+        const form = this.form;
+        if (value && value !== form.getFieldValue('password')) {
+          callback('两次输入的密码不一样！');
+        } else {
+          callback()
+        }
+      },
+      handleConfirmBlur  (e) {
+        const value = e.target.value
+        this.confirmDirty = this.confirmDirty || !!value
+      }
+    }
+  }
+</script>

jshERP-web/src/views/system/modules/PermissionDataRuleModal.vue

@@ -0,0 +1,179 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="1000"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则名称">
+          <a-input placeholder="请输入规则名称" v-decorator="['ruleName', validatorRules.ruleName]"/>
+        </a-form-item>
+        <a-form-item
+          v-show="showRuleColumn"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则字段">
+          <a-input placeholder="请输入规则字段" v-decorator="['ruleColumn', validatorRules.ruleColumn]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="条件规则">
+          <j-dict-select-tag @change="handleChangeRuleCondition" v-decorator="['ruleConditions', validatorRules.ruleConditions]" placeholder="请输入条件规则" :triggerChange="true" dictCode="rule_conditions"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则值">
+          <a-input placeholder="请输入规则值" v-decorator="['ruleValue', validatorRules.ruleValue]"/>
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="状态">
+          <a-radio-group buttonStyle="solid" v-decorator="['status',{initialValue:'1'}]">
+            <a-radio-button value="1">有效</a-radio-button>
+            <a-radio-button value="0">无效</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+
+  export default {
+    name: 'PermissionDataRuleModal',
+    data() {
+      return {
+        queryParam: {},
+        title: '操作',
+        visible: false,
+        model: {},
+        ruleConditionList: [],
+        labelCol: {
+          xs: {span: 24},
+          sm: {span: 5}
+        },
+        wrapperCol: {
+          xs: {span: 24},
+          sm: {span: 16}
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        permissionId: '',
+        validatorRules: {
+          ruleConditions: {rules: [{required: true, message: '请选择条件!'}]},
+          ruleName: {rules: [{required: true, message: '请输入规则名称!'}]},
+          ruleValue: {rules: [{required: true, message: '请输入规则值!'}]},
+          ruleColumn: {rules: []}
+        },
+        url: {
+          list: '/sys/dictItem/list',
+          add: '/sys/permission/addPermissionRule',
+          edit: '/sys/permission/editPermissionRule'
+        },
+        showRuleColumn:true
+      }
+    },
+    created() {
+    },
+    methods: {
+      add(permId) {
+        this.permissionId = permId
+        this.edit({})
+      },
+      edit(record) {
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        if (record.permissionId) {
+          this.model.permissionId = record.permissionId
+        } else {
+          this.model.permissionId = this.permissionId
+        }
+        this.visible = true
+        this.initRuleCondition()
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'status','ruleName', 'ruleColumn', 'ruleConditions', 'ruleValue'))
+        })
+      },
+      close() {
+        this.$emit('close')
+        this.visible = false
+      },
+      handleOk() {
+        const that = this
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true
+            let httpurl = ''
+            let method = ''
+            if (!this.model.id) {
+              httpurl += this.url.add
+              method = 'post'
+            } else {
+              httpurl += this.url.edit
+              method = 'put'
+            }
+            let formData = Object.assign(this.model, values)
+            if(formData.ruleColumn && formData.ruleColumn.length>0){
+              formData.ruleColumn = formData.ruleColumn.trim()
+            }
+            if(formData.ruleValue && formData.ruleValue.length>0){
+              formData.ruleValue = formData.ruleValue.trim()
+            }
+            httpAction(httpurl, formData, method).then((res) => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.$emit('ok')
+              } else {
+                that.$message.warning(res.message)
+              }
+            }).finally(() => {
+              that.confirmLoading = false
+              that.close()
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.close()
+      },
+      initRuleCondition(){
+        if(this.model.ruleConditions && this.model.ruleConditions=='USE_SQL_RULES'){
+          this.showRuleColumn = false
+        }else{
+          this.showRuleColumn = true
+        }
+      },
+      handleChangeRuleCondition(val){
+        if(val=='USE_SQL_RULES'){
+          this.form.setFieldsValue({
+            ruleColumn:''
+          })
+          this.showRuleColumn = false
+        }else{
+          this.showRuleColumn = true
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/PermissionModal.vue

@@ -0,0 +1,430 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="drawerWidth"
+    @close="handleCancel"
+    :visible="visible"
+    :confirmLoading="confirmLoading">
+
+    <div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item label="菜单类型" :labelCol="labelCol" :wrapperCol="wrapperCol" >
+          <a-radio-group @change="onChangeMenuType" v-decorator="['menuType',{'initialValue':localMenuType}]">
+            <a-radio :value="0">一级菜单</a-radio>
+            <a-radio :value="1">子菜单</a-radio>
+            <a-radio :value="2">按钮/权限</a-radio>
+          </a-radio-group>
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          :label="menuLabel"
+          hasFeedback >
+          <a-input placeholder="请输入菜单名称" v-decorator="[ 'name', validatorRules.name]" :readOnly="disableSubmit"/>
+        </a-form-item>
+
+
+        <a-form-item
+          v-show="localMenuType!=0"
+          label="上级菜单"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          :validate-status="validateStatus"
+          :hasFeedback="true"
+          :required="true">
+          <span slot="help">{{ validateStatus=='error'?'请选择上级菜单':'&nbsp;&nbsp;' }}</span>
+          <a-tree-select
+            style="width:100%"
+            :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"
+            :treeData="treeData"
+            v-model="model.parentId"
+            placeholder="请选择父级菜单"
+            :disabled="disableSubmit"
+            @change="handleParentIdChange">
+          </a-tree-select>
+        </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="菜单路径">
+          <a-input placeholder="请输入菜单路径" v-decorator="[ 'url',validatorRules.url]" :readOnly="disableSubmit"/>
+        </a-form-item>
+
+        <a-form-item
+          v-show="show"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="前端组件">
+          <a-input placeholder="请输入前端组件" v-decorator="[ 'component',validatorRules.component]" :readOnly="disableSubmit"/>
+        </a-form-item>
+
+        <a-form-item
+          v-show="localMenuType==0"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="默认跳转地址">
+          <a-input placeholder="请输入路由参数 redirect" v-decorator="[ 'redirect',{}]" :readOnly="disableSubmit"/>
+        </a-form-item>
+
+        <a-form-item
+          v-show="!show"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="授权标识">
+          <a-input placeholder="多个用逗号分隔, 如: user:list,user:create" v-decorator="[ 'perms', {rules:[{ required: false, message: '请输入授权标识!' },{validator: this.validatePerms }]}]" :readOnly="disableSubmit"/>
+        </a-form-item>
+
+        <a-form-item
+          v-show="!show"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="授权策略">
+          <j-dict-select-tag  v-decorator="['permsType', {}]" placeholder="请选择授权策略" :type="'radio'" :triggerChange="true" dictCode="global_perms_type"/>
+
+
+        </a-form-item>
+        <a-form-item
+          v-show="!show"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="状态">
+          <j-dict-select-tag  v-decorator="['status', {}]" placeholder="请选择状态" :type="'radio'" :triggerChange="true" dictCode="valid_status"/>
+
+        </a-form-item>
+
+        <a-form-item
+          v-show="show"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="菜单图标">
+          <a-input placeholder="点击选择图标" v-model="model.icon" :readOnly="disableSubmit">
+            <a-icon slot="addonAfter" type="setting" @click="selectIcons" />
+          </a-input>
+        </a-form-item>
+
+        <a-form-item
+          v-show="show"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="排序">
+          <a-input-number placeholder="请输入菜单排序" style="width: 200px" v-decorator="[ 'sortNo',validatorRules.sortNo]" :readOnly="disableSubmit"/>
+        </a-form-item>
+
+        <a-form-item
+          v-show="show"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="是否路由菜单">
+          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="routeSwitch"/>
+        </a-form-item>
+
+        <a-form-item
+          v-show="show"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="隐藏路由">
+          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="menuHidden"/>
+        </a-form-item>
+
+        <a-form-item
+          v-show="show"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="是否缓存路由">
+          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="isKeepalive"/>
+        </a-form-item>
+
+
+        <a-form-item
+          v-show="show"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="聚合路由">
+          <a-switch checkedChildren="是" unCheckedChildren="否" v-model="alwaysShow"/>
+        </a-form-item>
+
+        <!--update_begin author:wuxianquan date:20190908 for:增加组件，外链打开方式可选 -->
+        <a-form-item
+          v-show="show"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="打开方式">
+          <a-switch checkedChildren="外部" unCheckedChildren="内部" v-model="internalOrExternal"/>
+        </a-form-item>
+        <!--update_end author:wuxianquan date:20190908 for:增加组件，外链打开方式可选 -->
+
+
+      </a-form>
+
+      <!-- 选择图标 -->
+      <icons @choose="handleIconChoose" @close="handleIconCancel" :iconChooseVisible="iconChooseVisible"></icons>
+    </a-spin>
+      <a-row :style="{textAlign:'right'}">
+        <a-button :style="{marginRight: '8px'}" @click="handleCancel">
+          关闭
+        </a-button>
+        <a-button :disabled="disableSubmit" @click="handleOk" type="primary">确定</a-button>
+      </a-row>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import {addPermission,editPermission,queryTreeList, duplicateCheck} from '@/api/api'
+  import Icons from './icon/Icons'
+  import pick from 'lodash.pick'
+
+  export default {
+    name: "PermissionModal",
+    components: {Icons},
+    data () {
+      return {
+        drawerWidth:700,
+        treeData:[],
+        treeValue: '0-0-4',
+        title:"操作",
+        visible: false,
+        disableSubmit:false,
+        model: {},
+        localMenuType:0,
+        alwaysShow:false,//表单元素-聚合路由
+        menuHidden:false,//表单元素-隐藏路由
+        routeSwitch:true, //是否路由菜单
+        /*update_begin author:wuxianquan date:20190908 for:定义变量，初始值代表内部打开*/
+        internalOrExternal:false,//菜单打开方式
+        /*update_end author:wuxianquan date:20190908 for:定义变量，初始值代表内部打开*/
+        isKeepalive:true, //是否缓存路由
+        show:true,//根据菜单类型，动态显示隐藏表单元素
+        menuLabel:'菜单名称',
+        isRequrie:true,  // 是否需要验证
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+
+        iconChooseVisible: false,
+        validateStatus:""
+      }
+    },
+    computed:{
+      validatorRules:function() {
+        return {
+          name:{rules: [{ required: true, message: '请输入菜单标题!' }]},
+          component:{rules: [{ required: this.show, message: '请输入前端组件!' }]},
+          url:{rules: [{ required: this.show, message: '请输入菜单路径!' }]},
+          permsType:{rules: [{ required: true, message: '请输入授权策略!' }]},
+          sortNo:{initialValue:1.0},
+        }
+      }
+    },
+    created () {
+      this.initDictConfig();
+    },
+    methods: {
+      loadTree(){
+        var that = this;
+        queryTreeList().then((res)=>{
+          if(res.success){
+            console.log('----queryTreeList---')
+            console.log(res)
+            that.treeData = [];
+            let treeList = res.result.treeList
+            for(let a=0;a<treeList.length;a++){
+              let temp = treeList[a];
+              temp.isLeaf = temp.leaf;
+              that.treeData.push(temp);
+            }
+          }
+        });
+      },
+      add () {
+        // 默认值
+        this.edit({status:'1',permsType:'1',route:true});
+      },
+      edit (record) {
+        this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        //--------------------------------------------------------------------------------------------------
+        //根据菜单类型，动态展示页面字段
+        console.log(record)
+        this.alwaysShow = !record.alwaysShow?false:true;
+        this.menuHidden = !record.hidden?false:true;
+
+        if(record.route!=null){
+          this.routeSwitch = record.route?true:false;
+        }
+
+        if(record.keepAlive!=null){
+          this.isKeepalive = record.keepAlive?true:false;
+        }else{
+          this.isKeepalive = false; // 升级兼容 如果没有（后台没有传过来、或者是新建）默认为false
+        }
+
+        /*update_begin author:wuxianquan date:20190908 for:编辑初始化数据*/
+        if(record.internalOrExternal!=null){
+          this.internalOrExternal = record.internalOrExternal?true:false;
+        }else{
+          this.internalOrExternal = false;
+        }
+        /*update_end author:wuxianquan date:20190908 for:编辑初始化数据*/
+
+
+        //console.log('record.menuType', record.menuType);
+        this.show = record.menuType==2?false:true;
+        this.menuLabel = record.menuType==2?'按钮/权限':'菜单名称';
+
+        if(this.model.parentId){
+          this.localMenuType = 1;
+        }else{
+          this.localMenuType = 0;
+        }
+        //----------------------------------------------------------------------------------------------
+
+        this.visible = true;
+        this.loadTree();
+        let fieldsVal = pick(this.model,'name','perms','permsType','component','url','sortNo','menuType','status');
+        this.$nextTick(() => {
+          this.form.setFieldsValue(fieldsVal)
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.disableSubmit = false;
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            this.model.alwaysShow = this.alwaysShow;
+            this.model.hidden = this.menuHidden;
+            this.model.route = this.routeSwitch;
+            this.model.keepAlive = this.isKeepalive;
+            /*update_begin author:wuxianquan date:20190908 for:获取值*/
+            this.model.internalOrExternal = this.internalOrExternal;
+            /*update_end author:wuxianquan date:20190908 for:获取值*/
+
+            let formData = Object.assign(this.model, values);
+            if ((formData.menuType == 1 || formData.menuType == 2) && !formData.parentId) {
+              that.validateStatus = 'error';
+              that.$message.error("请检查你填的类型以及信息是否正确！");
+              return;
+            } else {
+              that.validateStatus = 'success';
+            }
+            that.confirmLoading = true;
+            console.log(formData);
+            let obj;
+            if (!this.model.id) {
+              obj = addPermission(formData);
+            } else {
+              obj = editPermission(formData);
+            }
+            obj.then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.$emit('ok');
+              } else {
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            });
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateNumber(rule, value, callback){
+        if(!value || new RegExp(/^[0-9]*[1-9][0-9]*$/).test(value)){
+          callback();
+        }else{
+          callback("请输入正整数!");
+        }
+      },
+      validatePerms(rule, value, callback){
+        if(value && value.length>0){
+          //校验授权标识是否存在
+          var params = {
+            tableName: 'sys_permission',
+            fieldName: 'perms',
+            fieldVal: value,
+            dataId: this.model.id
+          };
+          duplicateCheck(params).then((res) => {
+            if (res.success) {
+              callback()
+            } else {
+              callback("授权标识已存在!")
+            }
+          })
+        }else{
+          callback()
+        }
+      },
+      onChangeMenuType(e) {
+        //console.log('localMenuType checked', e.target.value)
+        this.localMenuType=e.target.value
+        if(e.target.value == 2){
+          this.show = false;
+          this.menuLabel = '按钮/权限';
+        }else{
+          this.show = true;
+          this.menuLabel = '菜单名称';
+        }
+        this.$nextTick(() => {
+          this.form.validateFields(['url','component'], { force: true });
+        });
+      },
+      selectIcons(){
+        this.iconChooseVisible = true
+      },
+      handleIconCancel () {
+        this.iconChooseVisible = false
+      },
+      handleIconChoose (value) {
+        console.log(value)
+        this.model.icon = value
+        this.form.icon = value
+        this.iconChooseVisible = false
+      },
+      // 根据屏幕变化,设置抽屉尺寸
+      resetScreenSize(){
+        let screenWidth = document.body.clientWidth;
+        if(screenWidth < 500){
+          this.drawerWidth = screenWidth;
+        }else{
+          this.drawerWidth = 700;
+        }
+      },
+      initDictConfig() {
+      },
+      handleParentIdChange(value){
+        if(!value){
+          this.validateStatus="error"
+        }else{
+          this.validateStatus="success"
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/PersonModal.vue

@@ -0,0 +1,132 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:25%;height: 50%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="姓名">
+          <a-input placeholder="请输入姓名" v-decorator.trim="[ 'name', validatorRules.name]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类型">
+          <a-select placeholder="请选择类型" v-decorator="[ 'type', validatorRules.type]">
+            <a-select-option value="业务员">业务员</a-select-option>
+            <a-select-option value="仓管员">仓管员</a-select-option>
+            <a-select-option value="财务员">财务员</a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addPerson,editPerson,checkPerson } from '@/api/api'
+  export default {
+    name: "PersonModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          name:{
+            rules: [
+              { required: true, message: '请输入姓名!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validatePersonName}
+            ]},
+          type:{
+            rules: [
+              { required: true, message: '请选择类型!' }
+            ]
+          }
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'name', 'type', 'description'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=addPerson(formData);
+            }else{
+              obj=editPerson(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validatePersonName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkPerson(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/PluginModal.vue

@@ -0,0 +1,114 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:25%;height: 50%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="机器码">
+          <a-input v-decorator.trim="[ 'platformKey' ]" :readOnly="true"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="激活码">
+          <a-textarea :rows="2" placeholder="请输入激活码" v-decorator="[ 'platformValue' ]"/>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addPerson,editPerson,checkPerson } from '@/api/api'
+  import { getAction, postAction } from '../../../api/manage'
+  export default {
+    name: "PluginModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        machineCode: '',
+        activationCode: '',
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          name:{
+            rules: [
+              { required: true, message: '请输入姓名!' },
+            ]},
+          type:{
+            rules: [
+              { required: true, message: '请选择类型!' }
+            ]
+          }
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      edit () {
+        this.form.resetFields();
+        this.model = Object.assign({}, {});
+        getAction("/plugin/getMacWithSecret").then((res)=>{
+          if(res && res.code == 200) {
+            this.model.platformKey = res.data
+            getAction("/platformConfig/getPlatformConfigByKey", {"platformKey": "activation_code"}).then((res)=>{
+              if(res && res.code == 200) {
+                this.model.platformValue = res.data.platformValue
+                this.visible = true;
+                this.$nextTick(() => {
+                  this.form.setFieldsValue(pick(this.model, 'platformKey','platformValue'))
+                });
+              }
+            })
+          }
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            formData.platformKey = 'activation_code'
+            postAction('/platformConfig/updatePlatformConfigByKey', formData).then((res)=>{
+              if(res.code === 200){
+                that.$message.info('填写成功！');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/QuartzJobModal.vue

@@ -0,0 +1,190 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    okText="保存并安排任务"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="任务类名"
+          hasFeedback >
+          <a-input placeholder="请输入任务类名" v-decorator="['jobClassName', {rules: [{ required: true, message: '请输入任务类名!' }]}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="cron表达式">
+<!--                    <a-input placeholder="请输入cron表达式" v-decorator="['cronExpression', {'initialValue':'0/1 * * * * ?',rules: [{ required: true, message: '请输入任务类名!' }]}]" />-->
+<!--                    <a target="_blank" href="http://cron.qqe2.com/">-->
+<!--                      <a-icon type="share-alt" />-->
+<!--                      在线cron表达式生成-->
+<!--                    </a>-->
+<!--          <j-cron ref="innerVueCron" v-decorator="['cronExpression', {'initialValue':'0/1 * * * * ?',rules: [{ required: true, message: '请输入cron表达式!' }]}]"  @change="setCorn"></j-cron>-->
+          <j-cron ref="innerVueCron" v-decorator="['cronExpression', { initialValue: '* * * * * ? *' }]" @change="setCorn"></j-cron>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="参数">
+          <a-textarea placeholder="请输入参数" :rows="5" v-decorator="['parameter', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="描述">
+          <a-textarea placeholder="请输入描述" :rows="3" v-decorator="['description', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="状态">
+          <j-dict-select-tag type="radioButton"  v-decorator="[ 'status', {'initialValue':0}]" :trigger-change="true" dictCode="quartz_status"/>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import JCron from "@/components/jeecg/JCron";
+  import pick from 'lodash.pick'
+  // import moment from "moment"
+
+  export default {
+    name: "QuartzJobModal",
+    components: {
+      JCron
+    },
+    data () {
+      return {
+        title:"操作",
+        buttonStyle: 'solid',
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        cron: {
+          label: '',
+          value: ''
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {
+          cron: {
+            rules: [{
+              required: true, message: '请输入cron表达式!'
+            }]
+          }
+        },
+        url: {
+          add: "/sys/quartzJob/add",
+          edit: "/sys/quartzJob/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        let that = this;
+        that.form.resetFields();
+        this.model = Object.assign({},record);
+        console.log(this.model)
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'jobClassName','cronExpression','parameter','description','status'));
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          console.log('values',values)
+          if (!err) {
+            if (typeof values.cronExpression == "undefined" || Object.keys(values.cronExpression).length==0 ) {
+              this.$message.warning('请输入cron表达式!');
+              return false;
+            }
+
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+              method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+
+            console.log('提交参数',formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      setCorn(data){
+        console.log('data)',data);
+        this.$nextTick(() => {
+          this.model.cronExpression = data;
+        })
+
+        // console.log(Object.keys(data).length==0);
+        if (Object.keys(data).length==0) {
+          this.$message.warning('请输入cron表达式!');
+        }
+      },
+      validateCron(rule, value, callback){
+        if(!value){
+          callback()
+        }else if (Object.keys(value).length==0) {
+          callback("请输入cron表达式!");
+        }
+      },
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/RoleDataruleModal.vue

@@ -0,0 +1,120 @@
+<template>
+  <a-drawer
+    title="数据规则/按钮权限配置"
+    width="365"
+    :closable="false"
+    @close="onClose"
+    :visible="visible"
+  >
+
+    <a-tabs defaultActiveKey="1">
+      <a-tab-pane tab="数据规则" key="1">
+
+        <a-checkbox-group v-model="dataruleChecked" v-if="dataruleList.length>0">
+          <a-row>
+            <a-col :span="24" v-for="(item,index) in dataruleList" :key=" 'dr'+index ">
+              <a-checkbox :value="item.id">{{ item.ruleName }}</a-checkbox>
+            </a-col>
+
+            <a-col :span="24">
+              <div style="width: 100%;margin-top: 15px">
+                <a-button @click="saveDataruleForRole" type="primary" size="small" icon="save">点击保存</a-button>
+              </div>
+            </a-col>
+          </a-row>
+        </a-checkbox-group>
+        <div v-else><h3>无配置信息!</h3></div>
+
+      </a-tab-pane>
+      <!--<a-tab-pane tab="按钮权限" key="2">敬请期待!!!</a-tab-pane>-->
+    </a-tabs>
+
+  </a-drawer>
+</template>
+
+<script>
+  import ARow from 'ant-design-vue/es/grid/Row'
+  import ACol from 'ant-design-vue/es/grid/Col'
+  import { getAction,postAction } from '@/api/manage'
+
+  export default {
+    name: 'RoleDataruleModal',
+    components: { ACol, ARow },
+    data(){
+      return {
+        functionId:'',
+        roleId:'',
+        visible:false,
+        tabList: [{
+          key: '1',
+          tab: '数据规则',
+        }, {
+          key: '2',
+          tab: '按钮权限',
+        }],
+        activeTabKey: '1',
+        url:{
+          datarule:"/sys/role/datarule",
+        },
+        dataruleList:[],
+        dataruleChecked:[]
+      }
+    },
+    methods:{
+      loadData(){
+        getAction(`${this.url.datarule}/${this.functionId}/${this.roleId}`).then(res=>{
+          console.log(res)
+          if(res.success){
+            this.dataruleList = res.result.datarule
+            let drChecked = res.result.drChecked
+            if(drChecked){
+              this.dataruleChecked = drChecked.split(",")
+            }
+          }
+        })
+      },
+      saveDataruleForRole(){
+        if(!this.dataruleChecked || this.dataruleChecked.length==0){
+          this.$message.warning("请注意，现未勾选任何数据权限!")
+        }
+        let params = {
+          permissionId:this.functionId,
+          roleId:this.roleId,
+          dataRuleIds:this.dataruleChecked.join(",")
+        }
+        console.log("保存数据权限",params)
+        postAction(this.url.datarule,params).then(res=>{
+          if(res.success){
+            this.$message.success(res.message)
+          }else{
+            this.$message.error(res.message)
+          }
+        })
+      },
+      show(functionId,roleId){
+        this.onReset()
+        this.functionId = functionId
+        this.roleId = roleId
+        this.visible=true
+        this.loadData()
+      },
+      onClose(){
+        this.visible=false
+        this.onReset()
+      },
+      onTabChange (key) {
+        this.activeTabKey = key
+      },
+      onReset(){
+        this.functionId=''
+        this.roleId=''
+        this.dataruleList=[]
+        this.dataruleChecked=[]
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/RoleFunctionModal.vue

@@ -0,0 +1,209 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 95%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <div class="drawer-bootom-button">
+        <a-dropdown :trigger="['click']" placement="topCenter">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
+            <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
+            <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
+            <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
+            <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
+            <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
+          </a-menu>
+          <a-button>
+            树操作 <a-icon type="up" />
+          </a-button>
+        </a-dropdown>
+      </div>
+      <a-col :md="10" :sm="24">
+        <template>
+          <a-tree
+            checkable
+            multiple
+            @check="onCheck"
+            :selectedKeys="selectedKeys"
+            :checkedKeys="checkedKeys"
+            :treeData="roleFunctionTree"
+            :checkStrictly="checkStrictly"
+            :expandedKeys="iExpandedKeys"
+            :autoExpandParent="true"
+            @expand="onExpand"/>
+        </template>
+      </a-col>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addUserBusiness,editUserBusiness,checkUserBusiness} from '@/api/api'
+  import {getAction} from '../../../api/manage'
+  export default {
+    name: "RoleFunctionModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        roleId: 0,
+        iExpandedKeys: [],
+        roleFunctionTree: [],
+        checkedKeys: [],
+        selectedKeys: [],
+        checkStrictly: false,
+        hiding: true,
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+      }
+    },
+    created () {
+    },
+    methods: {
+      edit (id) {
+        this.form.resetFields();
+        this.model = Object.assign({}, {});
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'name', 'type', 'description'))
+        });
+        this.roleId = id
+        this.checkedKeys = []
+        this.loadTree(id)
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            formData.type = 'RoleFunctions'
+            formData.keyId = this.model.id
+            formData.value = this.checkedKeys
+            let obj;
+            checkUserBusiness({'type': 'RoleFunctions','keyId': this.roleId}).then((res)=>{
+              if(res.data && res.data.id) {
+                formData.id=res.data.id
+                obj=editUserBusiness(formData);
+              } else {
+                obj=addUserBusiness(formData);
+              }
+              obj.then((res)=>{
+                if(res.code === 200){
+                  that.$emit('ok');
+                }else{
+                  that.$message.warning(res.data.message);
+                }
+              }).finally(() => {
+                that.confirmLoading = false;
+                that.close();
+              })
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      loadTree(id) {
+        let that = this
+        that.treeData = []
+        that.roleFunctionTree = []
+        let params = {};
+        params.id='';
+        getAction('/function/findRoleFunction?UBType=RoleFunctions&UBKeyId='+id).then((res) => {
+          if (res) {
+            //机构全选后，再添加机构，选中数量增多
+            this.allTreeKeys = [];
+            for (let i = 0; i < res.length; i++) {
+              let temp = res[i]
+              that.treeData.push(temp)
+              that.roleFunctionTree.push(temp)
+              that.setThisExpandedKeys(temp)
+              that.getAllKeys(temp);
+            }
+            console.log(JSON.stringify(this.checkedKeys))
+            this.loading = false
+          }
+        })
+      },
+      onCheck(checkedKeys, info) {
+        console.log('onCheck', checkedKeys, info)
+        this.hiding = false
+        if(this.checkStrictly){
+          this.checkedKeys = checkedKeys.checked;
+        }else{
+          this.checkedKeys = checkedKeys
+        }
+      },
+      setThisExpandedKeys(node) {
+        if(node.checked==true) {
+          this.checkedKeys.push(node.key)
+        }
+        if (node.children && node.children.length > 0) {
+          this.iExpandedKeys.push(node.key)
+          for (let a = 0; a < node.children.length; a++) {
+            this.setThisExpandedKeys(node.children[a])
+          }
+        }
+      },
+      getAllKeys(node) {
+        // console.log('node',node);
+        this.allTreeKeys.push(node.key)
+        if (node.children && node.children.length > 0) {
+          for (let a = 0; a < node.children.length; a++) {
+            this.getAllKeys(node.children[a])
+          }
+        }
+      },
+      expandAll () {
+        this.iExpandedKeys = this.allTreeKeys
+      },
+      closeAll () {
+        this.iExpandedKeys = []
+      },
+      checkALL () {
+        this.checkStriccheckStrictlytly = false
+        this.checkedKeys = this.allTreeKeys
+      },
+      cancelCheckALL () {
+        this.checkedKeys = []
+      },
+      switchCheckStrictly (v) {
+        if(v==1){
+          this.checkStrictly = false
+        }else if(v==2){
+          this.checkStrictly = true
+        }
+      },
+      onExpand(expandedKeys) {
+        console.log('onExpand', expandedKeys)
+        this.iExpandedKeys = expandedKeys
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/RoleModal.vue

@@ -0,0 +1,141 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 85%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="角色名称">
+          <a-input placeholder="请输入角色名称" v-decorator.trim="[ 'name', validatorRules.name]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="数据类型">
+          <a-select placeholder="请选择数据类型" v-decorator="[ 'type', validatorRules.type]">
+            <a-select-option value="全部数据">全部数据</a-select-option>
+            <a-select-option value="本机构数据">本机构数据</a-select-option>
+            <a-select-option value="个人数据">个人数据</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
+          <a-textarea :rows="5" placeholder="请输入描述" v-decorator="[ 'description', validatorRules.description ]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addRole,editRole,checkRole } from '@/api/api'
+  export default {
+    name: "RoleModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          name:{
+            rules: [
+              { required: true, message: '请输入角色名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validateRoleName}
+            ]
+          },
+          type:{
+            rules: [
+              { required: true, message: '请选择数据类型!' }
+            ]
+          },
+          description:{
+            rules: [
+              { min: 0, max: 126, message: '长度不超过 126 个字符', trigger: 'blur' }
+            ]
+          }
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'name', 'type', 'description'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=addRole(formData);
+            }else{
+              obj=editRole(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateRoleName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkRole(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/RolePushBtnModal.vue

@@ -0,0 +1,141 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 95%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="按钮名称">
+          <a-input placeholder="请输入角色名称" v-decorator.trim="[ 'name', validatorRules.name]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="数据类型">
+          <a-select placeholder="请选择数据类型" v-decorator="[ 'type', validatorRules.type]">
+            <a-select-option value="全部数据">全部数据</a-select-option>
+            <a-select-option value="本机构数据">本机构数据</a-select-option>
+            <a-select-option value="个人数据">个人数据</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
+          <a-textarea :rows="5" placeholder="请输入描述" v-decorator="[ 'description', validatorRules.description ]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addRole,editRole,checkRole } from '@/api/api'
+  export default {
+    name: "RolePushBtnModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          name:{
+            rules: [
+              { required: true, message: '请输入角色名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validateRoleName}
+            ]
+          },
+          type:{
+            rules: [
+              { required: true, message: '请选择数据类型!' }
+            ]
+          },
+          description:{
+            rules: [
+              { min: 0, max: 126, message: '长度不超过 126 个字符', trigger: 'blur' }
+            ]
+          }
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'name', 'type', 'description'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=addRole(formData);
+            }else{
+              obj=editRole(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateRoleName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkRole(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/SelectUserListModal.vue

@@ -0,0 +1,290 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="1200"
+    :visible="visible"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :span="6">
+            <a-form-item label="账号">
+              <a-input placeholder="请输入账号" v-model="queryParam.username"></a-input>
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="6">
+            <a-form-item label="性别">
+              <a-select v-model="queryParam.sex" placeholder="请选择性别">
+                <a-select-option value="">请选择性别查询</a-select-option>
+                <a-select-option value="1">男性</a-select-option>
+                <a-select-option value="2">女性</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+
+          <template v-if="toggleSearchStatus">
+            <a-col :span="6">
+              <a-form-item label="邮箱">
+                <a-input placeholder="请输入邮箱" v-model="queryParam.email"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="6">
+              <a-form-item label="手机号码">
+                <a-input placeholder="请输入手机号码" v-model="queryParam.phone"></a-input>
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="6">
+              <a-form-item label="状态">
+                <a-select v-model="queryParam.status" placeholder="请选择状态">
+                  <a-select-option value="">请选择状态</a-select-option>
+                  <a-select-option value="1">正常</a-select-option>
+                  <a-select-option value="2">解冻</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </template>
+
+          <a-col :span="6" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchByquery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+ <!--    update-begin author:kangxiaolin   date:20190921   for:系统发送通知 用户多选失败 #513  -->
+    <a-table
+      ref="table"
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="ipagination"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,onSelect:onSelect}"
+      @change="handleTableChange"
+    >
+<!--     update-end   author:kangxiaolin  date:20190921     for:系统发送通知 用户多选失败 #513 -->
+    </a-table>
+  </a-modal>
+</template>
+
+<script>
+  import { filterObj } from '@/utils/util';
+
+  import { getUserList } from '@/api/api'
+
+  export default {
+    name: "SelectUserListModal",
+    components: {
+    },
+    data () {
+      return {
+        title:"选择用户",
+        queryParam: {},
+        columns: [{
+          title: '用户账号',
+          align:"center",
+          dataIndex: 'username',
+          fixed:'left',
+          width:200
+        },{
+          title: '用户名称',
+          align:"center",
+          dataIndex: 'realname',
+        },{
+          title: '性别',
+          align:"center",
+          dataIndex: 'sex',
+          customRender:function (text) {
+            if(text==1){
+              return "男";
+            }else if(text==2){
+              return "女";
+            }else{
+              return text;
+            }
+          }
+        },{
+          title: '手机号码',
+          align:"center",
+          dataIndex: 'phone'
+        },{
+          title: '邮箱',
+          align:"center",
+          dataIndex: 'email'
+        },{
+          title: '状态',
+          align:"center",
+          dataIndex: 'status',
+          customRender:function (text) {
+            if(text==1){
+              return "正常";
+            }else if(text==2){
+              return "冻结";
+            }else{
+              return text;
+            }
+          }
+        }],
+        dataSource:[],
+        ipagination:{
+          current: 1,
+          pageSize: 5,
+          pageSizeOptions: ['5', '10', '20'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        isorter:{
+          column: 'createTime',
+          order: 'desc',
+        },
+        selectedRowKeys: [],
+        selectionRows: [],
+        visible:false,
+        toggleSearchStatus:false,
+      }
+    },
+    created() {
+      this.loadData();
+    },
+    methods: {
+      add (selectUser,userIds) {
+        this.visible = true;
+        this.edit(selectUser,userIds);
+      },
+      edit(selectUser,userIds){
+        //控制台报错
+        if(userIds&&userIds.length>0){
+          this.selectedRowKeys = userIds.split(',');
+        }else{
+          this.selectedRowKeys = []
+        }
+        if(!selectUser){
+          this.selectionRows=[]
+        }else{
+          var that=this;
+          that.selectionRows=[];
+          selectUser.forEach(function(record,index){
+            console.log(record)
+            that.selectionRows.push({id: that.selectedRowKeys[index],realname:record})
+          })
+          // this.selectionRows = selectUser;
+        }
+      },
+      loadData (arg){
+        if(arg===1){
+          this.ipagination.current = 1;
+        }
+        let params = this.getQueryParams();//查询条件
+        getUserList(params).then((res)=>{
+          if(res.success){
+            this.dataSource = res.result.records;
+            this.ipagination.total = res.result.total;
+          }
+        })
+      },
+      getQueryParams(){
+        let param = Object.assign({}, this.queryParam,this.isorter);
+        param.field = this.getQueryField();
+        //--update-begin----author:scott---date:20190818------for:新建公告时指定特定用户翻页错误SelectUserListModal #379----
+        // param.current = this.ipagination.current;
+        // param.pageSize = this.ipagination.pageSize;
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        //--update-end----author:scott---date:20190818------for:新建公告时指定特定用户翻页错误SelectUserListModal #379---
+        return filterObj(param);
+      },
+      getQueryField(){
+        let str = "id,";
+        for(let a = 0;a<this.columns.length;a++){
+          str+=","+this.columns[a].dataIndex;
+        }
+        return str;
+      },
+      //--update-begin----author:kangxiaolin---date:20190921------for:系统发送通知 用户多选失败 #513----
+      onSelectChange (selectedRowKeys) {
+        this.selectedRowKeys = selectedRowKeys;
+      },
+      onSelect(record, selected){
+        if(selected == true ){
+          this.selectionRows.push(record);
+        }else {
+          this.selectionRows.forEach(function(item,index,arr){
+            if(item.id == record.id) {
+              arr.splice(index, 1);
+            }
+          })
+        }
+        //--update-end----author:kangxiaolin---date:20190921------for:系统发送通知 用户多选失败 #513----
+      },
+
+      searchReset(){
+        let that = this;
+        Object.keys(that.queryParam).forEach(function(key){
+          that.queryParam[key] = '';
+        });
+        that.loadData(1);
+      },
+      handleTableChange(pagination, filters, sorter){
+        //TODO 筛选
+        if (Object.keys(sorter).length>0){
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend"==sorter.order?"asc":"desc"
+        }
+        this.ipagination = pagination;
+        this.loadData();
+      },
+      handleCancel () {
+        this.selectionRows = [];
+        this.selectedRowKeys = [];
+        this.visible = false;
+      },
+      handleOk () {
+        this.$emit("choseUser",this.selectionRows);
+        this.handleCancel();
+      },
+      searchByquery(){
+        this.loadData(1);
+      },
+      handleToggleSearch(){
+        this.toggleSearchStatus = !this.toggleSearchStatus;
+      },
+    }
+  }
+</script>
+<style scoped>
+  .ant-card-body .table-operator{
+    margin-bottom: 18px;
+  }
+
+  .ant-table-tbody .ant-table-row td{
+    padding-top:15px;
+    padding-bottom:15px;
+  }
+  .anty-row-operator button{margin: 0 5px}
+  .ant-btn-danger{background-color: #ffffff}
+
+  .ant-modal-cust-warp{height: 100%}
+  .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+  .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+
+  .anty-img-wrap{height:25px;position: relative;}
+  .anty-img-wrap > img{max-height:100%;}
+</style>

jshERP-web/src/views/system/modules/SelectUserModal.vue

@@ -0,0 +1,287 @@
+<template>
+  <div>
+    <a-modal
+      centered
+      :title="title"
+      :width="1000"
+      :visible="visible"
+      @ok="handleOk"
+      @cancel="handleCancel"
+      cancelText="关闭">
+
+
+      <!-- 查询区域 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline"  @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+
+            <a-col :span="10">
+              <a-form-item label="用户账号">
+                <a-input placeholder="请输入用户账号" v-model="queryParam.username"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="8">
+                    <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                      <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                      <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+                    </span>
+            </a-col>
+
+          </a-row>
+        </a-form>
+      </div>
+      <!-- table区域-begin -->
+      <div>
+        <a-table
+          size="small"
+          bordered
+          rowKey="id"
+          :columns="columns1"
+          :dataSource="dataSource1"
+          :pagination="ipagination"
+          :loading="loading"
+          :scroll="{ y: 240 }"
+          :rowSelection="{selectedRowKeys: selectedRowKeys,onSelectAll:onSelectAll,onSelect:onSelect,onChange: onSelectChange}"
+          @change="handleTableChange">
+
+        </a-table>
+      </div>
+      <!-- table区域-end -->
+
+
+    </a-modal>
+  </div>
+</template>
+
+<script>
+  import {filterObj} from '@/utils/util'
+  import {getAction} from '@/api/manage'
+
+  export default {
+    name: "SelectUserModal",
+    data() {
+      return {
+        title: "添加已有用户",
+        names: [],
+        visible: false,
+        placement: 'right',
+        description: '',
+        // 查询条件
+        queryParam: {},
+        // 表头
+        columns1: [
+          {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 50,
+            align: "center",
+            customRender: function (t, r, index) {
+              return parseInt(index) + 1;
+            }
+          },
+          {
+            title: '用户账号',
+            align: "center",
+            width: 100,
+            dataIndex: 'username'
+          },
+          {
+            title: '用户名称',
+            align: "center",
+            width: 100,
+            dataIndex: 'realname'
+          },
+          {
+            title: '性别',
+            align: "center",
+            width: 100,
+            dataIndex: 'sex_dictText'
+          },
+          {
+            title: '电话',
+            align: "center",
+            width: 100,
+            dataIndex: 'phone'
+          },
+          {
+            title: '部门',
+            align: "center",
+            width: 150,
+            dataIndex: 'orgCode'
+          }
+        ],
+        columns2: [
+          {
+            title: '用户账号',
+            align: "center",
+            dataIndex: 'username',
+
+          },
+          {
+            title: '用户名称',
+            align: "center",
+            dataIndex: 'realname',
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: "center",
+            width: 100,
+            scopedSlots: {customRender: 'action'},
+          }
+        ],
+        //数据集
+        dataSource1: [],
+        dataSource2: [],
+        // 分页参数
+        ipagination: {
+          current: 1,
+          pageSize: 10,
+          pageSizeOptions: ['10', '20', '30'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        isorter: {
+          column: 'createTime',
+          order: 'desc',
+        },
+        loading: false,
+        selectedRowKeys: [],
+        selectedRows: [],
+        url: {
+          list: "/sys/user/list",
+        }
+      }
+    },
+    created() {
+      this.loadData();
+    },
+    methods: {
+      searchQuery() {
+        this.loadData(1);
+      },
+      searchReset() {
+        this.queryParam = {};
+        this.loadData(1);
+      },
+      handleCancel() {
+        this.visible = false;
+      },
+      handleOk() {
+        this.dataSource2 = this.selectedRowKeys;
+        console.log("data:" + this.dataSource2);
+        this.$emit("selectFinished", this.dataSource2);
+        this.visible = false;
+      },
+      add() {
+        this.visible = true;
+      },
+      loadData(arg) {
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        var params = this.getQueryParams();//查询条件
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource1 = res.result.records;
+            this.ipagination.total = res.result.total;
+          }
+        })
+      },
+      getQueryParams() {
+        var param = Object.assign({}, this.queryParam, this.isorter);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        return filterObj(param);
+      },
+      getQueryField() {
+        //TODO 字段权限控制
+      },
+      onSelectAll(selected, selectedRows, changeRows) {
+        if (selected === true) {
+          for (var a = 0; a < changeRows.length; a++) {
+            this.dataSource2.push(changeRows[a]);
+          }
+        } else {
+          for (var b = 0; b < changeRows.length; b++) {
+            this.dataSource2.splice(this.dataSource2.indexOf(changeRows[b]), 1);
+          }
+        }
+        // console.log(selected, selectedRows, changeRows);
+      },
+      onSelect(record, selected) {
+        if (selected === true) {
+          this.dataSource2.push(record);
+        } else {
+          var index = this.dataSource2.indexOf(record);
+          //console.log();
+          if (index >= 0) {
+            this.dataSource2.splice(this.dataSource2.indexOf(record), 1);
+          }
+
+        }
+      },
+      onSelectChange(selectedRowKeys, selectedRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectedRows;
+      },
+      onClearSelected() {
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+      },
+      handleDelete: function (record) {
+        this.dataSource2.splice(this.dataSource2.indexOf(record), 1);
+      },
+      handleTableChange(pagination, filters, sorter) {
+        //分页、排序、筛选变化时触发
+        console.log(sorter);
+        //TODO 筛选
+        if (Object.keys(sorter).length > 0) {
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+        }
+        this.ipagination = pagination;
+        this.loadData();
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+  .ant-card-body .table-operator {
+    margin-bottom: 18px;
+  }
+
+  .ant-table-tbody .ant-table-row td {
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+
+  .anty-row-operator button {
+    margin: 0 5px
+  }
+
+  .ant-btn-danger {
+    background-color: #ffffff
+  }
+
+  .ant-modal-cust-warp {
+    height: 100%
+  }
+
+  .ant-modal-cust-warp .ant-modal-body {
+    height: calc(100% - 110px) !important;
+    overflow-y: auto
+  }
+
+  .ant-modal-cust-warp .ant-modal-content {
+    height: 90% !important;
+    overflow-y: hidden
+  }
+</style>

jshERP-web/src/views/system/modules/SerialNumberBatchModal.vue

@@ -0,0 +1,130 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:10%;height: 80%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号前缀">
+          <a-input placeholder="请输入序列号前缀" v-decorator.trim="[ 'serialNumberPrefix', validatorRules.serialNumberPrefix]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号数量">
+          <a-input placeholder="请输入序列号数量" v-decorator.trim="[ 'batAddTotal' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="商品条码">
+          <j-select-serial-material v-decorator="[ 'materialCode' ]" :multi="false" @change="onInputChange"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="商品名称">
+          <a-input v-decorator="[ 'materialName' ]" :readOnly="true"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+          <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import JSelectSerialMaterial from '@/components/jeecgbiz/JSelectSerialMaterial'
+  import {batAddSerialNumber,getMaterialByBarCode} from '@/api/api'
+  import { getMpListShort } from "@/utils/util"
+  import Vue from 'vue'
+  export default {
+    name: "SerialNumberBatchModal",
+    components: {
+      JSelectSerialMaterial
+    },
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          serialNumberPrefix:{
+            rules: [
+              { required: true, message: '请输入序列号前缀!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
+            ]
+          }
+        }
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'serialNumberPrefix', 'batAddTotal', 'materialCode', 'materialName', 'remark'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=batAddSerialNumber(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      onInputChange(value) {
+        let param = {
+          barCode: value,
+          mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
+        }
+        getMaterialByBarCode(param).then((res) => {
+          if (res && res.code === 200) {
+            this.form.setFieldsValue({'materialName': res.data.name})
+          }
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/SerialNumberModal.vue

@@ -0,0 +1,147 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:15%;height: 70%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号">
+          <a-input placeholder="请输入序列号" v-decorator.trim="[ 'serialNumber', validatorRules.serialNumber]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="商品条码">
+          <j-select-serial-material v-decorator="[ 'materialCode' ]" :multi="false" @change="onInputChange"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="商品名称">
+          <a-input v-decorator="[ 'materialName' ]" :readOnly="true"/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+          <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import JSelectSerialMaterial from '@/components/jeecgbiz/JSelectSerialMaterial'
+  import {addSerialNumber,editSerialNumber,checkSerialNumber,getMaterialByBarCode} from '@/api/api'
+  import { getMpListShort } from "@/utils/util"
+  import Vue from 'vue'
+  export default {
+    name: "SerialNumberModal",
+    components: {
+      JSelectSerialMaterial
+    },
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          serialNumber:{
+            rules: [
+              { required: true, message: '请输入序列号!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validateSerialNumberName}
+            ]
+          }
+        }
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'serialNumber', 'materialCode', 'materialName', 'remark'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=addSerialNumber(formData);
+            }else{
+              obj=editSerialNumber(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateSerialNumberName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkSerialNumber(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("序列号已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      },
+      onInputChange(value) {
+        let param = {
+          barCode: value,
+          mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
+        }
+        getMaterialByBarCode(param).then((res) => {
+          if (res && res.code === 200) {
+            this.form.setFieldsValue({'materialName': res.data.name})
+          }
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/SysAnnouncementModal.vue

@@ -0,0 +1,332 @@
+<template>
+  <a-modal
+    :title="title"
+
+    :width="900"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    :okButtonProps="{ props: {disabled: disabled} }"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row style="width: 100%;">
+          <a-col :span="24/2">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="标题">
+              <a-input placeholder="请输入标题" v-decorator="['titile', validatorRules.title]" :readOnly="disableSubmit"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24/2">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="消息类型">
+              <a-select
+                v-decorator="[ 'msgCategory', validatorRules.msgCategory]"
+                placeholder="请选择消息类型"
+                :disabled="disableSubmit"
+                :getPopupContainer = "(target) => target.parentNode">
+                <a-select-option value="1">通知公告</a-select-option>
+                <a-select-option value="2">系统消息</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row style="width: 100%;">
+          <a-col :span="24/2">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="开始时间:">
+              <j-date style="width: 100%" :getCalendarContainer="node => node.parentNode" v-decorator="[ 'startTime', validatorRules.startTime]" placeholder="请选择开始时间" showTime dateFormat="YYYY-MM-DD HH:mm:ss" ></j-date>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24/2">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="结束时间"
+              class="endTime">
+              <j-date style="width: 100%" :getCalendarContainer="node => node.parentNode" v-decorator="[ 'endTime', validatorRules.endTime]" placeholder="请选择结束时间" showTime dateFormat="YYYY-MM-DD HH:mm:ss"></j-date>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row style="width: 100%;">
+          <a-col :span="24/2">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="优先级">
+              <a-select
+                v-decorator="[ 'priority', {}]"
+                placeholder="请选择优先级"
+                :disabled="disableSubmit"
+                :getPopupContainer = "(target) => target.parentNode">
+                <a-select-option value="L">低</a-select-option>
+                <a-select-option value="M">中</a-select-option>
+                <a-select-option value="H">高</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24/2">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="通告类型">
+              <a-select
+                v-decorator="[ 'msgType', validatorRules.msgType]"
+                placeholder="请选择通告类型"
+                :disabled="disableSubmit"
+                @change="chooseMsgType"
+                :getPopupContainer = "(target) => target.parentNode">
+                <a-select-option value="USER">指定用户</a-select-option>
+                <a-select-option value="ALL">全体用户</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row style="width: 100%;">
+          <a-col :span="24/2">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="摘要">
+              <a-textarea placeholder="请输入摘要" v-decorator="['msgAbstract',validatorRules.msgAbstract]" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24/2">
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="指定用户"
+              v-if="userType">
+              <a-select
+                mode="multiple"
+                placeholder="请选择用户"
+                v-model="selectedUser"
+                @dropdownVisibleChange="selectUserIds"
+              >
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row style="width: 100%;">
+          <a-col :span="24">
+            <a-form-item
+              :labelCol="labelColX1"
+              :wrapperCol="wrapperColX1"
+              label="内容"
+              class="j-field-content">
+              <j-editor v-decorator="[ 'msgContent', {} ]" triggerChange></j-editor>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+    <select-user-list-modal ref="UserListModal" @choseUser="choseUser"></select-user-list-modal>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { getAction } from '@/api/manage'
+  import JDate from '@/components/jeecg/JDate'
+  import JEditor from '@/components/jeecg/JEditor'
+  import SelectUserListModal from "./SelectUserListModal";
+  import moment from 'moment'
+
+  export default {
+    components: { JEditor, JDate, SelectUserListModal},
+    name: "SysAnnouncementModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        disableSubmit:false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 6 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 18 },
+        },
+        labelColX1: {
+          xs: { span: 24 },
+          sm: { span: 3 },
+        },
+        wrapperColX1: {
+          xs: { span: 24 },
+          sm: { span: 21 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          title:{rules: [{ required: true, message: '请输入标题!' }]},
+          msgCategory:{rules: [{ required: true, message: '请选择消息类型!' }]},
+          msgType:{rules: [{ required: true, message: '请选择通告对象类型!' }]},
+          endTime:{rules:[{ required: true, message: '请选择结束时间!'} ,{validator: this.endTimeValidate}]},
+          startTime:{rules:[{required: true, message: '请选择开始时间!'},{validator: this.startTimeValidate}]},
+          msgAbstract:{rules: [{ required: true, message: '请输入摘要!' }]},
+        },
+        url: {
+          queryByIds: "/sys/user/queryByIds",
+          add: "/sys/annountCement/add",
+          edit: "/sys/annountCement/edit",
+        },
+        userType:false,
+        userIds:[],
+        selectedUser:[],
+        disabled:false,
+        msgContent:"",
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = {}
+        this.disable = false;
+        this.visible = true;
+        this.getUser(record);
+      },
+      getUser(record){
+        this.model = Object.assign({}, record);
+        // 指定用户
+        if(record&&record.msgType === "USER"){
+          this.userType =  true;
+          this.userIds = record.userIds;
+          getAction(this.url.queryByIds,{userIds:this.userIds}).then((res)=>{
+            if(res.success){
+              for(var i=0;i<res.result.length;i++){
+                this.selectedUser.push(res.result[i].realname);
+              }
+              this.$refs.UserListModal.edit(res.result,this.userIds);
+            }
+          });
+        }
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'endTime','startTime','titile','msgContent','sender','priority','msgCategory','msgType','sendStatus','delFlag','msgAbstract'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.selectedUser = [];
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        //当设置指定用户类型，但用户为空时，后台报错
+        if(this.userType &&!(this.userIds!=null && this.userIds.length >0)){
+            this.$message.warning('指定用户不能为空！')
+            return;
+          }
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            if(this.userType){
+              formData.userIds =  this.userIds;
+            }
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+                that.resetUser();
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.visible = false;
+        this.$emit('close');
+        this.resetUser();
+      },
+      resetUser (){
+        this.userType =  false;
+        this.userIds = [];
+        this.selectedUser = [];
+        this.disabled = false;
+        this.$refs.UserListModal.edit(null,null);
+      },
+      selectUserIds() {
+        this.$refs.UserListModal.add(this.selectedUser,this.userIds);
+      },
+      chooseMsgType(value) {
+        if("USER" == value) {
+          this.userType = true;
+        } else {
+          this.userType = false;
+          this.selectedUser = [];
+          this.userIds = [];
+        }
+      },
+      // 子modal回调
+      choseUser:function(userList){
+        this.selectedUser = [];
+        this.userIds = [];
+        for(var i=0;i<userList.length;i++){
+          this.selectedUser.push(userList[i].realname);
+          this.userIds += userList[i].id+","
+        }
+      },
+      startTimeValidate(rule,value,callback){
+        let endTime = this.form.getFieldValue("endTime")
+        if(!value || !endTime){
+          callback()
+        }else if(moment(value).isBefore(endTime)){
+          callback()
+        }else{
+          callback("开始时间需小于结束时间")
+        }
+      },
+      endTimeValidate(rule,value,callback){
+        let startTime = this.form.getFieldValue("startTime")
+        if(!value || !startTime){
+          callback()
+        }else if(moment(startTime).isBefore(value)){
+          callback()
+        }else{
+          callback("结束时间需大于开始时间")
+        }
+      }
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/SysCategoryModal.vue

@@ -0,0 +1,194 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    :destroyOnClose="true"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-tree-select
+            ref="treeSelect"
+            placeholder="请选择父级节点"
+            v-decorator="['pid', validatorRules.pid]"
+            dict="sys_category,name,id"
+            pidField="pid"
+            pidValue="0">
+          </j-tree-select>
+        </a-form-item>
+          
+        <a-form-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input v-decorator="[ 'name', validatorRules.name]" placeholder="请输入分类名称"></a-input>
+        </a-form-item>
+          
+        <!--<a-form-item label="类型编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input v-decorator="[ 'code', validatorRules.code]" placeholder="请输入类型编码"></a-input>
+        </a-form-item>-->
+
+        <!--<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <span style="font-size: 12px;color:red" slot="label">编码规则(注)</span>
+          <span style="font-size: 12px;color:red">
+            编码值前缀需和父节点保持一致,比如父级节点编码是A01则当前编码必须以A01开头
+          </span>
+        </a-form-item>-->
+          
+        
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+
+  import { httpAction,getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import JTreeSelect from '@/components/jeecg/JTreeSelect'
+  
+  export default {
+    name: "SysCategoryModal",
+    components: { 
+      JTreeSelect
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        title:"操作",
+        width:800,
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        validatorRules:{
+          code:{
+            rules: [{
+              required: true, message: '请输入类型编码!'
+            },{
+              validator: this.validateMyCode
+            }]
+          },
+          pid:{},
+          name:{rules: [{ required: true, message: '请输入类型名称!' }]}
+        },
+        url: {
+          add: "/sys/category/add",
+          edit: "/sys/category/edit",
+          checkCode:"/sys/category/checkCode",
+        },
+        expandedRowKeys:[],
+        pidField:"pid",
+        subExpandedKeys:[]
+     
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'pid','name','code'))
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.submitSuccess(formData)
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+         
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'pid','name','code'))
+      },
+      submitSuccess(formData){
+        if(!formData.id){
+          let treeData = this.$refs.treeSelect.getCurrTreeData()
+          this.expandedRowKeys=[]
+          this.getExpandKeysByPid(formData[this.pidField],treeData,treeData)
+          if(formData.pid && this.expandedRowKeys.length==0){
+            this.expandedRowKeys = this.subExpandedKeys;
+          }
+          this.$emit('ok',formData,this.expandedRowKeys.reverse());
+        }else{
+          this.$emit('ok',formData);
+      }
+      },
+      getExpandKeysByPid(pid,arr,all){
+        if(pid && arr && arr.length>0){
+          for(let i=0;i<arr.length;i++){
+            if(arr[i].key==pid){
+              this.expandedRowKeys.push(arr[i].key)
+              this.getExpandKeysByPid(arr[i]['parentId'],all,all)
+            }else{
+              this.getExpandKeysByPid(pid,arr[i].children,all)
+            }
+          }
+        }
+      },
+      validateMyCode(rule, value, callback){
+        let params = {
+          pid: this.form.getFieldValue('pid'),
+          code: value
+        }
+        getAction(this.url.checkCode,params).then((res) => {
+          if (res.success) {
+            callback()
+          } else {
+            callback(res.message)
+          }
+        })
+      },
+      
+      
+    }
+  }
+</script>

jshERP-web/src/views/system/modules/SysCheckRuleModal.vue

@@ -0,0 +1,379 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="1000"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则名称">
+          <a-input placeholder="请输入规则名称" v-decorator="['ruleName', validatorRules.ruleName]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则Code">
+          <a-input placeholder="请输入规则Code" v-decorator="['ruleCode', validatorRules.ruleCode]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则描述">
+          <a-textarea placeholder="请输入规则描述" v-decorator="['ruleDescription', {}]"/>
+        </a-form-item>
+
+      </a-form>
+      <!-- 规则设计 -->
+      <a-tabs v-model="tabs.activeKey">
+        <a-tab-pane tab="局部规则" :key="tabs.design.key" forceRender>
+          <a-alert type="info" showIcon message="局部规则按照你输入的位数有序的校验。"/>
+          <j-editable-table
+            ref="designTable"
+            dragSort
+            rowNumber
+            :maxHeight="240"
+            :columns="tabs.design.columns"
+            :dataSource="tabs.design.dataSource"
+            style="margin-top: 8px;"
+          >
+
+            <template #action="props">
+              <my-action-button :rowEvent="props"/>
+            </template>
+
+          </j-editable-table>
+        </a-tab-pane>
+        <a-tab-pane tab="全局规则" :key="tabs.global.key" forceRender>
+          <j-editable-table
+            ref="globalTable"
+            dragSort
+            rowNumber
+            actionButton
+            :maxHeight="240"
+            :columns="tabs.global.columns"
+            :dataSource="tabs.global.dataSource"
+          >
+
+            <template #actionButtonAfter>
+              <a-alert type="info" showIcon message="全局规则可校验用户输入的所有字符；全局规则的优先级比局部规则的要高。" style="margin-bottom: 8px;"/>
+            </template>
+
+            <template #action="props">
+              <my-action-button :rowEvent="props" allowEmpty/>
+            </template>
+
+          </j-editable-table>
+        </a-tab-pane>
+      </a-tabs>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import { httpAction } from '@/api/manage'
+  import { validateDuplicateValue, alwaysResolve, failedSymbol } from '@/utils/util'
+  import { FormTypes } from '@/utils/JEditableTableUtil'
+  import JEditableTable from '@comp/jeecg/JEditableTable'
+
+  export default {
+    name: 'SysCheckRuleModal',
+    components: {
+      JEditableTable,
+      'my-action-button': {
+        props: { rowEvent: Object, allowEmpty: Boolean },
+        methods: {
+          confirmIsShow() {
+            const { index, allValues: { inputValues } } = this.rowEvent
+            let value = inputValues[index]
+            return value.digits || value.pattern
+          },
+          handleLineAdd() {
+            const { target } = this.rowEvent
+            target.add()
+          },
+          handleLineDelete() {
+            const { rowId, target } = this.rowEvent
+            target.removeRows(rowId)
+          },
+          renderDeleteButton() {
+            if (this.allowEmpty || this.rowEvent.index > 0) {
+              if (this.confirmIsShow()) {
+                return (
+                  <a-popconfirm title="确定要删除吗？" onConfirm={this.handleLineDelete}>
+                    <a-button icon="minus"/>
+                  </a-popconfirm>
+                )
+              } else {
+                return (
+                  <a-button icon="minus" onClick={this.handleLineDelete}/>
+                )
+              }
+            }
+            return ''
+          },
+        },
+        render() {
+          return (
+            <div>
+              <a-button onClick={this.handleLineAdd} icon="plus"/>
+              &nbsp;
+              {this.renderDeleteButton()}
+            </div>
+          )
+        }
+      }
+    },
+    data() {
+      return {
+        title: '操作',
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {
+          ruleName: { rules: [{ required: true, message: '请输入规则名称!' },] },
+          ruleCode: {
+            rules: [
+              { required: true, message: '请输入规则Code!' },
+              { validator: (rule, value, callback) => validateDuplicateValue('sys_check_rule', 'rule_code', value, this.model.id, callback) }
+    ]
+          },
+        },
+        tabs: {
+          activeKey: 'design',
+          global: {
+            key: 'global',
+            columns: [
+              {
+                title: '优先级',
+                key: 'priority',
+                width: '15%',
+                type: FormTypes.select,
+                defaultValue: '1',
+                options: [
+                  { title: '优先运行', value: '1' },
+                  { title: '最后运行', value: '0' },
+                ],
+                validateRules: []
+              },
+              {
+                title: '规则（正则表达式）',
+                key: 'pattern',
+                width: '50%',
+                type: FormTypes.input,
+                validateRules: [
+                  { required: true, message: '规则不能为空' },
+                  { handler: this.validatePatternHandler },
+                ]
+              },
+              {
+                title: '提示文本',
+                key: 'message',
+                width: '20%',
+                type: FormTypes.input,
+                validateRules: [
+                  { required: true, message: '${title}不能为空' },
+                ]
+              },
+              {
+                title: '操作',
+                key: 'action',
+                width: '15%',
+                slotName: 'action',
+                type: FormTypes.slot
+              }
+            ],
+            dataSource: [],
+          },
+          design: {
+            key: 'design',
+            columns: [
+              {
+                title: '位数',
+                key: 'digits',
+                width: '15%',
+                type: FormTypes.inputNumber,
+                validateRules: [
+                  { required: true, message: '${title}不能为空' },
+                  { pattern: /^[1-9]\d*$/, message: '请输入零以上的正整数' },
+                ]
+              },
+              {
+                title: '规则（正则表达式）',
+                key: 'pattern',
+                width: '50%',
+                type: FormTypes.input,
+                validateRules: [
+                  { required: true, message: '规则不能为空' },
+                  { handler: this.validatePatternHandler }
+                ]
+              },
+              {
+                title: '提示文本',
+                key: 'message',
+                width: '20%',
+                type: FormTypes.input,
+                validateRules: [
+                  { required: true, message: '${title}不能为空' },
+                ]
+              },
+              {
+                title: '操作',
+                key: 'action',
+                width: '15%',
+                slotName: 'action',
+                type: FormTypes.slot
+              },
+            ],
+            dataSource: [],
+          }
+        },
+        url: {
+          add: '/sys/checkRule/add',
+          edit: '/sys/checkRule/edit',
+        },
+      }
+    },
+    created() {
+    },
+    methods: {
+
+      validatePatternHandler(type, value, row, column, callback, target) {
+        if (type === 'blur' || type === 'getValues') {
+          try {
+            new RegExp(value)
+            callback(true)
+          } catch (e) {
+            callback(false, '请输入正确的正则表达式')
+          }
+        } else {
+          callback(true) // 不填写或者填写 null 代表不进行任何操作
+        }
+      },
+
+      add() {
+        this.edit({})
+      },
+      edit(record) {
+        this.form.resetFields()
+        this.tabs.activeKey = this.tabs.design.key
+        this.tabs.global.dataSource = []
+        this.tabs.design.dataSource = [{ digits: '', pattern: '', message: '' }]
+        this.model = Object.assign({}, record)
+        this.visible = true
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'ruleName', 'ruleCode', 'ruleDescription'))
+          // 子表数据
+          let ruleJson = this.model.ruleJson
+          if (ruleJson) {
+            let ruleList = JSON.parse(ruleJson)
+            // 筛选出全局规则和局部规则
+            let global = [], design = [], priority = '1'
+            ruleList.forEach(rule => {
+              if (rule.digits === '*') {
+                global.push(Object.assign(rule, { priority }))
+              } else {
+                priority = '0'
+                design.push(rule)
+              }
+            })
+            this.tabs.global.dataSource = global
+            this.tabs.design.dataSource = design
+          }
+        })
+      },
+      close() {
+        this.$emit('close')
+        this.visible = false
+      },
+      handleOk() {
+        Promise.all([
+          // 主表单校验
+          alwaysResolve(new Promise((resolve, reject) => {
+            this.form.validateFields((error, values) => error ? reject(error) : resolve(values))
+          })),
+          // 局部规则子表校验
+          alwaysResolve(this.$refs.designTable.getValuesPromise),
+          // 全局规则子表校验
+          alwaysResolve(this.$refs.globalTable.getValuesPromise),
+        ]).then(results => {
+          let [mainResult, designResult, globalResult] = results
+
+          if (mainResult.type === failedSymbol) {
+            return Promise.reject('主表校验未通过')
+          } else if (designResult.type === failedSymbol) {
+            this.tabs.activeKey = this.tabs.design.key
+            return Promise.reject('局部规则子表校验未通过')
+          } else if (globalResult.type === failedSymbol) {
+            this.tabs.activeKey = this.tabs.global.key
+            return Promise.reject('全局规则子表校验未通过')
+          } else {
+            // 所有校验已通过，这一步是整合数据
+            let mainValues = mainResult.data, globalValues = globalResult.data, designValues = designResult.data
+
+            // 整合两个子表的数据
+            let firstGlobal = [], afterGlobal = []
+            globalValues.forEach(v => {
+              v.digits = '*'
+              if (v.priority === '1') {
+                firstGlobal.push(v)
+              } else {
+                afterGlobal.push(v)
+              }
+            })
+            let concatValues = firstGlobal.concat(designValues).concat(afterGlobal)
+            let subValues = concatValues.map(i => pick(i, 'digits', 'pattern', 'message'))
+
+            // 生成 formData，用于传入后台
+            let ruleJson = JSON.stringify(subValues)
+            let formData = Object.assign(this.model, mainValues, { ruleJson })
+
+            // 判断请求方式和请求地址，并发送请求
+            let method = 'post', httpUrl = this.url.add
+            if (this.model.id) {
+              method = 'put'
+              httpUrl = this.url.edit
+            }
+            this.confirmLoading = true
+            return httpAction(httpUrl, formData, method)
+          }
+        }).then((res) => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.$emit('ok')
+            this.close()
+          } else {
+            this.$message.warning(res.message)
+          }
+        }).catch(e => {
+          console.error(e)
+        }).finally(() => {
+          this.confirmLoading = false
+        })
+      },
+      handleCancel() {
+        this.close()
+      },
+
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>

jshERP-web/src/views/system/modules/SysCheckRuleTestModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <a-modal
+    title="功能测试"
+    :width="800"
+    :visible="visible"
+    @ok="visible=false"
+    @cancel="visible=false"
+  >
+    <a-form :form="form">
+      <a-form-item label="功能测试">
+        <a-input placeholder="请输入" v-decorator="['test', validatorRules.test]" @change="e=>testValue=e.target.value"/>
+      </a-form-item>
+    </a-form>
+    <a-row type="flex" :gutter="8">
+      <a-col v-for="(str,index) of testValue" :key="index">
+        <a-row>
+          <a-col>
+            <a-input :value="str" style="text-align: center;width: 40px;"/>
+          </a-col>
+          <a-col style="text-align: center;">{{index+1}}</a-col>
+        </a-row>
+      </a-col>
+    </a-row>
+
+  </a-modal>
+</template>
+
+<script>
+  import { validateCheckRule } from '@/utils/util'
+
+  export default {
+    name: 'SysCheckRuleModal',
+    data() {
+      return {
+        title: '操作',
+        visible: false,
+        ruleCode: '',
+        testValue: '',
+        form: this.$form.createForm(this),
+        validatorRules: {
+          test: {
+            rules: [{ validator: (rule, value, callback) => validateCheckRule(this.ruleCode, value, callback) }]
+          }
+        },
+      }
+    },
+    methods: {
+      open(ruleCode) {
+        this.ruleCode = ruleCode
+        this.form.resetFields()
+        this.testValue = ''
+        this.visible = true
+      },
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>

jshERP-web/src/views/system/modules/SysDataSourceModal.vue

@@ -0,0 +1,239 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="数据源编码">
+          <a-input placeholder="请输入数据源编码" :disabled="!!model.id" v-decorator="['code', validatorRules.code]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="数据源名称">
+          <a-input placeholder="请输入数据源名称" v-decorator="['name', validatorRules.name]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="数据库类型">
+          <j-dict-select-tag placeholder="请选择数据库类型" dict-code="database_type" triggerChange v-decorator="['dbType', validatorRules.dbType]" @change="handleDbTypeChange"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="驱动类">
+          <a-input placeholder="请输入驱动类" v-decorator="['dbDriver', validatorRules.dbDriver]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="数据源地址">
+          <a-input placeholder="请输入数据源地址" v-decorator="['dbUrl', validatorRules.dbUrl]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="数据库名称">
+          <a-input placeholder="请输入数据库名称" v-decorator="['dbName', validatorRules.dbName]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="用户名">
+          <a-input placeholder="请输入用户名" v-decorator="['dbUsername', validatorRules.dbUsername]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="密码">
+          <a-row :gutter="8">
+            <a-col :span="21">
+              <a-input-password placeholder="请输入密码" v-decorator="['dbPassword', validatorRules.dbPassword]"/>
+            </a-col>
+            <a-col :span="3">
+              <a-button type="primary" size="small" style="width: 100%" @click="handleTest">测试</a-button>
+            </a-col>
+          </a-row>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="备注">
+          <a-textarea placeholder="请输入备注" v-decorator="['remark', {}]"/>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import { httpAction, postAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'SysDataSourceModal',
+    components: {},
+    data() {
+      return {
+        title: '操作',
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {
+          code: {
+            validateFirst: true,
+            rules: [
+              { required: true, message: '请输入数据源编码!' },
+              {
+                validator: (rule, value, callback) => {
+                  let pattern = /^[a-z|A-Z][a-z|A-Z\d_-]{0,}$/
+                  if (!pattern.test(value)) {
+                    callback('编码必须以字母开头，可包含数字、下划线、横杠')
+                  } else {
+                    validateDuplicateValue('sys_data_source', 'code', value, this.model.id, callback)
+                  }
+                }
+              }
+            ]
+          },
+          name: { rules: [{ required: true, message: '请输入数据源名称!' }] },
+          dbType: { rules: [{ required: true, message: '请选择数据库类型!' }] },
+          dbDriver: { rules: [{ required: true, message: '请输入驱动类!' }] },
+          dbUrl: { rules: [{ required: true, message: '请输入数据源地址!' }] },
+          dbName: { rules: [{ required: true, message: '请输入数据库名称!' }] },
+          dbUsername: { rules: [{ required: true, message: '请输入用户名!' }] },
+          dbPassword: { rules: [{ required: true, message: '请输入密码!' }] }
+        },
+        url: {
+          add: '/sys/dataSource/add',
+          edit: '/sys/dataSource/edit',
+        },
+        dbDriverMap: {
+          // MySQL 数据库
+          '1': { dbDriver: 'com.mysql.jdbc.Driver' },
+          // Oracle
+          '2': { dbDriver: 'oracle.jdbc.OracleDriver' },
+          // SQLServer 数据库
+          '3': { dbDriver: 'com.microsoft.sqlserver.jdbc.SQLServerDriver' },
+        },
+        dbUrlMap: {
+          // MySQL 数据库
+          '1': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jshERP-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false' },
+          // Oracle
+          '2': { dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:ORCL' },
+          // SQLServer 数据库
+          '3': { dbUrl: 'jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=jeecgboot' }
+        }
+      }
+    },
+    created() {
+    },
+    methods: {
+      add() {
+        this.edit({})
+      },
+      edit(record) {
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'code', 'name', 'remark', 'dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword'))
+        })
+      },
+      close() {
+        this.$emit('close')
+        this.visible = false
+      },
+      handleOk() {
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            this.confirmLoading = true
+            let formData = Object.assign(this.model, values)
+            let httpUrl = this.url.add, method = 'post'
+            if (this.model.id) {
+              httpUrl = this.url.edit
+              method = 'put'
+              // 由于编码的特殊性，所以不能更改
+              formData['code'] = undefined
+            }
+            httpAction(httpUrl, formData, method).then((res) => {
+              if (res.success) {
+                this.$message.success(res.message)
+                this.$emit('ok')
+                this.close()
+              } else {
+                this.$message.warning(res.message)
+              }
+            }).finally(() => {
+              this.confirmLoading = false
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.close()
+      },
+      // 测试数据源配置是否可以正常连接
+      handleTest() {
+        let keys = ['dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword']
+        // 获取以上字段的值，并清除校验状态
+        let fieldsValues = this.form.getFieldsValue(keys)
+        let setFields = {}
+        keys.forEach(key => setFields[key] = { value: fieldsValues[key], errors: null })
+        // 清除校验状态，目的是可以让错误文字闪烁
+        this.form.setFields(setFields)
+        // 重新校验
+        this.$nextTick(() => {
+          this.form.validateFields(keys, (errors, values) => {
+            if (!errors) {
+              let loading = this.$message.loading('连接中……', 0)
+              postAction('/online/cgreport/api/testConnection', fieldsValues).then(res => {
+                if (res.success) {
+                  this.$message.success('连接成功')
+                } else throw new Error(res.message)
+              }).catch(error => {
+                this.$warning({ title: '连接失败', content: error.message || error })
+              }).finally(() => loading())
+            }
+          })
+        })
+      },
+      // 数据库类型更改时，联动更改数据库驱动
+      handleDbTypeChange(val) {
+        let dbDriver = this.dbDriverMap[val]
+        let dbUrl = this.dbUrlMap[val]
+        if (dbDriver) {
+          this.form.setFieldsValue(dbDriver)
+        }
+        if (dbUrl) {
+          this.form.setFieldsValue(dbUrl)
+        }
+      },
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>

jshERP-web/src/views/system/modules/SysDepartRoleModal.vue

@@ -0,0 +1,162 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="部门角色名称">
+          <a-input placeholder="请输入部门角色名称" v-decorator="['roleName', validatorRules.roleName]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="部门角色编码">
+          <a-input placeholder="请输入部门角色编码" v-decorator="['roleCode', validatorRules.roleCode]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="描述">
+          <a-input placeholder="请输入描述" v-decorator="['description', validatorRules.description]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import {duplicateCheck } from '@/api/api'
+
+  export default {
+    name: "SysDepartRoleModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          roleName:{
+            rules: [
+              { required: true, message: '请输入部门角色名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
+            ]},
+          roleCode:{
+            rules: [
+              { required: true, message: '请输入部门角色编码!'},
+              { min: 0, max: 64, message: '长度不超过 64 个字符', trigger: 'blur' },
+              { validator: this.validateRoleCode}
+            ]},
+          description:{
+            rules: [
+              { min: 0, max: 126, message: '长度不超过 126 个字符', trigger: 'blur' }
+            ]}
+        },
+        url: {
+          add: "/sys/sysDepartRole/add",
+          edit: "/sys/sysDepartRole/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add (departId) {
+        this.edit({},departId);
+      },
+      edit (record,departId) {
+        this.departId = departId;
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'roleName','roleCode','description'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            formData.departId = this.departId;
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateRoleCode(rule, value, callback){
+        if(/[\u4E00-\u9FA5]/g.test(value)){
+          callback("部门角色编码不可输入汉字!");
+        }else{
+          var params = {
+            tableName: "sys_depart_role",
+            fieldName: "role_code",
+            fieldVal: value,
+            dataId: this.model.id,
+          };
+          duplicateCheck(params).then((res)=>{
+            if(res.success){
+              callback();
+            }else{
+              callback(res.message);
+            }
+          });
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jshERP-web/src/views/system/modules/SysFillRuleModal.vue

@@ -0,0 +1,158 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则名称">
+          <a-input placeholder="请输入规则名称" v-decorator="['ruleName', validatorRules.ruleName]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则Code">
+          <a-input placeholder="请输入规则Code" :disabled="disabledCode" v-decorator="['ruleCode', validatorRules.ruleCode]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则实现类">
+          <a-input placeholder="请输入规则实现类" v-decorator="['ruleClass', validatorRules.ruleClass]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="规则参数">
+          <a-textarea placeholder="请输入规则参数" :rows="5" v-decorator="['ruleParams', validatorRules.ruleParams]"/>
+        </a-form-item>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import { httpAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'SysFillRuleModal',
+    components: {},
+    data() {
+      return {
+        title: '操作',
+        visible: false,
+        model: {},
+        labelCol: { xs: { span: 24 }, sm: { span: 5 } },
+        wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {
+          ruleName: { rules: [{ required: true, message: '规则名称不能为空' }] },
+          ruleCode: {
+            rules: [
+              { required: true, message: '规则Code不能为空' },
+              { validator: (rule, value, callback) => validateDuplicateValue('sys_fill_rule', 'rule_code', value, this.model.id, callback) }
+            ]
+          },
+          ruleClass: { rules: [{ required: true, message: '规则实现类不能为空' }] },
+          ruleParams: {
+            rules: [{
+              validator: (rule, value, callback) => {
+
+                try {
+                  let json = JSON.parse(value)
+                  if (json instanceof Array) {
+                    callback('只能传递JSON对象，不能传递JSON数组')
+                  } else if (json instanceof Object) {
+                    callback()
+                  } else {
+                    callback('请输入JSON字符串')
+                  }
+                } catch {
+                  callback('请输入JSON字符串')
+                }
+              }
+            }]
+          },
+        },
+        url: {
+          add: '/sys/fillRule/add',
+          edit: '/sys/fillRule/edit',
+        },
+      }
+    },
+    computed: {
+      disabledCode() {
+        return !!this.model.id
+      }
+    },
+    created() {
+    },
+    methods: {
+      add() {
+        this.edit({})
+      },
+      edit(record) {
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'ruleName', 'ruleCode', 'ruleClass', 'ruleParams'))
+        })
+      },
+      close() {
+        this.$emit('close')
+        this.visible = false
+      },
+      handleOk() {
+        const that = this
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true
+            let httpUrl = this.url.add, method = 'post'
+            if (this.model.id) {
+              httpUrl = this.url.edit
+              method = 'put'
+            }
+
+            let formData = Object.assign(this.model, values)
+            httpAction(httpUrl, formData, method).then((res) => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.$emit('ok')
+              } else {
+                that.$message.warning(res.message)
+              }
+            }).finally(() => {
+              that.confirmLoading = false
+              that.close()
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.close()
+      }
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jshERP-web/src/views/system/modules/SysPositionModal.vue

@@ -0,0 +1,180 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="职务编码">
+          <a-input placeholder="请输入职务编码" v-decorator="['code', validatorRules.code]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="职务名称">
+          <a-input placeholder="请输入职务名称" v-decorator="['name', validatorRules.name]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="职级"
+        >
+          <j-dict-select-tag
+            placeholder="请选择职级"
+            :triggerChange="true"
+            dictCode="position_rank"
+            v-decorator="['postRank', validatorRules.postRank]"
+          />
+        </a-form-item>
+        <!--<a-form-item-->
+        <!--  :labelCol="labelCol"-->
+        <!--  :wrapperCol="wrapperCol"-->
+        <!--  label="公司id">-->
+        <!--  <a-input placeholder="请输入公司id" v-decorator="['companyId', {}]"/>-->
+        <!--</a-form-item>-->
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import { httpAction } from '@/api/manage'
+  import { duplicateCheck } from '@/api/api'
+  import JDictSelectTag from '@/components/dict/JDictSelectTag'
+
+  let validatorCodeTimer = null
+
+  export default {
+    name: 'SysPositionModal',
+    components: { JDictSelectTag },
+    data() {
+      return {
+        title: '操作',
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules: {
+          code: {
+            rules: [
+              { required: true, message: '请输入职务编码' },
+              {
+                validator: (rule, value, callback) => {
+                  // 函数消抖的简单实现，防止一段时间内发送多次请求
+                  if (validatorCodeTimer) {
+                    // 停止上次开启的定时器
+                    clearTimeout(validatorCodeTimer)
+                  }
+                  validatorCodeTimer = setTimeout(() => {
+                    duplicateCheck({
+                      tableName: 'sys_position',
+                      fieldName: 'code',
+                      fieldVal: value,
+                      dataId: this.model.id
+                    }).then((res) => {
+                      if (res.success) {
+                        callback()
+                      } else {
+                        callback(res.message)
+                      }
+                    }).catch(console.error)
+                  }, 300)
+                }
+              }
+            ]
+          },
+          name: { rules: [{ required: true, message: '请输入职务名称' }] },
+          postRank: { rules: [{ required: true, message: '请选择职级' }] },
+        },
+        url: {
+          add: '/sys/position/add',
+          edit: '/sys/position/edit',
+        },
+      }
+    },
+    created() {
+    },
+    methods: {
+      add() {
+        this.edit({})
+      },
+      edit(record) {
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.visible = true
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,
+            'code',
+            'name',
+            'postRank',
+            // 'companyId'
+          ))
+        })
+      },
+      close() {
+        this.$emit('close')
+        this.visible = false
+      },
+      handleOk() {
+        const that = this
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true
+            let httpurl = ''
+            let method = ''
+            if (!this.model.id) {
+              httpurl += this.url.add
+              method = 'post'
+            } else {
+              httpurl += this.url.edit
+              method = 'put'
+            }
+
+            let formData = Object.assign(this.model, values)
+            httpAction(httpurl, formData, method).then((res) => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.$emit('ok')
+              } else {
+                that.$message.warning(res.message)
+              }
+            }).finally(() => {
+              that.confirmLoading = false
+              that.close()
+            })
+          }
+        })
+      },
+      handleCancel() {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jshERP-web/src/views/system/modules/SysUserAgentModal.vue

@@ -0,0 +1,181 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="用户名">
+          <a-input placeholder="请输入用户名" v-decorator="['userName', {}]" readOnly/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="代理人用户名">
+          <j-select-user-by-dep placeholder="请输入代理人用户名" v-decorator="['agentUserName', validatorRules.agentUserName]" :trigger-change="true"></j-select-user-by-dep>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="代理开始时间">
+          <j-date
+            v-decorator="[ 'startTime', validatorRules.startTime]"
+            :trigger-change="true"
+            :showTime="true"
+            date-format="YYYY-MM-DD HH:mm:ss"
+            style="width:100%"
+            placeholder="请选择开始时间" >
+          </j-date>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="代理结束时间">
+          <j-date
+            v-decorator="[ 'endTime', validatorRules.endTime]"
+            :trigger-change="true"
+            :showTime="true"
+            date-format="YYYY-MM-DD HH:mm:ss"
+            style="width:100%"
+            placeholder="请选择结束时间" >
+          </j-date>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="状态">
+          <a-radio-group class="fontiframe" name="radioGroup" v-decorator="[ 'status', {}]">
+            <a-radio class="radioGroup" value="1">有效</a-radio>
+            <a-radio class="radioGroup" value="0">无效</a-radio>
+          </a-radio-group>
+        </a-form-item>
+
+      </a-form>
+
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import { httpAction, getAction } from '@/api/manage'
+  import JDate from '@/components/jeecg/JDate.vue';
+  import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
+
+  export default {
+    name: "SysUserAgentModal",
+    components: {
+      JDate,
+      JSelectUserByDep
+    },
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        username:"",
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          agentUserName:{rules: [{ required: true, message: '请输入代理人用户名!' }]},
+          startTime:{rules: [{ required: true, message: '请输入代理开始时间!' }]},
+          endTime:{rules: [{ required: true, message: '请输入代理结束时间!' }]},
+        },
+        url: {
+          add: "/sys/sysUserAgent/add",
+          edit: "/sys/sysUserAgent/edit",
+          queryByUserName:"/sys/sysUserAgent/queryByUserName",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      agentSettings(username){
+        this.username = username;
+        this.init();
+
+      },
+      init () {
+        var params = {userName:this.username};//查询条件
+        getAction(this.url.queryByUserName,params).then((res)=>{
+          if(res.success){
+            console.log("获取流程节点信息",res);
+            this.edit (res.result);
+          }else{
+            this.edit({userName:this.username,status:"0"});
+          }
+        })
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'userName','agentUserName','status','startTime','endTime'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                //this.init();
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/SystemConfigModal.vue

@@ -0,0 +1,175 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司名称">
+          <a-input placeholder="请输入公司名称" v-decorator.trim="[ 'companyName', validatorRules.companyName]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
+          <a-input placeholder="请输入联系人" v-decorator.trim="[ 'companyContacts' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司地址">
+          <a-input placeholder="请输入公司地址" v-decorator.trim="[ 'companyAddress' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司电话">
+          <a-input placeholder="请输入公司电话" v-decorator.trim="[ 'companyTel' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司传真">
+          <a-input placeholder="请输入公司传真" v-decorator.trim="[ 'companyFax' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司邮编">
+          <a-input placeholder="请输入公司邮编" v-decorator.trim="[ 'companyPostCode' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库权限">
+          <a-switch checked-children="启用" un-checked-children="关闭" v-model="depotFlagSwitch" @change="onDepotChange"></a-switch>
+          （如果启用则需要到用户列表配置）
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户权限">
+          <a-switch checked-children="启用" un-checked-children="关闭" v-model="customerFlagSwitch" @change="onCustomerChange"></a-switch>
+          （如果启用则需要到用户列表配置）
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="负库存">
+          <a-switch checked-children="启用" un-checked-children="关闭" v-model="minusStockFlagSwitch" @change="onMinusStockChange"></a-switch>
+          （如果启用则支持负库存，批次商品除外）
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addSystemConfig,editSystemConfig,checkSystemConfig } from '@/api/api'
+  export default {
+    name: "SystemConfigModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        depotFlagSwitch: false, //仓库权限状态
+        customerFlagSwitch: false, //客户权限状态
+        minusStockFlagSwitch: false, //负库存状态
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          companyName:{
+            rules: [
+              { required: true, message: '请输入公司名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validateSystemConfig}
+            ]
+          }
+        }
+      }
+    },
+    created () {
+    },
+    methods: {
+      onDepotChange(checked) {
+        this.model.depotFlag = checked?'1':'0'
+      },
+      onCustomerChange(checked) {
+        this.model.customerFlag = checked?'1':'0'
+      },
+      onMinusStockChange(checked) {
+        this.model.minusStockFlag = checked?'1':'0'
+      },
+      add () {
+        this.depotFlagSwitch = false
+        this.customerFlagSwitch = false
+        this.minusStockFlagSwitch = false
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'companyName', 'companyContacts', 'companyAddress',
+            'companyTel', 'companyFax', 'companyPostCode', 'depotFlag', 'customerFlag', 'minusStockFlag'))
+        });
+        if(record.id) {
+          if (record.depotFlag != null) {
+            this.depotFlagSwitch = record.depotFlag == '1' ? true : false;
+          }
+          if (record.customerFlag != null) {
+            this.customerFlagSwitch = record.customerFlag == '1' ? true : false;
+          }
+          if (record.minusStockFlag != null) {
+            this.minusStockFlagSwitch = record.minusStockFlag == '1' ? true : false;
+          }
+        }
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=addSystemConfig(formData);
+            }else{
+              obj=editSystemConfig(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateSystemConfig(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkSystemConfig(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("公司名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/UnitModal.vue

@@ -0,0 +1,121 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:20%;height: 70%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="基本单位">
+          <a-input placeholder="请输入基本单位" v-decorator.trim="[ 'basicUnit', validatorRules.basicUnit]" />
+        </a-form-item>
+      </a-form>
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="副单位">
+          <a-input placeholder="请输入副单位" v-decorator.trim="[ 'otherUnit', validatorRules.otherUnit]" />
+        </a-form-item>
+      </a-form>
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="比例">
+          <a-input addon-before="基本单位 : 副单位=1 :" placeholder="请输入比例" v-decorator.trim="[ 'ratio', validatorRules.ratio]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addUnit,editUnit,checkUnit } from '@/api/api'
+  export default {
+    name: "UnitModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          basicUnit:{
+            rules: [
+              { required: true, message: '请输入基本单位!' },
+              { min: 1, max: 10, message: '长度在 1 到 10 个字符', trigger: 'blur' }
+            ]},
+          otherUnit:{
+            rules: [
+              { required: true, message: '请输入副单位!' },
+              { min: 1, max: 10, message: '长度在 1 到 10 个字符', trigger: 'blur' }
+            ]},
+          ratio:{
+            rules: [
+              { required: true, message: '请输入比例!' }
+            ]}
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'basicUnit','otherUnit','ratio'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=addUnit(formData);
+            }else{
+              obj=editUnit(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/UserModal.vue

@@ -0,0 +1,367 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item label="登录名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入登录名称" v-decorator.trim="[ 'loginName', validatorRules.loginName]" :readOnly="!!model.id"
+           suffix="初始密码：123456" />
+        </a-form-item>
+        <a-form-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" >
+          <a-input placeholder="请输入用户姓名" v-decorator.trim="[ 'username', validatorRules.username]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="角色">
+          <a-select v-if="model.roleName!='租户'" placeholder="选择角色" v-decorator="[ 'roleId' ]" :dropdownMatchSelectWidth="false">
+            <a-select-option v-for="(item,index) in roleList" :key="index" :value="item.id">
+              {{ item.text }}
+            </a-select-option>
+          </a-select>
+          <a-col v-if="model.roleName=='租户'"><a-row>租户</a-row></a-col>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="机构">
+          <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear
+             :treeData="orgaTree" v-decorator="[ 'orgaId' ]" placeholder="请选择机构">
+          </a-tree-select>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="职位">
+          <a-input placeholder="请输入职位" v-decorator.trim="[ 'position' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电话号码">
+          <a-input placeholder="请输入电话号码" v-decorator.trim="[ 'phonenum' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
+          <a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
+          <a-input placeholder="请输入排序" v-decorator.trim="[ 'userBlngOrgaDsplSeq' ]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
+          <a-textarea :rows="1" placeholder="请输入描述" v-decorator="[ 'description' ]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import Vue from 'vue'
+  import departWindow from './DepartWindow'
+  import JSelectPosition from '@/components/jeecgbiz/JSelectPosition'
+  import { ACCESS_TOKEN } from "@/store/mutation-types"
+  import { getAction } from '@/api/manage'
+  import {addUser,editUser,queryOrganizationTreeList,findUserRole} from '@/api/api'
+  import { disabledAuthFilter } from "@/utils/authFilter"
+  import {duplicateCheck } from '@/api/api'
+  import JImageUpload from '../../../components/jeecg/JImageUpload'
+  export default {
+    name: "UserModal",
+    components: {
+      JImageUpload,
+      departWindow,
+      JSelectPosition
+    },
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        departDisabled: false, //是否是我的部门调用该页面
+        roleDisabled: false, //是否是角色维护调用该页面
+        modalWidth:800,
+        drawerWidth:700,
+        modaltoggleFlag:true,
+        confirmDirty: false,
+        orgaTree: [],
+        roleList: [],
+        selectedDepartKeys:[], //保存用户选择部门id
+        checkedDepartKeys:[],
+        checkedDepartNames:[], // 保存部门的名称 =>title
+        checkedDepartNameString:"", // 保存部门的名称 =>title
+        resultDepartOptions:[],
+        userId:"", //保存用户id
+        disableSubmit:false,
+        userDepartModel:{userId:'',departIdList:[]}, // 保存SysUserDepart的用户部门中间表数据需要的对象
+        dateFormat:"YYYY-MM-DD",
+        validatorRules:{
+          loginName:{
+            rules: [{
+              required: true, message: '请输入登录名称!'
+            }]
+          },
+          username:{
+            rules: [{
+              required: true, message: '请输入用户账号!'
+            }]
+          }
+        },
+        departIdShow:false,
+        departIds:[], //负责部门id
+        model: {},
+        selectedRole:[],
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        uploadLoading:false,
+        confirmLoading: false,
+        headers:{},
+        form:this.$form.createForm(this),
+        picUrl: "",
+        url: {
+          userId:"/sys/user/generateUserId", // 引入生成添加用户情况下的url
+          syncUserByUserName:"/process/extActProcess/doSyncUserByUserName",//同步用户到工作流
+        },
+        identity:"1",
+        fileList:[],
+      }
+    },
+    created () {
+      this.loadOrgaData()
+      this.loadRoleData()
+      const token = Vue.ls.get(ACCESS_TOKEN);
+      this.headers = {"X-Access-Token":token}
+    },
+    computed:{
+      uploadAction:function () {
+        return this.url.fileUpload;
+      }
+    },
+    methods: {
+      isDisabledAuth(code){
+        return disabledAuthFilter(code);
+      },
+      //窗口最大化切换
+      toggleScreen(){
+        if(this.modaltoggleFlag){
+          this.modalWidth = window.innerWidth;
+        }else{
+          this.modalWidth = 800;
+        }
+        this.modaltoggleFlag = !this.modaltoggleFlag;
+      },
+      refresh () {
+          this.selectedDepartKeys=[];
+          this.checkedDepartKeys=[];
+          this.checkedDepartNames=[];
+          this.checkedDepartNameString = "";
+          this.userId=""
+          this.resultDepartOptions=[];
+          this.departId=[];
+          this.departIdShow=false;
+      },
+      add () {
+        this.picUrl = "";
+        this.edit({activitiSync:'1'});
+      },
+      edit (record) {
+        let that = this;
+        that.checkedDepartNameString = "";
+        that.form.resetFields();
+        if(record.hasOwnProperty("id")){
+          setTimeout(() => {
+            this.fileList = record.avatar;
+          }, 5)
+        }
+        that.userId = record.id;
+        that.visible = true;
+        that.model = Object.assign({}, record);
+        that.$nextTick(() => {
+          that.form.setFieldsValue(pick(this.model,'loginName','username','roleId','orgaId','position',
+            'phonenum','email','userBlngOrgaDsplSeq','description'))
+        });
+        // 调用查询用户对应的部门信息的方法
+        that.checkedDepartKeys = [];
+        that.loadCheckedDeparts();
+      },
+      loadCheckedDeparts(){
+        let that = this;
+        if(!that.userId){return}
+        getAction(that.url.userWithDepart,{userId:that.userId}).then((res)=>{
+          that.checkedDepartNames = [];
+          if(res.success){
+            var depart=[];
+            var departId=[];
+            for (let i = 0; i < res.result.length; i++) {
+              that.checkedDepartNames.push(res.result[i].title);
+              this.checkedDepartNameString = this.checkedDepartNames.join(",");
+              that.checkedDepartKeys.push(res.result[i].key);
+              //新增负责部门选择下拉框
+              depart.push({
+                  key:res.result[i].key,
+                  title:res.result[i].title
+              })
+              departId.push(res.result[i].key)
+            }
+            that.resultDepartOptions=depart;
+            //判断部门id是否存在，不存在择直接默认当前所在部门
+            if(this.model.departIds){
+                this.departIds=this.model.departIds.split(",");
+            }else{
+                this.departIds=departId;
+            }
+            that.userDepartModel.departIdList = that.checkedDepartKeys
+          }else{
+            console.log(res.message);
+          }
+        })
+      },
+      close() {
+        this.$emit('close');
+        this.visible = false;
+        this.disableSubmit = false;
+        this.selectedRole = [];
+        this.userDepartModel = {userId:'',departIdList:[]};
+        this.checkedDepartNames = [];
+        this.checkedDepartNameString='';
+        this.checkedDepartKeys = [];
+        this.selectedDepartKeys = [];
+        this.resultDepartOptions=[];
+        this.departIds=[];
+        this.departIdShow=false;
+        this.identity="1";
+        this.fileList=[];
+      },
+      handleOk() {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            if(!values.birthday){
+              values.birthday = '';
+            }else{
+              values.birthday = values.birthday.format(this.dateFormat);
+            }
+            let formData = Object.assign(this.model, values);
+            if(that.fileList != ''){
+              formData.avatar = that.fileList;
+            }else{
+              formData.avatar = null;
+            }
+            formData.selectedroles = this.selectedRole.length>0?this.selectedRole.join(","):'';
+            formData.selecteddeparts = this.userDepartModel.departIdList.length>0?this.userDepartModel.departIdList.join(","):'';
+            formData.userIdentity=this.identity;
+            //如果是上级择传入departIds,否则为空
+            if(this.identity==="2"){
+              formData.departIds=this.departIds.join(",");
+            }else{
+              formData.departIds="";
+            }
+            // that.addDepartsToUser(that,formData); // 调用根据当前用户添加部门信息的方法
+            let obj;
+            if(!this.model.id){
+              formData.id = this.userId;
+              obj=addUser(formData);
+            }else{
+              obj=editUser(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.checkedDepartNames = [];
+              that.userDepartModel.departIdList = {userId:'',departIdList:[]};
+              that.close();
+            })
+
+          }
+        })
+      },
+      handleCancel() {
+        this.close()
+      },
+      handleConfirmBlur(e) {
+        const value = e.target.value;
+        this.confirmDirty = this.confirmDirty || !!value
+      },
+      handleChange(info) {
+        this.picUrl = "";
+        if (info.file.status === 'uploading') {
+          this.uploadLoading = true;
+          return
+        }
+        if (info.file.status === 'done') {
+          var response = info.file.response;
+          this.uploadLoading = false;
+          console.log(response);
+          if(response.success){
+            this.model.avatar = response.message;
+            this.picUrl = "Has no pic url yet";
+          }else{
+            this.$message.warning(response.message);
+          }
+        }
+      },
+      loadOrgaData(){
+        let that = this;
+        let params = {};
+        params.id='';
+        queryOrganizationTreeList(params).then((res)=>{
+          if(res){
+            that.orgaTree = res
+          }
+        })
+      },
+      loadRoleData(){
+        let that = this;
+        let params = {
+          'UBType': 'UserRole',
+          'UBKeyId': ''
+        };
+        findUserRole(params).then((res)=>{
+          if(res){
+            that.roleList = res
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .avatar-uploader > .ant-upload {
+    width:104px;
+    height:104px;
+  }
+  .ant-upload-select-picture-card i {
+    font-size: 49px;
+    color: #999;
+  }
+
+  .ant-upload-select-picture-card .ant-upload-text {
+    margin-top: 8px;
+    color: #666;
+  }
+
+  .ant-table-tbody .ant-table-row td{
+    padding-top:10px;
+    padding-bottom:10px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jshERP-web/src/views/system/modules/UserRecycleBinModal.vue

@@ -0,0 +1,193 @@
+<template>
+  <a-modal
+    :width="1000"
+    :title="title"
+    :visible="innerVisible"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    :okButtonProps="{style:{display:'none'}}"
+  >
+    <a-alert type="info" showIcon style="margin-bottom: 16px;">
+      <template slot="message">
+        <span>已选择</span>
+        <a style="font-weight: 600;padding: 0 4px;">{{ selectedRowKeys.length }}</a>
+        <span>项</span>
+        <template v-if="selectedRowKeys.length>0">
+          <a-divider type="vertical"/>
+          <a @click="handleClearSelection">清空选择</a>
+          <a-divider type="vertical"/>
+          <a @click="handleRevertBatch">批量还原</a>
+          <a-divider type="vertical"/>
+          <a @click="handleDeleteBatch">批量删除</a>
+        </template>
+      </template>
+    </a-alert>
+
+    <a-table
+      ref="table"
+      rowKey="id"
+      size="middle"
+      bordered
+      :columns="columns"
+      :loading="loading"
+      :dataSource="dataSource"
+      :pagination="false"
+      :rowSelection="{selectedRowKeys, onChange: handleTableSelectChange}"
+    >
+
+      <!-- 显示头像 -->
+      <template slot="avatarslot" slot-scope="text, record, index">
+        <div class="anty-img-wrap">
+          <a-avatar shape="square" :src="url.getAvatar(record.avatar)" icon="user"/>
+        </div>
+      </template>
+
+      <span slot="action" slot-scope="text, record">
+        <a @click="handleRevert([record.id])"><a-icon type="redo"/> 还原用户</a>
+        <a-divider type="vertical"/>
+        <a @click="handleDelete([record.id])"><a-icon type="delete"/> 彻底删除</a>
+      </span>
+    </a-table>
+
+  </a-modal>
+</template>
+
+<script>
+  import { putAction,deleteAction,getFileAccessHttpUrl } from "@/api/manage"
+
+  // 高度封装的请求，请务必使用 superRequest.call(this,{}) 的方式调用
+  function superRequest(options) {
+    this.loading = !!options.loading
+    options.promise.then(res => {
+      if (res.success && typeof options.success === 'function') {
+        options.success(res)
+      } else {
+        throw new Error(res.message)
+      }
+    }).catch(e => {
+      console.error('查询已删除的用户失败：', e)
+      this.$message.warning('查询已删除的用户失败：' + (e.message || e))
+    }).finally(() => {
+      this.loading = false
+    })
+  }
+
+  export default {
+    name: 'UserRecycleBinModal',
+    props: {
+      visible: {
+        type: Boolean,
+        default: false
+      },
+    },
+    data() {
+      return {
+        title: '用户回收站',
+        loading: false,
+        innerVisible: false,
+        selectedRowKeys: [],
+        dataSource: [],
+        columns: [
+          { title: '#', align: 'center', key: 'rowIndex', width: 80, customRender: (t, r, i) => i + 1 },
+          { title: '账号', align: 'center', dataIndex: 'username' },
+          { title: '姓名', align: 'center', dataIndex: 'realname', },
+          { title: '头像', align: 'center', dataIndex: 'avatar', scopedSlots: { customRender: 'avatarslot' } },
+          { title: '部门', align: 'center', dataIndex: 'orgCode' },
+          { title: '操作', align: 'center', dataIndex: 'action', width: 200, scopedSlots: { customRender: 'action' } }
+        ],
+        url: {
+          getAvatar: (path) => getFileAccessHttpUrl(`${path}`),
+          // 回收站操作，get = 获取列表；put = 取回；delete = 彻底删除
+          recycleBin: '/sys/user/recycleBin',
+          putRecycleBin: '/sys/user/putRecycleBin',
+          deleteRecycleBin: '/sys/user/deleteRecycleBin',
+        },
+      }
+    },
+    watch: {
+      visible: {
+        immediate: true,
+        handler(val) {
+          if (val) {
+            this.loadData()
+          }
+          this.innerVisible = val
+        }
+      },
+      innerVisible(val) {
+        this.$emit('update:visible', val)
+      },
+    },
+    methods: {
+      loadData() {
+        superRequest.call(this, {
+          loading: true,
+          promise: this.$http.get(this.url.recycleBin),
+          success: res => this.dataSource = res.result
+        })
+      },
+      handleOk() {
+        this.loadData()
+        this.$emit('ok')
+      },
+      handleCancel() {
+        this.innerVisible = false
+      },
+      // 还原用户
+      handleRevert(userIds) {
+        this.$confirm({
+          title: '恢复用户',
+          content: `您确定要恢复这 ${userIds.length} 个用户吗？`,
+          centered: true,
+          onOk: () => {
+            putAction(this.url.putRecycleBin,{userIds:userIds.join(',')}).then((res)=>{
+              if(res.success){
+                this.handleOk()
+                this.handleClearSelection()
+                this.$message.success(`还原 ${userIds.length} 个用户成功！`)
+              }
+            })
+          }
+        })
+      },
+      // 彻底删除用户
+      handleDelete(userIds) {
+        this.$confirm({
+          title: '彻底删除用户',
+          content: (<div>
+            <p>您确定要彻底删除这 {userIds.length} 个用户吗？</p>
+            <p style="color:red;">注意：彻底删除后将无法恢复，请谨慎操作！</p>
+          </div>),
+          centered: true,
+          onOk: () => {
+            var that = this;
+            deleteAction(that.url.deleteRecycleBin, {userIds: userIds.join(',')}).then((res) => {
+              if (res.success) {
+                this.loadData()
+                this.handleClearSelection()
+                this.$message.success(`彻底删除 ${userIds.length} 个用户成功！`)
+              } else {
+                that.$message.warning(res.message);
+              }
+            });
+          },
+        })
+      },
+      handleRevertBatch() {
+        this.handleRevert(this.selectedRowKeys)
+      },
+      handleDeleteBatch() {
+        this.handleDelete(this.selectedRowKeys)
+      },
+      handleClearSelection() {
+        this.handleTableSelectChange([], [])
+      },
+      handleTableSelectChange(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys
+        this.selectionRows = selectionRows
+      },
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>

jshERP-web/src/views/system/modules/UserRoleModal.vue

@@ -0,0 +1,200 @@
+<template>
+  <a-drawer
+    :title="title"
+    :maskClosable="true"
+    width=650
+    placement="right"
+    :closable="true"
+    @close="close"
+    :visible="visible"
+    style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;">
+
+    <a-form>
+      <a-form-item label='所拥有的权限'>
+        <a-tree
+          checkable
+          @check="onCheck"
+          :checkedKeys="checkedKeys"
+          :treeData="treeData"
+          @expand="onExpand"
+          @select="onTreeNodeSelect"
+          :selectedKeys="selectedKeys"
+          :expandedKeys="expandedKeysss"
+          :checkStrictly="checkStrictly">
+          <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
+            {{ slotTitle }}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
+          </span>
+        </a-tree>
+      </a-form-item>
+    </a-form>
+
+    <div class="drawer-bootom-button">
+      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
+          <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
+          <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
+          <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
+          <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
+          <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
+        </a-menu>
+        <a-button>
+          树操作 <a-icon type="up" />
+        </a-button>
+      </a-dropdown>
+      <a-popconfirm title="确定放弃编辑？" @confirm="close" okText="确定" cancelText="取消">
+        <a-button style="margin-right: .8rem">取消</a-button>
+      </a-popconfirm>
+      <a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">仅保存</a-button>
+      <a-button @click="handleSubmit(true)" type="primary" :loading="loading">保存并关闭</a-button>
+    </div>
+
+    <role-datarule-modal ref="datarule"></role-datarule-modal>
+
+  </a-drawer>
+
+</template>
+<script>
+  import {queryTreeListForRole,queryRolePermission,saveRolePermission} from '@/api/api'
+  import RoleDataruleModal from './RoleDataruleModal.vue'
+
+  export default {
+    name: "RoleModal",
+    components:{
+      RoleDataruleModal
+    },
+    data(){
+      return {
+        roleId:"",
+        treeData: [],
+        defaultCheckedKeys:[],
+        checkedKeys:[],
+        expandedKeysss:[],
+        allTreeKeys:[],
+        autoExpandParent: true,
+        checkStrictly: true,
+        title:"角色权限配置",
+        visible: false,
+        loading: false,
+        selectedKeys:[]
+      }
+    },
+    methods: {
+      onTreeNodeSelect(id){
+        if(id && id.length>0){
+          this.selectedKeys = id
+        }
+        this.$refs.datarule.show(this.selectedKeys[0],this.roleId)
+      },
+      onCheck (o) {
+        if(this.checkStrictly){
+          this.checkedKeys = o.checked;
+        }else{
+          this.checkedKeys = o
+        }
+      },
+      show(roleId){
+        this.roleId=roleId
+        this.visible = true;
+      },
+      close () {
+        this.reset()
+        this.$emit('close');
+        this.visible = false;
+      },
+      onExpand(expandedKeys){
+        this.expandedKeysss = expandedKeys;
+        this.autoExpandParent = false
+      },
+      reset () {
+        this.expandedKeysss = []
+        this.checkedKeys = []
+        this.defaultCheckedKeys = []
+        this.loading = false
+      },
+      expandAll () {
+        this.expandedKeysss = this.allTreeKeys
+      },
+      closeAll () {
+        this.expandedKeysss = []
+      },
+      checkALL () {
+        this.checkedKeys = this.allTreeKeys
+      },
+      cancelCheckALL () {
+        //this.checkedKeys = this.defaultCheckedKeys
+        this.checkedKeys = []
+      },
+      switchCheckStrictly (v) {
+        if(v==1){
+          this.checkStrictly = false
+        }else if(v==2){
+          this.checkStrictly = true
+        }
+      },
+      handleCancel () {
+        this.close()
+      },
+      handleSubmit(exit) {
+        let that = this;
+        let params =  {
+          roleId:that.roleId,
+          permissionIds:that.checkedKeys.join(","),
+          lastpermissionIds:that.defaultCheckedKeys.join(","),
+        };
+        that.loading = true;
+        console.log("请求参数：",params);
+        saveRolePermission(params).then((res)=>{
+          if(res.success){
+            that.$message.success(res.message);
+            that.loading = false;
+            if (exit) {
+              that.close()
+            }
+          }else {
+            that.$message.error(res.message);
+            that.loading = false;
+            if (exit) {
+              that.close()
+            }
+          }
+          this.loadData();
+        })
+      },
+      loadData(){
+        queryTreeListForRole().then((res) => {
+          this.treeData = res.result.treeList
+          this.allTreeKeys = res.result.ids
+          queryRolePermission({roleId:this.roleId}).then((res)=>{
+              this.checkedKeys = [...res.result];
+              this.defaultCheckedKeys = [...res.result];
+              this.expandedKeysss = this.allTreeKeys;
+              console.log(this.defaultCheckedKeys)
+          })
+        })
+      }
+    },
+  watch: {
+    visible () {
+      if (this.visible) {
+        this.loadData();
+      }
+    }
+  }
+  }
+
+</script>
+<style lang="less" scoped>
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+</style>

jshERP-web/src/views/system/modules/VendorModal.vue

@@ -0,0 +1,206 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:5%;height: 100%;overflow-y: hidden">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
+            <a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
+            <a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
+            <a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
+            <a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
+            <a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真">
+            <a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应收">
+            <a-input placeholder="请输入期初应收" v-decorator.trim="[ 'beginNeedGet' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应付">
+            <a-input placeholder="请输入期初应付" v-decorator.trim="[ 'beginNeedPay' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应收">
+            <a-input v-decorator.trim="[ 'AllNeedGet' ]" :readOnly="true" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应付">
+            <a-input v-decorator.trim="[ 'AllNeedPay' ]" :readOnly="true" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号">
+            <a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)">
+            <a-input placeholder="请输入税率(%)" v-decorator.trim="[ 'taxRate' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行">
+            <a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号">
+            <a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
+            <a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24/2">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
+            <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
+          </a-form-item>
+        </a-col>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addSupplier,editSupplier,checkSupplier } from '@/api/api'
+  export default {
+    name: "VendorModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 6 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          supplier:{
+            rules: [
+              { required: true, message: '请输入名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
+              { validator: this.validateSupplierName}
+            ]
+          }
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone',
+            'phoneNum', 'fax', 'beginNeedGet', 'beginNeedPay', 'AllNeedGet', 'AllNeedPay', 'taxNum', 'taxRate',
+            'bankName', 'accountNumber', 'address', 'description'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            if(this.model.beginNeedGet && this.model.beginNeedPay) {
+              that.$message.warn("期初应收和期初应付不能同时输入");
+              that.confirmLoading = false;
+              return;
+            }
+            formData.type = "供应商";
+            let obj;
+            if(!this.model.id){
+              obj=addSupplier(formData);
+            }else{
+              obj=editSupplier(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateSupplierName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkSupplier(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

jshERP-web/src/views/system/modules/icon/Icon.less

@@ -0,0 +1,35 @@
+@active-color: #4a4a48;
+ul {
+  max-height: 700px;
+  overflow-y: auto;
+  padding-left: .5rem;
+  i {
+    font-size: 1.5rem;
+    border: 1px solid #f1f1f1;
+    padding: .2rem;
+    margin: .3rem;
+    cursor: pointer;
+    &.active, &:hover {
+      border-radius: 2px;
+      border-color: @active-color;
+      background-color: @active-color;
+      color: #fff;
+      transition: all .3s;
+    }
+  }
+  li {
+    list-style: none;
+    float: left;
+    width: 5%;
+    text-align: center;
+    cursor: pointer;
+    color: #555;
+    transition: color .3s ease-in-out,background-color .3s ease-in-out;
+    position: relative;
+    margin: 3px 0;
+    border-radius: 4px;
+    background-color: #fff;
+    overflow: hidden;
+    padding: 10px 0 0;
+  }
+}

jshERP-web/src/views/system/modules/icon/Icons.vue

@@ -0,0 +1,123 @@
+<template>
+  <a-modal
+    v-model="show"
+    :width="900"
+    :keyboard="false"
+    :closable="false"
+    :centered="true"
+    @ok="ok"
+    @cancel="cancel"
+    :maskClosable="false"
+    :mask="false"
+    okText="确认"
+    cancelText="取消">
+    <a-tabs>
+      <a-tab-pane tab="方向性图标" key="1">
+        <ul>
+          <li v-for="icon in icons.directionIcons" :key="icon">
+            <a-icon :type="icon" :title="icon" @click="chooseIcon(icon)" :class="{'active':activeIndex === icon}"/>
+          </li>
+        </ul>
+      </a-tab-pane>
+      <a-tab-pane tab="指示性图标" key="2">
+        <ul>
+          <li v-for="icon in icons.suggestionIcons" :key="icon">
+            <a-icon :type="icon" :title="icon" @click="chooseIcon(icon)" :class="{'active':activeIndex === icon}"/>
+          </li>
+        </ul>
+      </a-tab-pane>
+      <a-tab-pane tab="编辑类图标" key="3">
+        <ul>
+          <li v-for="icon in icons.editIcons" :key="icon">
+            <a-icon :type="icon" :title="icon" @click="chooseIcon(icon)" :class="{'active':activeIndex === icon}"/>
+          </li>
+        </ul>
+      </a-tab-pane>
+      <a-tab-pane tab="数据类图标" key="4">
+        <ul>
+          <li v-for="icon in icons.dataIcons" :key="icon">
+            <a-icon :type="icon" :title="icon" @click="chooseIcon(icon)" :class="{'active':activeIndex === icon}"/>
+          </li>
+        </ul>
+      </a-tab-pane>
+      <a-tab-pane tab="网站通用图标" key="5">
+        <ul>
+          <li v-for="icon in icons.webIcons" :key="icon">
+            <a-icon :type="icon" :title="icon" @click="chooseIcon(icon)" :class="{'active':activeIndex === icon}"/>
+          </li>
+        </ul>
+      </a-tab-pane>
+      <a-tab-pane tab="品牌和标识" key="6">
+        <ul>
+          <li v-for="icon in icons.logoIcons" :key="icon">
+            <a-icon :type="icon" :title="icon" @click="chooseIcon(icon)" :class="{'active':activeIndex === icon}"/>
+          </li>
+        </ul>
+      </a-tab-pane>
+    </a-tabs>
+  </a-modal>
+</template>
+<script>
+const directionIcons = ['step-backward', 'step-forward', 'fast-backward', 'fast-forward', 'shrink', 'arrows-alt', 'down', 'up', 'left', 'right', 'caret-up', 'caret-down', 'caret-left', 'caret-right', 'up-circle', 'down-circle', 'left-circle', 'right-circle', 'up-circle-o', 'down-circle-o', 'right-circle-o', 'left-circle-o', 'double-right', 'double-left', 'vertical-left', 'vertical-right', 'forward', 'backward', 'rollback', 'enter', 'retweet', 'swap', 'swap-left', 'swap-right', 'arrow-up', 'arrow-down', 'arrow-left', 'arrow-right', 'play-circle', 'play-circle-o', 'up-square', 'down-square', 'left-square', 'right-square', 'up-square-o', 'down-square-o', 'left-square-o', 'right-square-o', 'login', 'logout', 'menu-fold', 'menu-unfold', 'border-bottom', 'border-horizontal', 'border-inner', 'border-left', 'border-right', 'border-top', 'border-verticle', 'pic-center', 'pic-left', 'pic-right', 'radius-bottomleft', 'radius-bottomright', 'radius-upleft', 'radius-upright', 'fullscreen', 'fullscreen-exit']
+const suggestionIcons = ['question', 'question-circle', 'plus', 'plus-circle', 'pause', 'pause-circle', 'minus', 'minus-circle', 'plus-square', 'minus-square', 'info', 'info-circle', 'exclamation', 'exclamation-circle', 'close', 'close-circle', 'close-square', 'check', 'check-circle', 'check-square', 'clock-circle', 'warning', 'issues-close', 'stop']
+const editIcons = ['edit', 'form', 'copy', 'scissor', 'delete', 'snippets', 'diff', 'highlight', 'align-center', 'align-left', 'align-right', 'bg-colors', 'bold', 'italic', 'underline', 'strikethrough', 'redo', 'undo', 'zoom-in', 'zoom-out', 'font-colors', 'font-size', 'line-height', 'colum-height', 'dash', 'small-dash', 'sort-ascending', 'sort-descending', 'drag', 'ordered-list', 'radius-setting']
+const dataIcons = ['area-chart', 'pie-chart', 'bar-chart', 'dot-chart', 'line-chart', 'radar-chart', 'heat-map', 'fall', 'rise', 'stock', 'box-plot', 'fund', 'sliders']
+const webIcons = ['lock', 'unlock', 'bars', 'book', 'calendar', 'cloud', 'cloud-download', 'code', 'copy', 'credit-card', 'delete', 'desktop', 'download', 'ellipsis', 'file', 'file-text', 'file-unknown', 'file-pdf', 'file-word', 'file-excel', 'file-jpg', 'file-ppt', 'file-markdown', 'file-add', 'folder', 'folder-open', 'folder-add', 'hdd', 'frown', 'meh', 'smile', 'inbox', 'laptop', 'appstore', 'link', 'mail', 'mobile', 'notification', 'paper-clip', 'picture', 'poweroff', 'reload', 'search', 'setting', 'share-alt', 'shopping-cart', 'tablet', 'tag', 'tags', 'to-top', 'upload', 'user', 'video-camera', 'home', 'loading', 'loading-3-quarters', 'cloud-upload', 'star', 'heart', 'environment', 'eye', 'camera', 'save', 'team', 'solution', 'phone', 'filter', 'exception', 'export', 'customer-service', 'qrcode', 'scan', 'like', 'dislike', 'message', 'pay-circle', 'calculator', 'pushpin', 'bulb', 'select', 'switcher', 'rocket', 'bell', 'disconnect', 'database', 'compass', 'barcode', 'hourglass', 'key', 'flag', 'layout', 'printer', 'sound', 'usb', 'skin', 'tool', 'sync', 'wifi', 'car', 'schedule', 'user-add', 'user-delete', 'usergroup-add', 'usergroup-delete', 'man', 'woman', 'shop', 'gift', 'idcard', 'medicine-box', 'red-envelope', 'coffee', 'copyright', 'trademark', 'safety', 'wallet', 'bank', 'trophy', 'contacts', 'global', 'shake', 'api', 'fork', 'dashboard', 'table', 'profile', 'alert', 'audit', 'branches', 'build', 'border', 'crown', 'experiment', 'fire', 'money-collect', 'property-safety', 'read', 'reconciliation', 'rest', 'security-scan', 'insurance', 'interation', 'safety-certificate', 'project', 'thunderbolt', 'block', 'cluster', 'deployment-unit', 'dollar', 'euro', 'pound', 'file-done', 'file-exclamation', 'file-protect', 'file-search', 'file-sync', 'gateway', 'gold', 'robot', 'shopping']
+const logoIcons = ['android', 'apple', 'windows', 'ie', 'chrome', 'github', 'aliwangwang', 'dingding', 'weibo-square', 'weibo-circle', 'taobao-circle', 'html5', 'weibo', 'twitter', 'wechat', 'youtube', 'alipay-circle', 'taobao', 'skype', 'qq', 'medium-workmark', 'gitlab', 'medium', 'linkedin', 'google-plus', 'dropbox', 'facebook', 'codepen', 'amazon', 'google', 'codepen-circle', 'alipay', 'ant-design', 'aliyun', 'zhihu', 'slack', 'slack-square', 'behance', 'behance-square', 'dribbble', 'dribbble-square', 'instagram', 'yuque', 'alibaba', 'yahoo']
+export default {
+  name: 'Icons',
+  props: {
+    iconChooseVisible: {
+      default: false
+    }
+  },
+  data () {
+    return {
+      icons: {
+        directionIcons,
+        suggestionIcons,
+        editIcons,
+        dataIcons,
+        webIcons,
+        logoIcons
+      },
+      choosedIcon: '',
+      activeIndex: ''
+    }
+  },
+  computed: {
+    show: {
+      get: function () {
+        return this.iconChooseVisible
+      },
+      set: function () {
+      }
+    }
+  },
+  methods: {
+    reset () {
+      this.activeIndex = ''
+    },
+    chooseIcon (icon) {
+      this.activeIndex = icon
+      this.choosedIcon = icon
+      this.$message.success(`选中 ${icon}`)
+    },
+    ok () {
+      if (this.choosedIcon === '') {
+        this.$message.warning('尚未选择任何图标')
+        return
+      }
+      this.reset()
+      this.$emit('choose', this.choosedIcon)
+    },
+    cancel () {
+      this.reset()
+      this.$emit('close')
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+@import "Icon";
+</style>