|
@@ -937,11 +937,11 @@
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
- prop="fWarehouseInformation"
|
|
|
+ prop="fTransferWarehouselocid"
|
|
|
header-align="center"
|
|
|
width="240px"
|
|
|
align="center"
|
|
|
- label="*调入库位"
|
|
|
+ label="*调入1库位"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
@@ -2730,6 +2730,7 @@ export default {
|
|
|
this.choiceWarehouse = true
|
|
|
treeselect(this.form.fWarehouseid).then(response => {
|
|
|
this.fWarehouseidOptions = response.data;
|
|
|
+ // this.dataList[this.inDex].fTransferWarehouselocid
|
|
|
})
|
|
|
this.Warehouse = this.dataList[this.inDex].fWarehouseInformation
|
|
|
},
|
|
@@ -2739,8 +2740,9 @@ export default {
|
|
|
},
|
|
|
confirm(){
|
|
|
this.$set(this.dataList[this.inDex], 'fWarehouseInformation', this.information)
|
|
|
- this.$set(this.dataList[this.inDex], 'fWarehouselocid', this.informationId)
|
|
|
+ this.$set(this.dataList[this.inDex], 'fTransferWarehouselocid ', this.informationId)
|
|
|
this.choiceWarehouse = false
|
|
|
+ this.dataList.fTransferWarehouselocid = this.informationId
|
|
|
},
|
|
|
// 撤销审核
|
|
|
backrRconciliation(){
|
|
@@ -3234,7 +3236,11 @@ export default {
|
|
|
fBusinessType: this.dialogWhgenlegList[whgen].fBusinessType + '',
|
|
|
fPlangrossweight: this.dialogWhgenlegList[whgen].fGrossweightblc,
|
|
|
fOriginalbilldate: this.dialogWhgenlegList[whgen].fOriginalbilldate,
|
|
|
+
|
|
|
+
|
|
|
fWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
|
|
|
+
|
|
|
+
|
|
|
fWarehouselocids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
|
|
|
fWarehouseLocationids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
|
|
|
fTransferWarehouselocid: null,
|
|
@@ -4224,6 +4230,7 @@ export default {
|
|
|
setTimeout(() => {
|
|
|
this.form.fBillstatus = 2
|
|
|
let formData = new window.FormData()
|
|
|
+ // this.dataList.fTransferWarehouselocid = this.treeselectList.fWarehouselocid
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataList));
|
|
|
formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|