|
@@ -928,7 +928,7 @@
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="140px"
|
|
|
- label="唛头"
|
|
|
+ label="*唛头"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
@@ -3900,8 +3900,12 @@ export default {
|
|
|
creditClick() {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
for (let warehouseCr in this.dataListSelection) {
|
|
|
+ if (this.dataListSelection[warehouseCr].fBillstatus === 20) {
|
|
|
+ this.$message.error("请先卸货");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
if (this.dataListSelection[warehouseCr].fBillstatus != 30) {
|
|
|
- this.$message.error("请先打印");
|
|
|
+ this.$message.error("请先打印作业单");
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.dataListSelection[warehouseCr].fGrossweight) {
|
|
@@ -4104,16 +4108,18 @@ export default {
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
for (let warehouseCr in this.Printinglist) {
|
|
|
console.log(this.Printinglist);
|
|
|
- // if (this.Printinglist[warehouseCr].fBillstatus === '20') {
|
|
|
- // this.$message.error("请先入库");
|
|
|
- // return false;
|
|
|
- // if (
|
|
|
- // this.Printinglist[warehouseCr].fDriverName !=
|
|
|
- // this.Printinglist[0].fDriverName
|
|
|
- // ) {
|
|
|
- // this.$message.error("请选择相同司机名");
|
|
|
- // return false;
|
|
|
- // }
|
|
|
+ if (this.dataListSelection[warehouseCr].fBillstatus === 10) {
|
|
|
+ this.$message.error("请先打印");
|
|
|
+ return false;
|
|
|
+ }if (this.dataListSelection[warehouseCr].fBillstatus === 30) {
|
|
|
+ this.$message.error("请勿重复卸货");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (this.Printinglist[warehouseCr].fBillstatus === 40) {
|
|
|
+ this.$message.error("请勿重复卸货");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
|
|
@@ -4323,9 +4329,7 @@ export default {
|
|
|
this.fid = response.data.warehouseBills.fId;
|
|
|
// this.open = true;
|
|
|
this.getList();
|
|
|
- return true
|
|
|
});
|
|
|
- return false
|
|
|
},
|
|
|
// 请核成功
|
|
|
pleaseCheck () {
|