diff --git a/yunxi-ui-admin/src/utils/constants.js b/yunxi-ui-admin/src/utils/constants.js
index a233871..3a7763a 100644
--- a/yunxi-ui-admin/src/utils/constants.js
+++ b/yunxi-ui-admin/src/utils/constants.js
@@ -364,3 +364,17 @@ export const customerstatus = {
     name: '关闭'
   }
 }
+
+/**
+ * 树状列表
+ */
+ export const TreeEnum = {
+  WAREHOUSE: {
+    status: 0,
+    name: '开启'
+  },
+  CLOSE: {
+    status: 1,
+    name: '关闭'
+  }
+}
diff --git a/yunxi-ui-admin/src/views/xxjj/businessAndWarehouse/index.vue b/yunxi-ui-admin/src/views/xxjj/businessAndWarehouse/index.vue
new file mode 100644
index 0000000..fc2bc29
--- /dev/null
+++ b/yunxi-ui-admin/src/views/xxjj/businessAndWarehouse/index.vue
@@ -0,0 +1,1097 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <el-tabs v-model="activeTabs" @tab-click="handleClick">
+          <!--用户数据-->
+          <el-tab-pane label="仓库列表" name="warehouse">
+            <!-- 搜索工作栏 -->
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="68px"
+            >
+              <el-form-item label="仓库编号" prop="warehouseCode">
+                <el-input
+                  v-model="queryParams.warehouseCode"
+                  placeholder="请输入仓库编号"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="仓库名称" prop="warehouseName">
+                <el-input
+                  v-model="queryParams.warehouseName"
+                  placeholder="请输入仓库名称"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="类型" prop="type">
+                <el-select
+                  v-model="queryParams.type"
+                  placeholder="请选择类型"
+                  clearable
+                  size="small"
+                >
+                  <el-option
+                    v-for="dict in this.getDictDatas(DICT_TYPE.WAREHOUSE_TYPE)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="成立时间" prop="establishDate">
+                <el-date-picker
+                  v-model="queryParams.establishDate"
+                  style="width: 240px"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :default-time="['00:00:00', '23:59:59']"
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  @click="handleQuery"
+                  >搜索</el-button
+                >
+                <el-button icon="el-icon-refresh" @click="resetQuery"
+                  >重置</el-button
+                >
+              </el-form-item>
+            </el-form>
+
+            <!-- 操作工具栏 -->
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['xxjj:warehouse:create']"
+                  >新增</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  :loading="exportLoading"
+                  v-hasPermi="['xxjj:warehouse:export']"
+                  >导出</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+              ></right-toolbar>
+            </el-row>
+
+            <!-- 列表 -->
+            <el-table v-loading="loading" :data="list">
+              <el-table-column label="仓库id" align="center" prop="id" />
+              <el-table-column
+                label="仓库编号"
+                align="center"
+                prop="warehouseCode"
+              />
+              <el-table-column
+                label="仓库名称"
+                align="center"
+                prop="warehouseName"
+              />
+              <el-table-column
+                label="仓库简称"
+                align="center"
+                prop="warehouseSimple"
+              />
+              <el-table-column
+                label="隶属业务线"
+                align="center"
+                prop="affiliatLineId"
+              />
+              <el-table-column label="类型" align="center" prop="type">
+                <template v-slot="scope">
+                  <dict-tag
+                    :type="DICT_TYPE.WAREHOUSE_TYPE"
+                    :value="scope.row.type"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column label="所在城市" align="center" prop="city" />
+              <el-table-column
+                label="成立时间"
+                align="center"
+                prop="establishDate"
+                width="180"
+              >
+                <template v-slot="scope">
+                  <span>{{ parseTime(scope.row.establishDate) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="归属人员"
+                align="center"
+                prop="belongUserId"
+              />
+              <el-table-column label="介绍" align="center" prop="description" />
+              <el-table-column
+                label="创建时间"
+                align="center"
+                prop="createTime"
+                width="180"
+              >
+                <template v-slot="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+              >
+                <template v-slot="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-edit"
+                    @click="handleUpdate(scope.row)"
+                    v-hasPermi="['xxjj:warehouse:update']"
+                    >修改</el-button
+                  >
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.row)"
+                    v-hasPermi="['xxjj:warehouse:delete']"
+                    >删除</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+          <el-tab-pane label="客户列表" name="customer">
+            <!-- 搜索工作栏 -->
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="68px"
+            >
+              <el-form-item label="客户名称" prop="customerName">
+                <el-input
+                  v-model="queryParams.customerName"
+                  placeholder="请输入客户名称"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="客户类型" prop="customerType">
+                <el-select
+                  v-model="queryParams.customerType"
+                  placeholder="请选择客户类型"
+                  clearable
+                  size="small"
+                >
+                  <el-option
+                    v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_TYPE)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="统一结算主体" prop="unifiedSettlement">
+                <el-input
+                  v-model="queryParams.unifiedSettlement"
+                  placeholder="请输入统一结算主体"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="客户性质" prop="customerNature">
+                <el-select
+                  v-model="queryParams.customerNature"
+                  placeholder="请选择客户性质"
+                  clearable
+                  size="small"
+                >
+                  <el-option
+                    v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_NATUER)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="合作模式" prop="cooperationMode">
+                <el-select
+                  v-model="queryParams.cooperationMode"
+                  placeholder="请选择合作模式"
+                  clearable
+                  size="small"
+                >
+                  <el-option
+                    v-for="dict in this.getDictDatas(
+                      DICT_TYPE.COOPERATION_MODE
+                    )"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="隶属业务线" prop="linebusinessId">
+                <el-input
+                  v-model="queryParams.linebusinessId"
+                  placeholder="请输入隶属业务线"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="创建时间" prop="createTime">
+                <el-date-picker
+                  v-model="queryParams.createTime"
+                  style="width: 240px"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :default-time="['00:00:00', '23:59:59']"
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  @click="handleQuery"
+                  >搜索</el-button
+                >
+                <el-button icon="el-icon-refresh" @click="resetQuery"
+                  >重置</el-button
+                >
+              </el-form-item>
+            </el-form>
+
+            <!-- 操作工具栏 -->
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['xxjj:customer:create']"
+                  >新增</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  :loading="exportLoading"
+                  v-hasPermi="['xxjj:customer:export']"
+                  >导出</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
+
+            <!-- 列表 -->
+            <el-table
+              v-loading="loading"
+              :data="list"
+              @selection-change="handleSelectionChange"
+              sortable
+              border
+              custom-column
+              stripe
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="‘center’"
+              ></el-table-column>
+              <el-table-column
+                label="编号"
+                align="center"
+                prop="id"
+                v-if="columns[0].visible"
+              />
+              <el-table-column
+                label="客户名称"
+                align="center"
+                prop="customerName"
+                sortable
+                v-if="columns[1].visible"
+              />
+              <el-table-column
+                label="客户类型"
+                align="center"
+                prop="customerType"
+                sortable
+                v-if="columns[2].visible"
+              >
+                <template v-slot="scope">
+                  <dict-tag
+                    :type="DICT_TYPE.CUSTOMER_TYPE"
+                    :value="scope.row.customerType"
+                  />
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                label="统一结算主体"
+                align="center"
+                prop="unifiedSettlement"
+                sortable
+                v-if="columns[3].visible"
+              />
+              <el-table-column
+                label="客户性质"
+                align="center"
+                prop="customerNature"
+                sortable
+                v-if="columns[4].visible"
+              >
+                <template v-slot="scope">
+                  <dict-tag
+                    :type="DICT_TYPE.CUSTOMER_NATUER"
+                    :value="scope.row.customerNature"
+                  />
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                label="合作模式"
+                align="center"
+                prop="cooperationMode"
+                sortable
+                v-if="columns[5].visible"
+              >
+                <template v-slot="scope">
+                  <dict-tag
+                    :type="DICT_TYPE.COOPERATION_MODE"
+                    :value="scope.row.cooperationMode"
+                  />
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                label="隶属业务线"
+                align="center"
+                prop="linebusinessId"
+                sortable
+                v-if="columns[6].visible"
+              />
+
+              <el-table-column
+                label="状态"
+                align="center"
+                prop="status"
+                sortable
+                v-if="columns[7].visible"
+              >
+                <template v-slot="scope">
+                  <dict-tag
+                    :type="DICT_TYPE.UNIT_LIBRARY_STATUS"
+                    :value="scope.row.status"
+                  />
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                label="归属人员"
+                align="center"
+                prop="belongingPeople"
+                sortable
+                v-if="columns[8].visible"
+              />
+
+              <el-table-column
+                label="创建时间"
+                align="center"
+                prop="createTime"
+                width="180"
+                v-if="columns[9].visible"
+              >
+                <template v-slot="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="更新时间"
+                align="center"
+                prop="updateTime"
+                width="180"
+                v-if="columns[10].visible"
+              >
+                <template v-slot="scope">
+                  <span>{{ parseTime(scope.row.updateTime) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+              >
+                <template v-slot="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-edit"
+                    @click="handleUpdate(scope.row)"
+                    v-hasPermi="['xxjj:customer:update']"
+                    >修改</el-button
+                  >
+
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-edit"
+                    @click="handleopen1close(scope.row)"
+                    >{{ scope.row.status == 0 ? "禁用" : "启用" }}</el-button
+                  >
+
+                  <el-divider direction="vertical"></el-divider>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.row)"
+                    v-hasPermi="['xxjj:customer:delete']"
+                    >删除</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
+        <!-- 分页组件 -->
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNo"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      v-dialogDrag
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="仓库编号" prop="warehouseCode">
+          <el-input v-model="form.warehouseCode" placeholder="请输入仓库编号" />
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="warehouseName">
+          <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
+        </el-form-item>
+        <el-form-item label="仓库简称" prop="warehouseSimple">
+          <el-input
+            v-model="form.warehouseSimple"
+            placeholder="请输入仓库简称"
+          />
+        </el-form-item>
+        <el-form-item label="隶属业务线" prop="affiliatLineId">
+          <el-input
+            v-model="form.affiliatLineId"
+            placeholder="请输入隶属业务线"
+          />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option
+              v-for="dict in this.getDictDatas(DICT_TYPE.WAREHOUSE_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所在城市" prop="city">
+          <el-input v-model="form.city" placeholder="请输入所在城市" />
+        </el-form-item>
+        <el-form-item label="成立时间" prop="establishDate">
+          <el-date-picker
+            clearable
+            v-model="form.establishDate"
+            type="date"
+            value-format="timestamp"
+            placeholder="选择成立时间"
+          />
+        </el-form-item>
+        <el-form-item label="归属人员" prop="belongUserId">
+          <el-input v-model="form.belongUserId" placeholder="请输入归属人员" />
+        </el-form-item>
+        <el-form-item label="介绍" prop="description">
+          <el-input v-model="form.description" placeholder="请输入介绍" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  addUser,
+  changeUserStatus,
+  delUser,
+  exportUser,
+  getUser,
+  importTemplate,
+  listUser,
+  resetUserPwd,
+  updateUser,
+} from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getBusinessLintTree } from "@/api/xxjj/businessLine";
+
+import { listSimpleDepts } from "@/api/system/dept";
+import { listSimplePosts } from "@/api/system/post";
+
+import { CommonStatusEnum } from "@/utils/constants";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
+import { assignUserRole, listUserRoles } from "@/api/system/permission";
+import { listSimpleRoles } from "@/api/system/role";
+import { getBaseHeader } from "@/utils/request";
+import {
+  createWarehouse,
+  updateWarehouse,
+  deleteWarehouse,
+  getWarehouse,
+  getWarehousePage,
+  exportWarehouseExcel,
+} from "@/api/xxjj/warehouse";
+import {
+  createCustomer,
+  updateCustomer,
+  deleteCustomer,
+  getCustomer,
+  getCustomerPage,
+  exportCustomerExcel,
+} from "@/api/xxjj/customer";
+
+export default {
+  name: "SystemUser",
+  components: { Treeselect },
+  data() {
+    return {
+      activeTabs: "warehouse",
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 部门名称
+      deptName: undefined,
+      // 默认密码
+      initPassword: undefined,
+      // 性别状态字典
+      sexOptions: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "name",
+      },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: getBaseHeader(),
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/admin-api/system/user/import",
+      },
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        warehouseCode: null,
+        warehouseName: null,
+        affiliatLineId: null,
+        type: null,
+        city: null,
+        establishDate: [],
+        createTime: [],
+        linebusinessId: null,
+      },
+      columns: [
+        { key: 0, label: `编号`, visible: true },
+        { key: 1, label: `客户名称`, visible: true },
+        { key: 2, label: `客户类型`, visible: true },
+        { key: 3, label: `统一结算主体`, visible: true },
+        { key: 4, label: `客户性质`, visible: true },
+        { key: 5, label: `合作模式`, visible: true },
+        { key: 6, label: `隶属业务线`, visible: true },
+        { key: 7, label: `状态`, visible: true },
+        { key: 8, label: `归属人员`, visible: true },
+        { key: 9, label: `创建时间`, visible: true },
+        { key: 10, label: `更新时间`, visible: true },
+      ],
+      // 表单校验
+      rules: {
+        warehouseCode: [
+          { required: true, message: "仓库编号不能为空", trigger: "blur" },
+        ],
+        warehouseName: [
+          { required: true, message: "仓库名称不能为空", trigger: "blur" },
+        ],
+        affiliatLineId: [
+          { required: true, message: "隶属业务线不能为空", trigger: "blur" },
+        ],
+        type: [{ required: true, message: "类型不能为空", trigger: "change" }],
+        city: [
+          { required: true, message: "所在城市不能为空", trigger: "blur" },
+        ],
+        establishDate: [
+          { required: true, message: "成立时间不能为空", trigger: "blur" },
+        ],
+        belongUserId: [
+          { required: true, message: "归属人员不能为空", trigger: "blur" },
+        ],
+      },
+      // 是否显示弹出层（角色权限）
+      openRole: false,
+
+      // 枚举
+      SysCommonStatusEnum: CommonStatusEnum,
+      // 数据字典
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
+      sexDictDatas: getDictDatas(DICT_TYPE.SYSTEM_USER_SEX),
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+    // this.getConfigKey("sys.user.init-password").then(response => {
+    //   this.initPassword = response.msg;
+    // });
+  },
+  methods: {
+    handleClick(val) {
+      if (val.name === "warehouse") {
+        // this.queryParams.affiliatLineId = undefined;
+        this.queryParams.alarmStock = undefined;
+        debugger;
+      } else if (val.name === "customer") {
+        // this.queryParams.affiliatLineId = 2;
+        this.queryParams.alarmStock = undefined;
+      }
+      this.getList();
+    },
+    // 更多操作
+    handleCommand(command, index, row) {
+      switch (command) {
+        case "handleUpdate":
+          this.handleUpdate(row); //修改客户信息
+          break;
+        case "handleDelete":
+          this.handleDelete(row); //红号变更
+          break;
+        case "handleResetPwd":
+          this.handleResetPwd(row);
+          break;
+        case "handleRole":
+          this.handleRole(row);
+          break;
+        default:
+          break;
+      }
+    },
+    /** 查询列表 */
+    getList() {
+      debugger;
+      this.loading = true;
+      if (this.activeTabs == "warehouse") {
+        // 执行查询
+        getWarehousePage(this.queryParams).then((response) => {
+          this.list = response.data.list;
+          this.total = response.data.total;
+          this.loading = false;
+        });
+      } else if (this.activeTabs == "customer") {
+        getCustomerPage(this.queryParams).then((response) => {
+          this.list = response.data.list;
+          this.total = response.data.total;
+          this.loading = false;
+        });
+      }
+    },
+    /** 查询部门下拉树结构 + 岗位下拉 */
+    getTreeselect() {
+      // listSimpleDepts().then((response) => {
+      //   // 处理 deptOptions 参数
+      //   this.deptOptions = [];
+      //   this.deptOptions.push(...this.handleTree(response.data, "id"));
+      //   debugger;
+      // });
+      getBusinessLintTree().then((response) => {
+        debugger;
+        // 处理 deptOptions 参数
+        this.deptOptions = [];
+        this.deptOptions.push(...response.data);
+        debugger;
+      });
+      listSimplePosts().then((response) => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+        debugger;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      debugger;
+
+      if (data.affiliatCompanyId) {
+        this.activeTabs = "warehouse";
+        this.queryParams.affiliatLineId = data.id;
+        debugger;
+      } else if (data.affiliatLineId) {
+        debugger;
+        this.activeTabs = "customer";
+        this.queryParams.linebusiness_id = data.id;
+      }
+      debugger;
+      this.getList();
+    },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
+      this.$modal
+        .confirm('确认要"' + text + '""' + row.username + '"用户吗?')
+        .then(function () {
+          return changeUserStatus(row.id, row.status);
+        })
+        .then(() => {
+          this.$modal.msgSuccess(text + "成功");
+        })
+        .catch(function () {
+          row.status =
+            row.status === CommonStatusEnum.ENABLE
+              ? CommonStatusEnum.DISABLE
+              : CommonStatusEnum.ENABLE;
+        });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消按钮（角色权限）
+    cancelRole() {
+      this.openRole = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        deptId: undefined,
+        username: undefined,
+        nickname: undefined,
+        password: undefined,
+        mobile: undefined,
+        email: undefined,
+        sex: undefined,
+        status: "0",
+        remark: undefined,
+        postIds: [],
+        roleIds: [],
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加仓库";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getWarehouse(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改仓库";
+      });
+    },
+    /** 重置密码按钮操作 */
+    handleResetPwd(row) {
+      this.$prompt('请输入"' + row.username + '"的新密码', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+      })
+        .then(({ value }) => {
+          resetUserPwd(row.id, value).then((response) => {
+            this.$modal.msgSuccess("修改成功，新密码是：" + value);
+          });
+        })
+        .catch(() => {});
+    },
+    /** 分配用户角色操作 */
+    handleRole(row) {
+      this.reset();
+      const id = row.id;
+      // 处理了 form 的用户 username 和 nickname 的展示
+      this.form.id = id;
+      this.form.username = row.username;
+      this.form.nickname = row.nickname;
+      // 打开弹窗
+      this.openRole = true;
+      // 获得角色列表
+      listSimpleRoles().then((response) => {
+        // 处理 roleOptions 参数
+        this.roleOptions = [];
+        this.roleOptions.push(...response.data);
+      });
+      // 获得角色拥有的菜单集合
+      listUserRoles(id).then((response) => {
+        // 设置选中
+        this.form.roleIds = response.data;
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateWarehouse(this.form).then((response) => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createWarehouse(this.form).then((response) => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 提交按钮（角色权限） */
+    submitRole: function () {
+      if (this.form.id !== undefined) {
+        assignUserRole({
+          userId: this.form.id,
+          roleIds: this.form.roleIds,
+        }).then((response) => {
+          this.$modal.msgSuccess("分配角色成功");
+          this.openRole = false;
+          this.getList();
+        });
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除用户编号为"' + ids + '"的数据项?')
+        .then(function () {
+          return delUser(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.$modal
+        .confirm("是否确认导出所有用户数据项?")
+        .then(() => {
+          // 处理查询参数
+          let params = { ...this.queryParams };
+          params.pageNo = undefined;
+          params.pageSize = undefined;
+          this.exportLoading = true;
+          return exportUser(params);
+        })
+        .then((response) => {
+          this.$download.excel(response, "用户数据.xls");
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then((response) => {
+        this.$download.excel(response, "用户导入模板.xls");
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      if (response.code !== 0) {
+        this.$modal.msgError(response.msg);
+        return;
+      }
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      // 拼接提示语
+      let data = response.data;
+      let text = "创建成功数量：" + data.createUsernames.length;
+      for (const username of data.createUsernames) {
+        text += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + username;
+      }
+      text += "<br />更新成功数量：" + data.updateUsernames.length;
+      for (const username of data.updateUsernames) {
+        text += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + username;
+      }
+      text +=
+        "<br />更新失败数量：" + Object.keys(data.failureUsernames).length;
+      for (const username in data.failureUsernames) {
+        text +=
+          "<br />&nbsp;&nbsp;&nbsp;&nbsp;" +
+          username +
+          "：" +
+          data.failureUsernames[username];
+      }
+      this.$alert(text, "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    // 格式化部门的下拉框
+    normalizer(node) {
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children,
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.app-container {
+  .el-tag + .el-tag {
+    margin-left: 10px;
+  }
+}
+</style>
diff --git a/yunxi-ui-admin/src/views/xxjj/businessLine/index.vue b/yunxi-ui-admin/src/views/xxjj/businessLine/index.vue
new file mode 100644
index 0000000..cbbb3cf
--- /dev/null
+++ b/yunxi-ui-admin/src/views/xxjj/businessLine/index.vue
@@ -0,0 +1,535 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="业务线编号" prop="businessCode">
+        <el-input
+          v-model="queryParams.businessCode"
+          placeholder="请输入业务线编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="业务线名称" prop="businessName">
+        <el-input
+          v-model="queryParams.businessName"
+          placeholder="请输入业务线名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="隶属企业" prop="affiliatCompanyId">
+        <el-input
+          v-model="queryParams.affiliatCompanyId"
+          placeholder="请输入隶属企业"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择类型"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.BUSINESS_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属行业" prop="industry">
+        <el-input
+          v-model="queryParams.industry"
+          placeholder="请输入所属行业"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所在城市" prop="city">
+        <el-input
+          v-model="queryParams.city"
+          placeholder="请输入所在城市"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="成立时间" prop="establishDate">
+        <el-date-picker
+          v-model="queryParams.establishDate"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        />
+      </el-form-item>
+      <el-form-item label="品牌/业务线/事业群名称" prop="brandName">
+        <el-input
+          v-model="queryParams.brandName"
+          placeholder="请输入品牌/业务线/事业群名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['xxjj:business-line:create']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['xxjj:business-line:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="业务id" align="center" prop="id" />
+      <el-table-column label="业务线编号" align="center" prop="businessCode" />
+      <el-table-column label="业务线名称" align="center" prop="businessName" />
+      <el-table-column
+        label="业务线简称"
+        align="center"
+        prop="businessSimple"
+      />
+      <el-table-column label="业务线LOGO" align="center" prop="businessLogo" />
+      <el-table-column
+        label="隶属企业"
+        align="center"
+        prop="affiliatCompanyId"
+      />
+      <el-table-column label="类型" align="center" prop="type">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.BUSINESS_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="所属行业" align="center" prop="industry" />
+      <el-table-column label="所在城市" align="center" prop="city" />
+      <el-table-column
+        label="成立时间"
+        align="center"
+        prop="establishDate"
+        width="180"
+      >
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.establishDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="归属人员" align="center" prop="belongUserId" />
+      <el-table-column
+        label="品牌/业务线/事业群名称"
+        align="center"
+        prop="brandName"
+      />
+      <el-table-column label="电话" align="center" prop="phone" />
+      <el-table-column label="传真" align="center" prop="fax" />
+      <el-table-column label="网址" align="center" prop="url" />
+      <el-table-column label="介绍" align="center" prop="description" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template v-slot="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['xxjj:business-line:update']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['xxjj:business-line:delete']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      v-dialogDrag
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="业务线编号" prop="businessCode">
+          <el-input
+            v-model="form.businessCode"
+            placeholder="请输入业务线编号"
+          />
+        </el-form-item>
+        <el-form-item label="业务线名称" prop="businessName">
+          <el-input
+            v-model="form.businessName"
+            placeholder="请输入业务线名称"
+          />
+        </el-form-item>
+        <el-form-item label="业务线简称" prop="businessSimple">
+          <el-input
+            v-model="form.businessSimple"
+            placeholder="请输入业务线简称"
+          />
+        </el-form-item>
+        <el-form-item label="业务线LOGO" prop="businessLogo">
+          <el-input
+            v-model="form.businessLogo"
+            placeholder="请输入业务线LOGO"
+          />
+        </el-form-item>
+        <el-form-item label="隶属企业" prop="affiliatCompanyId">
+          <el-input
+            v-model="form.affiliatCompanyId"
+            placeholder="请输入隶属企业"
+          />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option
+              v-for="dict in this.getDictDatas(DICT_TYPE.BUSINESS_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属行业" prop="industry">
+          <el-input v-model="form.industry" placeholder="请输入所属行业" />
+        </el-form-item>
+        <el-form-item label="所在城市" prop="city">
+          <el-input v-model="form.city" placeholder="请输入所在城市" />
+        </el-form-item>
+        <el-form-item label="成立时间" prop="establishDate">
+          <el-date-picker
+            clearable
+            v-model="form.establishDate"
+            type="date"
+            value-format="timestamp"
+            placeholder="选择成立时间"
+          />
+        </el-form-item>
+        <el-form-item label="归属人员" prop="belongUserId">
+          <el-input v-model="form.belongUserId" placeholder="请输入归属人员" />
+        </el-form-item>
+        <el-form-item label="品牌/业务线/事业群名称" prop="brandName">
+          <el-input
+            v-model="form.brandName"
+            placeholder="请输入品牌/业务线/事业群名称"
+          />
+        </el-form-item>
+        <el-form-item label="电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入电话" />
+        </el-form-item>
+        <el-form-item label="传真" prop="fax">
+          <el-input v-model="form.fax" placeholder="请输入传真" />
+        </el-form-item>
+        <el-form-item label="网址" prop="url">
+          <el-input v-model="form.url" placeholder="请输入网址" />
+        </el-form-item>
+        <el-form-item label="介绍" prop="description">
+          <el-input v-model="form.description" placeholder="请输入介绍" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  createBusinessLine,
+  updateBusinessLine,
+  deleteBusinessLine,
+  getBusinessLine,
+  getBusinessLinePage,
+  exportBusinessLineExcel,
+} from "@/api/xxjj/businessLine";
+
+export default {
+  name: "BusinessLine",
+  components: {},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 业务线列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        businessCode: null,
+        businessName: null,
+        affiliatCompanyId: null,
+        type: null,
+        industry: null,
+        city: null,
+        establishDate: [],
+        brandName: null,
+        phone: null,
+        createTime: [],
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        businessCode: [
+          { required: true, message: "业务线编号不能为空", trigger: "blur" },
+        ],
+        businessName: [
+          { required: true, message: "业务线名称不能为空", trigger: "blur" },
+        ],
+        businessLogo: [
+          { required: true, message: "业务线LOGO不能为空", trigger: "blur" },
+        ],
+        affiliatCompanyId: [
+          { required: true, message: "隶属企业不能为空", trigger: "blur" },
+        ],
+        type: [{ required: true, message: "类型不能为空", trigger: "change" }],
+        industry: [
+          { required: true, message: "所属行业不能为空", trigger: "blur" },
+        ],
+        city: [
+          { required: true, message: "所在城市不能为空", trigger: "blur" },
+        ],
+        establishDate: [
+          { required: true, message: "成立时间不能为空", trigger: "blur" },
+        ],
+        belongUserId: [
+          { required: true, message: "归属人员不能为空", trigger: "blur" },
+        ],
+        brandName: [
+          {
+            required: true,
+            message: "品牌/业务线/事业群名称不能为空",
+            trigger: "blur",
+          },
+        ],
+        phone: [{ required: true, message: "电话不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getBusinessLinePage(this.queryParams).then((response) => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        businessCode: undefined,
+        businessName: undefined,
+        businessSimple: undefined,
+        businessLogo: undefined,
+        affiliatCompanyId: undefined,
+        type: undefined,
+        industry: undefined,
+        city: undefined,
+        establishDate: undefined,
+        belongUserId: undefined,
+        brandName: undefined,
+        phone: undefined,
+        fax: undefined,
+        url: undefined,
+        description: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加业务线";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getBusinessLine(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改业务线";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateBusinessLine(this.form).then((response) => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createBusinessLine(this.form).then((response) => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal
+        .confirm('是否确认删除业务线编号为"' + id + '"的数据项?')
+        .then(function () {
+          return deleteBusinessLine(id);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal
+        .confirm("是否确认导出所有业务线数据项?")
+        .then(() => {
+          this.exportLoading = true;
+          return exportBusinessLineExcel(params);
+        })
+        .then((response) => {
+          this.$download.excel(response, "业务线.xls");
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
diff --git a/yunxi-ui-admin/src/views/xxjj/warehouse/index.vue b/yunxi-ui-admin/src/views/xxjj/warehouse/index.vue
new file mode 100644
index 0000000..9f3ab79
--- /dev/null
+++ b/yunxi-ui-admin/src/views/xxjj/warehouse/index.vue
@@ -0,0 +1,444 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="仓库编号" prop="warehouseCode">
+        <el-input
+          v-model="queryParams.warehouseCode"
+          placeholder="请输入仓库编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="warehouseName">
+        <el-input
+          v-model="queryParams.warehouseName"
+          placeholder="请输入仓库名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="隶属业务线" prop="affiliatLineId">
+        <el-input
+          v-model="queryParams.affiliatLineId"
+          placeholder="请输入隶属业务线"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择类型"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.WAREHOUSE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所在城市" prop="city">
+        <el-input
+          v-model="queryParams.city"
+          placeholder="请输入所在城市"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="成立时间" prop="establishDate">
+        <el-date-picker
+          v-model="queryParams.establishDate"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['xxjj:warehouse:create']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['xxjj:warehouse:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="仓库id" align="center" prop="id" />
+      <el-table-column label="仓库编号" align="center" prop="warehouseCode" />
+      <el-table-column label="仓库名称" align="center" prop="warehouseName" />
+      <el-table-column label="仓库简称" align="center" prop="warehouseSimple" />
+      <el-table-column
+        label="隶属业务线"
+        align="center"
+        prop="affiliatLineId"
+      />
+      <el-table-column label="类型" align="center" prop="type">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.WAREHOUSE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="所在城市" align="center" prop="city" />
+      <el-table-column
+        label="成立时间"
+        align="center"
+        prop="establishDate"
+        width="180"
+      >
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.establishDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="归属人员" align="center" prop="belongUserId" />
+      <el-table-column label="介绍" align="center" prop="description" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template v-slot="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['xxjj:warehouse:update']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['xxjj:warehouse:delete']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      v-dialogDrag
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="仓库编号" prop="warehouseCode">
+          <el-input v-model="form.warehouseCode" placeholder="请输入仓库编号" />
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="warehouseName">
+          <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
+        </el-form-item>
+        <el-form-item label="仓库简称" prop="warehouseSimple">
+          <el-input
+            v-model="form.warehouseSimple"
+            placeholder="请输入仓库简称"
+          />
+        </el-form-item>
+        <el-form-item label="隶属业务线" prop="affiliatLineId">
+          <el-input
+            v-model="form.affiliatLineId"
+            placeholder="请输入隶属业务线"
+          />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option
+              v-for="dict in this.getDictDatas(DICT_TYPE.WAREHOUSE_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所在城市" prop="city">
+          <el-input v-model="form.city" placeholder="请输入所在城市" />
+        </el-form-item>
+        <el-form-item label="成立时间" prop="establishDate">
+          <el-date-picker
+            clearable
+            v-model="form.establishDate"
+            type="date"
+            value-format="timestamp"
+            placeholder="选择成立时间"
+          />
+        </el-form-item>
+        <el-form-item label="归属人员" prop="belongUserId">
+          <el-input v-model="form.belongUserId" placeholder="请输入归属人员" />
+        </el-form-item>
+        <el-form-item label="介绍" prop="description">
+          <el-input v-model="form.description" placeholder="请输入介绍" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  createWarehouse,
+  updateWarehouse,
+  deleteWarehouse,
+  getWarehouse,
+  getWarehousePage,
+  exportWarehouseExcel,
+} from "@/api/xxjj/warehouse";
+
+export default {
+  name: "Warehouse",
+  components: {},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 仓库列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        warehouseCode: null,
+        warehouseName: null,
+        affiliatLineId: null,
+        type: null,
+        city: null,
+        establishDate: [],
+        createTime: [],
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        warehouseCode: [
+          { required: true, message: "仓库编号不能为空", trigger: "blur" },
+        ],
+        warehouseName: [
+          { required: true, message: "仓库名称不能为空", trigger: "blur" },
+        ],
+        affiliatLineId: [
+          { required: true, message: "隶属业务线不能为空", trigger: "blur" },
+        ],
+        type: [{ required: true, message: "类型不能为空", trigger: "change" }],
+        city: [
+          { required: true, message: "所在城市不能为空", trigger: "blur" },
+        ],
+        establishDate: [
+          { required: true, message: "成立时间不能为空", trigger: "blur" },
+        ],
+        belongUserId: [
+          { required: true, message: "归属人员不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getWarehousePage(this.queryParams).then((response) => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        warehouseCode: undefined,
+        warehouseName: undefined,
+        warehouseSimple: undefined,
+        affiliatLineId: undefined,
+        type: undefined,
+        city: undefined,
+        establishDate: undefined,
+        belongUserId: undefined,
+        description: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加仓库";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getWarehouse(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改仓库";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateWarehouse(this.form).then((response) => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createWarehouse(this.form).then((response) => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal
+        .confirm('是否确认删除仓库编号为"' + id + '"的数据项?')
+        .then(function () {
+          return deleteWarehouse(id);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal
+        .confirm("是否确认导出所有仓库数据项?")
+        .then(() => {
+          this.exportLoading = true;
+          return exportWarehouseExcel(params);
+        })
+        .then((response) => {
+          this.$download.excel(response, "仓库.xls");
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>