|
@@ -189,8 +189,8 @@
|
|
|
v-model="dimension"
|
|
v-model="dimension"
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
|
>
|
|
>
|
|
|
- <el-option v-if="allocateId != 1" label="物品维度" value="1"> </el-option>
|
|
|
|
|
- <el-option v-if="allocateId != 1" label="批次维度" value="2"> </el-option>
|
|
|
|
|
|
|
+ <el-option label="物品维度" value="1"> </el-option>
|
|
|
|
|
+ <el-option label="批次维度" value="2"> </el-option>
|
|
|
<el-option label="包装维度" value="3"> </el-option>
|
|
<el-option label="包装维度" value="3"> </el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</template>
|
|
</template>
|
|
@@ -701,7 +701,7 @@
|
|
|
tuneLibrary: [], // 调入库
|
|
tuneLibrary: [], // 调入库
|
|
|
outWarehouseList: [],
|
|
outWarehouseList: [],
|
|
|
inWarehouseList: [],
|
|
inWarehouseList: [],
|
|
|
- dimension: '3',
|
|
|
|
|
|
|
+ dimension: '2',
|
|
|
// 搜索验证状态
|
|
// 搜索验证状态
|
|
|
searchState: { hasError: false },
|
|
searchState: { hasError: false },
|
|
|
params: {
|
|
params: {
|
|
@@ -1158,7 +1158,7 @@
|
|
|
if (baseInfo.inventoryDimension == 0) {
|
|
if (baseInfo.inventoryDimension == 0) {
|
|
|
if (dataList?.length) {
|
|
if (dataList?.length) {
|
|
|
if (dataList[0].packageNo) {
|
|
if (dataList[0].packageNo) {
|
|
|
- this.dimension = '3';
|
|
|
|
|
|
|
+ this.dimension = '2';
|
|
|
}else{
|
|
}else{
|
|
|
this.dimension = '2';
|
|
this.dimension = '2';
|
|
|
}
|
|
}
|
|
@@ -1493,10 +1493,10 @@
|
|
|
inWarehouseChange(val) {
|
|
inWarehouseChange(val) {
|
|
|
this.inCargoAreaList = this.inTreeList.filter(
|
|
this.inCargoAreaList = this.inTreeList.filter(
|
|
|
(item) => item.id == val
|
|
(item) => item.id == val
|
|
|
- )[0].children;
|
|
|
|
|
|
|
+ )[0]?.children;
|
|
|
this.params.inWarehouseName = this.inTreeList.filter(
|
|
this.params.inWarehouseName = this.inTreeList.filter(
|
|
|
(item) => item.id == val
|
|
(item) => item.id == val
|
|
|
- )[0].name;
|
|
|
|
|
|
|
+ )[0]?.name;
|
|
|
// this.productList = [];
|
|
// this.productList = [];
|
|
|
// this.tableData = [];
|
|
// this.tableData = [];
|
|
|
// this.selection = [];
|
|
// this.selection = [];
|
|
@@ -1651,7 +1651,7 @@
|
|
|
goodsAllocationName: item.goodsAllocationName,
|
|
goodsAllocationName: item.goodsAllocationName,
|
|
|
goodsShelfId: item.goodsShelfId,
|
|
goodsShelfId: item.goodsShelfId,
|
|
|
goodsShelfName: item.goodsShelfName,
|
|
goodsShelfName: item.goodsShelfName,
|
|
|
- outInDetailRecordId: item.outInDetailRecordId,
|
|
|
|
|
|
|
+ outInDetailRecordId: item.id,
|
|
|
targetAreaId: item.targetAreaId,
|
|
targetAreaId: item.targetAreaId,
|
|
|
targetAreaName: item.targetAreaName,
|
|
targetAreaName: item.targetAreaName,
|
|
|
targetGoodsAllocationId: item.targetGoodsAllocationId,
|
|
targetGoodsAllocationId: item.targetGoodsAllocationId,
|