|
@@ -978,7 +978,6 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
v-model="scope.row.fTruckno"
|
|
|
placeholder="车号"
|
|
|
:disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
|
|
@@ -2796,7 +2795,6 @@ export default {
|
|
|
remark: null,
|
|
|
fIsPass: 'F'
|
|
|
});
|
|
|
- console.log(JSON.stringify(this.dialogWhgenlegList))
|
|
|
}
|
|
|
this.whgenlegVisible = false;
|
|
|
},
|
|
@@ -3147,7 +3145,6 @@ export default {
|
|
|
this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
|
|
|
this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + '');
|
|
|
this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
|
|
|
- console.log(this.form)
|
|
|
}
|
|
|
if (response.data.corps) {
|
|
|
this.fMblnoOptions = response.data.corps;
|
|
@@ -3171,7 +3168,6 @@ export default {
|
|
|
}
|
|
|
this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
|
|
|
}
|
|
|
- console.log(JSON.stringify(this.dataList))
|
|
|
}
|
|
|
if (response.data.enclosures) {
|
|
|
this.relevantAttachments = response.data.enclosures;
|
|
@@ -3406,7 +3402,10 @@ export default {
|
|
|
let listSelection = JSON.parse(JSON.stringify(this.dataListSelection))
|
|
|
let formData = new window.FormData();
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
|
|
|
+ formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
+ formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
addWhgenleg(formData).then((response) => {
|
|
|
this.fid = response.data.fPid;
|
|
|
// 暂时注释掉,后续可能会加回来 仓储费得出的明细
|
|
@@ -3438,9 +3437,11 @@ export default {
|
|
|
if (valid) {
|
|
|
let listSelection = JSON.parse(JSON.stringify(this.dataListSelection))
|
|
|
let formData = new window.FormData();
|
|
|
- console.log(JSON.stringify(this.dataListSelection))
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
|
|
|
+ formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
+ formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
addJoblist(formData).then((response) => {
|
|
|
this.formBrowseStatus = true;
|
|
|
this.$refs.tableDr.clearSelection();
|
|
@@ -3464,7 +3465,10 @@ export default {
|
|
|
// 撤回入库
|
|
|
let withdrawList = JSON.parse(JSON.stringify(this.dataWithdrawList))
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataWithdrawList));
|
|
|
+ formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
+ formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
updateCredit(formData).then((response) => {
|
|
|
this.fid = response.data;
|
|
|
this.formBrowseStatus = false;
|
|
@@ -3510,8 +3514,11 @@ export default {
|
|
|
if (valid) {
|
|
|
let withdrawList = JSON.parse(JSON.stringify(this.dataListSelection))
|
|
|
let formData = new window.FormData()
|
|
|
- formData.append('warehouseBills', JSON.stringify(this.form))
|
|
|
- formData.append('warehousebillsitems', JSON.stringify(this.dataListSelection))
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
+ formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
|
|
|
+ formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
+ formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
for (let li in this.dataListSelection) {
|
|
|
this.dataListSelection[li].fBillstatus = 30
|
|
|
}
|
|
@@ -3591,16 +3598,11 @@ export default {
|
|
|
if (valid) {
|
|
|
this.form.fBillstatus = 2
|
|
|
let formData = new window.FormData()
|
|
|
- // 附件数据
|
|
|
- formData.append('tWarehouseBills', JSON.stringify(this.form))
|
|
|
- // 库存明细
|
|
|
- formData.append('tWarehousebillsitems', JSON.stringify(this.dataList))
|
|
|
- // 附件数据
|
|
|
- formData.append('tEnclosure', JSON.stringify(this.relevantAttachments))
|
|
|
- // 费用明细付款
|
|
|
- formData.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
|
|
|
- // 收款
|
|
|
- formData.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ formData.append("warehousebillsitems", JSON.stringify(this.dataList));
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
+ formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
+ formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
addWarehousebills(formData).then((response) => {
|
|
|
this.msgSuccess('保存成功')
|
|
|
this.form = response.data.warehouseBills
|
|
@@ -3612,7 +3614,6 @@ export default {
|
|
|
this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
|
|
|
this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
|
|
|
this.dataList = response.data.warehousebillsitems
|
|
|
- console.log(JSON.stringify(this.dataList))
|
|
|
})
|
|
|
}
|
|
|
})
|
|
@@ -3668,16 +3669,11 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
let formData = new window.FormData()
|
|
|
- // 附件数据
|
|
|
- formData.append('tWarehouseBills', JSON.stringify(this.form))
|
|
|
- // 库存明细
|
|
|
- formData.append('tWarehousebillsitems', JSON.stringify(this.dataList))
|
|
|
- // 附件数据
|
|
|
- formData.append('tEnclosure', JSON.stringify(this.relevantAttachments))
|
|
|
- // 费用明细付款
|
|
|
- formData.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
|
|
|
- // 收款
|
|
|
- formData.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ formData.append("warehousebillsitems", JSON.stringify(this.dataList));
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
+ formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
+ formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
warehouseSubmission(formData).then((response) => {
|
|
|
this.msgSuccess('提交成功')
|
|
|
this.cancel()
|