|
|
@@ -55,7 +55,7 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@click.stop="pick(row)"
|
|
|
- :disabled="seeDisabled||!assemblyForm.hblno"
|
|
|
+ :disabled="seeDisabled || !assemblyForm.hblno"
|
|
|
>
|
|
|
选择
|
|
|
</el-button>
|
|
|
@@ -64,7 +64,7 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@click.stop="rowRevoke(row)"
|
|
|
- :disabled="seeDisabled||!assemblyForm.hblno"
|
|
|
+ :disabled="seeDisabled || !assemblyForm.hblno"
|
|
|
>
|
|
|
撤销
|
|
|
</el-button>
|
|
|
@@ -169,7 +169,7 @@
|
|
|
placeholder="请输入 箱量"
|
|
|
size="small"
|
|
|
:controls="false"
|
|
|
- :disabled="boxForm.containerNumberStatus == '录入'||seeDisabled"
|
|
|
+ :disabled="boxForm.containerNumberStatus == '录入' || seeDisabled"
|
|
|
></el-input-number>
|
|
|
</template>
|
|
|
<template slot="polStationCnName">
|
|
|
@@ -264,7 +264,8 @@ import {
|
|
|
selectedContainerNumber,
|
|
|
revokeSelectedContainerNumber,
|
|
|
sendVerificationPrompt,
|
|
|
- actualOccupyNumUpdate
|
|
|
+ actualOccupyNumUpdate,
|
|
|
+ billVerificationPrompt
|
|
|
} from "@/api/iosBasicData/ReceivingOrders/precontainers";
|
|
|
import { getWorkDicts } from "@/api/system/dictbiz";
|
|
|
import { mapGetters } from "vuex";
|
|
|
@@ -709,7 +710,8 @@ export default {
|
|
|
overHidden: true
|
|
|
}
|
|
|
]
|
|
|
- }
|
|
|
+ },
|
|
|
+ verificationCost: false
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -733,12 +735,11 @@ export default {
|
|
|
async created() {
|
|
|
this.option = await this.getColumnData(this.getColumnName(487), this.optionBack);
|
|
|
this.containerOption = await this.getColumnData(this.getColumnName(488), this.containerOptionBack);
|
|
|
- // isProcurement({ param: "is.occupyNum" }).then(res => {
|
|
|
- // if (res.data.data == 1) {
|
|
|
- // this.containerOption.menu = true;
|
|
|
- // this.isOccupyNum = true;
|
|
|
- // }
|
|
|
- // });
|
|
|
+ isProcurement({ param: "verification.cost " }).then(res => {
|
|
|
+ if (res.data.data == 1) {
|
|
|
+ this.verificationCost = true;
|
|
|
+ }
|
|
|
+ });
|
|
|
},
|
|
|
methods: {
|
|
|
sendEdi() {
|
|
|
@@ -779,8 +780,8 @@ export default {
|
|
|
let occupyNumSum = 0;
|
|
|
for (let item of this.containerNumberItemList) {
|
|
|
occupyNumSum += Number(item.occupyNum ? item.occupyNum : 0);
|
|
|
- item.mblno=this.assemblyForm.mblno;
|
|
|
- item.hblno=this.assemblyForm.hblno;
|
|
|
+ item.mblno = this.assemblyForm.mblno;
|
|
|
+ item.hblno = this.assemblyForm.hblno;
|
|
|
}
|
|
|
if (occupyNumSum != this.boxForm.quantity) {
|
|
|
return this.$message.error(`明细数据所有占用箱量的和必须等于箱量:${this.boxForm.quantity}!`);
|
|
|
@@ -802,8 +803,8 @@ export default {
|
|
|
return this.$message.error(`放箱号:${item.containerNumber}占用数量不能低于已出场数量:${item.outNum}`);
|
|
|
}
|
|
|
occupyNumSum += Number(item.occupyNum ? item.occupyNum : 0);
|
|
|
- item.mblno=this.assemblyForm.mblno;
|
|
|
- item.hblno=this.assemblyForm.hblno;
|
|
|
+ item.mblno = this.assemblyForm.mblno;
|
|
|
+ item.hblno = this.assemblyForm.hblno;
|
|
|
}
|
|
|
if (occupyNumSum != this.boxForm.quantity) {
|
|
|
return this.$message.error(`明细数据所有占用箱量的和必须等于箱量:${this.boxForm.quantity}!`);
|
|
|
@@ -843,7 +844,7 @@ export default {
|
|
|
return this.$message.error("请选择卸货港");
|
|
|
}
|
|
|
this.boxForm = row;
|
|
|
- this.boxForm.polStationId = this.assemblyForm.cyId?this.assemblyForm.cyId:null;
|
|
|
+ this.boxForm.polStationId = this.assemblyForm.cyId ? this.assemblyForm.cyId : null;
|
|
|
this.boxForm.polStationCnName = this.assemblyForm.cyCnName;
|
|
|
let obj = {
|
|
|
boxType: row.cntrTypeCode,
|
|
|
@@ -854,16 +855,31 @@ export default {
|
|
|
etd: this.assemblyForm.etd + " 00:00:00",
|
|
|
polStationId: this.boxForm.polStationId
|
|
|
};
|
|
|
- getItemListHY(obj).then(res => {
|
|
|
- if (res.data.data) {
|
|
|
- res.data.data.forEach(item => {
|
|
|
- item.pid = this.assemblyForm.id;
|
|
|
+ if (this.verificationCost) {
|
|
|
+ billVerificationPrompt({ ids: this.assemblyForm.id }).then(res => {
|
|
|
+ getItemListHY(obj).then(res => {
|
|
|
+ if (res.data.data) {
|
|
|
+ res.data.data.forEach(item => {
|
|
|
+ item.pid = this.assemblyForm.id;
|
|
|
+ });
|
|
|
+ this.editStatus = true;
|
|
|
+ this.containerNumberItemList = res.data.data;
|
|
|
+ }
|
|
|
});
|
|
|
- this.editStatus = true;
|
|
|
- this.containerNumberItemList = res.data.data;
|
|
|
- }
|
|
|
- });
|
|
|
- this.dialogVisible = true;
|
|
|
+ this.dialogVisible = true;
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ getItemListHY(obj).then(res => {
|
|
|
+ if (res.data.data) {
|
|
|
+ res.data.data.forEach(item => {
|
|
|
+ item.pid = this.assemblyForm.id;
|
|
|
+ });
|
|
|
+ this.editStatus = true;
|
|
|
+ this.containerNumberItemList = res.data.data;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.dialogVisible = true;
|
|
|
+ }
|
|
|
},
|
|
|
getNoPick(type) {
|
|
|
this.containerNumberItemList = this.containerNumberItemList.filter(item => item.id || item.occupyNum > 0);
|
|
|
@@ -920,7 +936,7 @@ export default {
|
|
|
this.editStatus = true;
|
|
|
this.dialogVisible = true;
|
|
|
this.boxForm = row;
|
|
|
- this.boxForm.polStationId = this.assemblyForm.cyId?this.assemblyForm.cyId:null;
|
|
|
+ this.boxForm.polStationId = this.assemblyForm.cyId ? this.assemblyForm.cyId : null;
|
|
|
this.boxForm.polStationCnName = this.assemblyForm.cyCnName;
|
|
|
this.oldBoxForm = this.deepClone(row);
|
|
|
this.containerNumberItemList = this.deepClone(
|