|
|
@@ -742,6 +742,13 @@
|
|
|
@click="saveForm"
|
|
|
>保 存</el-button
|
|
|
>
|
|
|
+ <el-button
|
|
|
+ :disabled="browseStatus || Printinglist.length != 1"
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ @click="addRelevant('copy')"
|
|
|
+ >复制录入</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col style="display: flex; justify-content: flex-end">
|
|
|
<el-button
|
|
|
@@ -3183,6 +3190,7 @@ export default {
|
|
|
approVal: false,
|
|
|
approvalStatus: false,
|
|
|
doNot: false,
|
|
|
+ stockoi: null,
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -3209,6 +3217,9 @@ export default {
|
|
|
this.fStorageTypeOptions = response.data;
|
|
|
localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
|
|
|
});
|
|
|
+ this.getConfigKey("stockoi").then((response) => {
|
|
|
+ this.stockoi = response.msg;
|
|
|
+ });
|
|
|
listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
|
|
|
this.warehouseOptions = response.rows;
|
|
|
});
|
|
|
@@ -3362,7 +3373,10 @@ export default {
|
|
|
if (this.Printinglist[item].fBillstatus === 10) {
|
|
|
return this.$message.error("请先打印作业单");
|
|
|
}
|
|
|
- if (this.Printinglist[item].fBillstatus >= 30) {
|
|
|
+ if (
|
|
|
+ this.Printinglist[item].fBillstatus >= 30 &&
|
|
|
+ this.stockoi == "0"
|
|
|
+ ) {
|
|
|
return this.$message.error("请勿重复卸货");
|
|
|
}
|
|
|
}
|
|
|
@@ -3452,10 +3466,10 @@ export default {
|
|
|
if (!this.Printinglist[item].fId) {
|
|
|
return this.$message.error("请存在未保存的数据");
|
|
|
}
|
|
|
- if (this.Printinglist[item].fBillstatus == 10) {
|
|
|
+ if (this.Printinglist[item].fBillstatus == 10 && this.stockoi == "0") {
|
|
|
return this.$message.error("请存在未打印的作业单");
|
|
|
}
|
|
|
- if (this.Printinglist[item].fBillstatus == 20) {
|
|
|
+ if (this.Printinglist[item].fBillstatus == 20 && this.stockoi == "0") {
|
|
|
return this.$message.error("请存在未卸货的数据");
|
|
|
}
|
|
|
}
|
|
|
@@ -4021,6 +4035,11 @@ export default {
|
|
|
imporTable() {
|
|
|
this.$refs["importList"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
+ for (let item in this.detailList) {
|
|
|
+ if (this.importList.fCntrno == this.detailList[item].fCntrno) {
|
|
|
+ return this.$message.error("箱号不能重复");
|
|
|
+ }
|
|
|
+ }
|
|
|
this.detailList.push({
|
|
|
fBillstatus: 10,
|
|
|
fMblno: this.form.fMblno,
|
|
|
@@ -4067,14 +4086,14 @@ export default {
|
|
|
this.Printinglist = selection;
|
|
|
//允许确认入库list
|
|
|
this.dataListSelection = [];
|
|
|
- this.dataListSelection = selection.filter((e) => e.fBillstatus == 30);
|
|
|
+ if (this.stockoi == "0") {
|
|
|
+ this.dataListSelection = selection.filter((e) => e.fBillstatus == 30);
|
|
|
+ } else {
|
|
|
+ this.dataListSelection = selection;
|
|
|
+ }
|
|
|
//允许撤销入库list
|
|
|
this.dataWithdrawList = [];
|
|
|
this.dataWithdrawList = selection.filter((e) => e.fBillstatus == 40);
|
|
|
- console.log("ruku");
|
|
|
- console.log(this.dataListSelection);
|
|
|
- console.log("chexiao");
|
|
|
- console.log(this.dataWithdrawList);
|
|
|
},
|
|
|
// 合计
|
|
|
getSummaries(param) {
|
|
|
@@ -4172,18 +4191,7 @@ export default {
|
|
|
);
|
|
|
},
|
|
|
imporComputer() {
|
|
|
- if (this.importList.fQty > this.allfPlanqty) {
|
|
|
- return this.$alert("计划件数不能超过" + this.allfPlanqty, "提示", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- type: "warning",
|
|
|
- callback: (action) => {
|
|
|
- this.importList.fQty = this.allfPlanqty;
|
|
|
- this.playcomputer();
|
|
|
- },
|
|
|
- });
|
|
|
- } else {
|
|
|
- this.playcomputer();
|
|
|
- }
|
|
|
+ this.playcomputer();
|
|
|
},
|
|
|
// 库存总账多选框
|
|
|
whgenlegSelectionChange(selection) {
|
|
|
@@ -4248,7 +4256,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
// 入库明细新增list
|
|
|
- addRelevant() {
|
|
|
+ addRelevant(status) {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
this.title = "新增";
|
|
|
@@ -4295,6 +4303,28 @@ export default {
|
|
|
treeselect(this.form.fWarehouseid).then((response) => {
|
|
|
this.fWarehouseidOptions = response.data;
|
|
|
});
|
|
|
+ if (status == "copy") {
|
|
|
+ this.importList.fBsdate = Date.parse(this.Printinglist[0].fBsdate);
|
|
|
+ this.importList.fGoodsid = this.Printinglist[0].fGoodsid;
|
|
|
+ this.importList.fBusinessType = this.Printinglist[0].fBusinessType.toString();
|
|
|
+ this.importList.fMarks = this.Printinglist[0].fMarks;
|
|
|
+ this.importList.fWarehouselocid = this.Printinglist[0].fWarehouselocid;
|
|
|
+ this.importList.fWarehouseInformation = this.Printinglist[0].fWarehouseInformation;
|
|
|
+ this.importList.fPackagespecs = this.Printinglist[0].fPackagespecs;
|
|
|
+ this.importList.fCntrtype = Number(this.Printinglist[0].fCntrtype);
|
|
|
+ this.importList.fCntqty = this.Printinglist[0].fCntqty;
|
|
|
+ this.importList.fTruckno = this.Printinglist[0].fTruckno;
|
|
|
+ this.importList.fDriverName = this.Printinglist[0].fDriverName;
|
|
|
+ this.importList.fDriverTel = this.Printinglist[0].fDriverTel;
|
|
|
+ this.importList.fDriverIdCar = this.Printinglist[0].fDriverIdCar;
|
|
|
+ this.importList.fSerialNumber = this.Printinglist[0].fSerialNumber;
|
|
|
+ this.importList.fGoodsval = this.Printinglist[0].fGoodsval;
|
|
|
+ this.importList.remark = this.Printinglist[0].remark;
|
|
|
+ this.importList.fQty = this.Printinglist[0].fQty;
|
|
|
+ this.importList.fGrossweight = this.Printinglist[0].fGrossweight;
|
|
|
+ this.importList.fNetweight = this.Printinglist[0].fNetweight;
|
|
|
+ }
|
|
|
+ console.log(this.importList);
|
|
|
this.weightList = true;
|
|
|
}
|
|
|
});
|
qukaidi