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

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

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

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

@ -1,33 +1,48 @@
<template>
<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-item label="父id" prop="parentId">
<el-form-item label="父级区域" prop="parentId">
<TreeSelect
v-model="formData.parentId"
:options="baseWarehouseTree"
:normalizer="normalizer"
placeholder="请选择父id"
placeholder="请选择父级仓库区域"
/>
</el-form-item>
<el-form-item label="仓库/货架名称" prop="name">
<el-form-item label="名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入仓库/货架名称"/>
</el-form-item>
<el-form-item label="仓库/货架编码" prop="code">
<el-form-item label="编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入仓库/货架编码"/>
</el-form-item>
<el-form-item label="状态（01启用，02禁用）" prop="status">
<el-radio-group v-model="formData.status">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="formData.sort" :precision="2" :step="0.1" :max="10"></el-input-number>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-switch
v-model="formData.status"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="01"
inactive-value="02">
</el-switch>
</el-form-item>
<el-form-item label="关联子公司" prop="corpId">
<el-select v-model="formData.corpIds" multiple placeholder="请选择">
<el-option
v-for="item in companyList"
:key="item.id"
:label="item.corpName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="所属子公司" prop="corpId">
<el-input v-model="formData.corpId" placeholder="请输入所属子公司" />
<el-input type="textarea" v-model="formData.remark" placeholder="请输入备注"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
@ -38,9 +53,11 @@
</template>
<script>
import * as BaseWarehouseApi from '@/api/conf/warehouse';
import * as BaseWarehouseApi from '@/api/base/warehouse';
import TreeSelect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {getCompanyList} from '@/api/base/company'
export default {
name: "BaseWarehouseForm",
components: {
@ -59,23 +76,28 @@
parentId: undefined,
name: undefined,
code: undefined,
status: undefined,
status: '01',
remark: undefined,
corpIds: [],
corpId: undefined,
},
// 表单校验
formRules: {
parentId: [{required: true, message: '父级仓库区域不能为空', trigger: 'blur'}],
code: [{required: true, message: '编码不能为空', trigger: 'blur'}],
name: [{required: true, message: '名称不能为空', trigger: 'blur'}],
},
baseWarehouseTree: [], // 树形结构
companyList: []
};
},
methods: {
/** 打开弹窗 */
async open(id) {
async open(id, addChild) {
this.dialogVisible = true;
this.reset();
// 修改时，设置数据
if (id) {
if (id && !addChild) {
this.formLoading = true;
try {
const res = await BaseWarehouseApi.getBaseWarehouse(id);
@ -85,8 +107,21 @@
this.formLoading = false;
}
}
//新增子级
if (addChild) {
this.formData.parentId = id;
}
this.title = "新增仓库";
//获取仓库树
await this.getBaseWarehouseTree();
//获取子公司
await this.listCompany();
},
/**查询子公司*/
async listCompany() {
const res = await getCompanyList()
this.companyList = res.data
},
/** 提交按钮 */
async submitForm() {
@ -94,6 +129,7 @@
await this.$refs["formRef"].validate();
this.formLoading = true;
try {
this.formData.corpId = this.formData.corpIds + ''
const data = this.formData;
// 修改的提交
if (data.id) {
@ -117,7 +153,7 @@
this.baseWarehouseTree = [];
const res = await BaseWarehouseApi.getBaseWarehouseList();
const root = {id: 0, name: '顶级仓库', children: []};
root.children = this.handleTree(res.data, 'id', 'parentId')
root.children = this.handleTree(res.data, 'id', 'parentId', "children", "0")
this.baseWarehouseTree.push(root)
},
/** 转换仓库数据结构 */
@ -137,8 +173,9 @@
parentId: undefined,
name: undefined,
code: undefined,
status: undefined,
status: '01',
remark: undefined,
corpIds: [],
corpId: undefined,
};
this.resetForm("formRef");

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

@ -2,30 +2,12 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="父id" prop="parentId">
<el-input v-model="queryParams.parentId" placeholder="请输入父id" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="仓库/货架名称" prop="name">
<el-form-item label="名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入仓库/货架名称" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="仓库/货架编码" prop="code">
<el-form-item label="编码" prop="code">
<el-input v-model="queryParams.code" placeholder="请输入仓库/货架编码" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="状态（01启用，02禁用）" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态（01启用，02禁用）" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="所属子公司" prop="corpId">
<el-input v-model="queryParams.corpId" 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>
@ -35,16 +17,8 @@
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
v-hasPermi="['conf:base-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="['conf:base-warehouse:export']">导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">
展开/折叠
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined,false)"
v-hasPermi="['conf:base-warehouse:create']">新增
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -60,23 +34,27 @@
:default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table-column label="父id" align="center" prop="parentId" />
<el-table-column label="仓库/货架名称" align="center" prop="name" />
<el-table-column label="仓库/货架编码" align="center" prop="code" />
<el-table-column label="状态（01启用，02禁用）" align="center" prop="status" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="所属子公司" align="center" prop="corpId" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column label="名称" align="left" prop="name"/>
<el-table-column label="编码" align="center" prop="code"/>
<el-table-column label="排序" align="center" prop="sort"/>
<el-table-column label="状态" align="center" prop="status">
<template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
<el-tag v-if="scope.row.status == '01'" type="success">启用</el-tag>
<el-tag v-if="scope.row.status == '02'" type="success">禁用</el-tag>
</template>
</el-table-column>
<el-table-column label="所属子公司" align="left" prop="corpNames"/>
<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="openForm(scope.row.id)"
v-hasPermi="['conf:base-warehouse:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-plus" @click="openForm(scope.row.id,true)"
v-hasPermi="['conf:base-warehouse:update']">新增
</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id,false)"
v-hasPermi="['conf:base-warehouse:update']">修改
</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['conf:base-warehouse:delete']">删除</el-button>
v-hasPermi="['conf:base-warehouse:delete']">删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -86,8 +64,9 @@
</template>
<script>
import * as BaseWarehouseApi from '@/api/conf/warehouse';
import * as BaseWarehouseApi from '@/api/base/warehouse';
import BaseWarehouseForm from './BaseWarehouseForm.vue';
export default {
name: "BaseWarehouse",
components: {
@ -130,7 +109,7 @@ export default {
try {
this.loading = true;
const res = await BaseWarehouseApi.getBaseWarehouseList(this.queryParams);
this.list = this.handleTree(res.data, 'id', 'parentId');
this.list = this.handleTree(res.data, 'id', 'parentId',"children","0");
} finally {
this.loading = false;
}
@ -146,18 +125,19 @@ export default {
this.handleQuery();
},
/** 添加/修改操作 */
openForm(id) {
this.$refs["formRef"].open(id);
openForm(id,addChild) {
this.$refs["formRef"].open(id,addChild);
},
/** 删除按钮操作 */
async handleDelete(row) {
const id = row.id;
await this.$modal.confirm('是否确认删除仓库编号为"' + id + '"的数据项?')
await this.$modal.confirm('是否确认删除仓库名称为"' + row.name + '"的数据项?')
try {
await BaseWarehouseApi.deleteBaseWarehouse(id);
await this.getList();
this.$modal.msgSuccess("删除成功");
} catch {}
} catch {
}
},
/** 导出按钮操作 */
async handleExport() {