purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善单据从订单到出库后，库存的切换逻辑

Browse Source
This commit is contained in:
jishenghua
2024-02-21 13:56:27 +08:00
parent a5b7d1c837
commit 5fc14dcfb0
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -434,6 +434,7 @@
this.$refs.linkBillList.title = "选择采购订单" this.$refs.linkBillList.title = "选择采购订单"
}, },
linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) { linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) {
let that = this
this.rowCanEdit = false this.rowCanEdit = false
this.materialTable.columns[1].type = FormTypes.normal this.materialTable.columns[1].type = FormTypes.normal
this.changeFormTypes(this.materialTable.columns, 'preNumber', 1) this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
@@ -450,7 +451,6 @@
info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0 info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0 info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
} }
info.depotId = depotId ? depotId:''
info.linkId = info.id info.linkId = info.id
allTaxLastMoney += info.taxLastMoney allTaxLastMoney += info.taxLastMoney
listEx.push(info) listEx.push(info)
@@ -481,6 +481,12 @@
'remark': remark 'remark': remark
}) })
}) })
//判断后进行仓库的切换
if(depotId) {
setTimeout(function () {
that.batchSetDepotModalFormOk(depotId)
},1000)
}
} }
}, },
} }

8
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

@@ -452,6 +452,7 @@
this.$refs.linkBillList.title = "选择销售订单" this.$refs.linkBillList.title = "选择销售订单"
}, },
linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) { linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId) {
let that = this
this.rowCanEdit = false this.rowCanEdit = false
this.materialTable.columns[1].type = FormTypes.normal this.materialTable.columns[1].type = FormTypes.normal
this.changeFormTypes(this.materialTable.columns, 'preNumber', 1) this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
@@ -468,7 +469,6 @@
info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0 info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0 info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
} }
info.depotId = depotId ? depotId:''
info.linkId = info.id info.linkId = info.id
allTaxLastMoney += info.taxLastMoney allTaxLastMoney += info.taxLastMoney
listEx.push(info) listEx.push(info)
@@ -499,6 +499,12 @@
'remark': remark 'remark': remark
}) })
}) })
//判断后进行仓库的切换
if(depotId) {
setTimeout(function () {
that.batchSetDepotModalFormOk(depotId)
},1000)
}
} }
}, },
} }