Skip to content

J
jiedao-app-operator-master
Commit 1c7516eb authored by wanglianghe's avatar wanglianghe
Browse files
Options

货架管理

parent b30467db
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 63 deletions
src/utils/dict.js
View file @ 1c7516eb
......@@ -63,6 +63,7 @@ export const DICT_TYPE = {
ECW_REGION_TYPE: 'region_trade_type', // 区域类型
ECW_TRANSPORT_TYPE: 'transport_type', //货运方式
ECW_CHARGE_TYPE: 'warehouse_charge_type', //仓储收费方式
ECW_SHELF_TYPE: 'shelf_type', //货架类型
}
/**
......
src/views/ecw/productPrice/index.vue
View file @ 1c7516eb
......@@ -214,7 +214,7 @@
<el-form-item label="是否预付" prop="advanceStatus">
<el-radio-group v-model="form.advanceStatus">
<el-radio v-for="advanceDict in advanceStatusDictDatas" :label="parseInt(advanceDict.value)">{{advanceDict.label}}</el-radio>
<el-radio v-for="advanceDict in advanceStatusDictDatas" :key="advanceDict.value" :label="parseInt(advanceDict.value)">{{advanceDict.label}}</el-radio>
</el-radio-group>
</el-form-item>
......
src/views/ecw/shelf/index.vue
View file @ 1c7516eb
......@@ -3,50 +3,16 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="仓库ID" prop="warehouseId">
<el-input v-model="queryParams.warehouseId" placeholder="请输入仓库ID" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="区域名称" prop="regionName">
<el-input v-model="queryParams.regionName" placeholder="请输入区域名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item label="归属仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" clearable>
<el-option v-for="warehouse in warehouseList" :key="warehouse.id" :label="warehouse.titleZh" :value="warehouse.id" />
</el-select>
</el-form-item>
<el-form-item label="区域编码" prop="regionCode">
<el-input v-model="queryParams.regionCode" placeholder="请输入区域编码" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="条码起始号" prop="barcodeStart">
<el-input v-model="queryParams.barcodeStart" placeholder="请输入条码起始号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="货架数量" prop="shelfNum">
<el-input v-model="queryParams.shelfNum" placeholder="请输入货架数量" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="货架起始号" prop="shelfStart">
<el-input v-model="queryParams.shelfStart" placeholder="请输入货架起始号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="货架层数" prop="shelfLayer">
<el-input v-model="queryParams.shelfLayer" placeholder="请输入货架层数" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="层数起始号" prop="layerStart">
<el-input v-model="queryParams.layerStart" placeholder="请输入层数起始号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="货架格数" prop="shelfGridNum">
<el-input v-model="queryParams.shelfGridNum" placeholder="请输入货架格数" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="货架类型" prop="shelfType">
<el-select v-model="queryParams.shelfType" placeholder="请选择货架类型" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="queryParams.sort" placeholder="请输入排序" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="是否展示 默认为展示" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择是否展示 默认为展示" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</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>
......@@ -59,32 +25,41 @@
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:shelf:create']">新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:shelf:export']">导出</el-button>
</el-col>
</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="warehouseId" />
<el-table-column label="序号" type="index" width="50" />
<el-table-column label="归属仓库" align="center" prop="warehouseId" >
<template slot-scope="scope">
<span>{{ warehouseName(scope.row.warehouseId) }}</span>
</template>
</el-table-column>
<el-table-column label="区域名称" align="center" prop="regionName" />
<el-table-column label="区域编码" align="center" prop="regionCode" />
<el-table-column label="条码起始号" align="center" prop="barcodeStart" />
<el-table-column label="货架数量" align="center" prop="shelfNum" />
<el-table-column label="货架起始号" align="center" prop="shelfStart" />
<!-- <el-table-column label="货架起始号" align="center" prop="shelfStart" /> -->
<el-table-column label="货架层数" align="center" prop="shelfLayer" />
<el-table-column label="层数起始号" align="center" prop="layerStart" />
<!-- <el-table-column label="层数起始号" align="center" prop="layerStart" /> -->
<el-table-column label="货架格数" align="center" prop="shelfGridNum" />
<el-table-column label="货架类型" align="center" prop="shelfType" />
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="是否展示 默认为展示" align="center" prop="status" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column label="货架类型" align="center" prop="shelfType">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
<span>{{ shelfTypeName(scope.row.shelfType) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="排序" align="center" prop="sort" /> -->
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<span>{{ statusName(scope.row.status) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
......@@ -100,7 +75,7 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-form ref="form" :model="form" :rules="rules" label-width="98px">
<el-form-item label="归属仓库" prop="warehouseId">
<el-select v-model="form.warehouseId" clearable>
......@@ -161,18 +136,17 @@
<el-form-item label="货架类型" prop="shelfType">
<el-select v-model="form.shelfType" placeholder="请选择货架类型">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序" />
<el-radio-group v-model="form.shelfType">
<el-radio v-for="shelfTypeItem in shelfTypeDatas" :key="shelfTypeItem.value" :label="parseInt(shelfTypeItem.value)">{{shelfTypeItem.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否展示 默认为展示" prop="status">
<el-form-item label="是否显示" prop="status">
<el-radio-group v-model="form.status">
<el-radio label="1">请选择字典生成</el-radio>
<el-radio v-for="statusItem in statusDictDatas" :key="statusItem.value" :label="parseInt(statusItem.value)">{{statusItem.value == CommonStatusEnum.ENABLE + '' ? '显示' : '不显示'}}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -185,7 +159,8 @@
<script>
import { createShelf, updateShelf, deleteShelf, getShelf, getShelfPage, exportShelfExcel } from "@/api/ecw/shelf";
import { getWarehouseList } from "@/api/ecw/warehouse"
import { getDictDatas, DICT_TYPE } from '@/utils/dict';
import {CommonStatusEnum} from '@/utils/constants'
export default {
name: "Shelf",
......@@ -195,6 +170,9 @@ export default {
return {
//仓库列表
warehouseList: [],
shelfTypeDatas: getDictDatas(DICT_TYPE.ECW_SHELF_TYPE),
CommonStatusEnum: CommonStatusEnum,
statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
// 遮罩层
loading: true,
......@@ -232,10 +210,52 @@ export default {
form: {},
// 表单校验
rules: {
sort: [{ required: true, message: "排序不能为空", trigger: "blur" }],
warehouseId: [{ required: true, message: "归属仓库不能为空", trigger: "blur" }],
regionName: [{ required: true, message: "区域名称不能为空", trigger: "blur" }],
regionCode: [{ required: true, message: "区域编码不能为空", trigger: "blur" }],
barcodeStart: [{ required: true, message: "条码起始号不能为空", trigger: "blur" }],
shelfNum: [{ required: true, message: "货架数量不能为空", trigger: "blur" }],
shelfLayer: [{ required: true, message: "货架层数不能为空", trigger: "blur" }],
shelfType: [{ required: true, message: "货架类型不能为空", trigger: "blur" }],
}
};
},
computed: {
warehouseName() {
return warehouseId => {
for(let index in this.warehouseList) {
let warehouseItem = this.warehouseList[index];
if(warehouseItem.id == warehouseId) {
return warehouseItem.titleZh;
}
}
}
},
statusName() {
return value => {
for(let index in this.statusDictDatas) {
let dictItem = this.statusDictDatas[index];
if(dictItem.value == value) {
return dictItem.value == CommonStatusEnum.ENABLE + '' ? '显示' : '不显示';
}
}
}
},
shelfTypeName() {
return value => {
for(let index in this.shelfTypeDatas) {
let dictItem = this.shelfTypeDatas[index];
if(dictItem.value == value) {
return dictItem.label;
}
}
}
},
},
created() {
this.requestWarehouseList();
this.getList();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment