dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
PQZ 2024-09-10 19:14:35 +08:00
parent f699cba7c0
commit 4de4def9d1
3 changed files with 402 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/api/base/warehouse/index.js
View File

@ -1,53 +1,53 @@
import request from '@/utils/request' import request from '@/utils/request'
// 创建仓库 // 创建仓库
export function createBaseWarehouse(data) { export function createBaseWarehouse(data) {
return request({ return request({
url: '/conf/base-warehouse/create', url: '/conf/baseWarehouse/create',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 更新仓库 // 更新仓库
export function updateBaseWarehouse(data) { export function updateBaseWarehouse(data) {
return request({ return request({
url: '/conf/base-warehouse/update', url: '/conf/baseWarehouse/update',
method: 'put', method: 'put',
data: data data: data
}) })
} }
// 删除仓库 // 删除仓库
export function deleteBaseWarehouse(id) { export function deleteBaseWarehouse(id) {
return request({ return request({
url: '/conf/base-warehouse/delete?id=' + id, url: '/conf/baseWarehouse/delete?id=' + id,
method: 'delete' method: 'delete'
}) })
} }
// 获得仓库 // 获得仓库
export function getBaseWarehouse(id) { export function getBaseWarehouse(id) {
return request({ return request({
url: '/conf/base-warehouse/get?id=' + id, url: '/conf/baseWarehouse/get?id=' + id,
method: 'get' method: 'get'
}) })
} }
// 获得仓库列表 // 获得仓库列表
export function getBaseWarehouseList(params) { export function getBaseWarehouseList(params) {
return request({ return request({
url: '/conf/base-warehouse/list', url: '/conf/baseWarehouse/list',
method: 'get', method: 'get',
params params
}) })
} }
// 导出仓库 Excel // 导出仓库 Excel
export function exportBaseWarehouseExcel(params) { export function exportBaseWarehouseExcel(params) {
return request({ return request({
url: '/conf/base-warehouse/export-excel', url: '/conf/baseWarehouse/export-excel',
method: 'get', method: 'get',
params, params,
responseType: 'blob' responseType: 'blob'
}) })
} }

333
src/views/conf/warehouse/BaseWarehouseForm.vue
View File

@ -1,148 +1,185 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body> <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="30%" v-dialogDrag append-to-body>
<el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px"> <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
<el-form-item label="父id" prop="parentId"> <el-form-item label="父级区域" prop="parentId">
<TreeSelect <TreeSelect
v-model="formData.parentId" v-model="formData.parentId"
:options="baseWarehouseTree" :options="baseWarehouseTree"
:normalizer="normalizer" :normalizer="normalizer"
placeholder="请选择父id" placeholder="请选择父级仓库区域"
/> />
</el-form-item> </el-form-item>
<el-form-item label="仓库/货架名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入仓库/货架名称" /> <el-input v-model="formData.name" placeholder="请输入仓库/货架名称"/>
</el-form-item> </el-form-item>
<el-form-item label="仓库/货架编码" prop="code"> <el-form-item label="编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入仓库/货架编码" /> <el-input v-model="formData.code" placeholder="请输入仓库/货架编码"/>
</el-form-item> </el-form-item>
<el-form-item label="状态（01启用，02禁用）" prop="status"> <el-form-item label="排序" prop="sort">
<el-radio-group v-model="formData.status"> <el-input-number v-model="formData.sort" :precision="2" :step="0.1" :max="10"></el-input-number>
<el-radio label="1">请选择字典生成</el-radio> </el-form-item>
</el-radio-group> <el-form-item label="状态" prop="status">
</el-form-item> <el-switch
<el-form-item label="备注" prop="remark"> v-model="formData.status"
<el-input v-model="formData.remark" placeholder="请输入备注" /> active-color="#13ce66"
</el-form-item> inactive-color="#ff4949"
<el-form-item label="所属子公司" prop="corpId"> active-value="01"
<el-input v-model="formData.corpId" placeholder="请输入所属子公司" /> inactive-value="02">
</el-form-item> </el-switch>
</el-form> </el-form-item>
<div slot="footer" class="dialog-footer"> <el-form-item label="关联子公司" prop="corpId">
<el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button> <el-select v-model="formData.corpIds" multiple placeholder="请选择">
<el-button @click="dialogVisible = false">取 消</el-button> <el-option
</div> v-for="item in companyList"
</el-dialog> :key="item.id"
</div> :label="item.corpName"
</template> :value="item.id">
</el-option>
<script> </el-select>
import * as BaseWarehouseApi from '@/api/conf/warehouse'; </el-form-item>
import TreeSelect from "@riophae/vue-treeselect"; <el-form-item label="备注" prop="remark">
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; <el-input type="textarea" v-model="formData.remark" placeholder="请输入备注"/>
export default { </el-form-item>
name: "BaseWarehouseForm",
components: { </el-form>
TreeSelect, <div slot="footer" class="dialog-footer">
}, <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
data() { <el-button @click="dialogVisible = false">取 消</el-button>
return { </div>
// 弹出层标题 </el-dialog>
dialogTitle: "", </div>
// 是否显示弹出层 </template>
dialogVisible: false,
// 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 <script>
formLoading: false, import * as BaseWarehouseApi from '@/api/base/warehouse';
// 表单参数 import TreeSelect from "@riophae/vue-treeselect";
formData: { import "@riophae/vue-treeselect/dist/vue-treeselect.css";
parentId: undefined, import {getCompanyList} from '@/api/base/company'
name: undefined,
code: undefined, export default {
status: undefined, name: "BaseWarehouseForm",
remark: undefined, components: {
corpId: undefined, TreeSelect,
}, },
// 表单校验 data() {
formRules: { return {
}, // 弹出层标题
baseWarehouseTree: [], // 树形结构 dialogTitle: "",
}; // 是否显示弹出层
}, dialogVisible: false,
methods: { // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
/** 打开弹窗 */ formLoading: false,
async open(id) { // 表单参数
this.dialogVisible = true; formData: {
this.reset(); parentId: undefined,
// 修改时，设置数据 name: undefined,
if (id) { code: undefined,
this.formLoading = true; status: '01',
try { remark: undefined,
const res = await BaseWarehouseApi.getBaseWarehouse(id); corpIds: [],
this.formData = res.data; corpId: undefined,
this.title = "修改仓库"; },
} finally { // 表单校验
this.formLoading = false; formRules: {
} parentId: [{required: true, message: '父级仓库区域不能为空', trigger: 'blur'}],
} code: [{required: true, message: '编码不能为空', trigger: 'blur'}],
this.title = "新增仓库"; name: [{required: true, message: '名称不能为空', trigger: 'blur'}],
await this.getBaseWarehouseTree(); },
}, baseWarehouseTree: [], // 树形结构
/** 提交按钮 */ companyList: []
async submitForm() { };
// 校验主表 },
await this.$refs["formRef"].validate(); methods: {
this.formLoading = true; /** 打开弹窗 */
try { async open(id, addChild) {
const data = this.formData; this.dialogVisible = true;
// 修改的提交 this.reset();
if (data.id) { // 修改时，设置数据
await BaseWarehouseApi.updateBaseWarehouse(data); if (id && !addChild) {
this.$modal.msgSuccess("修改成功"); this.formLoading = true;
this.dialogVisible = false; try {
this.$emit('success'); const res = await BaseWarehouseApi.getBaseWarehouse(id);
return; this.formData = res.data;
} this.title = "修改仓库";
// 添加的提交 } finally {
await BaseWarehouseApi.createBaseWarehouse(data); this.formLoading = false;
this.$modal.msgSuccess("新增成功"); }
this.dialogVisible = false; }
this.$emit('success'); //新增子级
} finally { if (addChild) {
this.formLoading = false; this.formData.parentId = id;
} }
}, this.title = "新增仓库";
/** 获得仓库树 */ //获取仓库树
async getBaseWarehouseTree() { await this.getBaseWarehouseTree();
this.baseWarehouseTree = []; //获取子公司
const res = await BaseWarehouseApi.getBaseWarehouseList(); await this.listCompany();
const root = { id: 0, name: '顶级仓库', children: [] }; },
root.children = this.handleTree(res.data, 'id', 'parentId')
this.baseWarehouseTree.push(root) /**查询子公司*/
}, async listCompany() {
/** 转换仓库数据结构 */ const res = await getCompanyList()
normalizer(node) { this.companyList = res.data
if (node.children && !node.children.length) { },
delete node.children; /** 提交按钮 */
} async submitForm() {
return { // 校验主表
id: node.id, await this.$refs["formRef"].validate();
label: node.name, this.formLoading = true;
children: node.children try {
}; this.formData.corpId = this.formData.corpIds + ''
}, const data = this.formData;
/** 表单重置 */ // 修改的提交
reset() { if (data.id) {
this.formData = { await BaseWarehouseApi.updateBaseWarehouse(data);
parentId: undefined, this.$modal.msgSuccess("修改成功");
name: undefined, this.dialogVisible = false;
code: undefined, this.$emit('success');
status: undefined, return;
remark: undefined, }
corpId: undefined, // 添加的提交
}; await BaseWarehouseApi.createBaseWarehouse(data);
this.resetForm("formRef"); this.$modal.msgSuccess("新增成功");
} this.dialogVisible = false;
} this.$emit('success');
}; } finally {
</script> this.formLoading = false;
}
},
/** 获得仓库树 */
async getBaseWarehouseTree() {
this.baseWarehouseTree = [];
const res = await BaseWarehouseApi.getBaseWarehouseList();
const root = {id: 0, name: '顶级仓库', children: []};
root.children = this.handleTree(res.data, 'id', 'parentId', "children", "0")
this.baseWarehouseTree.push(root)
},
/** 转换仓库数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.id,
label: node.name,
children: node.children
};
},
/** 表单重置 */
reset() {
this.formData = {
parentId: undefined,
name: undefined,
code: undefined,
status: '01',
remark: undefined,
corpIds: [],
corpId: undefined,
};
this.resetForm("formRef");
}
}
};
</script>

348
src/views/conf/warehouse/index.vue
View File

@ -1,184 +1,164 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="父id" prop="parentId"> <el-form-item label="名称" prop="name">
<el-input v-model="queryParams.parentId" placeholder="请输入父id" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.name" placeholder="请输入仓库/货架名称" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="仓库/货架名称" prop="name"> <el-form-item label="编码" prop="code">
<el-input v-model="queryParams.name" placeholder="请输入仓库/货架名称" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.code" placeholder="请输入仓库/货架编码" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="仓库/货架编码" prop="code"> <el-form-item>
<el-input v-model="queryParams.code" placeholder="请输入仓库/货架编码" clearable @keyup.enter.native="handleQuery"/> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
</el-form-item> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-form-item label="状态（01启用，02禁用）" prop="status"> </el-form-item>
<el-select v-model="queryParams.status" placeholder="请选择状态（01启用，02禁用）" clearable size="small"> </el-form>
<el-option label="请选择字典生成" value="" />
</el-select> <!-- 操作工具栏 -->
</el-form-item> <el-row :gutter="10" class="mb8">
<el-form-item label="备注" prop="remark"> <el-col :span="1.5">
<el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/> <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined,false)"
</el-form-item> v-hasPermi="['conf:base-warehouse:create']">新增
<el-form-item label="所属子公司" prop="corpId"> </el-button>
<el-input v-model="queryParams.corpId" placeholder="请输入所属子公司" clearable @keyup.enter.native="handleQuery"/> </el-col>
</el-form-item> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<el-form-item label="创建时间" prop="createTime"> </el-row>
<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-table
</el-form-item> v-loading="loading"
<el-form-item> :data="list"
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> :stripe="true"
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> :show-overflow-tooltip="true"
</el-form-item> v-if="refreshTable"
</el-form> row-key="id"
:default-expand-all="isExpandAll"
<!-- 操作工具栏 --> :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
<el-row :gutter="10" class="mb8"> >
<el-col :span="1.5"> <el-table-column label="名称" align="left" prop="name"/>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)" <el-table-column label="编码" align="center" prop="code"/>
v-hasPermi="['conf:base-warehouse:create']">新增</el-button> <el-table-column label="排序" align="center" prop="sort"/>
</el-col> <el-table-column label="状态" align="center" prop="status">
<el-col :span="1.5"> <template v-slot="scope">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <el-tag v-if="scope.row.status == '01'" type="success">启用</el-tag>
v-hasPermi="['conf:base-warehouse:export']">导出</el-button> <el-tag v-if="scope.row.status == '02'" type="success">禁用</el-tag>
</el-col> </template>
<el-col :span="1.5"> </el-table-column>
<el-button type="danger" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll"> <el-table-column label="所属子公司" align="left" prop="corpNames"/>
展开/折叠 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
</el-button> <template v-slot="scope">
</el-col> <el-button size="mini" type="text" icon="el-icon-plus" @click="openForm(scope.row.id,true)"
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> v-hasPermi="['conf:base-warehouse:update']">新增
</el-row> </el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id,false)"
<el-table v-hasPermi="['conf:base-warehouse:update']">修改
v-loading="loading" </el-button>
:data="list" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
:stripe="true" v-hasPermi="['conf:base-warehouse:delete']">删除
:show-overflow-tooltip="true" </el-button>
v-if="refreshTable" </template>
row-key="id" </el-table-column>
:default-expand-all="isExpandAll" </el-table>
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" <!-- 对话框(添加 / 修改) -->
> <BaseWarehouseForm ref="formRef" @success="getList"/>
<el-table-column label="父id" align="center" prop="parentId" /> </div>
<el-table-column label="仓库/货架名称" align="center" prop="name" /> </template>
<el-table-column label="仓库/货架编码" align="center" prop="code" />
<el-table-column label="状态（01启用，02禁用）" align="center" prop="status" /> <script>
<el-table-column label="备注" align="center" prop="remark" /> import * as BaseWarehouseApi from '@/api/base/warehouse';
<el-table-column label="所属子公司" align="center" prop="corpId" /> import BaseWarehouseForm from './BaseWarehouseForm.vue';
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template v-slot="scope"> export default {
<span>{{ parseTime(scope.row.createTime) }}</span> name: "BaseWarehouse",
</template> components: {
</el-table-column> BaseWarehouseForm,
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> },
<template v-slot="scope"> data() {
<el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)" return {
v-hasPermi="['conf:base-warehouse:update']">修改</el-button> // 遮罩层
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" loading: true,
v-hasPermi="['conf:base-warehouse:delete']">删除</el-button> // 导出遮罩层
</template> exportLoading: false,
</el-table-column> // 显示搜索条件
</el-table> showSearch: true,
<!-- 对话框(添加 / 修改) --> // 仓库列表
<BaseWarehouseForm ref="formRef" @success="getList" /> list: [],
</div> // 是否展开，默认全部展开
</template> isExpandAll: true,
// 重新渲染表格状态
<script> refreshTable: true,
import * as BaseWarehouseApi from '@/api/conf/warehouse'; // 选中行
import BaseWarehouseForm from './BaseWarehouseForm.vue'; currentRow: {},
export default { // 查询参数
name: "BaseWarehouse", queryParams: {
components: { parentId: null,
BaseWarehouseForm, name: null,
}, code: null,
data() { status: null,
return { remark: null,
// 遮罩层 corpId: null,
loading: true, createTime: [],
// 导出遮罩层 },
exportLoading: false, };
// 显示搜索条件 },
showSearch: true, created() {
// 仓库列表 this.getList();
list: [], },
// 是否展开，默认全部展开 methods: {
isExpandAll: true, /** 查询列表 */
// 重新渲染表格状态 async getList() {
refreshTable: true, try {
// 选中行 this.loading = true;
currentRow: {}, const res = await BaseWarehouseApi.getBaseWarehouseList(this.queryParams);
// 查询参数 this.list = this.handleTree(res.data, 'id', 'parentId',"children","0");
queryParams: { } finally {
parentId: null, this.loading = false;
name: null, }
code: null, },
status: null, /** 搜索按钮操作 */
remark: null, handleQuery() {
corpId: null, this.queryParams.pageNo = 1;
createTime: [], this.getList();
}, },
}; /** 重置按钮操作 */
}, resetQuery() {
created() { this.resetForm("queryForm");
this.getList(); this.handleQuery();
}, },
methods: { /** 添加/修改操作 */
/** 查询列表 */ openForm(id,addChild) {
async getList() { this.$refs["formRef"].open(id,addChild);
try { },
this.loading = true; /** 删除按钮操作 */
const res = await BaseWarehouseApi.getBaseWarehouseList(this.queryParams); async handleDelete(row) {
this.list = this.handleTree(res.data, 'id', 'parentId'); const id = row.id;
} finally { await this.$modal.confirm('是否确认删除仓库名称为"' + row.name + '"的数据项?')
this.loading = false; try {
} await BaseWarehouseApi.deleteBaseWarehouse(id);
}, await this.getList();
/** 搜索按钮操作 */ this.$modal.msgSuccess("删除成功");
handleQuery() { } catch {
this.queryParams.pageNo = 1; }
this.getList(); },
}, /** 导出按钮操作 */
/** 重置按钮操作 */ async handleExport() {
resetQuery() { await this.$modal.confirm('是否确认导出所有仓库数据项?');
this.resetForm("queryForm"); try {
this.handleQuery(); this.exportLoading = true;
}, const data = await BaseWarehouseApi.exportBaseWarehouseExcel(this.queryParams);
/** 添加/修改操作 */ this.$download.excel(data, '仓库.xls');
openForm(id) { } catch {
this.$refs["formRef"].open(id); } finally {
}, this.exportLoading = false;
/** 删除按钮操作 */ }
async handleDelete(row) { },
const id = row.id; /** 展开/折叠操作 */
await this.$modal.confirm('是否确认删除仓库编号为"' + id + '"的数据项?') toggleExpandAll() {
try { this.refreshTable = false
await BaseWarehouseApi.deleteBaseWarehouse(id); this.isExpandAll = !this.isExpandAll
await this.getList(); this.$nextTick(function () {
this.$modal.msgSuccess("删除成功"); this.refreshTable = true
} catch {} })
}, }
/** 导出按钮操作 */ }
async handleExport() { };
await this.$modal.confirm('是否确认导出所有仓库数据项?'); </script>
try {
this.exportLoading = true;
const data = await BaseWarehouseApi.exportBaseWarehouseExcel(this.queryParams);
this.$download.excel(data, '仓库.xls');
} catch {
} finally {
this.exportLoading = false;
}
},
/** 展开/折叠操作 */
toggleExpandAll() {
this.refreshTable = false
this.isExpandAll = !this.isExpandAll
this.$nextTick(function () {
this.refreshTable = true
})
}
}
};
</script>