|
|
@@ -343,7 +343,7 @@
|
|
|
<el-table-column
|
|
|
:label="`${title}编码`"
|
|
|
min-width="100"
|
|
|
- prop="onlyCode"
|
|
|
+ prop="sourceBizNo"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
label="批次号"
|
|
|
@@ -352,14 +352,14 @@
|
|
|
<el-table-column label="生产日期" width="200">
|
|
|
<template slot-scope="{ row }">
|
|
|
<span v-if="row.dateType === 2">
|
|
|
- {{ row.manufactureTime }}
|
|
|
+ {{ row.produceTime }}
|
|
|
</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="采购日期" width="200">
|
|
|
<template slot-scope="{ row }">
|
|
|
<span v-if="row.dateType === 1">
|
|
|
- {{ row.procurementtime }}
|
|
|
+ {{ row.procureTime }}
|
|
|
</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -371,13 +371,20 @@
|
|
|
<template slot-scope="{ row, $index }">
|
|
|
<template v-if="!row.isUnpack">
|
|
|
{{ row.measurementUnit }}{{ row.unit }}/{{
|
|
|
- row.minPackUnit
|
|
|
+ row.minUnit
|
|
|
}}</template
|
|
|
>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="包装编码" prop="num"></el-table-column>
|
|
|
- <el-table-column label="货位" prop="num" show-overflow-tooltip>
|
|
|
+ <el-table-column
|
|
|
+ label="包装编码"
|
|
|
+ prop="packageNo"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="货位"
|
|
|
+ prop="pathName"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
</el-table-column>
|
|
|
<el-table-column label="转消耗" prop="">
|
|
|
<template slot-scope="{ row }">
|
|
|
@@ -793,18 +800,18 @@
|
|
|
// delete newObj.inOutAddPO.extInfo;
|
|
|
console.log('2222', obj);
|
|
|
|
|
|
- // const res = await outin.addInOut(newObj);
|
|
|
- // if (res.code == 0) {
|
|
|
- // this.$message.success('保存成功!');
|
|
|
- // }
|
|
|
+ const res = await outin.save(obj);
|
|
|
+ if (res.code == 0) {
|
|
|
+ this.$message.success('保存成功!');
|
|
|
+ }
|
|
|
|
|
|
this.saveLoading = false;
|
|
|
- // this.$router.push('/warehouseManagement/outgoingManagement');
|
|
|
+ this.$router.push('/warehouseManagement/outgoingManagement');
|
|
|
|
|
|
- // if (res?.success) {
|
|
|
- // this.$message.success('保存成功!');
|
|
|
- // this.$router.go(-1);
|
|
|
- // }
|
|
|
+ if (res?.success) {
|
|
|
+ this.$message.success('保存成功!');
|
|
|
+ this.$router.go(-1);
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -855,10 +862,12 @@
|
|
|
// warehouseName: '', //仓库名称
|
|
|
assetType: this.formData.extInfo.assetType,
|
|
|
outInNum: '',
|
|
|
-
|
|
|
+ assetCode: next.code,
|
|
|
+ assetName: next.name,
|
|
|
bizStatus: 2
|
|
|
};
|
|
|
});
|
|
|
+ console.log('sasasasa===>>>', this.warehousingMaterialList);
|
|
|
},
|
|
|
async initData() {
|
|
|
const { data } = await getTreeByPid(0);
|