|
|
@@ -337,7 +337,7 @@
|
|
|
<el-link
|
|
|
type="danger"
|
|
|
@click="deleteProductList(row, $index)"
|
|
|
- v-if="isEdit && row.isSuspend != 1"
|
|
|
+ v-if="isEdit"
|
|
|
>删除</el-link
|
|
|
>
|
|
|
</template>
|
|
|
@@ -1068,15 +1068,18 @@
|
|
|
);
|
|
|
});
|
|
|
}
|
|
|
+ console.log(this.saleProductList, 'this.saleProductList33333');
|
|
|
let pData = {
|
|
|
type: '1',
|
|
|
+ deliveryOrderNo: this.form.docNo,
|
|
|
builders: this.detailList.map((item) => {
|
|
|
return {
|
|
|
categoryId:
|
|
|
item.categoryId || item.instanceId || item.productId,
|
|
|
num: item.demandQuantity || item.measurementCount,
|
|
|
warehouseId: this.bizType == 11 ? item.warehouseId : '',
|
|
|
- batchNo: item.batchNo || ''
|
|
|
+ batchNo: item.batchNo || '',
|
|
|
+ reversionBatchNo: item.isSuspend == 1 ? item.offsetDetail?.batchNo || '' : '',
|
|
|
};
|
|
|
})
|
|
|
};
|
|
|
@@ -1128,13 +1131,16 @@
|
|
|
this.formData.extInfo.verifyDeptCode = this.form.deptId;
|
|
|
this.formData.extInfo.verifyDeptName = this.form.deptName;
|
|
|
});
|
|
|
+ console.log(this.saleProductList, 'this.saleProductList11111');
|
|
|
let pData = {
|
|
|
type: '1',
|
|
|
+ deliveryOrderNo: this.form.docNo,
|
|
|
builders: this.saleProductList.map((item) => {
|
|
|
return {
|
|
|
categoryId: item.productId || item.categoryId,
|
|
|
num: item.totalCount,
|
|
|
- batchNo: item.batchNo || ''
|
|
|
+ batchNo: item.batchNo || '',
|
|
|
+ reversionBatchNo: item.isSuspend == 1 ? item?.offsetDetail[0]?.batchNo || '' : '',
|
|
|
// warehouseId: this.bizType == 3 ? item.warehouseId : ''
|
|
|
// batchNo: item.batchNo || '',
|
|
|
};
|
|
|
@@ -1145,6 +1151,7 @@
|
|
|
taskIds: this.extractedList.map((item) => item.taskId),
|
|
|
workOrderIds: this.extractedList.map((item) => item.workOrderId)
|
|
|
};
|
|
|
+ console.log('111~~~~~~~~', pData)
|
|
|
storageApi
|
|
|
.getHierarchyFifo(this.wwType == 3 ? pData2 : pData)
|
|
|
.then((data) => {
|
|
|
@@ -1163,8 +1170,10 @@
|
|
|
this.formData.extInfo.verifyDeptCode = this.form.deptId;
|
|
|
this.formData.extInfo.verifyDeptName = this.form.deptName;
|
|
|
});
|
|
|
+ console.log(this.saleProductList, 'this.saleProductList22222');
|
|
|
let pData = {
|
|
|
type: '1',
|
|
|
+ // deliveryOrderNo: this.form.docNo,
|
|
|
builders: this.form.productList.map((item) => {
|
|
|
return {
|
|
|
categoryId: item.productId,
|