|
|
@@ -80,7 +80,7 @@
|
|
|
<el-form-item
|
|
|
label-width="65px"
|
|
|
label="调出仓库:"
|
|
|
- prop="warehouseId"
|
|
|
+ prop="outWarehouseId"
|
|
|
>
|
|
|
<template>
|
|
|
<el-select
|
|
|
@@ -130,7 +130,7 @@
|
|
|
<el-form-item
|
|
|
label-width="65px"
|
|
|
label="调出货架:"
|
|
|
- prop="warehouseId"
|
|
|
+ prop="outShelvesId"
|
|
|
>
|
|
|
<template>
|
|
|
<el-select
|
|
|
@@ -154,7 +154,7 @@
|
|
|
<el-form-item
|
|
|
label-width="65px"
|
|
|
label="调出货位:"
|
|
|
- prop="warehouseId"
|
|
|
+ prop="outFreightId"
|
|
|
>
|
|
|
<template>
|
|
|
<el-select
|
|
|
@@ -281,7 +281,7 @@
|
|
|
<el-form-item
|
|
|
label-width="65px"
|
|
|
label="调入仓库:"
|
|
|
- prop="warehouseId"
|
|
|
+ prop="inWarehouseId"
|
|
|
>
|
|
|
<template>
|
|
|
<el-select
|
|
|
@@ -307,7 +307,7 @@
|
|
|
<el-form-item
|
|
|
label-width="65px"
|
|
|
label="调入库区:"
|
|
|
- prop="outCargoAreaId"
|
|
|
+ prop="inCargoAreaId"
|
|
|
>
|
|
|
<template>
|
|
|
<el-select
|
|
|
@@ -331,7 +331,7 @@
|
|
|
<el-form-item
|
|
|
label-width="65px"
|
|
|
label="调入货架:"
|
|
|
- prop="warehouseId"
|
|
|
+ prop="inShelvesId"
|
|
|
>
|
|
|
<template>
|
|
|
<el-select
|
|
|
@@ -355,7 +355,7 @@
|
|
|
<el-form-item
|
|
|
label-width="65px"
|
|
|
label="调入货位:"
|
|
|
- prop="warehouseId"
|
|
|
+ prop="inFreightId"
|
|
|
>
|
|
|
<template>
|
|
|
<el-select
|
|
|
@@ -993,6 +993,15 @@
|
|
|
return new Promise((resolve, reject) => {
|
|
|
// 重置错误标志
|
|
|
this.searchState.hasError = false;
|
|
|
+
|
|
|
+ if(!this.params.inWarehouseId){
|
|
|
+
|
|
|
+ this.searchState.hasError = true;
|
|
|
+ const errorMsg = '调入仓库不能为空';
|
|
|
+ this.$message.error(errorMsg);
|
|
|
+ return reject(new Error(errorMsg));
|
|
|
+ }
|
|
|
+
|
|
|
if (this.allocateId == 1) {
|
|
|
// 库内调拨
|
|
|
if (this.params.inFreightId && this.params.outFreightId) {
|
|
|
@@ -1371,11 +1380,6 @@
|
|
|
this.selectionIds = this.selectionIds.filter((item) => item != row.id);
|
|
|
this.selection = this.selection.filter((item) => item.id != row.id);
|
|
|
this.$refs.table.setSelectedRowKeys(this.selectionIds);
|
|
|
- console.log('this.$refs.table.getSelectedRowKeys()~~~~', this.$refs.table);
|
|
|
-
|
|
|
-
|
|
|
- console.log('selectionIds~~~~', this.selectionIds);
|
|
|
- console.log('selection~~~~', this.selection);
|
|
|
this.$forceUpdate()
|
|
|
},
|
|
|
config() {
|
|
|
@@ -1390,7 +1394,7 @@
|
|
|
submit(status) {
|
|
|
if (!this.params.name) {
|
|
|
return this.$message.error('名称不能为空！');
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
// 提交前通过search方法校验数据
|
|
|
this.search().then(() => {
|
