|
@@ -1825,7 +1825,7 @@
|
|
|
<div>
|
|
|
</div>
|
|
|
<div>
|
|
|
- <div>流水号:{{form.fBillno }}</div>
|
|
|
+ <div>流水号:{{ form.fBillno }}</div>
|
|
|
<div>办单日期:{{ nowTime }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -1996,6 +1996,19 @@
|
|
|
>
|
|
|
{{ company }}进仓单
|
|
|
</div>
|
|
|
+ <div
|
|
|
+ style="
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ margin-bottom: 5px;
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <div>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <div>流水号:{{ form.fBillno }}</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
<table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
|
|
|
<tr>
|
|
@@ -7002,6 +7015,7 @@ export default {
|
|
|
this.msgSuccess("撤销成功");
|
|
|
if (status) {
|
|
|
this.$set(this.form, "warehouseStatus", 2);
|
|
|
+ this.$set(this.form, "fBillstatus", 2);
|
|
|
}
|
|
|
}
|
|
|
});
|
|
@@ -7473,7 +7487,7 @@ export default {
|
|
|
getForm() {
|
|
|
let fId = null
|
|
|
if (this.chiId) fId = this.chiId
|
|
|
- if (this.form.fId) fId = this.form.fId
|
|
|
+ if (this.chiId? false: this.form.fId) fId = this.form.fId
|
|
|
getWarehousebills(fId).then((response) => {
|
|
|
this.TFformdata(response.data.warehousebills);
|
|
|
if (!this.copyStatus || this.recordStatus === true) {
|
|
@@ -7940,21 +7954,22 @@ export default {
|
|
|
if (response.data.enclosures) {
|
|
|
this.relevantAttachments = response.data.enclosures;
|
|
|
}
|
|
|
- } else {
|
|
|
- this.approvalStatus = false;
|
|
|
- this.browseStatus = false;
|
|
|
- this.$set(this.form, "fId", null);
|
|
|
- this.$set(this.form, "fMblno", null);
|
|
|
- this.$set(this.form, "fMarks", null);
|
|
|
- this.$set(this.form, "fProductName", null);
|
|
|
- this.$set(this.form, "warehouseStatus", null);
|
|
|
- this.$set(this.form, "fBillstatus", null);
|
|
|
- this.$set(this.form, "fItemsStatus", null);
|
|
|
- this.$set(this.form, "fNetweight", 0);
|
|
|
- this.$set(this.form, "fPlanvolumn", 0);
|
|
|
- this.$set(this.form, "fGrossweight", 0);
|
|
|
- // this.recordStatus = true
|
|
|
- }
|
|
|
+ }
|
|
|
+ // else {
|
|
|
+ // this.approvalStatus = false;
|
|
|
+ // this.browseStatus = false;
|
|
|
+ // this.$set(this.form, "fId", null);
|
|
|
+ // this.$set(this.form, "fMblno", null);
|
|
|
+ // this.$set(this.form, "fMarks", null);
|
|
|
+ // this.$set(this.form, "fProductName", null);
|
|
|
+ // this.$set(this.form, "warehouseStatus", null);
|
|
|
+ // this.$set(this.form, "fBillstatus", null);
|
|
|
+ // this.$set(this.form, "fItemsStatus", null);
|
|
|
+ // this.$set(this.form, "fNetweight", 0);
|
|
|
+ // this.$set(this.form, "fPlanvolumn", 0);
|
|
|
+ // this.$set(this.form, "fGrossweight", 0);
|
|
|
+ // // this.recordStatus = true
|
|
|
+ // }
|
|
|
});
|
|
|
if (status == "goBack") {
|
|
|
this.cancel();
|