|
|
@@ -2795,7 +2795,7 @@ import {
|
|
|
exportStockTransfer,
|
|
|
delstockTransfer_s,
|
|
|
serialNumber
|
|
|
-} from "@/api/warehouseBusiness/cargoClearance";
|
|
|
+} from "@/api/warehouseBusiness/stockTransfer";
|
|
|
|
|
|
import { listAgreement, operationAgreement } from "@/api/agreement/agreement";
|
|
|
|
|
|
@@ -3294,6 +3294,7 @@ export default {
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 50,
|
|
|
+ type:2,
|
|
|
fBillno: null,
|
|
|
createBy: null,
|
|
|
createTime: null,
|
|
|
@@ -3344,7 +3345,7 @@ export default {
|
|
|
fMblno: null,
|
|
|
fCorpid: null,
|
|
|
fWarehouseid: null,
|
|
|
- fInwarehouseid:null
|
|
|
+ fInwarehouseid:null,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {
|
|
|
@@ -3354,7 +3355,7 @@ export default {
|
|
|
fBsdates: null,
|
|
|
fTrademodeid: null,
|
|
|
fWarehouseid: null,
|
|
|
- fBstime:''
|
|
|
+ fBstime:'',
|
|
|
},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
@@ -3481,7 +3482,7 @@ export default {
|
|
|
save() {
|
|
|
this.showSetting = false;
|
|
|
this.data = {
|
|
|
- tableName: "调拨",
|
|
|
+ tableName: "货物通关",
|
|
|
userId: Cookies.get("userName"),
|
|
|
sysTableSetList: this.setRowList,
|
|
|
};
|
|
|
@@ -4197,17 +4198,14 @@ 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,
|
|
|
remark: null,
|
|
|
});
|
|
|
}
|
|
|
+ this.updateDeduplication()
|
|
|
this.whgenlegVisible = false;
|
|
|
},
|
|
|
// 作业单打印
|
|
|
@@ -4552,7 +4550,8 @@ export default {
|
|
|
this.title = "调拨单";
|
|
|
this.formBrowseStatus = false;
|
|
|
this.form = {
|
|
|
- fBstime:new Date()
|
|
|
+ fBstime:new Date(),
|
|
|
+ type:2
|
|
|
}
|
|
|
console.log(this.Operator,this.Lander)
|
|
|
},
|
|
|
@@ -4859,7 +4858,7 @@ export default {
|
|
|
listFees(queryParams).then((response) => {
|
|
|
this.fWbuOptions = response.rows;
|
|
|
});
|
|
|
- console.log(this.Operator,"111",this.Lander)
|
|
|
+ this.register()
|
|
|
});
|
|
|
},
|
|
|
// 数量计算
|
|
|
@@ -5064,6 +5063,7 @@ export default {
|
|
|
if (valid) {
|
|
|
let listSelection = JSON.parse(JSON.stringify(this.dataListSelection))
|
|
|
let formData = new window.FormData();
|
|
|
+ formData.append("type", '2');
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
|
|
|
@@ -5183,6 +5183,7 @@ export default {
|
|
|
setTimeout(() => {
|
|
|
let formData = new window.FormData()
|
|
|
this.form.fItemsStatus = 4
|
|
|
+ formData.append("type", '2');
|
|
|
// this.dataList.fTransferWarehouselocid = this.treeselectList.fWarehouselocid
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataList));
|
|
|
@@ -5428,6 +5429,8 @@ export default {
|
|
|
this.$set(this.form, 'fMarks', Array.from(new Set(fMarks)).join(","))
|
|
|
this.$set(this.form, 'fProductName', Array.from(new Set(fProductName)).join(","))
|
|
|
this.$set(this.form, 'fMblno', Array.from(new Set(fMblno)).join(","))
|
|
|
+ this.form.fMblno = this.form.fMblno.substring(0,this.form.fMblno.length-1)
|
|
|
+ console.log(this.form.fMblno)
|
|
|
|
|
|
},
|
|
|
// 保存
|
|
|
@@ -5448,8 +5451,10 @@ export default {
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
this.form.fBillstatus = 2
|
|
|
+ console.log(this.dataList)
|
|
|
let formData = new window.FormData()
|
|
|
// this.dataList.fTransferWarehouselocid = this.treeselectList.fWarehouselocid
|
|
|
+ formData.append("type", '2');
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataList));
|
|
|
formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
@@ -5467,9 +5472,11 @@ 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(response.data.warehousebillsitems)
|
|
|
for (let li in this.dataList) {
|
|
|
this.$set(this.dataList[li], 'fBsdate', Date.parse(this.dataList[li].fBsdate))
|
|
|
this.$set(this.dataList[li], 'fBusinessType', this.dataList[li].fBusinessType + '')
|
|
|
+ console.log(this.dataList[li].fMblno)
|
|
|
}
|
|
|
})
|
|
|
}, 200);
|
|
|
@@ -5491,7 +5498,6 @@ export default {
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
- this.updateDeduplication()
|
|
|
this.$refs['form'].validate((valid) => {
|
|
|
if (this.dataList.length === 0) {
|
|
|
this.$message.error('请新增库存明细!')
|
|
|
@@ -5581,6 +5587,7 @@ export default {
|
|
|
this.form.fId = this.fid
|
|
|
}
|
|
|
let formData = new window.FormData()
|
|
|
+ formData.append("type", '2');
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataList));
|
|
|
formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
@@ -5697,8 +5704,16 @@ export default {
|
|
|
deleteRow(index, rows) {
|
|
|
rows.splice(index, 1);
|
|
|
if (this.dataList.length === 0) {
|
|
|
+ this.form.fMblno = ''
|
|
|
this.formBrowseStatus = false
|
|
|
return false
|
|
|
+ }else {
|
|
|
+ let fMblno = []
|
|
|
+ for(let item in this.dataList){
|
|
|
+ fMblno.push(this.dataList[item].fMblno)
|
|
|
+ this.$set(this.form,'fMblno',Array.from(new Set(fMblno)).join(","))
|
|
|
+ this.form.fMblno = this.form.fMblno.substring(0,this.form.fMblno.length-1)
|
|
|
+ }
|
|
|
}
|
|
|
let sum = 0
|
|
|
for (let li in this.dataList) {
|
wengyuwen