|
@@ -352,7 +352,7 @@
|
|
|
>
|
|
|
<el-table-column type="selection" width="60" fixed align="center" />
|
|
|
<el-table-column type="index" label="行号" fixed align="center" />
|
|
|
- <el-table-column
|
|
|
+ <el-table-column
|
|
|
label="提单号"
|
|
|
width="180"
|
|
|
align="center"
|
|
@@ -4094,6 +4094,7 @@ export default {
|
|
|
approVal: false,
|
|
|
// 计价单位
|
|
|
jFeetunitOptions: [],
|
|
|
+ mblnoStatus:"",
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
fWarehouselocid: null,
|
|
@@ -4308,7 +4309,7 @@ export default {
|
|
|
getRow() {
|
|
|
let that = this;
|
|
|
this.data = {
|
|
|
- tableName: "计划下达",
|
|
|
+ tableName: "出库",
|
|
|
userId: Cookies.get("userName"),
|
|
|
};
|
|
|
select(this.data).then((res) => {
|
|
@@ -4333,7 +4334,7 @@ export default {
|
|
|
save() {
|
|
|
this.showSetting = false;
|
|
|
this.data = {
|
|
|
- tableName: "计划下达",
|
|
|
+ tableName: "出库",
|
|
|
userId: Cookies.get("userName"),
|
|
|
sysTableSetList: this.setRowList,
|
|
|
};
|
|
@@ -4737,6 +4738,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
cancelTwo() {
|
|
|
+ this.mblnoStatus=""
|
|
|
this.open = false;
|
|
|
let view = {
|
|
|
fullPath: "/business/outStock",
|
|
@@ -4761,6 +4763,7 @@ export default {
|
|
|
},
|
|
|
//关闭弹框的事件
|
|
|
addCloseDialog() {
|
|
|
+ this.mblnoStatus=""
|
|
|
this.getList();
|
|
|
},
|
|
|
// 上传成功返回数据
|
|
@@ -5512,6 +5515,7 @@ export default {
|
|
|
},
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
+ this.mblnoStatus=""
|
|
|
this.idCopy = null;
|
|
|
this.open = false;
|
|
|
this.fGrossweight = 0;
|
|
@@ -6743,46 +6747,70 @@ export default {
|
|
|
"warehousebillsfeesDr",
|
|
|
JSON.stringify(this.warehouseDrList)
|
|
|
);
|
|
|
+ formDatae.append("mblnoStatus", this.mblnoStatus);
|
|
|
addWarehousebills(formData).then((response) => {
|
|
|
- this.msgSuccess("保存成功");
|
|
|
- this.form = response.data.warehouseBills;
|
|
|
- this.$set(
|
|
|
- this.form,
|
|
|
- "fCartype",
|
|
|
- response.data.warehouseBills.fCartype + ""
|
|
|
- );
|
|
|
- this.$set(this.form, "fEta", Date.parse(this.form.fEta));
|
|
|
- this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
|
|
|
- this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
|
|
|
- this.$set(this.form, "fFeetunit", this.form.fFeetunit + "");
|
|
|
- this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
|
|
|
- this.$set(
|
|
|
- this.form,
|
|
|
- "createTime",
|
|
|
- Date.parse(this.form.createTime)
|
|
|
- );
|
|
|
- this.$set(
|
|
|
- this.form,
|
|
|
- "fChargedate",
|
|
|
- Date.parse(this.form.fChargedate)
|
|
|
- );
|
|
|
- this.$set(
|
|
|
- this.form,
|
|
|
- "fBusinessType",
|
|
|
- this.form.fBusinessType + ""
|
|
|
- );
|
|
|
- this.dataList = response.data.warehousebillsitems;
|
|
|
- for (let list in this.dataList) {
|
|
|
+ if (response.data == false) {
|
|
|
+ this.$confirm(response.msg, "提示", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning",
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.mblnoStatus = true;
|
|
|
+ this.preservation();
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ this.$message({
|
|
|
+ type: "info",
|
|
|
+ message: "已取消",
|
|
|
+ });
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ this.mblnoStatus =""
|
|
|
+ this.msgSuccess("保存成功");
|
|
|
+ this.form = response.data.warehouseBills;
|
|
|
this.$set(
|
|
|
- this.dataList[list],
|
|
|
- "fBsdate",
|
|
|
- Date.parse(this.dataList[list].fBsdate)
|
|
|
+ this.form,
|
|
|
+ "fCartype",
|
|
|
+ response.data.warehouseBills.fCartype + ""
|
|
|
);
|
|
|
+ this.$set(this.form, "fEta", Date.parse(this.form.fEta));
|
|
|
this.$set(
|
|
|
- this.dataList[list],
|
|
|
+ this.form,
|
|
|
+ "fTrademodeid",
|
|
|
+ this.form.fTrademodeid + ""
|
|
|
+ );
|
|
|
+ this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
|
|
|
+ this.$set(this.form, "fFeetunit", this.form.fFeetunit + "");
|
|
|
+ this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "createTime",
|
|
|
+ Date.parse(this.form.createTime)
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "fChargedate",
|
|
|
+ Date.parse(this.form.fChargedate)
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
"fBusinessType",
|
|
|
- this.dataList[list].fBusinessType + ""
|
|
|
+ this.form.fBusinessType + ""
|
|
|
);
|
|
|
+ this.dataList = response.data.warehousebillsitems;
|
|
|
+ for (let list in this.dataList) {
|
|
|
+ this.$set(
|
|
|
+ this.dataList[list],
|
|
|
+ "fBsdate",
|
|
|
+ Date.parse(this.dataList[list].fBsdate)
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ this.dataList[list],
|
|
|
+ "fBusinessType",
|
|
|
+ this.dataList[list].fBusinessType + ""
|
|
|
+ );
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
}, 200);
|