Browse Source

1.货架

dev-warehouse
0.0 2 years ago
parent
commit
af78cbe841
  1. 11
      src/api/warehouse/warehouseRetentionRecord.js
  2. 12
      src/option/warehouse/warehouseRetentionRecord.js
  3. 91
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  4. 10
      src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue
  5. 376
      src/views/warehouse/warehouseRetentionRecord/warehousewaybillRecord.vue

11
src/api/warehouse/warehouseRetentionRecord.js

@ -11,6 +11,17 @@ export const getList = (current, size, params) => {
}
})
}
export const getwaybillList = (current, size, params) => {
return request({
url: '/api/logpm-warehouse/warehouseRetentionRecord/waybill',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getDetail = (id) => {
return request({

12
src/option/warehouse/warehouseRetentionRecord.js

@ -7,7 +7,8 @@ export default {
border: true,
index: true,
viewBtn: true,
selection: true,
selection: false,
menu:false,
dialogClickModal: false,
column: [
{
@ -180,9 +181,14 @@ export default {
type: "input",
},
{
label: "滞留类型;1=装车滞留,2=配送滞留,3=取消滞留,4=出库滞留",
label: "滞留类型",
prop: "retentionType",
type: "input",
type: "select",
dicUrl: '/api/blade-system/dict-biz/dictionary?code=retention_type',
props: {
label: 'dictValue',
value: 'dictKey',
},
},
{
label: "装车时间",

91
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue

@ -79,25 +79,25 @@
:key="index">
</el-table-column>
</template>
<el-table-column
prop="enableStatus"
label="货架状态"
align="center"
width="150">
<template #default="{row,$index}" >
<el-switch
active-color="#13ce66"
v-model="row.enableState"
active-text="启用"
inactive-text="禁用"
@change="changeStatus($event,row,$index)">
</el-switch>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="enableStatus"-->
<!-- label="货架状态"-->
<!-- align="center"-->
<!-- width="150">-->
<!-- <template #default="{row,$index}" >-->
<!-- <el-switch-->
<!-- active-color="#13ce66"-->
<!-- v-model="row.enableState"-->
<!-- active-text="启用"-->
<!-- inactive-text="禁用"-->
<!-- @change="changeStatus($event,row,$index)">-->
<!-- </el-switch>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<!-- <el-button type="primary" text icon="el-icon-edit" @click="enableStatus(row)">-->
<!-- <span v-if="row.enableStatus === '启用'">禁用</span>-->
@ -178,11 +178,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="货架名称:" prop="goodsShelfName" label-width="100px" >
<el-input v-model="form.goodsShelfName" placeholder="请输入货架名称" style="width: 88%;"/>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="货架名称:" prop="goodsShelfName" label-width="100px" >-->
<!-- <el-input v-model="form.goodsShelfName" placeholder="请输入货架名称" style="width: 88%;"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="列 数:" prop="rowNum" label-width="100px">
<el-input v-model="form.rowNum" placeholder="请输入货架层数" style="width: 88%;"/>
@ -207,18 +207,18 @@
<!-- </el-cascader>-->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="模 板:" prop="templateId" label-width="100px">
<el-select v-model="form.templateId" clearable placeholder="请选择货架模板" style="width: 88%" >
<el-option
v-for="item in templateData"
:key="item.id"
:label="item.templateName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="模 板:" prop="templateId" label-width="100px">-->
<!-- <el-select v-model="form.templateId" clearable placeholder="请选择货架模板" style="width: 88%" >-->
<!-- <el-option-->
<!-- v-for="item in templateData"-->
<!-- :key="item.id"-->
<!-- :label="item.templateName"-->
<!-- :value="item.id">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="备 注:" prop="remarks" label-width="100px">
<el-input v-model="form.remarks" placeholder="请输入备注" style="width: 88%;"/>
@ -335,15 +335,15 @@ export default {
goodsAreaId: [
{ required: true, message: '请选择货区!', trigger: 'change' }
],
goodsShelfName: [
{ required: true, message: '请填写货架名称!', trigger: 'blur' }
],
goodsShelfStatus: [
{ required: true, message: '请选择货架状态!', trigger: 'change' }
],
enableStatus: [
{ required: true, message: '请选择启用状态!', trigger: 'change' }
],
// goodsShelfName: [
// { required: true, message: '!', trigger: 'blur' }
// ],
// goodsShelfStatus: [
// { required: true, message: '!', trigger: 'change' }
// ],
// enableStatus: [
// { required: true, message: '!', trigger: 'change' }
// ],
},
//
idShowStatus:false,
@ -415,6 +415,13 @@ export default {
this.$refs.form.validate(valid=>{
if (valid) {
if (!this.form.id) {
console.log("this.form>>>>>>>",this.form);
console.log("this.optioner>>>>>>>",this.optioner);
this.optioner.map(item=>{
if (item.id==this.form.goodsAreaId){
this.form.goodsAreaName=item.headline
}
})
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);

10
src/views/warehouse/warehouseRetentionRecord.vue → src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue

@ -26,11 +26,11 @@
v-if="permission.warehouseRetentionRecord_delete"
@click="handleDelete">
</el-button>
<el-button type="warning"
plain
icon="el-icon-download"
@click="handleExport">
</el-button>
<!-- <el-button type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- @click="handleExport"> -->
<!-- </el-button>-->
</template>
</avue-crud>
</basic-container>

376
src/views/warehouse/warehouseRetentionRecord/warehousewaybillRecord.vue

@ -0,0 +1,376 @@
<template>
<basic-container>
<avue-crud :option="option"
v-model:search="search"
v-model:page="page"
v-model="form"
:table-loading="loading"
:data="data"
:permission="permissionList"
:before-open="beforeOpen"
ref="crud"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
<template #menu-left>
<el-button type="danger"
icon="el-icon-delete"
plain
v-if="permission.warehouseRetentionRecord_delete"
@click="handleDelete">
</el-button>
<!-- <el-button type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- @click="handleExport"> -->
<!-- </el-button>-->
</template>
</avue-crud>
</basic-container>
</template>
<script>
import {getList, getDetail, add, update, remove,getwaybillList} from "@/api/warehouse/warehouseRetentionRecord";
import option from "@/option/warehouse/warehouseRetentionRecord";
import {mapGetters} from "vuex";
import {exportBlob} from "@/api/common";
import {getToken} from '@/utils/auth';
import {downloadXls} from "@/utils/util";
import {dateNow} from "@/utils/date";
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
export default {
data() {
return {
form: {},
query: {},
search: {},
loading: true,
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
selectionList: [],
option: {
height:'auto',
calcHeight: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
border: true,
index: true,
viewBtn: true,
selection: false,
menu:false,
dialogClickModal: false,
column: [
{
label: "主键",
prop: "id",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "租户号",
prop: "tenantId",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "状态",
prop: "status",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留1",
prop: "reserve1",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留2",
prop: "reserve2",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留3",
prop: "reserve3",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留4",
prop: "reserve4",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "预留5",
prop: "reserve5",
type: "input",
addDisplay: false,
editDisplay: false,
viewDisplay: false,
hide: true,
},
{
label: "运单",
prop: "waybillNo",
type: "input",
},
{
label: "滞留仓库",
prop: "retentionWarehouseName",
type: "input",
},
]
}
,
data: []
};
},
computed: {
...mapGetters(["permission"]),
permissionList() {
return {
addBtn: this.validData(this.permission.warehouseRetentionRecord_add, false),
viewBtn: this.validData(this.permission.warehouseRetentionRecord_view, false),
delBtn: this.validData(this.permission.warehouseRetentionRecord_delete, false),
editBtn: this.validData(this.permission.warehouseRetentionRecord_edit, false)
};
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
},
methods: {
rowSave(row, done, loading) {
add(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
done();
}, error => {
loading();
window.console.log(error);
});
},
rowUpdate(row, index, done, loading) {
update(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
done();
}, error => {
loading();
console.log(error);
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
handleExport() {
let downloadUrl = `/retentionRecord/warehouseRetentionRecord/export-warehouseRetentionRecord?${this.website.tokenHeader}=${getToken()}`;
const {
} = this.query;
let values = {
};
this.$confirm("是否导出数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
NProgress.start();
exportBlob(downloadUrl, values).then(res => {
downloadXls(res.data, `滞留记录${dateNow()}.xlsx`);
NProgress.done();
})
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
done();
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage){
this.page.currentPage = currentPage;
},
sizeChange(pageSize){
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
this.loading = true;
const {
} = this.query;
let values = {
};
getwaybillList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
}
}
};
</script>
<style>
</style>
Loading…
Cancel
Save