|
|
@@ -102,7 +102,7 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="8">
|
|
|
+ <!-- <el-col :span="8">
|
|
|
<el-form-item
|
|
|
label-width="65px"
|
|
|
label="调出库区:"
|
|
|
@@ -173,7 +173,7 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
<!-- </el-row>
|
|
|
<el-row :gutter="15"> -->
|
|
|
<el-col :span="8">
|
|
|
@@ -225,7 +225,7 @@
|
|
|
>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
+
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<div
|
|
|
@@ -328,7 +328,7 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="12">
|
|
|
+ <!-- <el-col :span="12">
|
|
|
<el-form-item
|
|
|
label-width="65px"
|
|
|
label="调入库区:"
|
|
|
@@ -399,7 +399,7 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<ele-pro-table
|
|
|
@@ -414,10 +414,10 @@
|
|
|
:fullZIndex="rightTableFullscreen ? 1000 : 999"
|
|
|
>
|
|
|
<template v-slot:quantity="{ row }">
|
|
|
- <el-input-number
|
|
|
- v-model="row.quantity"
|
|
|
- controls-position="right"
|
|
|
- :min="0"
|
|
|
+ <el-input-number
|
|
|
+ v-model="row.quantity"
|
|
|
+ controls-position="right"
|
|
|
+ :min="0"
|
|
|
:max="row.availableQuantity"
|
|
|
:precision="2"
|
|
|
style="width: 100%"
|
|
|
@@ -670,7 +670,7 @@
|
|
|
showOverflowTooltip: true,
|
|
|
}
|
|
|
] : []),
|
|
|
-
|
|
|
+
|
|
|
{
|
|
|
prop: 'weight',
|
|
|
label: '重量',
|
|
|
@@ -923,7 +923,7 @@
|
|
|
}
|
|
|
},
|
|
|
async created() {
|
|
|
-
|
|
|
+
|
|
|
// this.getTreeData();
|
|
|
await this.getFactoryList();
|
|
|
if (this.$route.query.isEdit) {
|
|
|
@@ -941,7 +941,7 @@
|
|
|
// if(this.allocateId == 1) {
|
|
|
// this.params.targetFactoriesId = this.factoryId
|
|
|
// }
|
|
|
- this.getTreeData(this.factoryId)
|
|
|
+ this.getTreeData(this.factoryId)
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -1014,7 +1014,7 @@
|
|
|
that.$refs.table.doLayout();
|
|
|
});
|
|
|
},
|
|
|
- async getEditInfo() {
|
|
|
+ async getEditInfo() {
|
|
|
const dataList = await storageApi.getAllotDetailList({
|
|
|
applyId: this.$route.query.id
|
|
|
});
|
|
|
@@ -1047,7 +1047,7 @@
|
|
|
};
|
|
|
|
|
|
console.log('baseInfo------', baseInfo);
|
|
|
- // 兼容旧数据
|
|
|
+ // 兼容旧数据
|
|
|
if (baseInfo.inventoryDimension == 0) {
|
|
|
if (dataList?.length) {
|
|
|
if (dataList[0].packageNo) {
|
|
|
@@ -1059,7 +1059,7 @@
|
|
|
} else {
|
|
|
this.dimension = baseInfo.inventoryDimension + '';
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (this.allocateId == 1) {
|
|
|
// 库内调拨
|
|
|
await this.outWarehouseChange(baseInfo.sourceWarehouseId); // 加载调出库区
|
|
|
@@ -1089,7 +1089,7 @@
|
|
|
// console.log('filterObj---', filterObj);
|
|
|
return {
|
|
|
...item,
|
|
|
- // quantity: filterObj.measureQuantity,
|
|
|
+ // quantity: filterObj.measureQuantity,
|
|
|
// warehouseId: filterObj.warehouseId,
|
|
|
// warehouseName: filterObj.warehouseName,
|
|
|
// areaId: filterObj.areaId,
|
|
|
@@ -1552,8 +1552,8 @@
|
|
|
if (!this.params.name) {
|
|
|
this.loading = false;
|
|
|
return this.$message.error('名称不能为空！');
|
|
|
- }
|
|
|
-
|
|
|
+ }
|
|
|
+
|
|
|
// 提交前通过search方法校验数据
|
|
|
this.search().then(() => {
|
|
|
// 验证通过后检查表格数据
|
|
|
@@ -1614,11 +1614,11 @@
|
|
|
console.log('params.allotApplyAddPOBuilders------------', params);
|
|
|
const customerNames = params.allotApplyAddPOBuilders.map((item) => item.customerNames);
|
|
|
const saleOrderNos = params.allotApplyAddPOBuilders.map((item) => item.saleOrderNos);
|
|
|
-
|
|
|
+
|
|
|
if (new Set(customerNames).size !== 1, new Set(saleOrderNos).size !== 1) {
|
|
|
this.loading = false;
|
|
|
return this.$message.warning('不同客户，不同销售订单的产品不允许调拨');
|
|
|
- }
|
|
|
+ }
|
|
|
storageApi.allotApplySave(params).then(() => {
|
|
|
this.$message.success('保存成功');
|
|
|
this.$router.go(-1);
|
